Index: trunk/src/helpers/dialog.c
===================================================================
--- trunk/src/helpers/dialog.c	(revision 159)
+++ trunk/src/helpers/dialog.c	(revision 161)
@@ -3135,5 +3135,5 @@
                             0,
                             { 150, SZL_AUTOSIZE },     // size
-                            5               // spacing
+                            COMMON_SPACING,
                          },
                 Entry = {
@@ -3145,5 +3145,5 @@
                             0,
                             { 150, SZL_AUTOSIZE },     // size
-                            5               // spacing
+                            COMMON_SPACING,
                          },
                 OKButton = {
@@ -3155,5 +3155,5 @@
                             0,
                             { STD_BUTTON_WIDTH, STD_BUTTON_HEIGHT },    // size
-                            5               // spacing
+                            COMMON_SPACING,
                          },
                 CancelButton = {
@@ -3165,5 +3165,5 @@
                             0,
                             { STD_BUTTON_WIDTH, STD_BUTTON_HEIGHT },    // size
-                            5               // spacing
+                            COMMON_SPACING,
                          };
     DLGHITEM DlgTemplate[] =
@@ -3217,5 +3217,5 @@
     if (NO_ERROR == dlghCreateDlg(&hwndDlg,
                                   hwndOwner,
-                                  FCF_TITLEBAR | FCF_SYSMENU | FCF_DLGBORDER | FCF_NOBYTEALIGN,
+                                  FCF_FIXED_DLG,
                                   WinDefDlgProc,
                                   strTitle.psz,
Index: trunk/src/helpers/dosh.c
===================================================================
--- trunk/src/helpers/dosh.c	(revision 159)
+++ trunk/src/helpers/dosh.c	(revision 161)
@@ -1282,4 +1282,5 @@
  *
  *@@added V0.9.16 (2002-01-13) [umoeller]
+ *@@changed V0.9.19 (2002-04-25) [umoeller]: added CDWFS (RSJ CD-Writer)
  */
 
@@ -1477,4 +1478,12 @@
                 fCheckEAs = TRUE;
             }
+            else if (!stricmp(pdi->szFileSystem, "CDWFS"))
+                    // V0.9.19 (2002-04-25) [umoeller]
+            {
+                pdi->lFileSystem = FSYS_CDWFS;
+                pdi->flDevice |= DFL_SUPPORTS_LONGNAMES;
+                fCheckLongnames = FALSE;
+                fCheckEAs = FALSE;
+            }
         }
         else
@@ -1556,8 +1565,26 @@
 /*
  *@@ doshSetLogicalMap:
- *       sets the mapping of logical floppy drives onto a single
- *       physical floppy drive.
- *       This means selecting either drive A: or drive B: to refer
- *       to the physical drive.
+ *      sets the mapping of logical floppy drives onto a single
+ *      physical floppy drive.
+ *      This means selecting either drive A: or drive B: to refer
+ *      to the physical drive.
+ *
+ *      Paul explained this to me as follows:
+ *
+ *      "It is really very simple - in a single physical floppy
+ *      drive system,  you still have 2 logical floppy drives
+ *      A: and B:. This was primarily to  support disk copying
+ *      e.g. diskcopy a: b: on a single floppy system without
+ *      having to rewrite applications. Whenever the application
+ *      accessed the other logical drive, the user would get a
+ *      prompt from the OS to swap disks.
+ *
+ *      "These calls allow applications to bypass the prompt by
+ *      doing the mapping themselves. They just get/set which
+ *      logical drive is currently mapped to the physical drive.
+ *      This concept existed in DOS as well although the specifics
+ *      of how it was done escape me now.... actually I just
+ *      looked it up - the byte at 0:504h in low memory on
+ *      DOS controlled this (it doesn't work in VDMs)."
  *
  *@@added V0.9.6 (2000-11-24) [pr]
Index: trunk/src/helpers/gpih.c
===================================================================
--- trunk/src/helpers/gpih.c	(revision 159)
+++ trunk/src/helpers/gpih.c	(revision 161)
@@ -1905,10 +1905,4 @@
                             if (cx)
                             {
-                                _Pmpf(("found bmp cxDisplay %d, cyDisplay %d",
-                                            pba->cxDisplay,
-                                            pba->cyDisplay));
-                                _Pmpf(("   cx %d, cy %d, cBitCount %d",
-                                            cx, cy, cBitCount));
-
                                 // store first bitmap of any type
                                 if (!puFirstAny)
Index: trunk/src/helpers/stringh.c
===================================================================
--- trunk/src/helpers/stringh.c	(revision 159)
+++ trunk/src/helpers/stringh.c	(revision 161)
@@ -550,4 +550,5 @@
  *
  *      Example:
+ *
  +          PSZ pszBuf = "KEYWORD { --blah-- } next",
  +              pEnd;
@@ -555,4 +556,5 @@
  +                      '{', '}',
  +                      &pEnd)
+ *
  *      would return a new buffer containing " --blah-- ",
  *      and ppEnd would afterwards point to the space
@@ -562,56 +564,54 @@
  */
 
