Changeset 1438

Timestamp:

Jun 28, 2009, 10:47:00 PM (16 years ago)

Author:

Gregg Young

Message:

Improved drivebar changes; Added AddBackslashToPath() to remove repeatative code. replaced "
" with PCSZ variable; ANY_OBJ added the DosAlloc... (experimental)

Location:

trunk/dll

Files:

• arccnrs.c (modified) (1 diff)
• autoview.c (modified) (4 diffs)
• avl.c (modified) (1 diff)
• cmdline.c (modified) (2 diffs)
• common.c (modified) (2 diffs)
• comp.c (modified) (2 diffs)
• copyf.c (modified) (6 diffs)
• datamin.c (modified) (2 diffs)
• dircnrs.c (modified) (4 diffs)
• dirs.c (modified) (1 diff)
• dirsize.c (modified) (5 diffs)
• draglist.c (modified) (2 diffs)
• eas.c (modified) (2 diffs)
• filldir.c (modified) (7 diffs)
• fm2cmd.c (modified) (3 diffs)
• fortify.c (modified) (1 diff)
• getnames.c (modified) (3 diffs)
• grep.c (modified) (2 diffs)
• grep2.c (modified) (3 diffs)
• init.c (modified) (5 diffs)
• init.h (modified) (1 diff)
• instant.c (modified) (5 diffs)
• killproc.c (modified) (2 diffs)
• literal.c (modified) (2 diffs)
• loadbmp.c (modified) (1 diff)
• mainwnd.c (modified) (14 diffs)
• mainwnd.h (modified) (1 diff)
• mainwnd2.c (modified) (2 diffs)
• misc.c (modified) (1 diff)
• mkdir.c (modified) (4 diffs)
• mle.c (modified) (5 diffs)
• objcnr.c (modified) (3 diffs)
• pathutil.c (modified) (1 diff)
• pathutil.h (modified) (2 diffs)
• saveclip.c (modified) (4 diffs)
• seeall.c (modified) (3 diffs)
• shadow.c (modified) (4 diffs)
• srchpath.c (modified) (1 diff)
• subj.c (modified) (1 diff)
• systemf.c (modified) (5 diffs)
• treecnr.c (modified) (1 diff)
• undel.c (modified) (2 diffs)
• uudecode.c (modified) (2 diffs)
• valid.c (modified) (2 diffs)
• viewinf.c (modified) (2 diffs)
• walkem.c (modified) (5 diffs)
• worker.c (modified) (7 diffs)
• wrappers.c (modified) (1 diff)
• wrappers.h (modified) (1 diff)

trunk/dll/arccnrs.c

@@ -3661 +3661 @@
           strcpy(dcd->workdir, pFM2SaveDirectory);
         MakeTempName(dcd->workdir, ArcTempRoot, 2);
-#if 0 // 06 Sep 08 SHL fixme to be gone
-        if (dcd->workdir[strlen(dcd->workdir) - 1] != '\\')
-            strcat(dcd->workdir, "\\");
-          sprintf(dcd->workdir + strlen(dcd->workdir), "%s.%03x",
-                  ArcTempRoot, (clock() & 4095));
-        else
-          sprintf(dcd->workdir, "%s.%03x",
-                  ArcTempRoot, (clock() & 4095));
-#endif // 06 Sep 08 SHL fixme to be gone
         strcpy(dcd->arcname, fullname);
         if (*extractpath) {

trunk/dll/autoview.c

@@ -136 +136 @@
   }
 
-  rc = DosAllocMem((PPVOID) & pfealist, ealen, PAG_COMMIT | PAG_READ |
-                   PAG_WRITE | OBJ_TILE);
+  rc = xDosAllocMem((PPVOID) & pfealist, ealen, PAG_COMMIT | PAG_READ |
+                    PAG_WRITE | OBJ_TILE);
   if (rc || !pfealist)
     Dos_Error(MB_CANCEL, rc, hwnd, pszSrcFile, __LINE__,
@@ -329 +329 @@
     stopflag--;
     if (fAutoView) {
-      WinSetWindowText((fComments) ? hwndAutoMLE : hwndAutoview, "");
+      WinSetWindowText((fComments) ? hwndAutoMLE : hwndAutoview, NullStr);
       MLEsetreadonly(hwndAutoMLE, TRUE);
       MLEsetchanged(hwndAutoMLE, FALSE);
@@ -394 +394 @@
                       if (info) {
                         sprintf(p, "**%s%s%s\n",
-                                info->id ? info->id : "",
-                                info->id ? " " : "",
+                                info->id ? info->id : NullStr,
+                                info->id ? " " : NullStr,
                                 GetPString(IDS_ARCHIVETEXT));
                         p += strlen(p);
@@ -511 +511 @@
                             "%s%-*.*s  %-8s  [%s%s%s%s]  %s "
                               "%02lu%s%02lu%s%02lu\r",
-                            pffbFile->attrFile & FILE_DIRECTORY ? "\\" : " ",
+                            pffbFile->attrFile & FILE_DIRECTORY ? PCSZ_BACKSLASH : " ",
                             ml,
                             ml,

trunk/dll/avl.c

@@ -650 +650 @@
           ditem.hstrType = DrgAddStrHandle(DRT_UNKNOWN);
           ditem.hstrRMF = DrgAddStrHandle(DRMDRF_LBOX);
-          ditem.hstrContainerName = DrgAddStrHandle("");
-          ditem.hstrSourceName = DrgAddStrHandle("");
-          ditem.hstrTargetName = DrgAddStrHandle("");
+          ditem.hstrContainerName = DrgAddStrHandle(NullStr);
+          ditem.hstrSourceName = DrgAddStrHandle(NullStr);
+          ditem.hstrTargetName = DrgAddStrHandle(NullStr);
           // ditem.fsControl = 0;
           ditem.fsSupportedOps = DO_MOVEABLE;

trunk/dll/cmdline.c

@@ -20 +20 @@
   19 Jul 08 GKY Replace save_dir2(dir) with pFM2SaveDirectory and use BldFullPathName
   24 Aug 08 GKY Warn full drive on save of .DAT file; prevent loss of existing file
+  28 Jun 09 GKY Added AddBackslashToPath() to remove repeatative code.
 
 ***********************************************************************/
@@ -403 +404 @@
         return 0;
       if (*ex->path) {
-        strcpy(executable, ex->path);
-        if (executable[strlen(executable) - 1] != '\\')
-          strcat(executable, "\\");
+        strcpy(executable, ex->path);
+        AddBackslashToPath(executable);
+        //if (executable[strlen(executable) - 1] != '\\')
+        //  strcat(executable, "\\");
       }
       else

trunk/dll/common.c

@@ -518 +518 @@
                              (swp->cy -
                               WinQuerySysValue(HWND_DESKTOP,
-                                               SV_CYSIZEBORDER)) - 30,
+                                               SV_CYSIZEBORDER)) -
+                             (DRIVE_BUTTON_HEIGHT),
                              swp->cx -
                              (WinQuerySysValue(HWND_DESKTOP,
                                                SV_CXSIZEBORDER) * 2),
-                             30,
+                             DRIVE_BUTTON_HEIGHT,
                              hwndFrame, HWND_TOP, MAIN_DRIVES, NULL, NULL);
 
@@ -859 +860 @@
             (*s) ? s : NullStr, (*s) ? " " : NullStr,
             directory,
-            (directory[strlen(directory) - 1] == '\\') ? "\\" : NullStr);
+            (directory[strlen(directory) - 1] == '\\') ? PCSZ_BACKSLASH : NullStr);
   }
   return hwndDir;

trunk/dll/comp.c

@@ -66 +66 @@
   08 Mar 09 GKY Additional strings move to PCSZs in init.c & String Table
   15 Mar 09 GKY Use WriteDetailsSwitchs to save detail switch changes to the ini file.
+  28 Jun 09 GKY Added AddBackslashToPath() to remove repeatative code.
 
 ***********************************************************************/
@@ -2899 +2900 @@
             strcpy(ofile, cmp->rightdir);
           else
