Changeset 730

Timestamp:

Jul 22, 2007, 7:57:09 PM (18 years ago)

Author:

Gregg Young

Message:

Preliminary work on variable sized container buffers. Removes szFileName etc. Builds fine but traps.

Location:

trunk/dll

Files:

• arccnrs.c (modified) (12 diffs)
• collect.c (modified) (20 diffs)
• comp.c (modified) (29 diffs)
• dircnrs.c (modified) (24 diffs)
• dirsize.c (modified) (15 diffs)
• draglist.c (modified) (8 diffs)
• droplist.c (modified) (1 diff)
• eas.c (modified) (1 diff)
• filldir.c (modified) (31 diffs)
• filter.c (modified) (5 diffs)
• findrec.c (modified) (2 diffs)
• flesh.c (modified) (9 diffs)
• fm3dll.h (modified) (2 diffs)
• fm3res.rc (modified) (1 diff)
• info.c (modified) (1 diff)
• mainwnd.c (modified) (4 diffs)
• makelist.c (modified) (2 diffs)
• misc.c (modified) (8 diffs)
• objcnr.c (modified) (5 diffs)
• saveclip.c (modified) (4 diffs)
• select.c (modified) (35 diffs)
• sortcnr.c (modified) (7 diffs)
• systemf.c (modified) (2 diffs)
• treecnr.c (modified) (43 diffs)
• update.c (modified) (13 diffs)

trunk/dll/arccnrs.c

@@ -189 +189 @@
     switch (sortFlags & (~SORT_REVERSE)) {
     case SORT_FIRSTEXTENSION:
-      pext = strchr(pai1->szFileName, '.');
-      ppext = strchr(pai2->szFileName, '.');
+      pext = strchr(pai1->pszFileName, '.');
+      ppext = strchr(pai2->pszFileName, '.');
       if (!pext)
         pext = NullStr;
@@ -199 +199 @@
 
     case SORT_LASTEXTENSION:
-      pext = strrchr(pai1->szFileName, '.');
-      ppext = strrchr(pai2->szFileName, '.');
+      pext = strrchr(pai1->pszFileName, '.');
+      ppext = strrchr(pai2->pszFileName, '.');
       if (!pext)
         pext = NullStr;
@@ -244 +244 @@
     }
     if (!ret)
-      ret = (SHORT) stricmp(pai1->szFileName, pai2->szFileName);
+      ret = (SHORT) stricmp(pai1->pszFileName, pai2->pszFileName);
     if (ret && (sortFlags & SORT_REVERSE))
       ret = ret > 0 ? -1 : 1;
     return ret;
   }
-  return (SHORT) stricmp(pai1->szFileName, pai2->szFileName);
+  return (SHORT) stricmp(pai1->pszFileName, pai2->pszFileName);
 }
 
@@ -265 +265 @@
         if (*dcd->mask.pszMasks[x]) {
           if (*dcd->mask.pszMasks[x] != '/') {
-            if (wildcard(r->szFileName, dcd->mask.pszMasks[x], FALSE))
+            if (wildcard(r->pszFileName, dcd->mask.pszMasks[x], FALSE))
               ret = TRUE;
           }
           else {
-            if (wildcard(r->szFileName, dcd->mask.pszMasks[x] + 1, FALSE)) {
+            if (wildcard(r->pszFileName, dcd->mask.pszMasks[x] + 1, FALSE)) {
               ret = FALSE;
               break;
@@ -278 +278 @@
     }
     else {
-      if (wildcard(r->szFileName, dcd->mask.szMask, FALSE))
+      if (wildcard(r->pszFileName, dcd->mask.szMask, FALSE))
         ret = TRUE;
     }
@@ -585 +585 @@
                   fname[strlen(fname) - 1] == '/')
                 pai->flags = ARCFLAGS_REALDIR;
-              strcpy(pai->szFileName, fname);
+              pai->pszFileName = xstrdup(fname,pszSrcFile, __LINE__);
               if (fdate)
                 strcpy(pai->szDate, fdate);
-              pai->pszFileName = pai->szFileName;
+              // pai->pszFileName = pai->pszFileName;
               pai->rc.pszIcon = pai->pszFileName;
               pai->rc.hptrIcon = (pai->flags & ARCFLAGS_REALDIR) != 0 ?
@@ -1318 +1318 @@
                             IDS_SELECTFILTERTEXT : IDS_DESELECTFILTERTEXT));
           if (pci && (INT) pci != -1)
-            strcpy(mask.szMask, pci->szFileName);
+            strcpy(mask.szMask, pci->pszFileName);
           if (WinDlgBox(HWND_DESKTOP, dcd->hwndCnr, PickMaskDlgProc,
                         FM3ModHandle, MSK_FRAME, MPFROMP(&mask))) {
@@ -2152 +2152 @@
               sprintf(s, "%s%s%s%s",
                       *tb ? " " : NullStr,
-                      tb, *tb ? "  " : NullStr, pci->szFileName);
+                      tb, *tb ? "  " : NullStr, pci->pszFileName);
               WinSetWindowText(hwndStatus2, s);
             }
             if (fMoreButtons)
-              WinSetWindowText(hwndName, pci->szFileName);
+              WinSetWindowText(hwndName, pci->pszFileName);
           }
           else {
@@ -2748 +2748 @@
             empty = TRUE;
             pci = (PARCITEM) CurrentRecord(hwnd);
-            if (pci && strchr(pci->szFileName, '.'))
-              strcpy(dcd->mask.szMask, pci->szFileName);
+            if (pci && strchr(pci->pszFileName, '.'))
+              strcpy(dcd->mask.szMask, pci->pszFileName);
           }
 
@@ -2868 +2868 @@
                                             MPFROMSHORT(CRA_CURSORED));
               if (pai && (INT) pai != -1)
-                strcpy(li->runfile, pai->szFileName);
+                strcpy(li->runfile, pai->pszFileName);
               else
                 strcpy(li->runfile, li->list[0]);
@@ -3132 +3132 @@
                   sprintf(s, "%s%s%s%s",
                           *tb ? " " : NullStr,
-                          tb, *tb ? "  " : NullStr, pci->szFileName);
+                          tb, *tb ? "  " : NullStr, pci->pszFileName);
                   WinSetWindowText(hwndStatus2, s);
                 }
                 if (fMoreButtons)
-                  WinSetWindowText(hwndName, pci->szFileName);
+                  WinSetWindowText(hwndName, pci->pszFileName);
               }
             }
@@ -3155 +3155 @@
                 (pci->flags & (ARCFLAGS_REALDIR | ARCFLAGS_PSEUDODIR)))
               break;
-            s = xstrdup(pci->szFileName, pszSrcFile, __LINE__);
+            s = xstrdup(pci->pszFileName, pszSrcFile, __LINE__);
             if (s) {
               if (!PostMsg(dcd->hwndObject, UM_ENTER, MPFROMP(s), MPVOID)) {

trunk/dll/collect.c

@@ -794 +794 @@
                             IDS_SELECTFILTERTEXT : IDS_DESELECTFILTERTEXT));
           if (pci && (INT) pci != -1)
-            strcpy(mask.szMask, pci->szFileName);
+            strcpy(mask.szMask, pci->pszFileName);
           if (WinDlgBox(HWND_DESKTOP, dcd->hwndCnr, PickMaskDlgProc,
                         FM3ModHandle, MSK_FRAME, MPFROMP(&mask))) {
@@ -1084 +1084 @@
                          MPFROMLONG(CMA_FIRST), MPFROMSHORT(CRA_CURSORED));
         if (pci && (INT) pci != -1 &&
-            (!(driveflags[toupper(*pci->szFileName) - 'A'] & DRIVE_SLOW)))
-          WinSendMsg(hwndMain, UM_LOADFILE, MPFROMP(pci->szFileName), MPVOID);
+            (!(driveflags[toupper(*pci->pszFileName) - 'A'] & DRIVE_SLOW)))
+          WinSendMsg(hwndMain, UM_LOADFILE, MPFROMP(pci->pszFileName), MPVOID);
         else
           WinSendMsg(hwndMain, UM_LOADFILE, MPVOID, MPVOID);
@@ -1122 +1122 @@
                            MPFROMLONG(CMA_FIRST), MPFROMSHORT(CRA_CURSORED));
           if (pci && (INT) pci != -1)
-            PostMsg(hwndMain, UM_LOADFILE, MPFROMP(pci->szFileName), MPVOID);
+            PostMsg(hwndMain, UM_LOADFILE, MPFROMP(pci->pszFileName), MPVOID);
           else
             PostMsg(hwndMain, UM_LOADFILE, MPVOID, MPVOID);
@@ -1149 +1149 @@
               p = pci->pszFileName;
             else {
-              p = strrchr(pci->szFileName, '\\');
+              p = strrchr(pci->pszFileName, '\\');
               if (p) {
                 if (*(p + 1))
@@ -1444 +1444 @@
             static CHAR dirname[CCHMAXPATH];
 
-            strcpy(dirname, pci->szFileName);
+            strcpy(dirname, pci->pszFileName);
             MakeValidDir(dirname);
             StartSeeAll(HWND_DESKTOP, FALSE, dirname);
@@ -1482 +1482 @@
             WinQueryWindowPos(dcd->hwndFrame, &swp);
             DefaultViewKeys(hwnd, dcd->hwndFrame, dcd->hwndParent, &swp,
-                            pci->szFileName);
+                            pci->pszFileName);
           }
         }