-PSZ strhExtract(PSZ pszBuf,     // in: search buffer
+PSZ strhExtract(PCSZ pszBuf,    // in: search buffer
                 CHAR cOpen,     // in: opening char
                 CHAR cClose,    // in: closing char
-                PSZ *ppEnd)     // out: if != NULL, receives first character after closing char
+                PCSZ *ppEnd)    // out: if != NULL, receives first character after closing char
 {
     PSZ pszReturn = NULL;
-
-    if (pszBuf)
-    {
-        PSZ pOpen;
-        if (pOpen = strchr(pszBuf, cOpen))
-        {
-            // opening char found:
-            // now go thru the whole rest of the buffer
-            PSZ     p = pOpen+1;
-            LONG    lLevel = 1;        // if this goes 0, we're done
-            while (*p)
+    PCSZ pOpen;
+    if (    (pszBuf)
+         && (pOpen = strchr(pszBuf, cOpen))
+       )
+    {
+        // opening char found:
+        // now go thru the whole rest of the buffer
+        PCSZ     p = pOpen + 1;
+        LONG    lLevel = 1;        // if this goes 0, we're done
+        while (*p)
+        {
+            if (*p == cOpen)
+                lLevel++;
+            else if (*p == cClose)
             {
-                if (*p == cOpen)
-                    lLevel++;
-                else if (*p == cClose)
+                lLevel--;
+                if (lLevel <= 0)
                 {
-                    lLevel--;
-                    if (lLevel <= 0)
-                    {
-                        // matching closing bracket found:
-                        // extract string
-                        pszReturn = strhSubstr(pOpen+1,  // after cOpen
-                                               p);          // excluding cClose
-                        if (ppEnd)
-                            *ppEnd = p+1;
-                        break;      // while (*p)
-                    }
+                    // matching closing bracket found:
+                    // extract string
+                    pszReturn = strhSubstr(pOpen + 1,   // after cOpen
+                                           p);          // excluding cClose
+                    if (ppEnd)
+                        *ppEnd = p + 1;
+                    break;      // while (*p)
                 }
-                else if (*p == '\"')
-                {
-                    // beginning of string:
-                    PSZ p2 = p+1;
-                    // find end of string
-                    while ((*p2) && (*p2 != '\"'))
-                        p2++;
-
-                    if (*p2 == '\"')
-                        // closing quote found:
-                        // search on after that
-                        p = p2;     // raised below
-                    else
-                        break;      // while (*p)
-                }
-
-                p++;
             }
+            else if (*p == '\"')
+            {
+                // beginning of string:
+                PCSZ p2 = p+1;
+                // find end of string
+                while ((*p2) && (*p2 != '\"'))
+                    p2++;
+
+                if (*p2 == '\"')
+                    // closing quote found:
+                    // search on after that
+                    p = p2;     // raised below
+                else
+                    break;      // while (*p)
+            }
+
+            p++;
         }
     }