-            strcpy(ofile, cmp->leftdir);
-          if (ofile[strlen(ofile) - 1] != '\\')
-            strcat(ofile, "\\");
+            strcpy(ofile, cmp->leftdir);
+          AddBackslashToPath(ofile);
+          //if (ofile[strlen(ofile) - 1] != '\\')
+          //  strcat(ofile, "\\");
           strcat(ofile, pci->pszDisplayName);
           if (*compare) {

trunk/dll/copyf.c

@@ -21 +21 @@
   19 Jul 08 GKY Modify MakeTempName for use making temp directory names
   08 Mar 09 GKY Removed variable aurguments from docopyf and unlinkf (not used)
+  28 Jun 09 GKY Added AddBackslashToPath() to remove repeatative code.
 
 ***********************************************************************/
@@ -50 +51 @@
 #include "wrappers.h"                   // xDosSetPathInfo
 #include "strips.h"                     // bstrip
-#include "fortify.h"
+#include "fortify.h"                    
+#include "pathutil.h"                   // AddBackslashToPath
 
 static PSZ pszSrcFile = __FILE__;
@@ -75 +77 @@
   char *p, *o;
 
-  if (strlen(buffer) > 3 && buffer[strlen(buffer) - 1] != '\\')
-    strcat(buffer, "\\");
+
+  if (strlen(buffer) > 3) // && buffer[strlen(buffer) - 1] != '\\')
+    AddBackslashToPath(buffer);
+    //strcat(buffer, "\\");
   p = o = buffer + strlen(buffer);
   switch (type) {
@@ -282 +286 @@
 BOOL ZapLongName(char *filename)
 {
-  return WriteLongName(filename, "");
+  return WriteLongName(filename, NullStr);
 }
 
@@ -308 +312 @@
   else
     ealen = sizeof(FEALIST) + 10;
-  rc = DosAllocMem((PPVOID) & pfealist,
-                   ealen + 32L, OBJ_TILE | PAG_COMMIT | PAG_READ | PAG_WRITE);
+  rc = xDosAllocMem((PPVOID) & pfealist,
+                    ealen + 32L, OBJ_TILE | PAG_COMMIT | PAG_READ | PAG_WRITE);
   if (rc)
     Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
@@ -536 +540 @@
       if (IsFile(newname) != -1 && stricmp(oldname, newname)) {
         strcpy(dir, newname);
-        p = strrchr(dir, '\\');
-        if (p)
-          *p = 0;
-        strcat(dir, "\\");
+        AddBackslashToPath(dir);
+        //p = strrchr(dir, '\\');
+        //if (p)
+        //  *p = 0;
+        //strcat(dir, "\\");
         MakeTempName(dir, NULL, 0);
         if (DosMove(newname, dir))

trunk/dll/datamin.c

@@ -852 +852 @@
         APIRET rc;
 
-        rc = DosAllocMem((PVOID)&pbh, USHRT_MAX + 4096,
-                         PAG_COMMIT | OBJ_TILE | PAG_READ | PAG_WRITE);
+        rc = xDosAllocMem((PVOID)&pbh, USHRT_MAX + 4096,
+                          PAG_COMMIT | OBJ_TILE | PAG_READ | PAG_WRITE);
         if (rc)
           Dos_Error(MB_CANCEL, rc, hwnd, pszSrcFile, __LINE__,
@@ -891 +891 @@
         APIRET rc;
 
-        rc = DosAllocMem((PVOID) & pbh, USHRT_MAX + 4096,
-                         PAG_COMMIT | OBJ_TILE | PAG_READ | PAG_WRITE);
+        rc = xDosAllocMem((PVOID) & pbh, USHRT_MAX + 4096,
+                          PAG_COMMIT | OBJ_TILE | PAG_READ | PAG_WRITE);
         if (rc)
           Dos_Error(MB_CANCEL, rc, hwnd, pszSrcFile, __LINE__,

trunk/dll/dircnrs.c

@@ -64 +64 @@
   29 Mar 09 SHL Keep more keys away from PM if extended search in progress
   29 Mar 09 SHL Increase extended search timeout to 3 seconds
+  28 Jun 09 GKY Added AddBackslashToPath() to remove repeatative code.
 
 ***********************************************************************/
@@ -141 +142 @@
 #include "fortify.h"
 #include "excputil.h"                   // 06 May 08 SHL added
+#include "pathutil.h"                   // AddBackslashToPath
 
 // Data definitions
@@ -1815 +1817 @@
               PCNRITEM pci;
 
-              strcpy(newfile, dcd->directory);
-              if (newfile[strlen(newfile) - 1] != '\\')
-                strcat(newfile, "\\");
+              strcpy(newfile, dcd->directory);
+              AddBackslashToPath(newfile);
+              //if (newfile[strlen(newfile) - 1] != '\\')
+              //  strcat(newfile, "\\");
               strcat(newfile, sip.ret);
               test = IsFile(newfile);
@@ -2440 +2443 @@
           CHAR tempname1[CCHMAXPATH], tempname2[CCHMAXPATH];
 
-          strcpy(tempname1, dcd->directory);
-          if (tempname1[strlen(tempname1) - 1] != '\\')
-            strcat(tempname1, "\\");
+          strcpy(tempname1, dcd->directory);
+          AddBackslashToPath(tempname1);
+          //if (tempname1[strlen(tempname1) - 1] != '\\')
+          //  strcat(tempname1, "\\");
           strcat(tempname1, "..");
           DosError(FERR_DISABLEHARDERR);

trunk/dll/dirs.c

@@ -89 +89 @@
       if ((CHAR) ((CHAR) curdrive + '@') != (CHAR) toupper(*HomePath) &&
           (CHAR) ((CHAR) curdrive + '@') != (CHAR) toupper(*path))
-        DosChDir("\\");
+        DosChDir(PCSZ_BACKSLASH);
     }
     ret = DosSelectDisk(toupper(*path) - '@');

trunk/dll/dirsize.c

@@ -45 +45 @@
   08 Mar 09 GKY Renamed commafmt.h i18nutil.h
   08 Mar 09 GKY Additional strings move to PCSZs in init.c
+  28 Jun 09 GKY Added AddBackslashToPath() to remove repeatative code.
 
 ***********************************************************************/
@@ -85 +86 @@
 #include "fortify.h"
 #include "excputil.h"                   // xbeginthread
+#include "pathutil.h"                   // AddBackslashToPath
 
 typedef struct
@@ -151 +153 @@
 
   strcpy(maskstr, pszFileName);
-  if (maskstr[strlen(maskstr) - 1] != '\\')
-    strcat(maskstr, "\\");
+  AddBackslashToPath(maskstr);
+  //if (maskstr[strlen(maskstr) - 1] != '\\')
+  //  strcat(maskstr, "\\");
   pEndMask = &maskstr[strlen(maskstr)]; // Point after last backslash
   strcat(maskstr, "*");
@@ -873 +876 @@
             memset(szTemp, 0, sizeof(szTemp));
             strcpy(szTemp, pci->pszFileName);
-            strrev(szTemp);
-            if (*szFileName && *szTemp != '\\')
-              strcat(szFileName, "\\");
+            strrev(szTemp);
+            AddBackslashToPath(szFileName);
+            //if (*szFileName && *szTemp != '\\')
+            //  strcat(szFileName, "\\");
             strcat(szFileName, szTemp);
             pci = WinSendDlgItemMsg(hwnd, DSZ_CNR, CM_QUERYRECORD,
@@ -951 +955 @@
         else
           strcpy(szFileName, pFM2SaveDirectory);
-        sprintf(&szFileName[strlen(szFileName)], "\\%csizes.Rpt",
+        sprintf(&szFileName[strlen(szFileName)], "%s%csizes.Rpt", PCSZ_BACKSLASH,
                 (pState) ? toupper(*pState->szDirName) : '+');
         if (export_filename(hwnd, szFileName, FALSE) && *szFileName) {

trunk/dll/draglist.c

@@ -152 +152 @@
         p++;
         strcpy(szFile, p);
-        strcat(szDir, "\\");
+        strcat(szDir, PCSZ_BACKSLASH);
       }
       else {
@@ -809 +809 @@
           p++;
           strcpy(szFile, p);
-          strcat(szDir, "\\");
+          strcat(szDir, PCSZ_BACKSLASH);
         }
         else {

trunk/dll/eas.c

@@ -198 +198 @@
 
             ealen = sizeof(FEA2LIST) + strlen(s) + 64;
-            rc = DosAllocMem((PPVOID) & pfealist, ealen + 1,
-                             OBJ_TILE | PAG_COMMIT | PAG_READ | PAG_WRITE);
+            rc = xDosAllocMem((PPVOID) & pfealist, ealen + 1,
+                              OBJ_TILE | PAG_COMMIT | PAG_READ | PAG_WRITE);
             if (rc)
               Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
@@ -1064 +1064 @@
   }
 
-  rc = DosAllocMem((PPVOID) & pfealist, ealen,
-                   OBJ_TILE | PAG_COMMIT | PAG_READ | PAG_WRITE);
+  rc = xDosAllocMem((PPVOID) & pfealist, ealen,
+                    OBJ_TILE | PAG_COMMIT | PAG_READ | PAG_WRITE);
   if (rc)
     Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,

trunk/dll/filldir.c

@@ -70 +70 @@
   14 Mar 09 GKY Prevent execution of UM_SHOWME while drive scan is occuring
   06 Jun 09 GKY Add option to show file system type or drive label in tree
+  28 Jun 09 GKY Added AddBackslashToPath() to remove repeatative code.
 
 ***********************************************************************/
@@ -110 +111 @@
 #include "excputil.h"                   // xbeginthread
 #include "fm3dlg.h"                     // INFO_LABEL
+#include "pathutil.h"                   // AddBackslashToPath
 
 VOID StubbyScanThread(VOID * arg);
@@ -968 +970 @@
 
   PSZ pszFileSpec;
-  INT t;
+  //INT t;
   PFILEFINDBUF4L paffbFound;
   PFILEFINDBUF4L *papffbSelected;
@@ -983 +985 @@
   ULONG ulReturnFiles = 0;
   ULONGLONG ullReturnBytes = 0;
-  PCH pchEndPath;
+  //PCH pchEndPath;
   APIRET rc;
   PCNRITEM pci;
@@ -1013 +1015 @@
 
   if (paffbFound && papffbSelected && pszFileSpec) {
-    t = strlen(szDirBase);
-    memcpy(pszFileSpec, szDirBase, t + 1);
-    pchEndPath = pszFileSpec + t;
-    if (*(pchEndPath - 1) != '\\') {
-      memcpy(pchEndPath, "\\", 2);
-      pchEndPath++;
-    }
-    memcpy(pchEndPath, "*", 2);
+    //t = strlen(szDirBase);
+    strcpy(pszFileSpec, szDirBase);
+    AddBackslashToPath(pszFileSpec);
+    //pchEndPath = pszFileSpec + t;
+    //if (*(pchEndPath - 1) != '\\') {
+    //  memcpy(pchEndPath, "\\", 2);
+    //  pchEndPath++;
+    //}
+    strcat(pszFileSpec, "*");
     DosError(FERR_DISABLEHARDERR);
     ulFindCnt = ulFindMax;
@@ -1033 +1036 @@
                        FIL_QUERYEASIZEL);
     priority_normal();
-    *pchEndPath = 0;                    // Chop off wildcard
+    pszFileSpec[strlen(pszFileSpec) - 1] = 0;     // Chop off wildcard
+    //*pchEndPath = 0;                  
     if (!rc) {
       do {
@@ -1457 +1461 @@
             }
           }
-          if (strcmp(volser.volumelabel, "") != 0 && FSInfo && fShowDriveLabelInTree)
+          if (strcmp(volser.volumelabel, NullStr) != 0 && FSInfo && fShowDriveLabelInTree)
             strcpy(szFSType, volser.volumelabel);
           pci->rc.flRecordAttr |= CRA_RECORDREADONLY;

trunk/dll/fm2cmd.c

@@ -10 +10 @@
 
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
+  28 Jun 09 GKY Added AddBackslashToPath() to remove repeatative code.
 
 ***********************************************************************/
@@ -31 +32 @@
 #include "misc.h"                       // PostMsg
 #include "delims.h"                     // skip_delim
+#include "pathutil.h"                   // AddBackslashToPath
 
 
@@ -55 +57 @@
     if (*name != '\\' && *name != '/') {
       strcpy(temp, directory);
-      if (directory[strlen(directory) - 1] != '\\')
-        strcat(temp, "\\");
+      AddBackslashToPath(directory);
+      //if (directory[strlen(directory) - 1] != '\\')
+      //  strcat(temp, "\\");
     }
     else {

trunk/dll/fortify.c

@@ -1571 +1571 @@
                 }
 
-                sprintf(st_Buffer, "%02x%s", *ptr, ((column % 4) == 3) ? " " : "");
+                sprintf(st_Buffer, "%02x%s", *ptr, ((column % 4) == 3) ? " " : NullStr);
                 st_Output(st_Buffer);
 

trunk/dll/getnames.c

@@ -12 +12 @@
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
   08 Mar 09 GKY Removed variable aurguments from docopyf and unlinkf (not used)
+  28 Jun 09 GKY Added AddBackslashToPath() to remove repeatative code.
 
 ***********************************************************************/
@@ -38 +39 @@
 #include "misc.h"                       // PaintRecessedWindow
 #include "wrappers.h"                   // xDosFindFirst
+#include "pathutil.h"                   // AddBackslashToPath
 
 #pragma data_seg(DATA1)
@@ -179 +181 @@
                               MPFROM2SHORT(sSelect,
                                            CCHMAXPATH), MPFROMP(szBuffer));
-            if (*szBuffer) {
-              if (szBuffer[strlen(szBuffer) - 1] != '\\')
-                strcat(szBuffer, "\\");
+            if (*szBuffer) {
+              AddBackslashToPath(szBuffer);
+              //if (szBuffer[strlen(szBuffer) - 1] != '\\')
+              //  strcat(szBuffer, "\\");
               *szTemp = 0;
               WinQueryDlgItemText(hwnd, 258, CCHMAXPATH, szTemp);

trunk/dll/grep.c

@@ -32 +32 @@
   07 Feb 09 GKY Allow user to turn off alert and/or error beeps in settings notebook.
   08 Mar 09 GKY Additional strings move to String Table
+  28 Jun 09 GKY Added AddBackslashToPath() to remove repeatative code.
 
 ***********************************************************************/
@@ -475 +476 @@
 
   // add a mask to search path
-  if (searchPath[strlen(searchPath) - 1] != '\\')
-    strcat(searchPath, "\\");
+  AddBackslashToPath(searchPath);
+  //if (searchPath[strlen(searchPath) - 1] != '\\')
+  //  strcat(searchPath, "\\");
   strcat(searchPath, "*");
   // step through all subdirectories

trunk/dll/grep2.c

@@ -367 +367 @@
           strcpy(simple, p);
         else if (*s) {
-          strcpy(simple, "\\");
+          strcpy(simple, PCSZ_BACKSLASH);
           strcat(simple, s);
           *s = 0;
@@ -590 +590 @@
               if (s[strlen(s) - 1] != '\\') {
                 lLen++;
-                strcat(s, "\\");
+                strcat(s, PCSZ_BACKSLASH);
               }
               rstrip(s);
@@ -647 +647 @@
           if (s[strlen(s) - 1] != '\\') {
             lLen++;
-            strcat(s, "\\");
+            strcat(s, PCSZ_BACKSLASH);
           }
           rstrip(s);

trunk/dll/init.c

@@ -80 +80 @@
                 saved drive containers.
   06 Jun 09 GKY Add option to show file system type or drive label in tree
+  28 Jun 09 GKY Added AddBackslashToPath() to remove repeatative code.
 
 ***********************************************************************/
@@ -281 +282 @@
 PCSZ PCSZ_FILLDIRQCURERRTEXT = "DosQCurDisk";
 PCSZ PCSZ_NODATA  =  "No Data";
+PCSZ PCSZ_BACKSLASH     = "\\";
 PCSZ PCSZ_STARDOTEXE    =  "*.EXE";
 PCSZ PCSZ_STARDOTINI    =  "*.INI";
@@ -520 +522 @@
   fcloseall();
   save_dir(s);
-  if (s[strlen(s) - 1] != '\\')
-    strcat(s, "\\");
+  AddBackslashToPath(s);
+  //if (s[strlen(s) - 1] != '\\')
+  //  strcat(s, "\\");
   enddir = &s[strlen(s)];
   if (*ArcTempRoot) {
@@ -552 +555 @@
   else
     strcpy(s, pFM2SaveDirectory);
-  if (s[strlen(s) - 1] != '\\')
-    strcat(s, "\\");
+  AddBackslashToPath(s);
+  //if (s[strlen(s) - 1] != '\\')
+  //  strcat(s, "\\");
   enddir = &s[strlen(s)];
   strcat(s, "$FM2LI$T.");
@@ -699 +703 @@
 
       strcpy(szTempName, env);
-      if (szTempName[strlen(szTempName) - 1] != '\\')
-        strcat(szTempName, "\\");
+      AddBackslashToPath(szTempName);
+      //if (szTempName[strlen(szTempName) - 1] != '\\')
+      //  strcat(szTempName, "\\");
       enddir = &szTempName[strlen(szTempName)];
       strcat(szTempName, "$FM2????.");

trunk/dll/init.h

@@ -107 +107 @@
 extern PCSZ PCSZ_FILLDIRQCURERRTEXT;
 extern PCSZ PCSZ_NODATA;
+extern PCSZ PCSZ_BACKSLASH;
 extern PCSZ PCSZ_STARDOTEXE;
 extern PCSZ PCSZ_STARDOTINI;

trunk/dll/instant.c

@@ -34 +34 @@
 #include "systemf.h"                    // runemf2
 #include "strips.h"                     // bstrip
+#include "wrappers.h"                   // xDosAllocMem
+#include "init.h"                       // Strings
 
 #pragma data_seg(DATA1)
@@ -101 +103 @@
         mem = MLEgetlen(hwndMLE);
         if (mem) {
-          rc = DosAllocMem((PVOID) & bat, mem,
-                           PAG_COMMIT | PAG_READ | PAG_WRITE);
+          rc = xDosAllocMem((PVOID) & bat, mem,
+                            PAG_COMMIT | PAG_READ | PAG_WRITE);
           if (rc || !bat) {
             Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
@@ -132 +134 @@
             else {
               sprintf(s, "%s%sFMTMP%d.CMD", path,
-                      (path[strlen(path) - 1] == '\\') ? "" : "\\",
+                      (path[strlen(path) - 1] == '\\') ? NullStr : PCSZ_BACKSLASH,
                       batches++);
               fp = fopen(s, "w");
@@ -144 +146 @@
                 fprintf(fp, "%s%c:%s\n", rexx, toupper(*path), rexx);
                 fprintf(fp, "%sCD \"%s%s\"%s\n", rexx, path,
-                        (strlen(path) < 3) ? "\\" : "", rexx);
+                        (strlen(path) < 3) ? PCSZ_BACKSLASH : NullStr, rexx);
                 fprintf(fp, "%s", bat);
                 fprintf(fp, "\n%sDEL \"%s\"%s\n", rexx, s, rexx);
@@ -169 +171 @@
                   GetPString(IDS_INSTANTHELPTITLETEXT),
                   GetPString(IDS_INSTANTHELPTEXT),
-                  path, (strlen(path) < 3) ? "\\" : "", path,
-                  (path[strlen(path) - 1] == '\\') ? "" : "\\", batches);
+                  path, (strlen(path) < 3) ? PCSZ_BACKSLASH : NullStr, path,
+                  (path[strlen(path) - 1] == '\\') ? NullStr : PCSZ_BACKSLASH, batches);
       if (rc == MBID_YES)
         runemf2(WINDOWED | INVISIBLE | BACKGROUND,

trunk/dll/killproc.c

@@ -116 +116 @@
 
   WinSendDlgItemMsg(hwnd, KILL_LISTBOX, LM_DELETEALL, MPVOID, MPVOID);
-  rc = DosAllocMem((PVOID) & pbh, USHRT_MAX + 4096,
-                   PAG_COMMIT | OBJ_TILE | PAG_READ | PAG_WRITE);
+  rc = xDosAllocMem((PVOID) & pbh, USHRT_MAX + 4096,
+                    PAG_COMMIT | OBJ_TILE | PAG_READ | PAG_WRITE);
   if (rc)
     Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
@@ -185 +185 @@
 
   WinSendDlgItemMsg(hwnd, KILL_LISTBOX, LM_DELETEALL, MPVOID, MPVOID);
-  rc = DosAllocMem((PVOID) & pbh, USHRT_MAX + 4096,
-                   PAG_COMMIT | OBJ_TILE | PAG_READ | PAG_WRITE);
+  rc = xDosAllocMem((PVOID) & pbh, USHRT_MAX + 4096,
+                    PAG_COMMIT | OBJ_TILE | PAG_READ | PAG_WRITE);
   if (rc)
     Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,

trunk/dll/literal.c

@@ -35 +35 @@
 #include "wrappers.h"                   // xmalloc
 #include "fortify.h"
+#include "init.h"                       // Strings
 
 static PSZ pszSrcFile = __FILE__;
@@ -321 +322 @@
         }
         else {
-          sprintf(pchOut, "\\x%02x", (UCHAR)*pchIn);
+          sprintf(pchOut, "%sx%02x", PCSZ_BACKSLASH, (UCHAR)*pchIn);
           pchOut += 4;
         }

trunk/dll/loadbmp.c

@@ -45 +45 @@
 
   strcpy(s, pFM2SaveDirectory);
-  sprintf(s + strlen(s), "\\%u.BMP", id);
+  sprintf(s + strlen(s), "%s%u.BMP", PCSZ_BACKSLASH, id);
   return LoadBitmapFromFile(s);
 }

trunk/dll/mainwnd.c

@@ -1891 +1891 @@
     {
       HPS hps; 
-      POINTL aptl[4] = { 0, 0, DRIVE_BUTTON_WIDTH - 1, DRIVE_BUTTON_HEIGTH - 1,
-      0, 0, 27, 20}; //The last 2 numbers should be the width and heigth of the bitmap
+      POINTL aptl[4] = {0, 0, DRIVE_BUTTON_WIDTH - 1, DRIVE_BUTTON_HEIGHT - 1,
+      0, 0, DRIVE_BUTTON_WIDTH - 1, DRIVE_BUTTON_HEIGHT - 1};
+      //The last 2 numbers should be the width and height of the bitmap
       HBITMAP hbm;
+      PBITMAPINFOHEADER    pbmpData;
       POINTL ptlStart;
       ULONG x, iconid;
@@ -1920 +1922 @@
         }
         else
-          iconid = FLOPPY_ICON;
+          iconid = FLOPPY_ICON;
       hps = WinBeginPaint(hwnd, (HPS) 0, NULL);
       if (hps) {
         hbm = GpiLoadBitmap(hps, 0, iconid, 0, 0);
-        if (hbm)
+        if (hbm) {
+          pbmpData = xmallocz(sizeof(PBITMAPINFOHEADER), pszSrcFile, __LINE__);
+          if (pbmpData) {
+            GpiQueryBitmapParameters(hbm, pbmpData);
+            aptl[1].x = pbmpData->cx;
+            aptl[1].y = pbmpData->cy;
+            aptl[3].x = pbmpData->cx;
+            aptl[3].y = pbmpData->cy;
+            free(pbmpData);
+          }
           GpiWCBitBlt(hps, hbm, 4L, aptl, ROP_SRCCOPY, BBO_PAL_COLORS);
-          memset(&fat, 0, sizeof(fat));
-          fat.usRecordLength = sizeof(FATTRS);
-          fat.fsSelection = FATTR_SEL_BOLD ;
-          fat.usCodePage = 850;
-          fat.fsFontUse = FATTR_FONTUSE_NOMIX;
-          strcpy(fat.szFacename , FNT_HELVETICA);
+        }
+        memset(&fat, 0, sizeof(fat));
+        fat.usRecordLength = sizeof(FATTRS);
+        fat.fsSelection = FATTR_SEL_BOLD ;
+        fat.usCodePage = 850;
+        fat.fsFontUse = FATTR_FONTUSE_NOMIX;
+        strcpy(fat.szFacename , FNT_HELVETICA);
         x = GpiCreateLogFont(hps, NULL, DRIVEBAR_FONT_LCID, &fat);
         if (x != GPI_ERROR) {
@@ -1940 +1952 @@
           GpiSetColor(hps, iconid == RAMDISK_ICON ? CLR_YELLOW : CLR_DARKBLUE);
           ptlStart.x = 1L;  //Char box position
-          ptlStart.y = 7L;
+          ptlStart.y = 8L;
           GpiCharStringAt(hps, &ptlStart, strlen(szDrv), szDrv);
           GpiDeleteSetId(hps, DRIVEBAR_FONT_LCID);
@@ -1989 +2001 @@
         UINT iDrv;
 
-        strcat(szDrv, "\\");
+        strcat(szDrv, PCSZ_BACKSLASH);
         MakeValidDir(szDrv);
         // Disable menus if MakeValidDir changes drive letter fixme this section doesn't do anything see treecnt.c
@@ -2036 +2048 @@
     strcpy(szDrv + 1, ":");
     if (isalpha(*szDrv)) {
-      strcat(szDrv, "\\");
+      strcat(szDrv, PCSZ_BACKSLASH);
       if (!FindDirCnrByName(szDrv, TRUE))
         OpenDirCnr((HWND) 0, hwndMain, hwndTree, FALSE, szDrv);
@@ -2051 +2063 @@
     strcpy(szDrv + 1, ":");
     if (isalpha(*szDrv)) {
-      strcat(szDrv, "\\");
+      strcat(szDrv, PCSZ_BACKSLASH);
       CommonDriveCmd(hwnd, szDrv, SHORT1FROMMP(mp1));
     }
@@ -2120 +2132 @@
       if (li) {
         strcpy(li->targetpath, szDrv);
-        strcat(li->targetpath, "\\");
+        strcat(li->targetpath, PCSZ_BACKSLASH);
         if (li->list && li->list[0] && IsRoot(li->list[0]))
           li->type = DO_LINK;
@@ -2282 +2294 @@
                                 0,
                                 DRIVE_BUTTON_WIDTH,
-                                DRIVE_BUTTON_HEIGTH,
+                                DRIVE_BUTTON_HEIGHT,
                                 hwndT, HWND_TOP, x + IDM_DRIVEA, NULL, NULL);
         if (!hwndB)
@@ -2299 +2311 @@
 VOID ResizeDrives(HWND hwndT, long xwidth)
 {
-  register ULONG ctrlxpos = 2, ctrlypos = 0, ctrlxsize;
+  register ULONG ctrlxpos = 1, ctrlypos = 0, ctrlxsize;
   HENUM henum;
   HWND hwndB;
@@ -2310 +2322 @@
     WinQueryWindowRect(hwndT, &rcl);
     xwidth = rcl.xRight - ((WinQuerySysValue(HWND_DESKTOP,
-                                             SV_CYSIZEBORDER) * 2) + 2);
+                                             SV_CYSIZEBORDER) * 2) + 1);
   }
   henum = WinBeginEnumWindows(hwndT);
@@ -2317 +2329 @@
     WinSetWindowPos(hwndB,
                     HWND_TOP,
-                    ctrlxpos, ctrlypos, ctrlxsize, DRIVE_BUTTON_HEIGTH, SWP_MOVE | SWP_SHOW);
+                    ctrlxpos, ctrlypos, ctrlxsize, DRIVE_BUTTON_HEIGHT, SWP_MOVE | SWP_SHOW);
     ctrlxpos += (ctrlxsize + 2);
-    if (ctrlxpos + (DRIVE_BUTTON_WIDTH + 4 + ((fShowTarget && DriveLines == 0) ?
+    if (ctrlxpos + (DRIVE_BUTTON_WIDTH + 2 + ((fShowTarget && DriveLines == 0) ?
                           256 : 0)) > xwidth) {
-      ctrlxpos = 2;
-      ctrlypos += DRIVE_BUTTON_HEIGTH;
+      ctrlxpos = 1;
+      ctrlypos += DRIVE_BUTTON_HEIGHT;
       DriveLines++;
     }
@@ -3998 +4010 @@
                            (WinQuerySysValue(HWND_DESKTOP,
                                              SV_CYSIZEBORDER) * 2)) - 4));
-            prectl->yTop -= (16 * (DriveLines * DRIVE_BUTTON_HEIGTH));
+            prectl->yTop -= (16 * (DriveLines * DRIVE_BUTTON_HEIGHT));
           }
           if (fUserComboBox) {
@@ -4027 +4039 @@
       PSWP pswp, pswpClient, pswpNew;
       SWP swpClient;
-      LONG theight = 48L, dheight = DRIVE_BUTTON_HEIGTH + 2, width, sheight = 20, bheight = 20;
+      LONG theight = 48L, dheight = DRIVE_BUTTON_HEIGHT, width, sheight = 20, bheight = 20;
 
       sCount = (SHORT) oldproc(hwnd, msg, mp1, mp2);
@@ -4136 +4148 @@
         pswpNew->hwndInsertBehind = HWND_BOTTOM;
         pswpNew->x = swpClient.x + 2;
-        dheight += ((dheight - 2) * DriveLines);
-        pswpNew->y = (swpClient.y + swpClient.cy) - (dheight - 2);
+        dheight += ((dheight) * DriveLines);
+        pswpNew->y = (swpClient.y + swpClient.cy) - (dheight);
         if (fToolbar)
           pswpNew->y -= theight;
         pswpNew->cx = swpClient.cx - 4;
-        pswpNew->cy = dheight - 4;
+        pswpNew->cy = dheight;
         pswpClient->cy -= dheight;
         sCount++;

trunk/dll/mainwnd.h

@@ -24 +24 @@
 
 #define DRIVE_BUTTON_WIDTH 28
-#define DRIVE_BUTTON_HEIGTH 21
+#define DRIVE_BUTTON_HEIGHT 21
 
 void BubbleHelp(HWND hwnd, BOOL other, BOOL data, BOOL above, PCSZ help);

trunk/dll/mainwnd2.c

@@ -224 +224 @@
       PSWP pswp, pswpClient, pswpNew;
       SWP swpClient;
-      ULONG theight = 48L, dheight = DRIVE_BUTTON_HEIGTH + 2, bheight = 20, sheight = 20;
+      ULONG theight = 48L, dheight = DRIVE_BUTTON_HEIGHT, bheight = 20, sheight = 20;
       LONG width, lastx;
 
@@ -310 +310 @@
       pswpNew->hwnd = WinWindowFromID(hwnd, MAIN_DRIVES);
       pswpNew->x = swpClient.x + 2;
-      dheight += ((dheight - 2) * DriveLines);
-      pswpNew->y = (swpClient.y + swpClient.cy) - (dheight - 2);
+      dheight += ((dheight) * DriveLines);
+      pswpNew->y = (swpClient.y + swpClient.cy) - (dheight);
       if (fToolbar)
         pswpNew->y -= theight;
       pswpNew->cx = swpClient.cx - 4;
-      pswpNew->cy = dheight - 4;
+      pswpNew->cy = dheight;
       pswpClient->cy -= dheight;
       pswpClient->cy -= 2;

trunk/dll/misc.c

@@ -845 +845 @@
           else
             ealen = sizeof(FEALIST) + 9;
-          rc = DosAllocMem((PPVOID) & pfealist, ealen + 64,
-                           OBJ_TILE | PAG_COMMIT | PAG_READ | PAG_WRITE);
+          rc = xDosAllocMem((PPVOID) & pfealist, ealen + 64,
+                            OBJ_TILE | PAG_COMMIT | PAG_READ | PAG_WRITE);
           if (rc)
             Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile,

trunk/dll/mkdir.c

@@ -13 +13 @@
   19 Jul 08 GKY Replace save_dir2(dir) with pFM2SaveDirectory
   25 Dec 08 GKY Add code to allow write verify to be turned off on a per drive basis
+  28 Jun 09 GKY Added AddBackslashToPath() to remove repeatative code.
 
 ***********************************************************************/
@@ -40 +41 @@
 #include "dirs.h"                       // save_dir2
 #include "input.h"                      // InputDlgProc
+#include "pathutil.h"                   // AddBackslashToPath
 
 // Data definitions
@@ -185 +187 @@
     strcpy(szBuff, pFM2SaveDirectory);
   MakeValidDir(szBuff);
-  if (*szBuff && szBuff[strlen(szBuff) - 1] != '\\')
-    strcat(szBuff, "\\");
+  AddBackslashToPath(szBuff);
+  //if (*szBuff && szBuff[strlen(szBuff) - 1] != '\\')
+  //  strcat(szBuff, "\\");
   sip.prompt = GetPString(IDS_MKDIRPROMPTTEXT);
   sip.inputlen = CCHMAXPATH - 1;
@@ -257 +260 @@
               "%s%s%s%s",
               GetPString(IDS_TARGETDIRTITLETEXT),
-              (*targetdir) ? "" : "<",
+              (*targetdir) ? NullStr : "<",
               (*targetdir) ?
-              targetdir : GetPString(IDS_NONE), (*targetdir) ? "" : ">");
+              targetdir : GetPString(IDS_NONE), (*targetdir) ? NullStr : ">");
     else
       *temp = 0;

trunk/dll/mle.c

@@ -180 +180 @@
   if (len) {
     len++;
-    rc = DosAllocMem((PVOID) & temp, 4096,
-                     PAG_COMMIT | OBJ_TILE | PAG_READ | PAG_WRITE);
+    rc = xDosAllocMem((PVOID) & temp, 4096,
+                      PAG_COMMIT | OBJ_TILE | PAG_READ | PAG_WRITE);
     if (rc || !temp)
       Dos_Error(MB_CANCEL, rc, h, pszSrcFile, __LINE__,
@@ -263 +263 @@
   if (!sel)
     return FALSE;
-  rc = DosAllocMem((PVOID) & temp, 32768L,
-                   PAG_COMMIT | OBJ_TILE | PAG_READ | PAG_WRITE);
+  rc = xDosAllocMem((PVOID) & temp, 32768L,
+                    PAG_COMMIT | OBJ_TILE | PAG_READ | PAG_WRITE);
   if (rc || !temp) {
     Dos_Error(MB_CANCEL, rc, h, pszSrcFile, __LINE__,
@@ -535 +535 @@
     DosChgFilePtr(handle, 0, FILE_BEGIN, &action);
     if (len) {
-      rc = DosAllocMem((PVOID) & hexbuff, 50001,
-                       PAG_COMMIT | OBJ_TILE | PAG_READ | PAG_WRITE);
+      rc = xDosAllocMem((PVOID) & hexbuff, 50001,
+                        PAG_COMMIT | OBJ_TILE | PAG_READ | PAG_WRITE);
       if (rc || !hexbuff) {
         Dos_Error(MB_CANCEL, rc, h, pszSrcFile, __LINE__,
@@ -664 +664 @@
     fseek(fp, 0L, SEEK_SET);
     if (len && len != -1) {
-      rc = DosAllocMem((PVOID) & buffer,
-                       50000L, PAG_COMMIT | OBJ_TILE | PAG_READ | PAG_WRITE);
+      rc = xDosAllocMem((PVOID) & buffer,
+                        50000L, PAG_COMMIT | OBJ_TILE | PAG_READ | PAG_WRITE);
       if (rc || !buffer) {
         Dos_Error(MB_CANCEL, rc, h, pszSrcFile, __LINE__,
@@ -916 +916 @@
   }
 
-  rc = DosAllocMem((PVOID) & buffer, 4096L,
-                   PAG_COMMIT | OBJ_TILE | PAG_READ | PAG_WRITE);
+  rc = xDosAllocMem((PVOID) & buffer, 4096L,
+                    PAG_COMMIT | OBJ_TILE | PAG_READ | PAG_WRITE);
   if (rc || !buffer) {
     Dos_Error(MB_CANCEL, rc, h, pszSrcFile, __LINE__,

trunk/dll/objcnr.c

@@ -24 +24 @@
   10 Dec 08 SHL Integrate exception handler support
   08 Mar 09 GKY Additional strings move to PCSZs
+  28 Jun 09 GKY Added AddBackslashToPath() to remove repeatative code.
 
 ***********************************************************************/
@@ -56 +57 @@
 #include "fortify.h"
 #include "excputil.h"                   // xbeginthread
+#include "pathutil.h"                   // AddBackslashToPath
 
 typedef struct
@@ -100 +102 @@
     return;                             // Error already reported
   strcpy(maskstr, filename);
-  if (maskstr[strlen(maskstr) - 1] != '\\')
-    strcat(maskstr, "\\");
+  AddBackslashToPath(maskstr);
+  //if (maskstr[strlen(maskstr) - 1] != '\\')
+  //  strcat(maskstr, "\\");
   endpath = &maskstr[strlen(maskstr)];
   strcat(maskstr, "*");

trunk/dll/pathutil.c

@@ -40 +40 @@
 
 static PSZ pszSrcFile = __FILE__;
+
+PSZ AddBackslashToPath(PSZ pszPathName)
+{
+  if (pszPathName[strlen(pszPathName) - 1] != '\\')
+    strcat(pszPathName,  PCSZ_BACKSLASH);
+  return pszPathName;
+}
 
 // #pragma data_seg(DATA1)

trunk/dll/pathutil.h

@@ -11 +11 @@
   05 Jan 08 SHL Move from fm3dll.h to here
   29 Feb 08 GKY Changes to enable user settable command line length
+  28 Jun 09 GKY Added AddBackslashToPath() to remove repeatative code.
 
 ***********************************************************************/
@@ -22 +23 @@
 #endif
 
+PSZ AddBackslashToPath(PSZ pszPathName);
 PSZ BldFullPathName(PSZ pszFullPathName, PCSZ pszPathName, PCSZ pszFileName);
 PSZ BldQuotedFullPathName(PSZ pszFullPathName, PCSZ pszPathName, PCSZ pszFileName);

trunk/dll/saveclip.c

@@ -100 +100 @@
         if (clip)
           len += strlen(clip) + 1;
-        if (!DosAllocSharedMem((PPVOID) & hold, (PSZ) NULL, len, PAG_COMMIT |
+        if (!xDosAllocSharedMem((PPVOID) &hold, (PSZ) NULL, len, PAG_COMMIT |
                                OBJ_GIVEABLE | PAG_READ | PAG_WRITE)) {
           *hold = 0;
@@ -169 +169 @@
       }
       if (WinOpenClipbrd(hab)) {
-        if (!DosAllocSharedMem((PPVOID) & text, (PSZ) NULL, len, PAG_COMMIT |
-                               OBJ_GIVEABLE | PAG_READ | PAG_WRITE)) {
+        if (!xDosAllocSharedMem((PPVOID) &text, (PSZ) NULL, len, PAG_COMMIT |
+                                OBJ_GIVEABLE | PAG_READ | PAG_WRITE)) {
           *text = 0;
           if (clip && clip[0]) {
@@ -242 +242 @@
 {
   HWND hwndCnr;
-  CHAR savename[CCHMAXPATH] = "", pattern[81];
+  CHAR savename[CCHMAXPATH] = "";
+  CHAR pattern[81];
 
   switch (msg) {
@@ -602 +603 @@
 
   CHAR **list;
-  CHAR savename[CCHMAXPATH] = "", pattern[81];
+  CHAR savename[CCHMAXPATH] = "";
+  CHAR pattern[81];
 
   switch (msg) {

trunk/dll/seeall.c

@@ -48 +48 @@
   08 Mar 09 GKY Additional strings move to PCSZs in init.c
   08 Mar 09 GKY Removed variable aurguments from docopyf and unlinkf (not used)
+  28 Jun 09 GKY Added AddBackslashToPath() to remove repeatative code.
 
 ***********************************************************************/
@@ -647 +648 @@
               GetPString(IDS_MOVEDTEXT) : GetPString(IDS_COPIEDTEXT);
             if (*path) {
-              strcpy(newname, path);
-              if (newname[strlen(newname) - 1] != '\\')
-                strcat(newname, "\\");
+              strcpy(newname, path);
+              AddBackslashToPath(newname);
+              //if (newname[strlen(newname) - 1] != '\\')
+              //  strcat(newname, "\\");
               if (plen)
                 p = list[x] + plen;
@@ -1058 +1060 @@
                                         (*list[x] &&
                                          list[x][strlen(list[x]) - 1] !=
-                                         '\\') ? "\\" : NullStr);
+                                         '\\') ? PCSZ_BACKSLASH : NullStr);
               DosError(FERR_DISABLEHARDERR);
               if (!error)

trunk/dll/shadow.c

@@ -71 +71 @@
       sprintf(s,
               "EXENAME=%s%s%s%s%s;PARAMETERS=%%*;OBJECTID=<FM2_%s>",
-              (path) ? path : "",
-              (path) ? "\\" : "",
+              (path) ? path : NullStr,
+              (path) ? PCSZ_BACKSLASH : NullStr,
               objtitle,
-              (path) ? ";STARTUPDIR=" : "", (path) ? path : "", objtitle);
+              (path) ? ";STARTUPDIR=" : NullStr, (path) ? path : NullStr, objtitle);
       WinSetObjectData(obj, s);
       free(s);
@@ -112 +112 @@
             "%s%s%sOBJECTID=<FM2_%s>",
             objtitle,
-            (p == type[1]) ? "ICONFILE=" : "",
-            (p == type[1]) ? s : "", (p == type[1]) ? ";" : "", objtitle);
+            (p == type[1]) ? "ICONFILE=" : NullStr,
+            (p == type[1]) ? s : NullStr, (p == type[1]) ? ";" : NullStr, objtitle);
     WinSetObjectData(obj, s2);
   }
@@ -150 +150 @@
     sprintf(s,
             "SHADOWID=%s%s%s",
-            (path) ? path : "", (path) ? "\\" : "", objtitle);
+            (path) ? path : NullStr, (path) ? PCSZ_BACKSLASH : NullStr, objtitle);
     {                                   /* find an icon for it if possible */
       CHAR *p, temp[CCHMAXPATH + 1];
@@ -166 +166 @@
       sprintf(&s[strlen(s)],
               ";EXENAME=%s%s%s%s%s;PARAMETERS=%%*",
-              (path) ? path : "",
-              (path) ? "\\" : "",
-              objtitle, (path) ? ";STARTUPDIR=" : "", (path) ? path : "");
+              (path) ? path : NullStr,
+              (path) ? PCSZ_BACKSLASH : NullStr,
+              objtitle, (path) ? ";STARTUPDIR=" : NullStr, (path) ? path : NullStr);
     strcat(s, ";NODELETE=NO;TEMPLATE=NO;NOCOPY=NO;NOMOVE=NO");
     sprintf(&s[strlen(s)], ";OBJECTID=<FM2_%s>", objtitle);

trunk/dll/srchpath.c

@@ -133 +133 @@
 
   if (!filename)
-    return "";
+    return NullStr;
   found = searchapath(PCSZ_PATH, filename);
   if (!*found) {

trunk/dll/subj.c

@@ -125 +125 @@
       else
         ealen = sizeof(FEALIST) + 9;
-      rc = DosAllocMem((PPVOID) & pfealist, ealen + 1L,
-                       OBJ_TILE | PAG_COMMIT | PAG_READ | PAG_WRITE);
+      rc = xDosAllocMem((PPVOID) & pfealist, ealen + 1L,
+                        OBJ_TILE | PAG_COMMIT | PAG_READ | PAG_WRITE);
       if (rc)
         Dos_Error(MB_CANCEL, rc, hwnd, pszSrcFile, __LINE__,

trunk/dll/systemf.c

@@ -201 +201 @@
             strcpy(listfile, pTmpDir ? pTmpDir : pFM2SaveDirectory);
             MakeTempName(listfile, "$FM2LI$T", 2);
-            /*if (listfile[strlen(listfile) - 1] != '\\')
-              strcat(listfile, "\\");
-            sprintf(&listfile[strlen(listfile)], "%s.%03x",
-                    LISTTEMPROOT, (clock() & 4095));*/
             fp = xfopen(listfile, "w",pszSrcFile,__LINE__);
             if (fp) {
@@ -670 +666 @@
   PID sessPID;
   BOOL wasquote;
-  char *pszPgm, *pszArgs = NULL;
-  char szObject[32] = "", *p, szSavedir[CCHMAXPATH];
+  char *p, *pszPgm, *pszArgs = NULL;
+  char szObject[32] = "";
+  char szSavedir[CCHMAXPATH];
   BOOL useTermQ = FALSE;
   char szTempdir[CCHMAXPATH];
@@ -704 +701 @@
     hwnd = HWND_DESKTOP;
 
-  rc = DosAllocMem((PVOID)&pszPgm,
-                   MaxComLineStrg,
-                   PAG_COMMIT | OBJ_TILE | PAG_READ | PAG_WRITE);
+  rc = xDosAllocMem((PVOID)&pszPgm,
+                    MaxComLineStrg,
+                    PAG_COMMIT | OBJ_TILE | PAG_READ | PAG_WRITE);
   if (rc) {
     Dos_Error(MB_CANCEL,rc,hwnd,pszSrcFile,__LINE__,GetPString(IDS_OUTOFMEMORY));
@@ -752 +749 @@
       temp = *p;
       if (temp) {
-        rc = DosAllocMem((PVOID)&pszArgs,
-                         MaxComLineStrg * 2,
-                         PAG_COMMIT | OBJ_TILE | PAG_READ | PAG_WRITE);
+        rc = xDosAllocMem((PVOID)&pszArgs,
+                          MaxComLineStrg * 2,
+                          PAG_COMMIT | OBJ_TILE | PAG_READ | PAG_WRITE);
         if (rc)
           Dos_Error(MB_CANCEL,rc,hwnd,pszSrcFile,__LINE__,GetPString(IDS_OUTOFMEMORY));
@@ -886 +883 @@
       if (~type & FULLSCREEN)
         type |= WINDOWED;
-      rc = DosAllocMem((PVOID) & pszArgs, MaxComLineStrg * 2,
-                       PAG_COMMIT | OBJ_TILE | PAG_READ | PAG_WRITE);
+      rc = xDosAllocMem((PVOID) & pszArgs, MaxComLineStrg * 2,
+                        PAG_COMMIT | OBJ_TILE | PAG_READ | PAG_WRITE);
       if (rc) {
         Dos_Error(MB_CANCEL,rc,hwnd,pszSrcFile,__LINE__,GetPString(IDS_OUTOFMEMORY));

trunk/dll/treecnr.c

@@ -799 +799 @@
               if (CheckDrive(toupper(*pci->pszFileName), FileSystem, &type) == -1 ||
                   fShowFSTypeInTree)
-                strcpy(FileSystem, "");
+                strcpy(FileSystem, NullStr);
               if (fShowDriveLabelInTree)
-                strcpy(szTmpLabel, "");
+                strcpy(szTmpLabel, NullStr);
               else
                 strcpy(szTmpLabel, volser.volumelabel);

trunk/dll/undel.c

@@ -19 +19 @@
   08 Mar 09 GKY Removed variable aurguments from docopyf and unlinkf (not used)
   08 Mar 09 GKY Additional strings move to PCSZs
+  28 Jun 09 GKY Added AddBackslashToPath() to remove repeatative code.
 
 ***********************************************************************/
@@ -208 +209 @@
 
       strcpy(s, (CHAR *)mp2);
-      if (s[strlen(s) - 1] != '\\')
-        strcat(s, "\\");
+      AddBackslashToPath(s);
+      //if (s[strlen(s) - 1] != '\\')
+      //  strcat(s, "\\");
       strcat(s, "*");
       WinSetDlgItemText(hwnd, UNDEL_ENTRY, s);

trunk/dll/uudecode.c

@@ -43 +43 @@
 #include "misc.h"                       // PaintRecessedWindow
 #include "wrappers.h"                   // xfgets
+#include "init.h"                       // Strings
 
 static PSZ pszSrcFile = __FILE__;
@@ -98 +99 @@
     }
     else
-      strcat(build, "\\");
+      strcat(build, PCSZ_BACKSLASH);
     strncat(build, dest, CCHMAXPATH - strlen(dest));
     strcpy(dest, build);

trunk/dll/valid.c

@@ -57 +57 @@
 #include "strips.h"                     // bstrip
 #include "init.h"                       // GetTidForWindow
+#include "wrappers.h"                    // xDosAllocMem
 
 
@@ -295 +296 @@
 
 # define BUFFER_BYTES 8192
-  rc = DosAllocMem(&pvBuffer, BUFFER_BYTES,
-                PAG_COMMIT | OBJ_TILE | PAG_READ | PAG_WRITE);
+  rc = xDosAllocMem(&pvBuffer, BUFFER_BYTES,
+                    PAG_COMMIT | OBJ_TILE | PAG_READ | PAG_WRITE);
   if (rc) {
     Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,

trunk/dll/viewinf.c

@@ -20 +20 @@
   07 Feb 09 GKY Allow user to turn off alert and/or error beeps in settings notebook.
   08 Mar 09 GKY Additional strings move to PCSZs in init.c
+  28 Jun 09 GKY Added AddBackslashToPath() to remove repeatative code.
 
 ***********************************************************************/
@@ -121 +122 @@
 
               strcpy(mask, p);
-              if (mask[strlen(mask) - 1] != '\\')
-                strcat(mask, "\\");
+              AddBackslashToPath(mask);
+              //if (mask[strlen(mask) - 1] != '\\')
+              //  strcat(mask, "\\");
               enddir = mask + strlen(mask);
               if (dummy->help)

trunk/dll/walkem.c

@@ -34 +34 @@
   19 Jul 08 GKY Replace save_dir2(dir) with pFM2SaveDirectory and use BldFullPathName
   24 Aug 08 GKY Warn full drive on save of .DAT file; prevent loss of existing file
+  28 Jun 09 GKY Added AddBackslashToPath() to remove repeatative code.
 
 ***********************************************************************/
@@ -681 +682 @@
     sprintf(szTemp,
             "%s%s*",
-            pszPath, (pszPath[strlen(pszPath) - 1] == '\\') ? "" : "\\");
+            pszPath, (pszPath[strlen(pszPath) - 1] == '\\') ? NullStr : PCSZ_BACKSLASH);
     DosError(FERR_DISABLEHARDERR);
     if (!DosFindFirst(szTemp,
@@ -1146 +1147 @@
         bstrip(szBuffer);
         if (*szBuffer) {
-          strcpy(szBuff, wa->szCurrentPath);
-          if (szBuff[strlen(szBuff) - 1] != '\\')
-            strcat(szBuff, "\\");
+          strcpy(szBuff, wa->szCurrentPath);
+          AddBackslashToPath(szBuff);
+          //if (szBuff[strlen(szBuff) - 1] != '\\')
+          //  strcat(szBuff, "\\");
           strcat(szBuff, szBuffer);
           MakeFullName(szBuff);
@@ -1539 +1541 @@
         bstrip(szBuffer);
         if (*szBuffer) {
-          strcpy(szBuff, wa->szCurrentPath1);
-          if (szBuff[strlen(szBuff) - 1] != '\\')
-            strcat(szBuff, "\\");
+          strcpy(szBuff, wa->szCurrentPath1);
+          AddBackslashToPath(szBuff);
+          //if (szBuff[strlen(szBuff) - 1] != '\\')
+          //  strcat(szBuff, "\\");
           strcat(szBuff, szBuffer);
           MakeFullName(szBuff);
@@ -1604 +1607 @@
         bstrip(szBuffer);
         if (*szBuffer) {
-          strcpy(szBuff, wa->szCurrentPath2);
-          if (szBuff[strlen(szBuff) - 1] != '\\')
-            strcat(szBuff, "\\");
+          strcpy(szBuff, wa->szCurrentPath2);
+          AddBackslashToPath(szBuff);
+          //if (szBuff[strlen(szBuff) - 1] != '\\')
+          //  strcat(szBuff, "\\");
           strcat(szBuff, szBuffer);
           MakeFullName(szBuff);

trunk/dll/worker.c

@@ -41 +41 @@
   08 Mar 09 GKY Removed variable aurguments from docopyf and unlinkf (not used)
   08 Mar 09 GKY Additional strings move to PCSZs
+  28 Jun 09 GKY Added AddBackslashToPath() to remove repeatative code.
 
 ***********************************************************************/
@@ -230 +231 @@
             }
             else
-              strcat(wk->li->targetpath, "\\");
+              strcat(wk->li->targetpath, PCSZ_BACKSLASH);
             sprintf(wk->li->targetpath + strlen(wk->li->targetpath),
                     "MERGE.%03x", (clock() & 4095L));
@@ -708 +709 @@
                       GetPString(IDS_MOVEDTEXT) : GetPString(IDS_COPIEDTEXT);
                     if (*wk->li->targetpath) {
-                      strcpy(newname, wk->li->targetpath);
-                      if (newname[strlen(newname) - 1] != '\\')
-                        strcat(newname, "\\");
+                      strcpy(newname, wk->li->targetpath);
+                      AddBackslashToPath(newname);
+                      //if (newname[strlen(newname) - 1] != '\\')
+                      //  strcat(newname, "\\");
                       if (plen)
                         p = wk->li->list[x] + plen;
@@ -1209 +1211 @@
               if (wk->li->type == IDM_MCIPLAY)
                 break;
-              strcpy(szBuffer, wk->li->targetpath);
-              if (wk->li->targetpath[strlen(wk->li->targetpath) - 1] != '\\')
-                strcat(szBuffer, "\\");
+              strcpy(szBuffer, wk->li->targetpath);
+              AddBackslashToPath(wk->li->targetpath);
+              //if (wk->li->targetpath[strlen(wk->li->targetpath) - 1] != '\\')
+              //  strcat(szBuffer, "\\");
               p = szBuffer + strlen(szBuffer);
               for (x = 0; wk->li->list[x]; x++) {
@@ -1270 +1273 @@
               }
               else {
-                if (*wk->li->targetpath && !IsFile(wk->li->targetpath))
-                  if (wk->li->targetpath[strlen(wk->li->targetpath) - 1] !=
-                      '\\')
-                    strcat(wk->li->targetpath, "\\");
+                if (*wk->li->targetpath && !IsFile(wk->li->targetpath))
+                  AddBackslashToPath(wk->li->targetpath);
+                  //if (wk->li->targetpath[strlen(wk->li->targetpath) - 1] !=
+                  //    '\\')
+                  //  strcat(wk->li->targetpath, "\\");
                 ad.namecanchange = 1;
               }
@@ -1298 +1302 @@
                 break;
               if (!*wk->li->targetpath && *wk->directory) {
-                strcpy(ad.arcname, wk->directory);
-                if (ad.arcname[strlen(ad.arcname) - 1] != '\\')
-                  strcat(ad.arcname, "\\");
+                strcpy(ad.arcname, wk->directory);
+                AddBackslashToPath(ad.arcname);
+                //if (ad.arcname[strlen(ad.arcname) - 1] != '\\')
+                //  strcat(ad.arcname, "\\");
               }
               if (!WinDlgBox(HWND_DESKTOP, wk->hwndFrame, ArchiveDlgProc, FM3ModHandle,
@@ -1636 +1641 @@
                                              wk->li->
                                              list[x][strlen(wk->li->list[x]) - 1]
-                                             != '\\') ? "\\" : NullStr);
+                                             != '\\') ? PCSZ_BACKSLASH : NullStr);
                   DosError(FERR_DISABLEHARDERR);
                   if (!error)

trunk/dll/wrappers.c

@@ -51 +51 @@
 #pragma data_seg(GLOBAL1)
 BOOL fNoLargeFileSupport;
+
+APIRET xDosAllocSharedMem(PPVOID ppb,
+                          PSZ pszName,
+                          ULONG cb,
+                          ULONG flag)
+{
+  APIRET rc; ;
+
+  rc = DosAllocSharedMem(ppb, pszName, cb, flag | OBJ_ANY);
+  DbgMsg(pszSrcFile, __LINE__, "ppb %p", *ppb);
+  if (rc)
+    rc = DosAllocSharedMem(ppb, pszName, cb, flag);
+  return rc;
+}
+
+APIRET xDosAllocMem(PPVOID ppb,
+                    ULONG cb,
+                    ULONG flag)
+{
+  APIRET rc;
+
+  rc = DosAllocMem(ppb, cb, flag | OBJ_ANY);
+  DbgMsg(pszSrcFile, __LINE__, "ppb %p %x", *ppb, rc);
+  if (rc)
+    rc = DosAllocMem(ppb, cb, flag);
+  DbgMsg(pszSrcFile, __LINE__, "ppb %p", *ppb);
+  return rc;
+}
 
 APIRET xDosFindFirst(PSZ pszFileSpec,

trunk/dll/wrappers.h

@@ -19 +19 @@
 #include <os2.h>
 #endif
+
+APIRET xDosAllocSharedMem(PPVOID ppb,
+                          PSZ pszName,
+                          ULONG cb,
+                          ULONG flag);
+
+APIRET xDosAllocMem(PPVOID ppb,
+                    ULONG cb,
+                    ULONG flag);
 
 APIRET xDosFindFirst(PSZ pszFileSpec,