@@ -1700 +1700 @@
           pci = (PCNRITEM) CurrentRecord(hwnd);
           if (pci) {
-            strcpy(path, pci->szFileName);
+            strcpy(path, pci->pszFileName);
             MakeValidDir(path);
             WinDlgBox(HWND_DESKTOP, hwnd, UndeleteDlgProc, FM3ModHandle,
@@ -1741 +1741 @@
             pci = (PCNRITEM) CurrentRecord(hwnd);
             if (pci && !(pci->attrFile & FILE_DIRECTORY)) {
-              p = strrchr(pci->szFileName, '\\');
+              p = strrchr(pci->pszFileName, '\\');
               if (p) {
                 p++;
@@ -1763 +1763 @@
                                MPFROMSHORT(CRA_CURSORED));
               if (pci && (INT) pci != -1 &&
-                  (!(driveflags[toupper(*pci->szFileName) - 'A'] &
+                  (!(driveflags[toupper(*pci->pszFileName) - 'A'] &
                      DRIVE_SLOW)))
-                WinSendMsg(hwndMain, UM_LOADFILE, MPFROMP(pci->szFileName),
+                WinSendMsg(hwndMain, UM_LOADFILE, MPFROMP(pci->pszFileName),
                            MPVOID);
               else
@@ -1913 +1913 @@
           if (pci && (INT) pci != -1)
             WinDlgBox(HWND_DESKTOP, HWND_DESKTOP, DirSizeProc, FM3ModHandle,
-                      DSZ_FRAME, pci->szFileName);
+                      DSZ_FRAME, pci->pszFileName);
         }
         break;
@@ -1923 +1923 @@
           pci = (PCNRITEM) CurrentRecord(hwnd);
           PMMkDir(dcd->hwndParent, (pci && (INT) pci != -1) ?
-                  pci->szFileName : NULL, FALSE);
+                  pci->pszFileName : NULL, FALSE);
         }
         break;
@@ -2137 +2137 @@
                  (pci) ? NullStr : GetPString(IDS_NOTEXT),
                  (pci) ? NullStr : " ",
-                 (pci) ? pci->szFileName : NullStr,
+                 (pci) ? pci->pszFileName : NullStr,
                  (pci) ? " " : NullStr,
                  GetPString((usOperation == DO_COPY) ?
@@ -2188 +2188 @@
               }
               if (uso != DO_LINK &&
-                  !(driveflags[toupper(*pci->szFileName) - 'A'] &
+                  !(driveflags[toupper(*pci->pszFileName) - 'A'] &
                     DRIVE_NOTWRITEABLE)) {
                 ARC_TYPE *info = NULL;
 
                 if (!fQuickArcFind &&
-                    !(driveflags[toupper(*pci->szFileName) - 'A'] &
+                    !(driveflags[toupper(*pci->pszFileName) - 'A'] &
                       DRIVE_SLOW))
-                  info = find_type(pci->szFileName, NULL);
+                  info = find_type(pci->pszFileName, NULL);
                 else
-                  info = quick_find_type(pci->szFileName, NULL);
+                  info = quick_find_type(pci->pszFileName, NULL);
                 if (!info || ((uso == DO_MOVE && !info->move) ||
                               (uso == DO_COPY && !info->create))) {
@@ -2213 +2213 @@
             DrgFreeDraginfo(pDInfo);    /* Free DRAGINFO */
             if (pci) {
-              if (driveflags[toupper(*pci->szFileName) - 'A'] &
+              if (driveflags[toupper(*pci->pszFileName) - 'A'] &
                   DRIVE_NOTWRITEABLE)
                 return MRFROM2SHORT(DOR_DROP, DO_LINK);
-              if (toupper(*pci->szFileName) < 'C')
+              if (toupper(*pci->pszFileName) < 'C')
                 return MRFROM2SHORT(DOR_DROP, DO_COPY);
               return MRFROM2SHORT(DOR_DROP,     /* Return okay to drop */
@@ -2240 +2240 @@
               if (pci->rc.flRecordAttr & CRA_SELECTED)
                 wasemphasized = TRUE;
-              if (IsRoot(pci->szFileName))
+              if (IsRoot(pci->pszFileName))
                 break;
               if (hwndStatus2)
@@ -2456 +2456 @@
                     p = pci->pszFileName;
                   else {
-                    p = strrchr(pci->szFileName, '\\');
+                    p = strrchr(pci->pszFileName, '\\');
                     if (p) {
                       if (*(p + 1))
@@ -2504 +2504 @@
                        MPFROMP(((fComments
                                  || (pci->attrFile & FILE_DIRECTORY) ==
-                                 0) ? pci->szFileName : NULL)), MPVOID);
+                                 0) ? pci->pszFileName : NULL)), MPVOID);
         }
         break;
@@ -2521 +2521 @@
               break;
             DosError(FERR_DISABLEHARDERR);
-            status = DosFindFirst(pci->szFileName, &hDir,
+            status = DosFindFirst(pci->pszFileName, &hDir,
                                   FILE_NORMAL | FILE_DIRECTORY |
                                   FILE_ARCHIVED | FILE_READONLY |
@@ -2535 +2535 @@
                 else if ((shiftstate & (KC_CTRL | KC_SHIFT)) ==
                          (KC_CTRL | KC_SHIFT))
-                  OpenObject(pci->szFileName, Settings, dcd->hwndFrame);
+                  OpenObject(pci->pszFileName, Settings, dcd->hwndFrame);
                 else if (shiftstate & KC_CTRL)
-                  OpenObject(pci->szFileName, Default, dcd->hwndFrame);
+                  OpenObject(pci->pszFileName, Default, dcd->hwndFrame);
                 else
                   OpenDirCnr(HWND_DESKTOP,
                              hwndMain,
-                             dcd->hwndFrame, FALSE, pci->szFileName);
+                             dcd->hwndFrame, FALSE, pci->pszFileName);
               }
               else {
@@ -2552 +2552 @@
                 DefaultViewKeys(hwnd,
                                 dcd->hwndFrame,
-                                dcd->hwndParent, &swp, pci->szFileName);
+                                dcd->hwndParent, &swp, pci->pszFileName);
                 WinSendMsg(hwnd,
                            CM_SETRECORDEMPHASIS,

trunk/dll/comp.c

@@ -355 +355 @@
   CHAR newname[CCHMAXPATH], dirname[CCHMAXPATH], *p;
   APIRET rc;
+  CHAR *f = 0;
 
   if (!cmp)
@@ -414 +415 @@
         pciOn = WinSendMsg(hwndCnrD, CM_QUERYRECORD, MPFROMP(pciO),
                            MPFROM2SHORT(CMA_NEXT, CMA_ITEMORDER));
-        if (*pci->szFileName && (pci->rc.flRecordAttr & CRA_SELECTED)) {
+        if (*pci->pszFileName && (pci->rc.flRecordAttr & CRA_SELECTED)) {
           switch (cmp->action) {
           case IDM_DELETE:
-            if (!unlinkf("%s", pci->szFileName)) {
+            if (!unlinkf("%s", pci->pszFileName)) {
               WinSendMsg(hwndCnrS, CM_SETRECORDEMPHASIS, MPFROMP(pci),
                          MPFROM2SHORT(FALSE, CRA_SELECTED));
-              if (!*pciO->szFileName) {
+              if (!*pciO->pszFileName) {
                 WinSendMsg(hwndCnrS, CM_REMOVERECORD, MPFROMP(&pci),
                            MPFROM2SHORT(1, CMA_FREE | CMA_INVALIDATE));
@@ -429 +430 @@
                            MPFROM2SHORT(1, CMA_FREE | CMA_INVALIDATE));
               }
-              else {
-                *pci->szFileName = 0;
-                pci->pszFileName = pci->szFileName;
+              else {
+                pci->pszFileName = xstrdup(f, pszSrcFile, __LINE__);
+                //pci->pszFileName = pci->szFileName;
                 pci->flags = 0;
                 WinSendMsg(hwndCnrS, CM_INVALIDATERECORD, MPFROMP(&pci),
@@ -463 +464 @@
                 MassMkdir(hwndMain, dirname);
             }
-            rc = docopyf(MOVE, pci->szFileName, "%s", newname);
-            if (!rc && stricmp(pci->szFileName, newname)) {
+            rc = docopyf(MOVE, pci->pszFileName, "%s", newname);
+            if (!rc && stricmp(pci->pszFileName, newname)) {
               WinSendMsg(hwndCnrS, CM_SETRECORDEMPHASIS, MPFROMP(pci),
                          MPFROM2SHORT(FALSE, CRA_SELECTED));
@@ -470 +471 @@
                 WinSendMsg(hwndCnrD, CM_SETRECORDEMPHASIS, MPFROMP(pciO),
                            MPFROM2SHORT(FALSE, CRA_SELECTED));
-              strcpy(pciO->szFileName, newname);
+              pciO->pszFileName = xstrdup(newname, pszSrcFile, __LINE__);
               if (hwndCnrS == WinWindowFromID(cmp->hwnd, COMP_RIGHTDIR)) {
-                pciO->pszFileName = pciO->szFileName + strlen(cmp->leftdir);
+                pciO->pszFileName = pciO->pszFileName + strlen(cmp->leftdir);
                 if (cmp->leftdir[strlen(cmp->leftdir) - 1] != '\\')
                   pciO->pszFileName++;
               }
               else {
-                pciO->pszFileName = pciO->szFileName + strlen(cmp->rightdir);
+                pciO->pszFileName = pciO->pszFileName + strlen(cmp->rightdir);
                 if (cmp->rightdir[strlen(cmp->rightdir) - 1] != '\\')
                   pciO->pszFileName++;
-              }
+              }
               strcpy(pciO->szDispAttr, pci->szDispAttr);
               pciO->attrFile = pci->attrFile;
@@ -492 +493 @@
               pciO->cbFile = pci->cbFile;
               pciO->easize = pci->easize;
-              *pciO->szSubject = 0;
-              *pci->szFileName = 0;
-              pci->pszFileName = pci->szFileName;
+              pciO->pszSubject = xstrdup(f, pszSrcFile, __LINE__);
+              pci->pszFileName = xstrdup(f, pszSrcFile, __LINE__);
+              //pci->pszFileName = pci->szFileName;
               pci->flags = 0;
               WinSendMsg(hwndCnrS, CM_INVALIDATERECORD, MPFROMP(&pci),
@@ -508 +509 @@
                              __LINE__,
                              GetPString(IDS_COMPMOVEFAILEDTEXT),
-                             pci->szFileName, newname);
+                             pci->pszFileName, newname);
               if (rc == MBID_CANCEL)    /* cause loop to break */
                 pcin = NULL;
@@ -533 +534 @@
                 MassMkdir(hwndMain, dirname);
             }
-            rc = docopyf(COPY, pci->szFileName, "%s", newname);
+            rc = docopyf(COPY, pci->pszFileName, "%s", newname);
             if (rc) {
               rc = Dos_Error(MB_ENTERCANCEL,
@@ -541 +542 @@
                              __LINE__,
                              GetPString(IDS_COMPCOPYFAILEDTEXT),
-                             pci->szFileName, newname);
+                             pci->pszFileName, newname);
               if (rc == MBID_CANCEL)
                 pcin = NULL;            /* cause loop to break */
@@ -551 +552 @@
                 WinSendMsg(hwndCnrD, CM_SETRECORDEMPHASIS, MPFROMP(pciO),
                            MPFROM2SHORT(FALSE, CRA_SELECTED));
-              strcpy(pciO->szFileName, newname);
+              pciO->pszFileName = xstrdup(newname, pszSrcFile, __LINE__);
               if (hwndCnrS == WinWindowFromID(cmp->hwnd, COMP_RIGHTDIR)) {
-                pciO->pszFileName = pciO->szFileName + strlen(cmp->leftdir);
+                pciO->pszFileName = pciO->pszFileName + strlen(cmp->leftdir);
                 if (cmp->leftdir[strlen(cmp->leftdir) - 1] != '\\')
                   pciO->pszFileName++;
               }
               else {
-                pciO->pszFileName = pciO->szFileName + strlen(cmp->rightdir);
+                pciO->pszFileName = pciO->pszFileName + strlen(cmp->rightdir);
                 if (cmp->rightdir[strlen(cmp->rightdir) - 1] != '\\')
                   pciO->pszFileName++;
-              }
+              }
               strcpy(pciO->szDispAttr, pci->szDispAttr);
               pciO->attrFile = pci->attrFile;
@@ -573 +574 @@
               pciO->cbFile = pci->cbFile;
               pciO->easize = pci->easize;
-              *pci->szSubject = 0;
+              pci->pszSubject = xstrdup(f, pszSrcFile, __LINE__);
               pci->flags = CNRITEM_EXISTS;
               WinSendMsg(hwndCnrS, CM_INVALIDATERECORD, MPFROMP(&pci),
@@ -792 +793 @@
       RECORDINSERT ri;
       CHAR *pch;
+      CHAR fname[CCHMAXPATH];
 
       WinCancelShutdown(hmq, TRUE);
@@ -1024 +1026 @@
         while ((filesl && filesl[l]) || (filesr && filesr[r])) {
           pcir->hwndCnr = hwndRight;
-          pcir->pszFileName = pcir->szFileName;
+          //pcir->pszFileName = pcir->szFileName;
           pcir->rc.pszIcon = pcir->pszFileName;
           pcir->rc.hptrIcon = (HPOINTER) 0;
-          pcir->pszSubject = pcir->szSubject;
-          pcir->pszLongname = pcir->szLongname;
+          //pcir->pszSubject = pcir->szSubject;
+          //pcir->pszLongname = pcir->szLongname;
           pcir->pszDispAttr = pcir->szDispAttr;
           pcil->hwndCnr = hwndLeft;
-          pcil->pszFileName = pcil->szFileName;
+          //pcil->pszFileName = pcil->szFileName;
           pcil->rc.pszIcon = pcil->pszFileName;
           pcil->rc.hptrIcon = (HPOINTER) 0;
           pcil->pszDispAttr = pcil->szDispAttr;
-          pcil->pszSubject = pcil->szSubject;
-          pcil->pszLongname = pcil->szLongname;
+          //pcil->pszSubject = pcil->szSubject;
+          //pcil->pszLongname = pcil->szLongname;
           if ((filesl && filesl[l]) && (filesr && filesr[r])) {
             x = stricmp(filesl[l]->fname, filesr[r]->fname);
             if (!x) {
-              // Same
-              sprintf(pcil->szFileName, "%s%s%s", cmp->leftdir,
+                // Same
+              sprintf(fname, "%s%s%s", cmp->leftdir,
                       (cmp->leftdir[strlen(cmp->leftdir) - 1] == '\\') ?
                       NullStr : "\\", filesl[l]->fname);
               // pcil->rc.hptrIcon    = hptrFile;
-              pcil->pszFileName = pcil->szFileName + lenl;
+              pcil->pszFileName = xstrdup((fname + lenl), pszSrcFile, __LINE__);
               pcil->attrFile = filesl[l]->attrFile;
               y = 0;
@@ -1081 +1083 @@
                 }
               }
-              sprintf(pcir->szFileName, "%s%s%s", cmp->rightdir,
+              sprintf(fname, "%s%s%s", cmp->rightdir,
                       (cmp->rightdir[strlen(cmp->rightdir) - 1] == '\\') ?
                       NullStr : "\\", filesr[r]->fname);
-              pcir->pszFileName = pcir->szFileName + lenr;
+              pcir->pszFileName = xstrdup((fname + lenr), pszSrcFile, __LINE__);
               pcir->attrFile = filesr[r]->attrFile;
               // pcir->rc.hptrIcon    = hptrFile;
@@ -1116 +1118 @@
               pcil->flags |= CNRITEM_EXISTS;
               pcir->flags |= CNRITEM_EXISTS;
-              pch = pcil->szSubject;
+              pch = pcil->pszSubject;
               if (pcil->cbFile + pcil->easize > pcir->cbFile + pcir->easize) {
                 pcil->flags |= CNRITEM_LARGER;
@@ -1144 +1146 @@
                 pcil->flags |= CNRITEM_NEWER;
                 pcir->flags |= CNRITEM_OLDER;
-                if (pch != pcil->szSubject) {
+                if (pch != pcil->pszSubject) {
                   strcpy(pch, ", ");
                   pch += 2;
@@ -1166 +1168 @@
                 pcil->flags |= CNRITEM_OLDER;
                 pcir->flags |= CNRITEM_NEWER;
-                if (pch != pcil->szSubject) {
+                if (pch != pcil->pszSubject) {
                   strcpy(pch, ", ");
                   pch += 2;
@@ -1179 +1181 @@
             else if (x < 0) {
               // Just on left
-              sprintf(pcil->szFileName, "%s%s%s", cmp->leftdir,
+              sprintf(fname, "%s%s%s", cmp->leftdir,
                       (cmp->leftdir[strlen(cmp->leftdir) - 1] == '\\') ?
                       NullStr : "\\", filesl[l]->fname);
-              pcil->pszFileName = pcil->szFileName + lenl;
+              pcil->pszFileName = xstrdup((fname + lenl), pszSrcFile, __LINE__);
               pcil->attrFile = filesl[l]->attrFile;
               // pcil->rc.hptrIcon    = hptrFile;
@@ -1223 +1225 @@
             else {
               // Just on right
-              sprintf(pcir->szFileName, "%s%s%s", cmp->rightdir,
+              sprintf(fname, "%s%s%s", cmp->rightdir,
                       (cmp->rightdir[strlen(cmp->rightdir) - 1] == '\\') ?
                       NullStr : "\\", filesr[r]->fname);
-              pcir->pszFileName = pcir->szFileName + lenr;
+              pcir->pszFileName = xstrdup((fname + lenr), pszSrcFile, __LINE__);
               pcir->attrFile = filesr[r]->attrFile;
               // pcir->rc.hptrIcon    = hptrFile;
@@ -1269 +1271 @@
           else if (filesl && filesl[l]) {
             // Just on left
-            sprintf(pcil->szFileName, "%s%s%s", cmp->leftdir,
+            sprintf(fname, "%s%s%s", cmp->leftdir,
                     (cmp->leftdir[strlen(cmp->leftdir) - 1] == '\\') ?
                     NullStr : "\\", filesl[l]->fname);
-            pcil->pszFileName = pcil->szFileName + lenl;
+            pcil->pszFileName = xstrdup((fname + lenl), pszSrcFile, __LINE__);
             pcil->attrFile = filesl[l]->attrFile;
             // pcil->rc.hptrIcon    = hptrFile;
@@ -1313 +1315 @@
             /* filesr && filesr[r] */
             // Just on right
-            sprintf(pcir->szFileName, "%s%s%s", cmp->rightdir,
+            sprintf(fname, "%s%s%s", cmp->rightdir,
                     (cmp->rightdir[strlen(cmp->rightdir) - 1] == '\\') ?
                     NullStr : "\\", filesr[r]->fname);
-            pcir->pszFileName = pcir->szFileName + lenr;
+            pcir->pszFileName = xstrdup((fname + lenr), pszSrcFile, __LINE__);
             pcir->attrFile = filesr[r]->attrFile;
             // pcir->rc.hptrIcon    = hptrFile;
@@ -1621 +1623 @@
       if (pcown) {
         pci = (PCNRITEM) pcown->pRecord;
-        if (pci && (INT) pci != -1 && !*pci->szFileName)
+        if (pci && (INT) pci != -1 && !*pci->pszFileName)
           return MRFROMLONG(TRUE);
       }
@@ -1761 +1763 @@
           SetShiftState();
           if (pci) {
-            if ((pci->rc.flRecordAttr & CRA_INUSE) || !*pci->szFileName)
+            if ((pci->rc.flRecordAttr & CRA_INUSE) || !*pci->pszFileName)
               break;
             WinSendMsg(hwndCnr, CM_SETRECORDEMPHASIS, MPFROMP(pci),
@@ -1767 +1769 @@
             if (pci->attrFile & FILE_DIRECTORY) {
               if ((shiftstate & (KC_CTRL | KC_SHIFT)) == (KC_CTRL | KC_SHIFT))
-                OpenObject(pci->szFileName, Settings, hwnd);
+                OpenObject(pci->pszFileName, Settings, hwnd);
               else
-                OpenObject(pci->szFileName, Default, hwnd);
+                OpenObject(pci->pszFileName, Default, hwnd);
             }
             else
               DefaultViewKeys(hwnd, hwnd, HWND_DESKTOP, NULL,
-                              pci->szFileName);
+                              pci->pszFileName);
             WinSendMsg(hwndCnr, CM_SETRECORDEMPHASIS,
                        MPFROMP(pci),
@@ -1794 +1796 @@
           cmp->hwndCalling = WinWindowFromID(hwnd, SHORT1FROMMP(mp1));
           if (pci) {
-            if (!*pci->szFileName || *cmp->rightlist)
+            if (!*pci->pszFileName || *cmp->rightlist)
               break;
             id = COMP_MENU;
@@ -1842 +1844 @@
             pci = (PCNRITEM) pre->pRecord;
             if (pci) {
-              if (!*pci->szFileName) {
+              if (!*pci->pszFileName) {
                 if (pci->rc.flRecordAttr & CRA_SELECTED)
                   WinSendDlgItemMsg(hwnd, SHORT1FROMMP(mp1),
@@ -2088 +2090 @@
             CHAR *fakelist[3];
 
-            fakelist[0] = pci->szFileName;
+            fakelist[0] = pci->pszFileName;
             fakelist[1] = ofile;
             fakelist[2] = NULL;
@@ -2101 +2103 @@
             fc.size = sizeof(fc);
             fc.hwndParent = hwnd;
-            strcpy(fc.file1, pci->szFileName);
+            strcpy(fc.file1, pci->pszFileName);
             strcpy(fc.file2, ofile);
             WinDlgBox(HWND_DESKTOP, hwnd,
@@ -2127 +2129 @@
           fSelectedAlways = temp;
           if (pci && !(pci->attrFile & FILE_DIRECTORY)) {
-            p = strrchr(pci->szFileName, '\\');
+            p = strrchr(pci->pszFileName, '\\');
             if (p) {
               p++;

trunk/dll/dircnrs.c

@@ -932 +932 @@
                             IDS_SELECTFILTERTEXT : IDS_DESELECTFILTERTEXT));
           if (pci && (INT) pci != -1)
-            strcpy(mask.szMask, pci->szFileName);
+            strcpy(mask.szMask, pci->pszFileName);
           if (WinDlgBox(HWND_DESKTOP,
                         dcd->hwndCnr,
@@ -1258 +1258 @@
                          MPFROMSHORT(CRA_CURSORED));
         if (pci && (INT) pci != -1 &&
-            (!(driveflags[toupper(*pci->szFileName) - 'A'] & DRIVE_SLOW)))
-          WinSendMsg(hwndMain, UM_LOADFILE, MPFROMP(pci->szFileName), MPVOID);
+            (!(driveflags[toupper(*pci->pszFileName) - 'A'] & DRIVE_SLOW)))
+          WinSendMsg(hwndMain, UM_LOADFILE, MPFROMP(pci->pszFileName), MPVOID);
         else
           WinSendMsg(hwndMain, UM_LOADFILE, MPVOID, MPVOID);
@@ -1638 +1638 @@
                          MPFROMLONG(CMA_FIRST), MPFROMSHORT(CRA_CURSORED));
         if (pci && (INT) pci != -1 &&
-            (!(driveflags[toupper(*pci->szFileName) - 'A'] & DRIVE_SLOW)))
-          WinSendMsg(hwndMain, UM_LOADFILE, MPFROMP(pci->szFileName), MPVOID);
+            (!(driveflags[toupper(*pci->pszFileName) - 'A'] & DRIVE_SLOW)))
+          WinSendMsg(hwndMain, UM_LOADFILE, MPFROMP(pci->pszFileName), MPVOID);
         else
           WinSendMsg(hwndMain, UM_LOADFILE, MPVOID, MPVOID);
@@ -1768 +1768 @@
             static CHAR dirname[CCHMAXPATH];
 
-            strcpy(dirname, pci->szFileName);
+            strcpy(dirname, pci->pszFileName);
             MakeValidDir(dirname);
             StartSeeAll(HWND_DESKTOP, FALSE, dirname);
@@ -1812 +1812 @@
             DefaultViewKeys(hwnd,
                             dcd->hwndFrame,
-                            dcd->hwndParent, &swp, pci->szFileName);
+                            dcd->hwndParent, &swp, pci->pszFileName);
           }
         }
@@ -1835 +1835 @@
             pci = (PCNRITEM) CurrentRecord(hwnd);
             if (pci && (INT) pci != -1)
-              strcpy(newpath, pci->szFileName);
+              strcpy(newpath, pci->pszFileName);
             else
               strcpy(newpath, dcd->directory);
@@ -1999 +1999 @@
           pci = (PCNRITEM) CurrentRecord(hwnd);
           if (pci && (INT) pci != -1) {
-            strcpy(path, pci->szFileName);
+            strcpy(path, pci->pszFileName);
             MakeValidDir(path);
             WinDlgBox(HWND_DESKTOP, hwnd, UndeleteDlgProc, FM3ModHandle,
@@ -2034 +2034 @@
             pci = (PCNRITEM) CurrentRecord(hwnd);
             if (pci && !(pci->attrFile & FILE_DIRECTORY)) {
-              p = strrchr(pci->szFileName, '\\');
+              p = strrchr(pci->pszFileName, '\\');
               if (p) {
                 p++;
@@ -2221 +2221 @@
           pci = (PCNRITEM) CurrentRecord(hwnd);
           if (pci && (INT) pci != -1)
-            strcpy(path, pci->szFileName);
+            strcpy(path, pci->pszFileName);
           else
             strcpy(path, dcd->directory);
@@ -2237 +2237 @@
           PMMkDir(dcd->hwndParent,
                   ((pci && (INT) pci != -1) ?
-                   pci->szFileName : dcd->directory), FALSE);
+                   pci->pszFileName : dcd->directory), FALSE);
         }
         break;
@@ -2581 +2581 @@
 
           if (pci && (INT) pci != -1 && !(pci->flags & RECFLAGS_ENV)) {
-            if (driveflags[toupper(*pci->szFileName) - 'A'] & DRIVE_REMOVABLE) {
+            if (driveflags[toupper(*pci->pszFileName) - 'A'] & DRIVE_REMOVABLE) {
               struct
               {
@@ -2594 +2594 @@
               DosError(FERR_DISABLEHARDERR);
               // fixme
-              rc = DosQueryFSInfo(toupper(*pci->szFileName) - '@',
+              rc = DosQueryFSInfo(toupper(*pci->pszFileName) - '@',
                                   FSIL_VOLSER, &volser, sizeof(volser));
               if (rc) {
                 Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
                           GetPString(IDS_CANTFINDDIRTEXT),
-                          pci->szFileName);
+                          pci->pszFileName);
                 DosBeep(250,100);
-                driveserial[toupper(*pci->szFileName) - 'A'] = -1;
+                driveserial[toupper(*pci->pszFileName) - 'A'] = -1;
                 UnFlesh(hwnd, pci);
                 PostMsg(hwnd, UM_RESCAN, MPVOID, MPVOID);
@@ -2608 +2608 @@
                 if (SHORT2FROMMP(mp1) == CN_COLLAPSETREE &&
                     !volser.serial ||
-                    driveserial[toupper(*pci->szFileName) - 'A'] !=
+                    driveserial[toupper(*pci->pszFileName) - 'A'] !=
                     volser.serial)
                   UnFlesh(hwnd, pci);
                 if (SHORT2FROMMP(mp1) != CN_COLLAPSETREE ||
                     (!volser.serial ||
-                     driveserial[toupper(*pci->szFileName) - 'A'] !=
+                     driveserial[toupper(*pci->pszFileName) - 'A'] !=
                      volser.serial)) {
                   if (Flesh(hwnd, pci) &&
@@ -2620 +2620 @@
                     PostMsg(hwnd, UM_TOPDIR, MPFROMP(pci), MPVOID);
                 }
-                driveserial[toupper(*pci->szFileName) - 'A'] = volser.serial;
+                driveserial[toupper(*pci->pszFileName) - 'A'] = volser.serial;
               }
             }
@@ -2707 +2707 @@
                    pci ? NullStr : GetPString(IDS_NOTEXT),
                    pci ? NullStr : " ",
-                   pci ? pci->szFileName : NullStr,
+                   pci ? pci->pszFileName : NullStr,
                    pci ? " " : NullStr,
                    GetPString((usOperation == DO_COPY) ?
@@ -2757 +2757 @@
               }
               if (uso != DO_LINK &&
-                  !(driveflags[toupper(*pci->szFileName) - 'A'] &
+                  !(driveflags[toupper(*pci->pszFileName) - 'A'] &
                     DRIVE_NOTWRITEABLE)) {
 
@@ -2763 +2763 @@
 
                 if (!fQuickArcFind &&
-                    !(driveflags[toupper(*pci->szFileName) - 'A'] &
+                    !(driveflags[toupper(*pci->pszFileName) - 'A'] &
                       DRIVE_SLOW))
-                  info = find_type(pci->szFileName, NULL);
+                  info = find_type(pci->pszFileName, NULL);
                 else
-                  info = quick_find_type(pci->szFileName, NULL);
+                  info = quick_find_type(pci->pszFileName, NULL);
                 if (!info || ((uso == DO_MOVE && !info->move) ||
                               (uso == DO_COPY && !info->create))) {
@@ -3080 +3080 @@
               (pci->rc.flRecordAttr & CRA_CURSORED) &&
               WinQueryActiveWindow(dcd->hwndParent) == dcd->hwndFrame) {
-            if (driveflags[toupper(*pci->szFileName) - 'A'] & DRIVE_SLOW)
+            if (driveflags[toupper(*pci->pszFileName) - 'A'] & DRIVE_SLOW)
               WinSendMsg(hwndMain, UM_LOADFILE, MPVOID, MPVOID);
             else
               WinSendMsg(hwndMain,
-                         UM_LOADFILE, MPFROMP(pci->szFileName), MPVOID);
+                         UM_LOADFILE, MPFROMP(pci->pszFileName), MPVOID);
           }
           if (!dcd->suspendview &&
@@ -3140 +3140 @@
               break;
             DosError(FERR_DISABLEHARDERR);
-            status = DosFindFirst(pci->szFileName,
+            status = DosFindFirst(pci->pszFileName,
                                   &hDir,
                                   FILE_NORMAL | FILE_DIRECTORY |
@@ -3156 +3156 @@
                 else if ((shiftstate & (KC_CTRL | KC_SHIFT)) ==
                          (KC_CTRL | KC_SHIFT))
-                  OpenObject(pci->szFileName, Settings, dcd->hwndFrame);
+                  OpenObject(pci->pszFileName, Settings, dcd->hwndFrame);
                 else if (shiftstate & KC_CTRL)
-                  OpenObject(pci->szFileName, Default, dcd->hwndFrame);
+                  OpenObject(pci->pszFileName, Default, dcd->hwndFrame);
                 else if (shiftstate & KC_SHIFT) {
 
@@ -3166 +3166 @@
                                        dcd->hwndParent,
                                        dcd->hwndFrame,
-                                       FALSE, pci->szFileName);
+                                       FALSE, pci->pszFileName);
                   if (hwndDir) {
                     if (fMinOnOpen)
@@ -3180 +3180 @@
                 else {
                   strcpy(dcd->previous, dcd->directory);
-                  strcpy(dcd->directory, pci->szFileName);
+                  strcpy(dcd->directory, pci->pszFileName);
                   DosEnterCritSec();
                   dcd->stopflag++;
@@ -3210 +3210 @@
                 DefaultViewKeys(hwnd,
                                 dcd->hwndFrame,
-                                dcd->hwndParent, &swp, pci->szFileName);
+                                dcd->hwndParent, &swp, pci->pszFileName);
                 WinSendMsg(hwnd,
                            CM_SETRECORDEMPHASIS,
@@ -3221 +3221 @@
             else {
               if (!*dcd->directory || IsValidDir(dcd->directory)) {
-                NotifyError(pci->szFileName, status);
+                NotifyError(pci->pszFileName, status);
                 WinSendMsg(hwnd,
                            CM_REMOVERECORD,

trunk/dll/dirsize.c

@@ -97 +97 @@
   RECORDINSERT ri;
   PCNRITEM pCI;
+  CHAR *f = 0;
 
   // fixme to report errors
@@ -146 +147 @@
     else
       DosError(FERR_DISABLEHARDERR);
-    pCI->pszLongname = pCI->szFileName;
+    pCI->pszLongname = pCI->pszFileName;
     pCI->rc.hptrIcon = hptrDir;
-    *pCI->szDispAttr = *pCI->szLongname = *pCI->szSubject = 0;
-    pCI->attrFile = 0L;
+    *pCI->szDispAttr = 0;
+    pCI->attrFile = 0;
+    pCI->pszLongname = xstrdup(f, pszSrcFile, __LINE__);
+    pCI->pszSubject = xstrdup(f, pszSrcFile, __LINE__);
   }
   else {
@@ -162 +165 @@
 
   if (strlen(pszFileName) < 4 || top)
-    strcpy(pCI->szFileName, pszFileName);
+   pCI->pszFileName = xstrdup(pszFileName, pszSrcFile, __LINE__);
   else {
     p = strrchr(pszFileName, '\\');
@@ -170 +173 @@
       p++;
     sp = (strchr(pszFileName, ' ') != NULL) ? "\"" : NullStr;
-    pp = pCI->szFileName;
+    pp = pCI->pszFileName;
     if (*sp) {
       *pp = *sp;
@@ -180 +183 @@
       strcat(pp, sp);
   }
-  pCI->pszFileName = pCI->szFileName + strlen(pCI->szFileName);
+  pCI->pszFileName = pCI->pszFileName + strlen(pCI->pszFileName);
   pCI->rc.pszIcon = pCI->pszLongname;
   pCI->rc.flRecordAttr |= CRA_RECORDREADONLY;
   if (fForceUpper)
-    strupr(pCI->szFileName);
+    strupr(pCI->pszFileName);
   else if (fForceLower)
-    strlwr(pCI->szFileName);
+    strlwr(pCI->pszFileName);
   memset(&ri, 0, sizeof(RECORDINSERT));
   ri.cb = sizeof(RECORDINSERT);
@@ -293 +296 @@
 
         memset(&fsa, 0, sizeof(fsa));
-        rc = DosQueryFSInfo(toupper(*pCI->szFileName) - '@', FSIL_ALLOC, &fsa,
+        rc = DosQueryFSInfo(toupper(*pCI->pszFileName) - '@', FSIL_ALLOC, &fsa,
                             sizeof(FSALLOCATE));
         if (!rc) {
@@ -299 +302 @@
             ((float)fsa.cUnit * (fsa.cSectorUnit * fsa.cbSector));
         }
-        pCI->szLongname[1] = 1;         // Flag root - hack cough
+        pCI->pszLongname[1] = 1;                // Flag root - hack cough
       }
       else
@@ -319 +322 @@
     CommaFmtULL(szSubDir, sizeof(szSubDir), pCI->easize, 'K');
     CommaFmtULL(szAllDir, sizeof(szAllDir), pCI->cbFile + pCI->easize, 'K');
-    sprintf(&pCI->szFileName[strlen(pCI->szFileName)],
+    sprintf(&pCI->pszFileName[strlen(pCI->pszFileName)],
             "  %s + %s = %s (%.02lf%%%s)\r%s",
             szCurDir,
@@ -355 +358 @@
   }
   if (pciParent) {
-    p = strchr(pciParent->szFileName, '\r');
+    p = strchr(pciParent->pszFileName, '\r');
     if (p)
       *p = 0;
     fprintf(fp, "%*.*s%s %lu %s%s\n",
             indent * 2, indent * 2, " ",
-            pciParent->szFileName,
+            pciParent->pszFileName,
             pciParent->attrFile,
             GetPString(IDS_FILETEXT), &"s"[pciParent->attrFile == 1]);
@@ -588 +591 @@
             LONG clr, x;
 
-            p = strchr(pci->szFileName, '\r');
+            p = strchr(pci->pszFileName, '\r');
             if (p) {
               /* draw text */
@@ -600 +603 @@
               GpiSetMix(oi->hps, FM_OVERPAINT);
               *p = 0;
-              GpiQueryTextBox(oi->hps, strlen(pci->szFileName),
-                              pci->szFileName, TXTBOX_COUNT, aptl);
+              GpiQueryTextBox(oi->hps, strlen(pci->pszFileName),
+                              pci->pszFileName, TXTBOX_COUNT, aptl);
               ptl.x = oi->rclItem.xLeft;
               ptl.y = (oi->rclItem.yTop - aptl[TXTBOX_TOPRIGHT].y);
               GpiMove(oi->hps, &ptl);
-              GpiCharString(oi->hps, strlen(pci->szFileName),
-                            pci->szFileName);
+              GpiCharString(oi->hps, strlen(pci->pszFileName),
+                            pci->pszFileName);
               *p = '\r';
 
@@ -663 +666 @@
               /* fill box with graph bar, flags is integer % */
               if (pci->flags) {
-                if (pci->szLongname[1] == 1)    /* is root record */
+                if (*(pci->pszLongname + 1) == 1)       /* is root record */
                   GpiSetColor(oi->hps, CLR_DARKGREEN);
                 else
@@ -675 +678 @@
 
                 /* draw highlights and shadows on graph */
-                if (pci->szLongname[1] == 1)
+                if (*(pci->pszLongname + 1) == 1)
                   GpiSetColor(oi->hps, CLR_GREEN);
                 else
@@ -692 +695 @@
                 ptl.x = oi->rclItem.xLeft + pci->flags;
                 GpiLine(oi->hps, &ptl);
-                if (pci->szLongname[1] != 1) {
+                if (*(pci->pszLongname + 1) != 1) {
                   GpiSetColor(oi->hps, CLR_DARKRED);
                   ptl.x = oi->rclItem.xLeft + 2;
@@ -752 +755 @@
           while (pci && (INT) pci != -1) {
             memset(szTemp, 0, sizeof(szTemp));
-            strncpy(szTemp, pci->szFileName,
-                    pci->pszFileName - pci->szFileName);
+            strncpy(szTemp, pci->pszFileName,
+                    pci->pszFileName - pci->pszFileName);
             strrev(szTemp);
             if (*pszFileName && *szTemp != '\\')

trunk/dll/draglist.c

@@ -256 +256 @@
   while (pci && (INT) pci > -1) {
     if (!(pci->rc.flRecordAttr & CRA_FILTERED)) {
-      if (IsRoot(pci->szFileName) && !IsValidDrive(*pci->szFileName))
+      if (IsRoot(pci->pszFileName) && !IsValidDrive(*pci->pszFileName))
         goto Continuing;
       if (!arcfile) {
-        strcpy(szBuffer, pci->szFileName);
+        strcpy(szBuffer, pci->pszFileName);
         p = strrchr(szBuffer, '\\');
         if (p) {
@@ -270 +270 @@
       }
       else
-        strcpy(szFile, pci->szFileName);
+        strcpy(szFile, pci->pszFileName);
     }
     if (!arcfile) {
@@ -369 +369 @@
       }
       pDItem->fsControl = isdir ? DC_CONTAINER : 0;
-      if (IsFullName(pci->szFileName) &&
-          (driveflags[toupper(*pci->szFileName) - 'A'] & DRIVE_REMOVABLE))
+      if (IsFullName(pci->pszFileName) &&
+          (driveflags[toupper(*pci->pszFileName) - 'A'] & DRIVE_REMOVABLE))
         pDItem->fsControl |= DC_REMOVEABLEMEDIA;
       pDItem->fsSupportedOps = DO_COPYABLE | DO_LINKABLE;
-      if (moveok && IsFullName(pci->szFileName) &&
-          !(driveflags[toupper(*pci->szFileName) - 'A'] &
+      if (moveok && IsFullName(pci->pszFileName) &&
+          !(driveflags[toupper(*pci->pszFileName) - 'A'] &
             DRIVE_NOTWRITEABLE))
         pDItem->fsSupportedOps |= DO_MOVEABLE;
-      if (IsRoot(pci->szFileName)) {
+      if (IsRoot(pci->pszFileName)) {
         pDItem->fsSupportedOps = DO_LINKABLE;
         rooting = TRUE;
@@ -774 +774 @@
                        MPFROMLONG(CMA_FIRST), MPFROMSHORT(CRA_SELECTED));
     }
-    while (pci && (INT) pci != -1 && *pci->szFileName) {
+    while (pci && (INT) pci != -1 && *pci->pszFileName) {
       if (pdinfoOld || DrgQueryDragStatus() & DGS_LAZYDRAGINPROGRESS) {
         if (!pdinfoOld)
@@ -787 +787 @@
         pdinfoCurrent = pdinfoOld = DrgAllocDraginfo(1);
       if (pdinfoCurrent) {
-        strcpy(szDir, pci->szFileName);
+        strcpy(szDir, pci->pszFileName);
         p = szDir;
         while (*p) {
@@ -802 +802 @@
         }
         else {
-          strcpy(szFile, pci->szFileName);
+          strcpy(szFile, pci->pszFileName);
           *szDir = 0;
         }
@@ -818 +818 @@
         ditem.hstrTargetName = DrgAddStrHandle(szFile);
         ditem.fsControl = 0;
-        if (IsRoot(pci->szFileName) || (pci->attrFile & FILE_DIRECTORY) != 0)
+        if (IsRoot(pci->pszFileName) || (pci->attrFile & FILE_DIRECTORY) != 0)
           ditem.fsControl |= DC_CONTAINER;
-        if (IsFullName(pci->szFileName) &&
-            (driveflags[toupper(*pci->szFileName) - 'A'] & DRIVE_REMOVABLE))
+        if (IsFullName(pci->pszFileName) &&
+            (driveflags[toupper(*pci->pszFileName) - 'A'] & DRIVE_REMOVABLE))
           ditem.fsControl |= DC_REMOVEABLEMEDIA;
         ditem.fsSupportedOps = DO_COPYABLE | DO_LINKABLE;
-        if (IsFullName(pci->szFileName) &&
-            !(driveflags[toupper(*pci->szFileName) - 'A'] &
+        if (IsFullName(pci->pszFileName) &&
+            !(driveflags[toupper(*pci->pszFileName) - 'A'] &
               DRIVE_NOTWRITEABLE))
           ditem.fsSupportedOps |= DO_MOVEABLE;
-        if (IsRoot(pci->szFileName))
+        if (IsRoot(pci->pszFileName))
           ditem.fsSupportedOps = DO_LINKABLE;
         memset(&dimgFakeIcon, 0, sizeof(DRAGIMAGE));
@@ -839 +839 @@
         dimgFakeIcon.cxOffset = -16;
         dimgFakeIcon.cyOffset = 0;
-        if (IsFullName(pci->szFileName) &&
-            (driveflags[toupper(*pci->szFileName) - 'A'] &
+        if (IsFullName(pci->pszFileName) &&
+            (driveflags[toupper(*pci->pszFileName) - 'A'] &
              DRIVE_NOTWRITEABLE))
           pdinfoCurrent->usOperation = DO_COPY;
         else
           pdinfoCurrent->usOperation = DO_DEFAULT;
-        if (IsRoot(pci->szFileName))
+        if (IsRoot(pci->pszFileName))
           pdinfoCurrent->usOperation = DO_LINK;
         pdinfoCurrent->hwndSource = (hwndObj) ? hwndObj : hwndCnr;

trunk/dll/droplist.c

@@ -468 +468 @@
         strcpy(li->targetpath, directory);
       else if (pci)
-        strcpy(li->targetpath, pci->szFileName);
+        strcpy(li->targetpath, pci->pszFileName);
       if (isArc) {
         strcpy(li->arcname, szArc);

trunk/dll/eas.c

@@ -16 +16 @@
   22 Mar 07 GKY Use QWL_USER
   05 Jul 07 SHL GetFileEAs: avoid heap corruption
+  15 Jul 07 GKY Allow subject edit of up to 256 chars
 
 ***********************************************************************/

trunk/dll/filldir.c

@@ -176 +176 @@
   UINT y;
   UINT t;
+  CHAR *f = 0;
 
   pci->hwndCnr = hwndCnr;
   t = strlen(pszDirectory);
-  memcpy(pci->szFileName, pszDirectory, t + 1);
+  pci->pszFileName = xstrdup(pszDirectory, pszSrcFile, __LINE__);
   /* note!  we cheat below, and accept the full pathname in pszDirectory
      if !*pffb->achName.  speeds up and simplifies processing elsewhere
@@ -185 +186 @@
    */
   if (*pffb->achName) {
-    p = pci->szFileName + (t - 1);
+    p = pci->pszFileName + (t - 1);
     if (*p != '\\') {
       p++;
@@ -196 +197 @@
   if (pffb->cbList > 4L &&
       dcd && fLoadSubject &&
-      (isalpha(*pci->szFileName) &&
-       !(driveflags[toupper(*pci->szFileName) - 'A'] & DRIVE_NOLOADSUBJS))) {
+      (isalpha(*pci->pszFileName) &&
+       !(driveflags[toupper(*pci->pszFileName) - 'A'] & DRIVE_NOLOADSUBJS))) {
     APIRET rc;
     EAOP2 eaop;
@@ -219 +220 @@
         eaop.fpFEA2List = pfealist;
         eaop.oError = 0;
-        rc = DosQueryPathInfo(pci->szFileName, FIL_QUERYEASFROMLIST,
+        rc = DosQueryPathInfo(pci->pszFileName, FIL_QUERYEASFROMLIST,
                               (PVOID) & eaop, (ULONG) sizeof(EAOP2));
         if (!rc) {
@@ -226 +227 @@
           value[pfea->cbValue] = 0;
           if (*(USHORT *) value == EAT_ASCII)
-            strncpy(pci->szSubject, value + (sizeof(USHORT) * 2), 39);
-          pci->szSubject[39] = 0;
+            pci->pszSubject = xstrdup(value + (sizeof(USHORT) * 2), pszSrcFile, __LINE__);
         }
         free(pfealist);
@@ -234 +234 @@
     }
   }
-  pci->pszSubject = pci->szSubject;
   /* load the object's longname */
-  *pci->szLongname = 0;
+  pci->pszLongname = xstrdup(f, pszSrcFile, __LINE__);
   if (fLoadLongnames &&
       dcd &&
       pffb->cbList > 4L &&
-      isalpha(*pci->szFileName) &&
-      ~driveflags[toupper(*pci->szFileName) - 'A'] & DRIVE_NOLONGNAMES &&
-      ~driveflags[toupper(*pci->szFileName) - 'A'] & DRIVE_NOLOADLONGS) {
+      isalpha(*pci->pszFileName) &&
+      ~driveflags[toupper(*pci->pszFileName) - 'A'] & DRIVE_NOLONGNAMES &&
+      ~driveflags[toupper(*pci->pszFileName) - 'A'] & DRIVE_NOLOADLONGS) {
     APIRET rc;
     EAOP2 eaop;
@@ -264 +263 @@
         eaop.fpFEA2List = pfealist;
         eaop.oError = 0;
-        rc = DosQueryPathInfo(pci->szFileName, FIL_QUERYEASFROMLIST,
+        rc = DosQueryPathInfo(pci->pszFileName, FIL_QUERYEASFROMLIST,
                               (PVOID) & eaop, (ULONG) sizeof(EAOP2));
         if (!rc) {
@@ -271 +270 @@
           value[pfea->cbValue] = 0;
           if (*(USHORT *) value == EAT_ASCII)
-            strncpy(pci->szLongname, value + (sizeof(USHORT) * 2),
-                    CCHMAXPATHCOMP);
-          pci->szLongname[CCHMAXPATHCOMP - 1] = 0;
+            pci->pszLongname = xstrdup(value + (sizeof(USHORT) * 2), pszSrcFile, __LINE__);
         }
         free(pfealist);
@@ -280 +277 @@
     }
   }
-  pci->pszLongname = pci->szLongname;
-
   /* do anything required to case of filename */
   if (fForceUpper)
-    strupr(pci->szFileName);
+    strupr(pci->pszFileName);
   else if (fForceLower)
-    strlwr(pci->szFileName);
+    strlwr(pci->pszFileName);
 
   /* get an icon to use with it */
@@ -292 +287 @@
     // is directory
     if (fNoIconsDirs ||
-        (driveflags[toupper(*pci->szFileName) - 'A'] & DRIVE_NOLOADICONS) ||
-        !isalpha(*pci->szFileName)) {
+        (driveflags[toupper(*pci->pszFileName) - 'A'] & DRIVE_NOLOADICONS) ||
+        !isalpha(*pci->pszFileName)) {
       hptr = (HPOINTER) 0;
     }
     else
-      hptr = WinLoadFileIcon(pci->szFileName, FALSE);
+      hptr = WinLoadFileIcon(pci->pszFileName, FALSE);
   }
   else {
     // is file
     if (fNoIconsFiles ||
-        (driveflags[toupper(*pci->szFileName) - 'A'] & DRIVE_NOLOADICONS) ||
-        !isalpha(*pci->szFileName)) {
+        (driveflags[toupper(*pci->pszFileName) - 'A'] & DRIVE_NOLOADICONS) ||
+        !isalpha(*pci->pszFileName)) {
       hptr = (HPOINTER) 0;
     }
     else
-      hptr = WinLoadFileIcon(pci->szFileName, FALSE);
+      hptr = WinLoadFileIcon(pci->pszFileName, FALSE);
 
     if (!hptr || IsDefaultIcon(hptr))
-      hptr = IDFile(pci->szFileName);
+      hptr = IDFile(pci->pszFileName);
   }
 
@@ -324 +319 @@
   /* decide where to point for the container's title text */
   if (partial) {
-    p = strrchr(pci->szFileName, '\\');
+    p = strrchr(pci->pszFileName, '\\');
     if (!p) {
-      p = strrchr(pci->szFileName, ':');
+      p = strrchr(pci->pszFileName, ':');
       if (!p)
-        p = pci->szFileName;
+        p = pci->pszFileName;
       else
         p++;
@@ -337 +332 @@
     }
     if (!*p)
-      p = pci->szFileName;
+      p = pci->pszFileName;
   }
   else
-    p = pci->szFileName;
+    p = pci->pszFileName;
   /* now fill the darned thing in... */
   pci->pszFileName = p;
@@ -411 +406 @@
   register INT x;
   register INT y;
+  CHAR *f = 0;
 
   /* fill in a container record from a FILESTATUS4 structure */
 
   pci->hwndCnr = hwndCnr;
-  strcpy(pci->szFileName, pszFileName);
+  pci->pszFileName = xstrdup(pszFileName, pszSrcFile, __LINE__);
   /* load the object's Subject, if required */
   if (pfsa4->cbList > 4L &&
       dcd &&
       fLoadSubject &&
-      (!isalpha(*pci->szFileName) ||
-       !(driveflags[toupper(*pci->szFileName) - 'A'] & DRIVE_NOLOADSUBJS))) {
+      (!isalpha(*pci->pszFileName) ||
+       !(driveflags[toupper(*pci->pszFileName) - 'A'] & DRIVE_NOLOADSUBJS))) {
     APIRET rc;
     EAOP2 eaop;
@@ -443 +439 @@
         eaop.fpFEA2List = pfealist;
         eaop.oError = 0;
-        rc = DosQueryPathInfo(pci->szFileName, FIL_QUERYEASFROMLIST,
+        rc = DosQueryPathInfo(pci->pszFileName, FIL_QUERYEASFROMLIST,
                               (PVOID) & eaop, (ULONG) sizeof(EAOP2));
         if (!rc) {
@@ -450 +446 @@
           value[pfea->cbValue] = 0;
           if (*(USHORT *) value == EAT_ASCII)
-            strncpy(pci->szSubject, value + (sizeof(USHORT) * 2), 39);
-          pci->szSubject[39] = 0;
+            pci->pszSubject = xstrdup(value + (sizeof(USHORT) * 2), pszSrcFile, __LINE__);
         }
         free(pfealist);
@@ -458 +453 @@
     }
   }
-  pci->pszSubject = pci->szSubject;
-  *pci->szLongname = 0;
+  pci->pszLongname = xstrdup(f, pszSrcFile, __LINE__);
   if (fLoadLongnames &&
       dcd &&
       pfsa4->cbList > 4L &&
-      isalpha(*pci->szFileName) &&
-      ~driveflags[toupper(*pci->szFileName) - 'A'] & DRIVE_NOLONGNAMES &&
-      ~driveflags[toupper(*pci->szFileName) - 'A'] & DRIVE_NOLOADLONGS) {
+      isalpha(*pci->pszFileName) &&
+      ~driveflags[toupper(*pci->pszFileName) - 'A'] & DRIVE_NOLONGNAMES &&
+      ~driveflags[toupper(*pci->pszFileName) - 'A'] & DRIVE_NOLOADLONGS) {
     APIRET rc;
     EAOP2 eaop;
@@ -487 +481 @@
         eaop.fpFEA2List = pfealist;
         eaop.oError = 0;
-        rc = DosQueryPathInfo(pci->szFileName, FIL_QUERYEASFROMLIST,
+        rc = DosQueryPathInfo(pci->pszFileName, FIL_QUERYEASFROMLIST,
                               (PVOID) & eaop, (ULONG) sizeof(EAOP2));
         if (!rc) {
@@ -494 +488 @@
           value[pfea->cbValue] = 0;
           if (*(USHORT *) value == EAT_ASCII)
-            strncpy(pci->szLongname, value + (sizeof(USHORT) * 2),
-                    CCHMAXPATHCOMP);
-          pci->szLongname[CCHMAXPATHCOMP - 1] = 0;
+            pci->pszLongname = xstrdup(value + (sizeof(USHORT) * 2), pszSrcFile, __LINE__);
         }
         free(pfealist);
@@ -503 +495 @@
     }
   }
-  pci->pszLongname = pci->szLongname;
   if (fForceUpper)
-    strupr(pci->szFileName);
+    strupr(pci->pszFileName);
   else if (fForceLower)
-    strlwr(pci->szFileName);
+    strlwr(pci->pszFileName);
 
   if (pfsa4->attrFile & FILE_DIRECTORY) {
     if (fNoIconsDirs ||
-        (driveflags[toupper(*pci->szFileName) - 'A'] & DRIVE_NOLOADICONS) ||
-        !isalpha(*pci->szFileName)) {
+        (driveflags[toupper(*pci->pszFileName) - 'A'] & DRIVE_NOLOADICONS) ||
+        !isalpha(*pci->pszFileName)) {
       hptr = (HPOINTER) 0;
     }
     else
-      hptr = WinLoadFileIcon(pci->szFileName, FALSE);
+      hptr = WinLoadFileIcon(pci->pszFileName, FALSE);
   }
   else {
     if (fNoIconsFiles ||
-        (driveflags[toupper(*pci->szFileName) - 'A'] & DRIVE_NOLOADICONS) ||
-        !isalpha(*pci->szFileName)) {
-      hptr = IDFile(pci->szFileName);
+        (driveflags[toupper(*pci->pszFileName) - 'A'] & DRIVE_NOLOADICONS) ||
+        !isalpha(*pci->pszFileName)) {
+      hptr = IDFile(pci->pszFileName);
     }
     else
-      hptr = WinLoadFileIcon(pci->szFileName, FALSE);
+      hptr = WinLoadFileIcon(pci->pszFileName, FALSE);
   }
   if (!hptr) {
@@ -537 +528 @@
 
   if (partial) {
-    p = strrchr(pci->szFileName, '\\');
+    p = strrchr(pci->pszFileName, '\\');
     if (!p) {
-      p = strrchr(pci->szFileName, ':');
+      p = strrchr(pci->pszFileName, ':');
       if (!p)
-        p = pci->szFileName;
+        p = pci->pszFileName;
       else
         p++;
@@ -549 +540 @@
       p++;
     if (!*p)
-      p = pci->szFileName;
+      p = pci->pszFileName;
   }
   else
-    p = pci->szFileName;
+    p = pci->pszFileName;
   pci->pszFileName = p;
   pci->date.day = pfsa4->fdateLastWrite.day;
@@ -1075 +1066 @@
 
             pci->rc.flRecordAttr |= CRA_RECORDREADONLY;
-            if ((ULONG) (toupper(*pci->szFileName) - '@') == ulDriveNum)
+            if ((ULONG) (toupper(*pci->pszFileName) - '@') == ulDriveNum)
               pci->rc.flRecordAttr |= (CRA_CURSORED | CRA_SELECTED);
 
@@ -1097 +1088 @@
                 }
                 sprintf(suggest + strlen(suggest), "%c" , toupper(*szDrive));
-                strcpy(pci->szFileName, szDrive);
-                pci->pszFileName = pci->szFileName;
+                pci->pszFileName = xstrdup(szDrive, pszSrcFile, __LINE__);
                 pci->rc.pszIcon = pci->pszFileName;
                 pci->attrFile = FILE_DIRECTORY;
@@ -1109 +1099 @@
             }
             else {
-              strcpy(pci->szFileName, szDrive);
-              pci->pszFileName = pci->szFileName;
+              pci->pszFileName = xstrdup(szDrive, pszSrcFile, __LINE__);
               pci->rc.pszIcon = pci->pszFileName;
               pci->attrFile = FILE_DIRECTORY;
@@ -1120 +1109 @@
           else {
             pci->rc.hptrIcon = hptrDunno;
-            strcpy(pci->szFileName, szDrive);
-            pci->pszFileName = pci->szFileName;
+            pci->pszFileName = xstrdup(szDrive, pszSrcFile, __LINE__);
             pci->rc.pszIcon = pci->pszFileName;
             pci->attrFile = FILE_DIRECTORY;
@@ -1131 +1119 @@
         else {
           pci->rc.hptrIcon = hptrFloppy;
-          strcpy(pci->szFileName, szDrive);
-          pci->pszFileName = pci->szFileName;
+          pci->pszFileName = xstrdup(szDrive, pszSrcFile, __LINE__);
           pci->rc.pszIcon = pci->pszFileName;
           pci->attrFile = FILE_DIRECTORY;
@@ -1173 +1160 @@
                                   MPFROM2SHORT(CMA_FIRST, CMA_ITEMORDER));
       while (pci && (INT) pci != -1) {
-        if ((ULONG) (toupper(*pci->szFileName) - '@') == ulDriveNum) {
+        if ((ULONG) (toupper(*pci->pszFileName) - '@') == ulDriveNum) {
           WinSendMsg(hwndCnr,
                      CM_SETRECORDEMPHASIS,
@@ -1200 +1187 @@
       if (pciParent) {
         pciParent->flags |= RECFLAGS_ENV;
-        strcpy(pciParent->szFileName, GetPString(IDS_ENVVARSTEXT));
-        pciParent->pszFileName = pciParent->szFileName;
+        pciParent->pszFileName = xstrdup(GetPString(IDS_ENVVARSTEXT), pszSrcFile, __LINE__);
+        //pciParent->pszFileName = pciParent->szFileName;
         pciParent->rc.hptrIcon = hptrEnv;
         pciParent->rc.pszIcon = pciParent->pszFileName;
@@ -1235 +1222 @@
                                MPFROMLONG(EXTRA_RECORD_BYTES2),
                                MPFROMLONG(1));
-              if (pci) {
-                pci->flags |= RECFLAGS_ENV;
-                sprintf(pci->szFileName, "%%%s%%", FileSystem);
-                pci->pszFileName = pci->szFileName;
+              if (pci) {
+                CHAR fname[CCHMAXPATH];
+                pci->flags |= RECFLAGS_ENV;
+                sprintf(fname, "%%%s%%", FileSystem);
+                pci->pszFileName = xstrdup(fname, pszSrcFile, __LINE__);
                 pci->rc.hptrIcon = hptrEnv;
                 pci->rc.pszIcon = pci->pszFileName;
@@ -1283 +1271 @@
                                       MPFROM2SHORT(CMA_NEXT, CMA_ITEMORDER));
       if (!(pci->flags & RECFLAGS_ENV)) {
-        if ((ULONG) (toupper(*pci->szFileName) - '@') == ulDriveNum ||
-            toupper(*pci->szFileName) > 'B') {
-          if (!(driveflags[toupper(*pci->szFileName) - 'A'] & DRIVE_INVALID)
-              && !(driveflags[toupper(*pci->szFileName) - 'A'] &
+        if ((ULONG) (toupper(*pci->pszFileName) - '@') == ulDriveNum ||
+            toupper(*pci->pszFileName) > 'B') {
+          if (!(driveflags[toupper(*pci->pszFileName) - 'A'] & DRIVE_INVALID)
+              && !(driveflags[toupper(*pci->pszFileName) - 'A'] &
                    DRIVE_NOPRESCAN) && (!fNoRemovableScan
                                         ||
                                         !(driveflags
-                                          [toupper(*pci->szFileName) -
+                                          [toupper(*pci->pszFileName) -
                                            'A'] & DRIVE_REMOVABLE))) {
             if (!Stubby(hwndCnr, pci) && !DRIVE_RAMDISK) {
@@ -1312 +1300 @@
                    LM_INSERTITEM,
                    MPFROM2SHORT(LIT_SORTASCENDING, 0),
-                   MPFROMP(pci->szFileName));
+                   MPFROMP(pci->pszFileName));
       }
     SkipBadRec:

trunk/dll/filter.c

@@ -56 +56 @@
   if (mask) {
     r = (PCNRITEM) rmini;
-    if (!r->szFileName[3]
+    if (!(*(r->pszFileName + 3))
         || (mask->fShowDirs && (r->attrFile & FILE_DIRECTORY)))
       return TRUE;
@@ -76 +76 @@
       return FALSE;
     if (*mask->szMask) {
-      file = strrchr(r->szFileName, '\\');
+      file = strrchr(r->pszFileName, '\\');
       if (!file)
-        file = strrchr(r->szFileName, ':');
+        file = strrchr(r->pszFileName, ':');
       if (file)
         file++;
       else
-        file = r->szFileName;
+        file = r->pszFileName;
       if (mask->pszMasks[1]) {
         for (x = 0; mask->pszMasks[x]; x++) {
@@ -89 +89 @@
               if (wildcard((strchr(mask->pszMasks[x], '\\') ||
                             strchr(mask->pszMasks[x], ':')) ?
-                           r->szFileName : file, mask->pszMasks[x], FALSE))
+                           r->pszFileName : file, mask->pszMasks[x], FALSE))
                 ret = TRUE;
             }
@@ -95 +95 @@
               if (wildcard((strchr(mask->pszMasks[x], '\\') ||
                             strchr(mask->pszMasks[x], ':')) ?
-                           r->szFileName : file, mask->pszMasks[x] + 1,
+                           r->pszFileName : file, mask->pszMasks[x] + 1,
                            FALSE)) {
                 ret = FALSE;
@@ -107 +107 @@
         if (wildcard((strchr(mask->szMask, '\\') ||
                       strchr(mask->szMask, ':')) ?
-                     r->szFileName : file, mask->szMask, FALSE))
+                     r->pszFileName : file, mask->szMask, FALSE))
           ret = TRUE;
       }

trunk/dll/findrec.c

@@ -49 +49 @@
     if (!noenv || (pci->flags & (RECFLAGS_ENV | RECFLAGS_UNDERENV)) == 0) {
       if (!partmatch) {                 /* full name must match full name */
-        if (!stricmp(pci->szFileName, filename))
+        if (!stricmp(pci->pszFileName, filename))
           return pci;                   /* success */
       }
       else {                            /* only root name must match */
-        if (strlen(pci->szFileName) > 3) {
-          p = strrchr(pci->szFileName, '\\');
+        if (strlen(pci->pszFileName) > 3) {
+          p = strrchr(pci->pszFileName, '\\');
           if (!p) {
-            p = strrchr(pci->szFileName, ':');
+            p = strrchr(pci->pszFileName, ':');
             if (p)
               p++;
             else
-              p = pci->szFileName;
+              p = pci->pszFileName;
           }
           else
@@ -66 +66 @@
         }
         else
-          p = pci->szFileName;
+          p = pci->pszFileName;
         if (!stricmp(p, file))
           return pci;                   /* success */

trunk/dll/flesh.c

@@ -52 +52 @@
     return FALSE;
 
-  strcpy(path, pciParent->szFileName + 1);
+  strcpy(path, pciParent->pszFileName + 1);
   if (stricmp(path, GetPString(IDS_ENVVARSTEXT) + 1))
     UnFlesh(hwndCnr, pciParent);
@@ -105 +105 @@
                                 MPFROMLONG(1));
               if (pciL) {
-                strcpy(pciL->szFileName, fullpath);
-                pciL->pszFileName = pciL->szFileName;
-                pciL->rc.pszIcon = pciL->pszFileName;
+                pciL->pszFileName = xstrdup(fullpath, pszSrcFile, __LINE__);
+                pciL->rc.pszIcon = pciL->pszFileName;
                 if (!fNoIconsDirs &&
                     (!isalpha(*fullpath) ||
@@ -165 +164 @@
                                MPFROMP(pciParent),
                                MPFROM2SHORT(CMA_FIRSTCHILD, CMA_ITEMORDER));
-  if (!pciL || !*pciL->szFileName) {
+  if (!pciL || !*pciL->pszFileName) {
     if (pciL && (INT) pciL != -1) {
       WinSendMsg(hwndCnr,
@@ -173 +172 @@
     if (dcd && dcd->size != sizeof(DIRCNRDATA))
       dcd = NULL;
-    if (driveflags[toupper(*pciParent->szFileName) - 'A'] &
+    if (driveflags[toupper(*pciParent->pszFileName) - 'A'] &
         DRIVE_INCLUDEFILES)
       includefiles = TRUE;
     ProcessDirectory(hwndCnr,
                      pciParent,
-                     pciParent->szFileName,
+                     pciParent->pszFileName,
                      includefiles, TRUE, TRUE, NULL, dcd, NULL, NULL);
   }
@@ -234 +233 @@
   ULONG ddepth = 3L;
   static BOOL brokenlan = FALSE, isbroken = FALSE;
-
-  if (!pciParent || !*pciParent->szFileName || !hwndCnr)
-    return FALSE;
-
-  len = strlen(pciParent->szFileName);
-  memcpy(str, pciParent->szFileName, len + 1);
+  CHAR *f = 0;
+
+  if (!pciParent || !*pciParent->pszFileName || !hwndCnr)
+    return FALSE;
+
+  len = strlen(pciParent->pszFileName);
+  memcpy(str, pciParent->pszFileName, len + 1);
   if (str[len - 1] != '\\')
     str[len++] = '\\';
@@ -337 +337 @@
                                                      &nm))));
     DosFindClose(hDir);
-    if (toupper(*pciParent->szFileName) > 'B' &&
-        pciParent->szFileName[1] == ':' &&
-        pciParent->szFileName[2] == '\\' && !pciParent->szFileName[3]) {
+    if (toupper(*pciParent->pszFileName) > 'B' &&
+        (*(pciParent->pszFileName + 1)) == ':' &&
+        (*(pciParent->pszFileName + 2)) == '\\' && !(*(pciParent->pszFileName + 3))) {
 
       CHAR s[132];
@@ -345 +345 @@
       sprintf(s,
               GetPString(IDS_NOSUBDIRSTEXT),
-              total, toupper(*pciParent->szFileName));
+              total, toupper(*pciParent->pszFileName));
       if (rc && rc != ERROR_NO_MORE_FILES)
         sprintf(&s[strlen(s)], GetPString(IDS_SEARCHERRORTEXT), rc, str);
@@ -422 +422 @@
         else {
           RECORDINSERT ri;
-
-          *pci->szFileName = 0;
-          pci->pszFileName = pci->szFileName;
+          pci->pszFileName = xstrdup(f, pszSrcFile, __LINE__);
+          //pci->pszFileName = pci->szFileName;
           pci->rc.pszIcon = pci->pszFileName;
           memset(&ri, 0, sizeof(RECORDINSERT));
@@ -461 +460 @@
                 GetPString(IDS_NOSUBDIRS2TEXT),
                 nm,
-                toupper(*pciParent->szFileName),
+                toupper(*pciParent->pszFileName),
                 (isremote) ? GetPString(IDS_NOSUBDIRS3TEXT) : NullStr);
         Notify(s);

trunk/dll/fm3dll.h

@@ -406 +406 @@
   HWND hwndCnr;                 /* The container holding this record */
   PSZ pszFileName;              // Points to szFileName  - required by CFA_STRING
-  CHAR szFileName[CCHMAXPATH];  // Path name - fixme to rename to szPathName?
-  CHAR szSubject[40];           /* Subject string */
+  //CHAR szFileName[CCHMAXPATH];        // Path name - fixme to rename to szPathName?
+  //CHAR szSubject[40];         /* Subject string */
   CHAR *pszSubject;             // Points szSubject - required by CFA_STRING
   CHAR *pszDispAttr;            // Points to szDispAttr - required by CFA_STRING
@@ -422 +422 @@
   ULONG attrFile;               /* Attributes of this file */
   ULONG flags;
-  CHAR szLongname[1];           // Holds .LONGNAME EA or root flag
+  //CHAR szLongname[1];         // Holds .LONGNAME EA or root flag
 }
 CNRITEM, *PCNRITEM;

trunk/dll/fm3res.rc

@@ -24 +24 @@
   17 Feb 07 GKY Additional drive type icons
   15 Jun 07 SHL Update for OpenWatcom
+  05 Jul 07 GKY Fix menu removals for WORKPLACE_PROCESS=YES
 
 ***********************************************************************/

trunk/dll/info.c

@@ -776 +776 @@
           WinEnableWindow(WinWindowFromID(hwnd, FLE_ISARCHIVE), TRUE);
           WinEnableWindow(WinWindowFromID(hwnd, FLE_BINARY), TRUE);
-          fp = _fsopen(pfs->szFileName, "rb", SH_DENYNO);
+          fp = _fsopen(pfs->szFileName, "rb", SH_DENYNO);
           if (fp) {
             char buff[512];

trunk/dll/mainwnd.c

@@ -328 +328 @@
       }
       if (pci && (INT) pci != -1) {
-        strcpy(ret, pci->szFileName);
+        strcpy(ret, pci->pszFileName);
         MakeValidDir(ret);
       }
@@ -4075 +4075 @@
                    MPFROMSHORT(CRA_CURSORED));
       if (pci && (INT) pci != -1) {
-        strcpy(wa.szCurrentPath1, pci->szFileName);
+        strcpy(wa.szCurrentPath1, pci->pszFileName);
         MakeValidDir(wa.szCurrentPath1);
       }
@@ -4487 +4487 @@
                                     MPFROMSHORT(CRA_CURSORED));
       if (pci && (INT) pci != -1) {
-        strcpy(path, pci->szFileName);
+        strcpy(path, pci->pszFileName);
         MakeValidDir(path);
       }
@@ -4553 +4553 @@
                                         MPFROMSHORT(CRA_CURSORED));
             if (pci && (INT) pci != -1 &&
-                (!(driveflags[toupper(*pci->szFileName) - 'A'] & DRIVE_SLOW)))
+                (!(driveflags[toupper(*pci->pszFileName) - 'A'] & DRIVE_SLOW)))
               WinSendMsg(hwnd,
                          UM_LOADFILE,
-                         MPFROMP(pci->szFileName),
+                         MPFROMP(pci->pszFileName),
                          (SHORT1FROMMP(mp1) == IDM_AUTOVIEW) ?
                          MPVOID : MPFROMLONG(1L));

trunk/dll/makelist.c

@@ -192 +192 @@
   while (pci && (INT) pci != -1 && !error) {
     if (!(pci->rc.flRecordAttr & CRA_FILTERED))
-      error = AddToList(pci->szFileName, &list, &numfiles, &numalloc);
+      error = AddToList(pci->pszFileName, &list, &numfiles, &numalloc);
     pci = WinSendMsg(hwndCnr, CM_QUERYRECORDEMPHASIS, MPFROMP(pci),
                      MPFROMSHORT(attribute));
@@ -223 +223 @@
   while (pai && (INT) pai != -1 && !error) {
     if (!(pai->rc.flRecordAttr & CRA_FILTERED))
-      error = AddToList(pai->szFileName, &list, &numfiles, &numalloc);
+      error = AddToList(pai->pszFileName, &list, &numfiles, &numalloc);
     pai = WinSendMsg(hwndCnr, CM_QUERYRECORDEMPHASIS, MPFROMP(pai),
                      MPFROMSHORT(attribute));

trunk/dll/misc.c

@@ -24 +24 @@
   18 Feb 07 GKY More drive type and drive icon support
   10 Jun 07 GKY Add IsFm2Window as part of work around PM drag limit
+  05 Jul 07 GKY Fix menu removals for WORKPLACE_PROCESS=YES
 
 ***********************************************************************/
@@ -651 +652 @@
       if (pci &&
           (INT) pci != -1 &&
-          !IsRoot(pci->szFileName) &&
+          !IsRoot(pci->pszFileName) &&
           !(pci->flags & RECFLAGS_ENV) && !(pci->flags & RECFLAGS_UNDERENV)) {
         if (!pfi || pfi->offStruct == FIELDOFFSET(CNRITEM, pszFileName)) {
-          PostMsg(hwnd, UM_FIXEDITNAME, MPFROMP(pci->szFileName), MPVOID);
+          PostMsg(hwnd, UM_FIXEDITNAME, MPFROMP(pci->pszFileName), MPVOID);
         }
         else if (pfi->offStruct == FIELDOFFSET(CNRITEM, pszSubject))
@@ -673 +674 @@
       HWND hwndMLE = WinWindowFromID(hwnd, CID_MLE);
 
-      if (pci && (INT) pci != -1 && !IsRoot(pci->szFileName)) {
+      if (pci && (INT) pci != -1 && !IsRoot(pci->pszFileName)) {
         if (pfi && pfi->offStruct == FIELDOFFSET(CNRITEM, pszSubject)) {
 
@@ -720 +721 @@
             eaop.fpFEA2List = pfealist;
             eaop.oError = 0L;
-            rc = DosSetPathInfo(pci->szFileName,
+            rc = DosSetPathInfo(pci->pszFileName,
                                 FIL_QUERYEASIZE,
                                 (PVOID) & eaop, sizeof(EAOP2), DSPI_WRTTHRU);
@@ -738 +739 @@
           chop_at_crnl(longname);
           WinSetWindowText(hwndMLE, longname);
-          return (MRESULT) WriteLongName(pci->szFileName, longname);
+          return (MRESULT) WriteLongName(pci->pszFileName, longname);
         }
         else {
           WinQueryWindowText(hwndMLE, sizeof(szData), szData);
           if (strchr(szData, '?') ||
-              strchr(szData, '*') || IsRoot(pci->szFileName))
+              strchr(szData, '*') || IsRoot(pci->pszFileName))
             return (MRESULT) FALSE;
           /* If the text changed, rename the file system object. */
@@ -755 +756 @@
                                  testname, sizeof(testname)))
               return FALSE;
-            if (DosQueryPathInfo(pci->szFileName,
+            if (DosQueryPathInfo(pci->pszFileName,
                                  FIL_QUERYFULLNAME, szData, sizeof(szData)))
-              strcpy(szData, pci->szFileName);
+              strcpy(szData, pci->pszFileName);
             WinSetWindowText(hwndMLE, szData);
             if (strcmp(szData, testname)) {
@@ -775 +776 @@
                     free(filename);
                 }
-                if (stricmp(testname, pci->szFileName)) {
+                if (stricmp(testname, pci->pszFileName)) {
                   PostMsg(hwnd, UM_FIXEDITNAME, MPFROMLONG(-1), MPFROMP(pci));
-                  filename = xstrdup(pci->szFileName, pszSrcFile, __LINE__);
+                  filename = xstrdup(pci->pszFileName, pszSrcFile, __LINE__);
                   if (filename) {
                     if (!PostMsg(hwnd,
@@ -797 +798 @@
       PCNRITEM pci = (PCNRITEM) ((PCNREDITDATA) mp2)->pRecord;
 
-      if (pci && (INT) pci != -1 && !IsRoot(pci->szFileName)) {
+      if (pci && (INT) pci != -1 && !IsRoot(pci->pszFileName)) {
         WinSendMsg(hwnd,
                    CM_INVALIDATERECORD,

trunk/dll/objcnr.c

@@ -67 +67 @@
   RECORDINSERT ri;
   PCNRITEM pciP;
+  CHAR *f = 0;
 
   ffb = xmalloc(sizeof(FILEFINDBUF3), pszSrcFile, __LINE__);
@@ -98 +99 @@
       return;
     }
-    strcpy(pciP->szFileName, filename);
+    pciP->pszFileName = xstrdup(filename, pszSrcFile, __LINE__);
     pciP->pszDispAttr = pciP->szDispAttr;
-    pciP->pszSubject = pciP->szSubject;
-    pciP->pszLongname = pciP->szLongname;
+    //pciP->pszSubject = pciP->szSubject;
+    //pciP->pszLongname = pciP->szLongname;
     pciP->pszDispAttr = pciP->szDispAttr;
-    *pciP->szDispAttr = *pciP->szLongname = *pciP->szSubject = 0;
+    *pciP->szDispAttr = 0;
+    pciP->pszLongname = xstrdup(f, pszSrcFile, __LINE__);
+    pciP->pszSubject = xstrdup(f, pszSrcFile, __LINE__);
     if (strlen(filename) < 4)
-      pciP->pszFileName = pciP->szFileName;
+      pciP->pszFileName = pciP->pszFileName;
     else {
-      p = strrchr(pciP->szFileName, '\\');
+      p = strrchr(pciP->pszFileName, '\\');
       if (!p)
-        pciP->pszFileName = pciP->szFileName;
+        pciP->pszFileName = pciP->pszFileName;
       else if (*(p + 1))
         p++;
@@ -116 +119 @@
     pciP->rc.pszIcon = pciP->pszFileName;
     if (fForceUpper)
-      strupr(pciP->szFileName);
+      strupr(pciP->pszFileName);
     else if (fForceLower)
-      strlwr(pciP->szFileName);
+      strlwr(pciP->pszFileName);
     pciP->rc.flRecordAttr |= CRA_RECORDREADONLY;
   }
@@ -133 +136 @@
     HPOINTER hptr;
 
-    hptr = WinLoadFileIcon(pciP->szFileName, FALSE);
+    hptr = WinLoadFileIcon(pciP->pszFileName, FALSE);
     if (hptr)
       pciP->rc.hptrIcon = hptr;
@@ -399 +402 @@
                                            MPFROMSHORT(CRA_CURSORED));
         if (pci && (INT) pci != -1)
-          strcpy(data->dirname, pci->szFileName);
+          strcpy(data->dirname, pci->pszFileName);
         WinDismissDlg(hwnd, 1);
       }

trunk/dll/saveclip.c

@@ -447 +447 @@
                     switch (*p) {
                     case 's':
-                      fputs(pci->szSubject, fp);
+                      fputs(pci->pszSubject, fp);
                       break;
                     case 'S':
-                      fprintf(fp, "%-40s", pci->szSubject);
+                      fprintf(fp, "%-40s", pci->pszSubject);
                       break;
                     case 'Z':
@@ -478 +478 @@
                       break;
                     case 'l':
-                      fputs(pci->szLongname, fp);
+                      fputs(pci->pszLongname, fp);
                       break;
                     case 'L':
-                      fprintf(fp, "%-40s", pci->szLongname);
+                      fprintf(fp, "%-40s", pci->pszLongname);
                       break;
                     case 'F':
                     case 'f':
-                      if (IsRoot(pci->szFileName))
-                        pp = pci->szFileName;
+                      if (IsRoot(pci->pszFileName))
+                        pp = pci->pszFileName;
                       else {
-                        pp = strrchr(pci->szFileName, '\\');
+                        pp = strrchr(pci->pszFileName, '\\');
                         if (pp)
                           pp++;
                         else
-                          pp = pci->szFileName;
+                          pp = pci->pszFileName;
                       }
                       if (*p == 'F')
@@ -500 +500 @@
                       break;
                     case 'p':
-                      fputs(pci->szFileName, fp);
+                      fputs(pci->pszFileName, fp);
                       break;
                     case 'P':
                       temp = 0;
-                      if (!IsRoot(pci->szFileName)) {
-                        pp = strrchr(pci->szFileName, '\\');
+                      if (!IsRoot(pci->pszFileName)) {
+                        pp = strrchr(pci->pszFileName, '\\');
                         if (pp) {
                           temp = *pp;
@@ -511 +511 @@
                         }
                       }
-                      fputs(pci->szFileName, fp);
+                      fputs(pci->pszFileName, fp);
                       if (temp)
                         *pp = temp;
                       break;
                     case '$':
-                      fputc(*pci->szFileName, fp);
+                      fputc(*pci->pszFileName, fp);
                       break;
                     case '%':

trunk/dll/select.c

@@ -70 +70 @@
         break;
       if (list)
-        AddToList(pci->szFileName, list, &numfiles, &numalloc);
+        AddToList(pci->pszFileName, list, &numfiles, &numalloc);
       pci = (PCNRITEM) WinSendMsg(hwndCnr, CM_QUERYRECORDEMPHASIS,
                                   MPFROMP(pci), MPFROMSHORT(CRA_SELECTED));
@@ -188 +188 @@
       if (maskstr && *maskstr && markit) {
         markit = FALSE;
-        file = strrchr(pci->szFileName, '\\');
+        file = strrchr(pci->pszFileName, '\\');
         if (!file)
-          file = strrchr(pci->szFileName, ':');
+          file = strrchr(pci->pszFileName, ':');
         if (file)
           file++;
         else
-          file = pci->szFileName;
+          file = pci->pszFileName;
         for (x = 0; Mask.pszMasks[x]; x++) {
           if (*Mask.pszMasks[x]) {
@@ -200 +200 @@
               if (wildcard((strchr(Mask.pszMasks[x], '\\') ||
                             strchr(Mask.pszMasks[x], ':')) ?
-                             pci->szFileName :
+                             pci->pszFileName :
                              file,
                            Mask.pszMasks[x],
@@ -210 +210 @@
               if (wildcard((strchr(Mask.pszMasks[x], '\\') ||
                             strchr(Mask.pszMasks[x], ':')) ?
-                              pci->szFileName :
+                              pci->pszFileName :
                               file,
                             Mask.pszMasks[x] + 1,
@@ -233 +233 @@
         FILE *inputFile;
 
-        if ((inputFile = _fsopen(pci->szFileName, "rb", SH_DENYNO)) != NULL) {
+        if ((inputFile = _fsopen(pci->pszFileName, "rb", SH_DENYNO)) != NULL) {
           pos = ftell(inputFile);
           while (!feof(inputFile)) {
@@ -294 +294 @@
       if (maskstr && *maskstr && unmarkit) {
         unmarkit = FALSE;
-        file = strrchr(pci->szFileName, '\\');
+        file = strrchr(pci->pszFileName, '\\');
         if (!file)
-          file = strrchr(pci->szFileName, ':');
+          file = strrchr(pci->pszFileName, ':');
         if (file)
           file++;
         else
-          file = pci->szFileName;
+          file = pci->pszFileName;
         for (x = 0; Mask.pszMasks[x]; x++) {
           if (*Mask.pszMasks[x]) {
@@ -306 +306 @@
               if (wildcard((strchr(Mask.pszMasks[x], '\\') ||
                             strchr(Mask.pszMasks[x], ':')) ?
-                           pci->szFileName : file, Mask.pszMasks[x], FALSE))
+                           pci->pszFileName : file, Mask.pszMasks[x], FALSE))
                 unmarkit = TRUE;
             }
@@ -312 +312 @@
               if (wildcard((strchr(Mask.pszMasks[x], '\\') ||
                             strchr(Mask.pszMasks[x], ':')) ?
-                           pci->szFileName : file, Mask.pszMasks[x] + 1,
+                           pci->pszFileName : file, Mask.pszMasks[x] + 1,
                            FALSE)) {
                 unmarkit = FALSE;
@@ -333 +333 @@
         FILE *inputFile;
 
-        if ((inputFile = _fsopen(pci->szFileName, "rb", SH_DENYNO)) != NULL) {
+        if ((inputFile = _fsopen(pci->pszFileName, "rb", SH_DENYNO)) != NULL) {
           pos = ftell(inputFile);
           while (!feof(inputFile)) {
@@ -674 +674 @@
   if (reset) {
     for (x = 0; x < numS; x++) {
-      if (!*pciSa[x]->szFileName || !*pciDa[x]->szFileName)
+      if (!*pciSa[x]->pszFileName || !*pciDa[x]->pszFileName)
         continue;
       pciSa[x]->flags |= CNRITEM_EXISTS;
@@ -730 +730 @@
     for (x = 0; x < numS; x++) {
       if (!(pciSa[x]->rc.flRecordAttr & CRA_FILTERED)) {
-        if (*pciSa[x]->szFileName &&
+        if (*pciSa[x]->pszFileName &&
             (pciSa[x]->flags & CNRITEM_EXISTS) &&
             !(pciSa[x]->flags & CNRITEM_SMALLER) &&
@@ -754 +754 @@
     for (x = 0; x < numS; x++) {
       if (!(pciSa[x]->rc.flRecordAttr & CRA_FILTERED) &&
-          *pciSa[x]->szFileName &&
+          *pciSa[x]->pszFileName &&
           (pciSa[x]->flags & CNRITEM_EXISTS) &&
           !(pciSa[x]->flags & CNRITEM_SMALLER) &&
@@ -776 +776 @@
     for (x = 0; x < numS; x++) {
       if (~pciSa[x]->rc.flRecordAttr & CRA_FILTERED &&
-          *pciSa[x]->szFileName &&
-          *pciDa[x]->szFileName &&
+          *pciSa[x]->pszFileName &&
+          *pciDa[x]->pszFileName &&
           pciSa[x]->flags & CNRITEM_EXISTS &&
           pciDa[x]->flags & CNRITEM_EXISTS) {
@@ -790 +790 @@
         HAB hab = WinQueryAnchorBlock(hwndCnrS);
 
-        fp1 = _fsopen(pciSa[x]->szFileName, "rb", SH_DENYNO);
+        fp1 = _fsopen(pciSa[x]->pszFileName, "rb", SH_DENYNO);
         if (!fp1) {
           errLineNo = __LINE__;
@@ -796 +796 @@
         }
         else {
-          fp2 = _fsopen(pciDa[x]->szFileName, "rb", SH_DENYNO);
+          fp2 = _fsopen(pciDa[x]->pszFileName, "rb", SH_DENYNO);
           if (!fp2) {
             errLineNo = __LINE__;
@@ -857 +857 @@
     for (x = 0; x < numS; x++) {
       if (!(pciSa[x]->rc.flRecordAttr & CRA_FILTERED) &&
-          *pciSa[x]->szFileName && (pciSa[x]->flags & CNRITEM_EXISTS)) {
+          *pciSa[x]->pszFileName && (pciSa[x]->flags & CNRITEM_EXISTS)) {
         if (!(pciSa[x]->rc.flRecordAttr & CRA_SELECTED))
           WinSendMsg(hwndCnrS, CM_SETRECORDEMPHASIS, MPFROMP(pciSa[x]),
@@ -875 +875 @@
     for (x = 0; x < numS; x++) {
       if (!(pciSa[x]->rc.flRecordAttr & CRA_FILTERED) &&
-          *pciSa[x]->szFileName && !(pciSa[x]->flags & CNRITEM_EXISTS)) {
+          *pciSa[x]->pszFileName && !(pciSa[x]->flags & CNRITEM_EXISTS)) {
         if (!(pciSa[x]->rc.flRecordAttr & CRA_SELECTED))
           WinSendMsg(hwndCnrS, CM_SETRECORDEMPHASIS, MPFROMP(pciSa[x]),
                      MPFROM2SHORT(TRUE, CRA_SELECTED));
       }
-      else if (*pciDa[x]->szFileName && !(pciDa[x]->flags & CNRITEM_EXISTS)) {
+      else if (*pciDa[x]->pszFileName && !(pciDa[x]->flags & CNRITEM_EXISTS)) {
         if (!(pciDa[x]->rc.flRecordAttr & CRA_SELECTED))
           WinSendMsg(hwndCnrD, CM_SETRECORDEMPHASIS, MPFROMP(pciDa[x]),
@@ -895 +895 @@
     for (x = 0; x < numS; x++) {
       if (!(pciSa[x]->rc.flRecordAttr & CRA_FILTERED) &&
-          *pciSa[x]->szFileName && (pciSa[x]->flags & CNRITEM_LARGER)) {
+          *pciSa[x]->pszFileName && (pciSa[x]->flags & CNRITEM_LARGER)) {
         if (!(pciSa[x]->rc.flRecordAttr & CRA_SELECTED))
           WinSendMsg(hwndCnrS, CM_SETRECORDEMPHASIS, MPFROMP(pciSa[x]),
@@ -901 +901 @@
       }
       else if (!(pciDa[x]->rc.flRecordAttr & CRA_FILTERED) &&
-               *pciDa[x]->szFileName && (pciDa[x]->flags & CNRITEM_LARGER)) {
+               *pciDa[x]->pszFileName && (pciDa[x]->flags & CNRITEM_LARGER)) {
         if (!(pciDa[x]->rc.flRecordAttr & CRA_SELECTED))
           WinSendMsg(hwndCnrD, CM_SETRECORDEMPHASIS, MPFROMP(pciDa[x]),
@@ -916 +916 @@
     for (x = 0; x < numS; x++) {
       if (!(pciSa[x]->rc.flRecordAttr & CRA_FILTERED) &&
-          *pciSa[x]->szFileName && (pciSa[x]->flags & CNRITEM_SMALLER)) {
+          *pciSa[x]->pszFileName && (pciSa[x]->flags & CNRITEM_SMALLER)) {
         if (!(pciSa[x]->rc.flRecordAttr & CRA_SELECTED))
           WinSendMsg(hwndCnrS, CM_SETRECORDEMPHASIS, MPFROMP(pciSa[x]),
@@ -922 +922 @@
       }
       else if (!(pciDa[x]->rc.flRecordAttr & CRA_FILTERED) &&
-               *pciDa[x]->szFileName && (pciDa[x]->flags & CNRITEM_SMALLER)) {
+               *pciDa[x]->pszFileName && (pciDa[x]->flags & CNRITEM_SMALLER)) {
         if (!(pciDa[x]->rc.flRecordAttr & CRA_SELECTED))
           WinSendMsg(hwndCnrD, CM_SETRECORDEMPHASIS, MPFROMP(pciDa[x]),
@@ -937 +937 @@
     for (x = 0; x < numS; x++) {
       if (!(pciSa[x]->rc.flRecordAttr & CRA_FILTERED) &&
-          *pciSa[x]->szFileName && (pciSa[x]->flags & CNRITEM_NEWER)) {
+          *pciSa[x]->pszFileName && (pciSa[x]->flags & CNRITEM_NEWER)) {
         if (!(pciSa[x]->rc.flRecordAttr & CRA_SELECTED))
           WinSendMsg(hwndCnrS, CM_SETRECORDEMPHASIS, MPFROMP(pciSa[x]),
@@ -943 +943 @@
       }
       else if (!(pciDa[x]->rc.flRecordAttr & CRA_FILTERED) &&
-               *pciDa[x]->szFileName && (pciDa[x]->flags & CNRITEM_NEWER)) {
+               *pciDa[x]->pszFileName && (pciDa[x]->flags & CNRITEM_NEWER)) {
         if (!(pciDa[x]->rc.flRecordAttr & CRA_SELECTED))
           WinSendMsg(hwndCnrD, CM_SETRECORDEMPHASIS, MPFROMP(pciDa[x]),
@@ -958 +958 @@
     for (x = 0; x < numS; x++) {
       if (!(pciSa[x]->rc.flRecordAttr & CRA_FILTERED) &&
-          *pciSa[x]->szFileName && (pciSa[x]->flags & CNRITEM_OLDER)) {
+          *pciSa[x]->pszFileName && (pciSa[x]->flags & CNRITEM_OLDER)) {
         if (!(pciSa[x]->rc.flRecordAttr & CRA_SELECTED))
           WinSendMsg(hwndCnrS, CM_SETRECORDEMPHASIS, MPFROMP(pciSa[x]),
@@ -964 +964 @@
       }
       else if (!(pciDa[x]->rc.flRecordAttr & CRA_FILTERED) &&
-               *pciDa[x]->szFileName && (pciDa[x]->flags & CNRITEM_OLDER)) {
+               *pciDa[x]->pszFileName && (pciDa[x]->flags & CNRITEM_OLDER)) {
         if (!(pciDa[x]->rc.flRecordAttr & CRA_SELECTED))
           WinSendMsg(hwndCnrD, CM_SETRECORDEMPHASIS, MPFROMP(pciDa[x]),
@@ -979 +979 @@
     for (x = 0; x < numS; x++) {
       if (!(pciSa[x]->rc.flRecordAttr & CRA_FILTERED) &&
-          *pciSa[x]->szFileName && (pciSa[x]->flags & CNRITEM_EXISTS)) {
+          *pciSa[x]->pszFileName && (pciSa[x]->flags & CNRITEM_EXISTS)) {
         if (pciSa[x]->rc.flRecordAttr & CRA_SELECTED)
           WinSendMsg(hwndCnrS, CM_SETRECORDEMPHASIS, MPFROMP(pciSa[x]),
@@ -997 +997 @@
     for (x = 0; x < numS; x++) {
       if (!(pciSa[x]->rc.flRecordAttr & CRA_FILTERED) &&
-          *pciSa[x]->szFileName && !(pciSa[x]->flags & CNRITEM_EXISTS)) {
+          *pciSa[x]->pszFileName && !(pciSa[x]->flags & CNRITEM_EXISTS)) {
         if (pciSa[x]->rc.flRecordAttr & CRA_SELECTED)
           WinSendMsg(hwndCnrS, CM_SETRECORDEMPHASIS, MPFROMP(pciSa[x]),
                      MPFROM2SHORT(FALSE, CRA_SELECTED));
       }
-      else if (*pciDa[x]->szFileName && !(pciDa[x]->flags & CNRITEM_EXISTS)) {
+      else if (*pciDa[x]->pszFileName && !(pciDa[x]->flags & CNRITEM_EXISTS)) {
         if (pciDa[x]->rc.flRecordAttr & CRA_SELECTED)
           WinSendMsg(hwndCnrD, CM_SETRECORDEMPHASIS, MPFROMP(pciDa[x]),
@@ -1017 +1017 @@
     for (x = 0; x < numS; x++) {
       if (!(pciSa[x]->rc.flRecordAttr & CRA_FILTERED) &&
-          *pciSa[x]->szFileName && (pciSa[x]->flags & CNRITEM_LARGER)) {
+          *pciSa[x]->pszFileName && (pciSa[x]->flags & CNRITEM_LARGER)) {
         if (pciSa[x]->rc.flRecordAttr & CRA_SELECTED)
           WinSendMsg(hwndCnrS, CM_SETRECORDEMPHASIS, MPFROMP(pciSa[x]),
@@ -1023 +1023 @@
       }
       else if (!(pciDa[x]->rc.flRecordAttr & CRA_FILTERED) &&
-               *pciDa[x]->szFileName && (pciDa[x]->flags & CNRITEM_LARGER)) {
+               *pciDa[x]->pszFileName && (pciDa[x]->flags & CNRITEM_LARGER)) {
         if (pciDa[x]->rc.flRecordAttr & CRA_SELECTED)
           WinSendMsg(hwndCnrD, CM_SETRECORDEMPHASIS, MPFROMP(pciDa[x]),
@@ -1038 +1038 @@
     for (x = 0; x < numS; x++) {
       if (!(pciSa[x]->rc.flRecordAttr & CRA_FILTERED) &&
-          *pciSa[x]->szFileName && (pciSa[x]->flags & CNRITEM_SMALLER)) {
+          *pciSa[x]->pszFileName && (pciSa[x]->flags & CNRITEM_SMALLER)) {
         if (pciSa[x]->rc.flRecordAttr & CRA_SELECTED)
           WinSendMsg(hwndCnrS, CM_SETRECORDEMPHASIS, MPFROMP(pciSa[x]),
@@ -1044 +1044 @@
       }
       else if (!(pciDa[x]->rc.flRecordAttr & CRA_FILTERED) &&
-               *pciDa[x]->szFileName && (pciDa[x]->flags & CNRITEM_SMALLER)) {
+               *pciDa[x]->pszFileName && (pciDa[x]->flags & CNRITEM_SMALLER)) {
         if (pciDa[x]->rc.flRecordAttr & CRA_SELECTED)
           WinSendMsg(hwndCnrD, CM_SETRECORDEMPHASIS, MPFROMP(pciDa[x]),
@@ -1059 +1059 @@
     for (x = 0; x < numS; x++) {
       if (!(pciSa[x]->rc.flRecordAttr & CRA_FILTERED) &&
-          *pciSa[x]->szFileName && (pciSa[x]->flags & CNRITEM_NEWER)) {
+          *pciSa[x]->pszFileName && (pciSa[x]->flags & CNRITEM_NEWER)) {
         if (pciSa[x]->rc.flRecordAttr & CRA_SELECTED)
           WinSendMsg(hwndCnrS, CM_SETRECORDEMPHASIS, MPFROMP(pciSa[x]),
@@ -1065 +1065 @@
       }
       else if (!(pciDa[x]->rc.flRecordAttr & CRA_FILTERED) &&
-               *pciDa[x]->szFileName && (pciDa[x]->flags & CNRITEM_NEWER)) {
+               *pciDa[x]->pszFileName && (pciDa[x]->flags & CNRITEM_NEWER)) {
         if (pciDa[x]->rc.flRecordAttr & CRA_SELECTED)
           WinSendMsg(hwndCnrD, CM_SETRECORDEMPHASIS, MPFROMP(pciDa[x]),
@@ -1080 +1080 @@
     for (x = 0; x < numS; x++) {
       if (!(pciSa[x]->rc.flRecordAttr & CRA_FILTERED) &&
-          *pciSa[x]->szFileName && (pciSa[x]->flags & CNRITEM_OLDER)) {
+          *pciSa[x]->pszFileName && (pciSa[x]->flags & CNRITEM_OLDER)) {
         if (pciSa[x]->rc.flRecordAttr & CRA_SELECTED)
           WinSendMsg(hwndCnrS, CM_SETRECORDEMPHASIS, MPFROMP(pciSa[x]),
@@ -1086 +1086 @@
       }
       else if (!(pciDa[x]->rc.flRecordAttr & CRA_FILTERED) &&
-               *pciDa[x]->szFileName && (pciDa[x]->flags & CNRITEM_OLDER)) {
+               *pciDa[x]->pszFileName && (pciDa[x]->flags & CNRITEM_OLDER)) {
         if (pciDa[x]->rc.flRecordAttr & CRA_SELECTED)
           WinSendMsg(hwndCnrD, CM_SETRECORDEMPHASIS, MPFROMP(pciDa[x]),

trunk/dll/sortcnr.c

@@ -58 +58 @@
   if (SortFlags & SORT_NOSORT)
     return 0;
-  if (SortFlags && pCI1->szFileName[3] && pCI2->szFileName[3]) {
+  if (SortFlags && pCI1->pszFileName + 3 && pCI2->pszFileName + 3) {
     if (SortFlags & SORT_DIRSFIRST) {
       if ((pCI1->attrFile & FILE_DIRECTORY) !=
@@ -71 +71 @@
     switch (SortFlags & (~(SORT_DIRSFIRST | SORT_DIRSLAST | SORT_REVERSE))) {
     case SORT_SUBJECT:
-      if (*pCI1->szSubject && *pCI2->szSubject)
-        ret = stricmp(pCI1->szSubject, pCI2->szSubject);
+      if (*pCI1->pszSubject && *pCI2->pszSubject)
+        ret = stricmp(pCI1->pszSubject, pCI2->pszSubject);
       else {
-        ret = (*pCI2->szSubject) ? 1 : (*pCI1->szSubject) ? -1 : 0;
+        ret = (*pCI2->pszSubject) ? 1 : (*pCI1->pszSubject) ? -1 : 0;
         if (ret && (SortFlags & SORT_REVERSE))
           ret = (ret > 0) ? -1 : 1;
@@ -81 +81 @@
 
     case SORT_FILENAME:
-      pch1 = strrchr(pCI1->szFileName, '\\');
-      pch2 = strrchr(pCI2->szFileName, '\\');
+      pch1 = strrchr(pCI1->pszFileName, '\\');
+      pch2 = strrchr(pCI2->pszFileName, '\\');
       if (!pch1)
         pch1 = NullStr;
@@ -91 +91 @@
 
     case SORT_FIRSTEXTENSION:
-      pch1 = strrchr(pCI1->szFileName, '\\');
-      pch2 = strrchr(pCI2->szFileName, '\\');
+      pch1 = strrchr(pCI1->pszFileName, '\\');
+      pch2 = strrchr(pCI2->pszFileName, '\\');
       if (!pch1)
-        pch1 = pCI1->szFileName;
+        pch1 = pCI1->pszFileName;
       if (!pch2)
-        pch2 = pCI2->szFileName;
+        pch2 = pCI2->pszFileName;
       pch1 = strchr(pch1, '.');
       pch2 = strchr(pch2, '.');
@@ -107 +107 @@
 
     case SORT_LASTEXTENSION:
-      pch1 = strrchr(pCI1->szFileName, '\\');
-      pch2 = strrchr(pCI2->szFileName, '\\');
+      pch1 = strrchr(pCI1->pszFileName, '\\');
+      pch2 = strrchr(pCI2->pszFileName, '\\');
       if (!pch1)
-        pch1 = pCI1->szFileName;
+        pch1 = pCI1->pszFileName;
       if (!pch2)
-        pch2 = pCI2->szFileName;
+        pch2 = pCI2->pszFileName;
       pch1 = strrchr(pch1, '.');
       pch2 = strrchr(pch2, '.');
@@ -189 +189 @@
 
     if (!ret)
-      ret = (SHORT) stricmp(pCI1->szFileName, pCI2->szFileName);
+      ret = (SHORT) stricmp(pCI1->pszFileName, pCI2->pszFileName);
 
     if (ret && (SortFlags & SORT_REVERSE))
@@ -196 +196 @@
     return ret;
   }
-  return (SHORT) stricmp(pCI1->szFileName, pCI2->szFileName);
+  return (SHORT) stricmp(pCI1->pszFileName, pCI2->pszFileName);
 }

trunk/dll/systemf.c

@@ -353 +353 @@
                                       MPFROMLONG(CMA_FIRST),
                                       MPFROMSHORT(CRA_CURSORED));
-          if (pci && (int) pci != -1 && *pci -> szFileName) {
-            if (needs_quoting(pci -> szFileName) &&
-                !strchr(pci -> szFileName, '\"'))
+          if (pci && (int) pci != -1 && *pci->pszFileName) {
+            if (needs_quoting(pci->pszFileName) &&
+                !strchr(pci->pszFileName, '\"'))
             {
               *pp = '\"';
@@ -363 +363 @@
             else
               spaces = FALSE;
-            strcpy(pp, pci -> szFileName);
-            pp += strlen(pci -> szFileName);
+            strcpy(pp, pci->pszFileName);
+            pp += strlen(pci->pszFileName);
             if (spaces) {
               *pp = '\"';

trunk/dll/treecnr.c

@@ -155 +155 @@
                    CM_QUERYRECORDEMPHASIS,
                    MPFROMLONG(CMA_FIRST), MPFROMSHORT(CRA_CURSORED));
-  if (pci && (INT) pci != -1 && !stricmp(pci->szFileName, dirname)) {
+  if (pci && (INT) pci != -1 && !stricmp(pci->pszFileName, dirname)) {
     quickbail = TRUE;
     goto MakeTop;                       /* skip lookup bullsh*t */
@@ -170 +170 @@
       pciP = FindCnrRecord(hwndCnr, szDir, NULL, TRUE, FALSE, TRUE);
       if (pciP && (INT) pciP != -1) {
-        if (!stricmp(dirname, pciP->szFileName))
+        if (!stricmp(dirname, pciP->pszFileName))
           break;
         if (!(pciP->rc.flRecordAttr & CRA_EXPANDED))
@@ -199 +199 @@
                           MPVOID, MPFROM2SHORT(CMA_FIRST, CMA_ITEMORDER));
         while (pciP && (INT) pciP != -1) {
-          if (toupper(*pciP->szFileName) == toupper(*dirname))
+          if (toupper(*pciP->pszFileName) == toupper(*dirname))
             /* collapse all levels if branch is our drive */
             ExpandAll(hwndCnr, FALSE, pciP);
@@ -634 +634 @@
         sprintf(s, GetPString(IDS_NUMDRIVESTEXT), cnri.cRecords);
         if (pci) {
-          if (!(driveflags[toupper(*pci->szFileName) - 'A'] &
+          if (!(driveflags[toupper(*pci->pszFileName) - 'A'] &
                 DRIVE_REMOVABLE) ||
-              driveserial[toupper(*pci->szFileName) - 'A'] != -1) {
+              driveserial[toupper(*pci->pszFileName) - 'A'] != -1) {
             memset(&volser, 0, sizeof(volser));
             DosError(FERR_DISABLEHARDERR);
-            if (!DosQueryFSInfo(toupper(*pci->szFileName) - '@',
+            if (!DosQueryFSInfo(toupper(*pci->pszFileName) - '@',
                                 FSIL_VOLSER,
                                 &volser,
@@ -645 +645 @@
                 dcd->hwndFrame == WinQueryActiveWindow(dcd->hwndParent)) {
               DosError(FERR_DISABLEHARDERR);
-              if (!DosQueryFSInfo(toupper(*pci->szFileName) - '@',
+              if (!DosQueryFSInfo(toupper(*pci->pszFileName) - '@',
                                   FSIL_ALLOC, &fsa, sizeof(FSALLOCATE))) {
                 CommaFmtULL(tb, sizeof(tb),
@@ -654 +654 @@
               else
                 *szFree = 0;
-              driveserial[toupper(*pci->szFileName) - 'A'] = volser.serial;
+              driveserial[toupper(*pci->pszFileName) - 'A'] = volser.serial;
               sprintf(&s[strlen(s)],
                       GetPString(IDS_TREESTATUSSTARTTEXT),
-                      toupper(*pci->szFileName),
+                      toupper(*pci->pszFileName),
                       volser.volumelabel, volser.serial, szFree);
               if (!fMoreButtons) {
@@ -663 +663 @@
                     (dcd->mask.attrFile != ALLATTRS ||
                      ((fFilesInTree ||
-                       (driveflags[toupper(*pci->szFileName)] &
+                       (driveflags[toupper(*pci->pszFileName)] &
                         DRIVE_INCLUDEFILES)) ?
                       dcd->mask.antiattr :
@@ -679 +679 @@
             /* find root record and strip it */
             pci = FindParentRecord(dcd->hwndCnr, pci);
-            driveserial[toupper(*pci->szFileName) - 'A'] = -1;
+            driveserial[toupper(*pci->pszFileName) - 'A'] = -1;
             UnFlesh(dcd->hwndCnr, pci);
           }
@@ -993 +993 @@
       pci = (PCNRITEM) CurrentRecord(hwnd);
       if (pci && (INT) pci != -1) {
-        if (IsRoot(pci->szFileName))
+        if (IsRoot(pci->pszFileName))
           menuHwnd = CheckMenu(&TreeMenu, TREE_POPUP);
         else {
@@ -1067 +1067 @@
                          MPFROMLONG(CMA_FIRST), MPFROMSHORT(CRA_CURSORED));
         if (pci && (INT) pci != -1 && fComments &&
-            !(driveflags[toupper(*pci->szFileName) - 'A'] & DRIVE_SLOW))
-          WinSendMsg(hwndMain, UM_LOADFILE, MPFROMP(pci->szFileName), MPVOID);
+            !(driveflags[toupper(*pci->pszFileName) - 'A'] & DRIVE_SLOW))
+          WinSendMsg(hwndMain, UM_LOADFILE, MPFROMP(pci->pszFileName), MPVOID);
         else
           WinSendMsg(hwndMain, UM_LOADFILE, MPVOID, MPVOID);
@@ -1081 +1081 @@
       if (pci) {
         if (*(ULONG *) realappname == FM3UL) {
-          sprintf(str, "%s %s", GetPString(IDS_DTTEXT), pci->szFileName);
+          sprintf(str, "%s %s", GetPString(IDS_DTTEXT), pci->pszFileName);
           WinSetWindowText(dcd->hwndFrame, str);
           WinSetWindowText(WinWindowFromID(dcd->hwndFrame, FID_TITLEBAR),
@@ -1088 +1088 @@
         else
           WinSetWindowText(WinWindowFromID(dcd->hwndFrame,
-                                           MAIN_STATUS), pci->szFileName);
+                                           MAIN_STATUS), pci->pszFileName);
         if (fMoreButtons && hwndName) {
-          WinSetWindowText(hwndName, pci->szFileName);
+          WinSetWindowText(hwndName, pci->pszFileName);
           sprintf(str,
                   "%04u/%02u/%02u %02u:%02u:%02u",
@@ -1112 +1112 @@
 
       if (pci)
-        NotifyError(pci->szFileName, (ULONG) mp2);
+        NotifyError(pci->pszFileName, (ULONG) mp2);
     }
     return 0;
@@ -1300 +1300 @@
               }
               if (uso != DO_LINK &&
-                  !(driveflags[toupper(*pci->szFileName) - 'A'] &
+                  !(driveflags[toupper(*pci->pszFileName) - 'A'] &
                     DRIVE_NOTWRITEABLE)) {
 
@@ -1306 +1306 @@
 
                 if (!fQuickArcFind &&
-                    !(driveflags[toupper(*pci->szFileName) - 'A'] &
+                    !(driveflags[toupper(*pci->pszFileName) - 'A'] &
                       DRIVE_SLOW))
-                  info = find_type(pci->szFileName, NULL);
+                  info = find_type(pci->pszFileName, NULL);
                 else
-                  info = quick_find_type(pci->szFileName, NULL);
+                  info = quick_find_type(pci->pszFileName, NULL);
                 if (!info || ((uso == DO_MOVE && !info->move) ||
                               (uso == DO_COPY && !info->create))) {
@@ -1327 +1327 @@
             if (!pci || (INT) pci == -1)
               return MRFROM2SHORT(DOR_DROP, DO_MOVE);
-            if (driveflags[toupper(*pci->szFileName) - 'A'] &
+            if (driveflags[toupper(*pci->pszFileName) - 'A'] &
                 DRIVE_NOTWRITEABLE)
               return MRFROM2SHORT(DOR_DROP, DO_LINK);
-            if (toupper(*pci->szFileName) < 'C')
+            if (toupper(*pci->pszFileName) < 'C')
               return MRFROM2SHORT(DOR_DROP, DO_COPY);
             return MRFROM2SHORT(DOR_DROP,       /* Return okay to drop */
@@ -1359 +1359 @@
             }
             if (hwndStatus2) {
-              WinSetWindowText(hwndStatus2, (IsRoot(pci->szFileName)) ?
+              WinSetWindowText(hwndStatus2, (IsRoot(pci->pszFileName)) ?
                                GetPString(IDS_DRAGROOTTEXT) :
                                (pci->attrFile & FILE_DIRECTORY) ?
@@ -1523 +1523 @@
                 if (fFollowTree &&
                     !(driveflags
-                      [toupper(*((PCNRITEM) pre->pRecord)->szFileName) -
+                      [toupper(*((PCNRITEM) pre->pRecord)->pszFileName) -
                        'A'] & DRIVE_INVALID)) {
                   if (!LastDir && !ParentIsDesktop(hwnd, dcd->hwndParent))
@@ -1547 +1547 @@
                   WinSetWindowText(WinWindowFromID(dcd->hwndFrame,
                                                    MAIN_STATUS),
-                                   ((PCNRITEM) (pre->pRecord))->szFileName);
+                                   ((PCNRITEM) (pre->pRecord))->pszFileName);
               }
             }
@@ -1570 +1570 @@
             if (!(pci->attrFile & FILE_DIRECTORY))
               dcd->hwndLastMenu = CheckMenu(&FileMenu, FILE_POPUP);
-            else if (!IsRoot(pci->szFileName))
+            else if (!IsRoot(pci->pszFileName))
               dcd->hwndLastMenu = CheckMenu(&DirMenu, DIR_POPUP);
             else
@@ -1620 +1620 @@
 
           if (pci && (INT) pci != -1 && !(pci->flags & RECFLAGS_ENV)) {
-            if (driveflags[toupper(*pci->szFileName) - 'A'] & DRIVE_REMOVABLE) {
+            if (driveflags[toupper(*pci->pszFileName) - 'A'] & DRIVE_REMOVABLE) {
 
               struct
@@ -1632 +1632 @@
               memset(&volser, 0, sizeof(volser));
               DosError(FERR_DISABLEHARDERR);
-              if (!DosQueryFSInfo(toupper(*pci->szFileName) - '@',
+              if (!DosQueryFSInfo(toupper(*pci->pszFileName) - '@',
                                   FSIL_VOLSER, &volser,
                                   (ULONG) sizeof(volser))) {
                 if (SHORT2FROMMP(mp1) == CN_COLLAPSETREE &&
                     !volser.serial ||
-                    driveserial[toupper(*pci->szFileName) - 'A'] !=
+                    driveserial[toupper(*pci->pszFileName) - 'A'] !=
                     volser.serial)
                   UnFlesh(hwnd, pci);
                 if (SHORT2FROMMP(mp1) != CN_COLLAPSETREE ||
                     (!volser.serial ||
-                     driveserial[toupper(*pci->szFileName) - 'A'] !=
+                     driveserial[toupper(*pci->pszFileName) - 'A'] !=
                      volser.serial)) {
                   if (Flesh(hwnd, pci) &&
@@ -1649 +1649 @@
                     PostMsg(hwnd, UM_TOPDIR, MPFROMP(pci), MPVOID);
                 }
-                driveserial[toupper(*pci->szFileName) - 'A'] = volser.serial;
+                driveserial[toupper(*pci->pszFileName) - 'A'] = volser.serial;
               }
               else {
-                driveserial[toupper(*pci->szFileName) - 'A'] = -1;
+                driveserial[toupper(*pci->pszFileName) - 'A'] = -1;
                 UnFlesh(hwnd, pci);
                 PostMsg(hwnd, UM_RESCAN, MPVOID, MPVOID);
@@ -1721 +1721 @@
           (INT) pci != -1 &&
           !(pci->rc.flRecordAttr & CRA_INUSE) &&
-          !(pci->flags & RECFLAGS_ENV) && IsFullName(pci->szFileName)) {
-        if (driveflags[toupper(*pci->szFileName) - 'A'] & DRIVE_INVALID) {
+          !(pci->flags & RECFLAGS_ENV) && IsFullName(pci->pszFileName)) {
+        if (driveflags[toupper(*pci->pszFileName) - 'A'] & DRIVE_INVALID) {
           DosBeep(50, 100);
           if (hwndStatus)
@@ -1730 +1730 @@
         DosError(FERR_DISABLEHARDERR);
         if (!DosQCurDisk(&ulDriveNum, &ulDriveMap)) {
-          if (!(ulDriveMap & 1L << (toupper(*pci->szFileName) - 'A'))) {
+          if (!(ulDriveMap & 1L << (toupper(*pci->pszFileName) - 'A'))) {
             pciL = pciP = pci;
             for (;;) {
@@ -1751 +1751 @@
           }
         }
-        if (driveflags[toupper(*pci->szFileName) - 'A'] &
+        if (driveflags[toupper(*pci->pszFileName) - 'A'] &
             (DRIVE_REMOVABLE | DRIVE_NOPRESCAN)) {
 
@@ -1775 +1775 @@
             }
           }
-          if ((driveflags[toupper(*pci->szFileName) - 'A'] &
+          if ((driveflags[toupper(*pci->pszFileName) - 'A'] &
                DRIVE_NOPRESCAN) ||
-              (toupper(*pci->szFileName) > 'B' &&
-               !(driveflags[toupper(*pci->szFileName) - 'A'] &
+              (toupper(*pci->pszFileName) > 'B' &&
+               !(driveflags[toupper(*pci->pszFileName) - 'A'] &
                  DRIVE_CDROM))) {
 
-            INT removable, x = (INT) (toupper(*pci->szFileName) - 'A');
+            INT removable, x = (INT) (toupper(*pci->pszFileName) - 'A');
             ULONG drvtype;
             CHAR FileSystem[CCHMAXPATH];
 
             DosError(FERR_DISABLEHARDERR);
-            removable = CheckDrive(toupper(*pciP->szFileName),
+            removable = CheckDrive(toupper(*pciP->pszFileName),
                                    FileSystem, &drvtype);
             if (removable != -1) {
@@ -1837 +1837 @@
           memset(&volser, 0, sizeof(volser));
           DosError(FERR_DISABLEHARDERR);
-          status = DosQueryFSInfo(toupper(*pci->szFileName) - '@',
+          status = DosQueryFSInfo(toupper(*pci->pszFileName) - '@',
                                   FSIL_VOLSER, &volser,
                                   (ULONG) sizeof(volser));
           if (!status) {
             if (!volser.serial ||
-                driveserial[toupper(*pci->szFileName) - 'A'] !=
+                driveserial[toupper(*pci->pszFileName) - 'A'] !=
                 volser.serial) {
               UnFlesh(hwnd, pciP);
               Flesh(hwnd, pciP);
-              driveserial[toupper(*pci->szFileName) - 'A'] = volser.serial;
+              driveserial[toupper(*pci->pszFileName) - 'A'] = volser.serial;
             }
             pciL = WinSendMsg(hwnd,
@@ -1856 +1856 @@
           }
           else {
-            driveserial[toupper(*pci->szFileName) - 'A'] = -1;
+            driveserial[toupper(*pci->pszFileName) - 'A'] = -1;
             UnFlesh(hwnd, pci);
             PostMsg(hwnd, UM_RESCAN, MPVOID, MPVOID);
@@ -1864 +1864 @@
         }
         status = 0;
-        IsOk = (IsRoot(pci->szFileName) &&
-                IsValidDrive(toupper(*pci->szFileName)));
+        IsOk = (IsRoot(pci->pszFileName) &&
+                IsValidDrive(toupper(*pci->pszFileName)));
         if (!IsOk) {
           DosError(FERR_DISABLEHARDERR);
-          status = DosFindFirst(pci->szFileName, &hDir,
+          status = DosFindFirst(pci->pszFileName, &hDir,
                                 FILE_NORMAL | FILE_DIRECTORY |
                                 FILE_ARCHIVED | FILE_READONLY |
@@ -1885 +1885 @@
             }
             if ((shiftstate & (KC_CTRL | KC_SHIFT)) == (KC_CTRL | KC_SHIFT)) {
-              OpenObject(pci->szFileName, Settings, dcd->hwndFrame);
+              OpenObject(pci->pszFileName, Settings, dcd->hwndFrame);
               return 0;
             }
             if (!(shiftstate & (KC_CTRL | KC_SHIFT))) {
               if (!ParentIsDesktop(hwnd, dcd->hwndParent)) {
-                if (FindDirCnrByName(pci->szFileName, TRUE))
+                if (FindDirCnrByName(pci->pszFileName, TRUE))
                   return 0;
               }
@@ -1907 +1907 @@
                                   (PVOID) & flWindowAttr, &size);
               if (flWindowAttr & CV_DETAIL) {
-                if (IsRoot(pci->szFileName))
+                if (IsRoot(pci->pszFileName))
                   strcpy(s, "TREE");
                 else
                   strcpy(s, "DETAILS");
               }
-              OpenObject(pci->szFileName, s, dcd->hwndFrame);
+              OpenObject(pci->pszFileName, s, dcd->hwndFrame);
               return 0;
             }
@@ -1920 +1920 @@
             if (LastDir && !fDCOpens && !(shiftstate & KC_SHIFT)) {
               WinSendMsg(LastDir,
-                         UM_SETDIR, MPFROMP(pci->szFileName), MPVOID);
+                         UM_SETDIR, MPFROMP(pci->pszFileName), MPVOID);
               WinSetWindowPos(WinQueryWindow(WinQueryWindow(LastDir,
                                                             QW_PARENT),
@@ -1929 +1929 @@
               OpenDirCnr(hwnd,
                          dcd->hwndParent,
-                         dcd->hwndFrame, FALSE, pci->szFileName);
+                         dcd->hwndFrame, FALSE, pci->pszFileName);
           }
           else {
-            if (!(driveflags[toupper(*pci->szFileName) - 'A'] &
+            if (!(driveflags[toupper(*pci->pszFileName) - 'A'] &
                   DRIVE_INCLUDEFILES))
               WinSendMsg(hwnd,
@@ -1945 +1945 @@
               DefaultViewKeys(hwnd,
                               dcd->hwndFrame,
-                              dcd->hwndParent, &swp, pci->szFileName);
+                              dcd->hwndParent, &swp, pci->pszFileName);
             }
           }
         }
         else {
-          if (!IsRoot(pci->szFileName)) {
-            NotifyError(pci->szFileName, status);
+          if (!IsRoot(pci->pszFileName)) {
+            NotifyError(pci->pszFileName, status);
             WinSendMsg(hwnd,
                        CM_REMOVERECORD,
@@ -2026 +2026 @@
             CHAR szDrv[CCHMAXPATH];
 
-            strcpy(szDrv, pci->szFileName);
-            chDrvU = *pci->szFileName;
+            strcpy(szDrv, pci->pszFileName);
+            chDrvU = *pci->pszFileName;
             chDrvU = toupper(chDrvU);
             MakeValidDir(szDrv);
@@ -2232 +2232 @@
 
           pci = (PCNRITEM) CurrentRecord(hwnd);
-          if (pci && (INT) pci != -1 && isalpha(*pci->szFileName)) {
-            *d = toupper(*pci->szFileName);
+          if (pci && (INT) pci != -1 && isalpha(*pci->pszFileName)) {
+            *d = toupper(*pci->pszFileName);
             p = GetCmdSpec(FALSE);
             memset(&pgd, 0, sizeof(pgd));
@@ -2298 +2298 @@
           pci = (PCNRITEM) CurrentRecord(hwnd);
           if (pci && (INT) pci != -1) {
-            strcpy(dir, pci->szFileName);
+            strcpy(dir, pci->pszFileName);
             MakeValidDir(dir);
           }
@@ -2330 +2330 @@
           if (pci && (INT) pci != -1)
             dcd->mask.fFilesIncluded =
-              ((driveflags[toupper(*pci->szFileName) - 'A'] &
+              ((driveflags[toupper(*pci->pszFileName) - 'A'] &
                 DRIVE_INCLUDEFILES) != 0);
           else
@@ -2370 +2370 @@
           pci = (PCNRITEM) CurrentRecord(hwnd);
           if (pci && (INT) pci != -1) {
-            strcpy(newpath, pci->szFileName);
+            strcpy(newpath, pci->pszFileName);
             MakeValidDir(newpath);
           }
@@ -2556 +2556 @@
           PCNRITEM pci = (PCNRITEM)CurrentRecord(hwnd);
           if (pci && (INT)pci != -1) {
-            UINT driveflag = driveflags[toupper(*pci->szFileName) - 'A'];
+            UINT driveflag = driveflags[toupper(*pci->pszFileName) - 'A'];
             if (pci->attrFile & FILE_DIRECTORY) {
               if (pci->flags & RECFLAGS_UNDERENV)
@@ -2565 +2565 @@
                   (~driveflag & DRIVE_NOPRESCAN && pci->rc.hptrIcon == hptrDunno))
               {
-                driveflags[toupper(*pci->szFileName) - 'A'] &=
+                driveflags[toupper(*pci->pszFileName) - 'A'] &=
                   (DRIVE_IGNORE | DRIVE_NOPRESCAN | DRIVE_NOLOADICONS |
                    DRIVE_NOLOADSUBJS | DRIVE_NOLOADLONGS | DRIVE_NOSTATS);
-                DriveFlagsOne(toupper(*pci->szFileName) - 'A');
-                driveflag = driveflags[toupper(*pci->szFileName) - 'A'];
+                DriveFlagsOne(toupper(*pci->pszFileName) - 'A');
+                driveflag = driveflags[toupper(*pci->pszFileName) - 'A'];
                 if (driveflag & DRIVE_INVALID)
                   pci->rc.hptrIcon = hptrDunno;
@@ -2653 +2653 @@
           pci = (PCNRITEM) CurrentRecord(hwnd);
           if (pci && (INT) pci != -1)
-            CommonDriveCmd(hwnd, pci->szFileName, SHORT1FROMMP(mp1));
+            CommonDriveCmd(hwnd, pci->pszFileName, SHORT1FROMMP(mp1));
         }
         break;

trunk/dll/update.c

@@ -40 +40 @@
 HPOINTER SelectDriveIcon(PCNRITEM pci)
 {
-    UINT driveflag = driveflags[toupper(*pci->szFileName) - 'A'];
-    *pci->szFileName = toupper(*pci->szFileName);
-              if (isalpha(*pci->szFileName) &&
-                  toupper(*pci->szFileName) > 'B') {
+    UINT driveflag = driveflags[toupper(*pci->pszFileName) - 'A'];
+    *pci->pszFileName = toupper(*pci->pszFileName);
+              if (isalpha(*pci->pszFileName) &&
+                  toupper(*pci->pszFileName) > 'B') {
                 if (driveflag & DRIVE_CDROM)
                   pci->rc.hptrIcon = hptrCDROM;
@@ -127 +127 @@
       found = TRUE;
 #endif
-      if ((!fForceUpper && !fForceLower && strcmp(pci->szFileName, filename)) ||
+      if ((!fForceUpper && !fForceLower && strcmp(pci->pszFileName, filename)) ||
           pci->cbFile != ffb.cbFile || pci->attrFile != ffb.attrFile ||
           pci->easize != CBLIST_TO_EASIZE(ffb.cbList) || pci->date.day !=
@@ -144 +144 @@
         ffb.cchName = 0;
         FillInRecordFromFFB(hwndCnr, pci, filename, &ffb, partial, dcd);
-        if (strlen(pci->szFileName) < 4)
+        if (strlen(pci->pszFileName) < 4)
         SelectDriveIcon(pci);
         oldemphasis = pci->rc.flRecordAttr & (CRA_SELECTED | CRA_CURSORED);
@@ -180 +180 @@
                                               pci,
                                               filename, &ffb, partial, dcd);
-          if (strlen(pci->szFileName) < 4)
+          if (strlen(pci->pszFileName) < 4)
           SelectDriveIcon(pci);
           memset(&ri, 0, sizeof(RECORDINSERT));
@@ -226 +226 @@
                 FillInRecordFromFFB(hwndCnr,
                                     pci, filename, &ffb, partial, dcd);
-                if (strlen(pci->szFileName) < 4)
+                if (strlen(pci->pszFileName) < 4)
                 SelectDriveIcon(pci);
                 memset(&ri, 0, sizeof(RECORDINSERT));
@@ -273 +273 @@
                                               pci,
                                               filename, &ffb, partial, dcd);
-          if (strlen(pci->szFileName) < 4)
+          if (strlen(pci->pszFileName) < 4)
           SelectDriveIcon(pci);
           memset(&ri, 0, sizeof(RECORDINSERT));
@@ -300 +300 @@
                                 FALSE,
                                 TRUE)) !=
-           NULL && (INT) pci != -1 && strlen(pci->szFileName) > 3) {
+           NULL && (INT) pci != -1 && strlen(pci->pszFileName) > 3) {
     /* file doesn't exist; delete record */
 #ifdef DEBUG
@@ -410 +410 @@
           /* update record? */
           if ((!fForceUpper && !fForceLower &&
-               strcmp(pci->szFileName, filename[x])) ||
+               strcmp(pci->pszFileName, filename[x])) ||
               pci->cbFile != ffb.cbFile || pci->attrFile != ffb.attrFile ||
               pci->easize != CBLIST_TO_EASIZE(ffb.cbList) ||
@@ -431 +431 @@
             FillInRecordFromFFB(hwndCnr,
                                 pci, filename[x], &ffb, partial, dcd);
-            if (IsRoot(pci->szFileName))
+            if (IsRoot(pci->pszFileName))
             SelectDriveIcon(pci);
             WinSendMsg(hwndCnr,
@@ -455 +455 @@
                                                   filename[x],
                                                   &ffb, partial, dcd);
-              if (strlen(pci->szFileName) < 4)
+              if (strlen(pci->pszFileName) < 4)
               SelectDriveIcon(pci);
               memset(&ri, 0, sizeof(RECORDINSERT));
@@ -509 +509 @@
                                                         filename[x],
                                                         &ffb, partial, dcd);
-                    if (strlen(pci->szFileName) < 4)
+                    if (strlen(pci->pszFileName) < 4)
                     SelectDriveIcon(pci);
                     memset(&ri, 0, sizeof(RECORDINSERT));
@@ -556 +556 @@
                                                     filename[x],
                                                     &ffb, partial, dcd);
-                if (strlen(pci->szFileName) < 4)
+                if (strlen(pci->pszFileName) < 4)
                 SelectDriveIcon(pci);
                 memset(&ri, 0, sizeof(RECORDINSERT));
@@ -589 +589 @@
                                     FALSE,
                                     TRUE)) != NULL &&
-               (INT) pci != -1 && !IsRoot(pci->szFileName)) {
+               (INT) pci != -1 && !IsRoot(pci->pszFileName)) {
         /* file doesn't exist; delete record */
         if (pci->rc.flRecordAttr & CRA_SELECTED)