Changeset 1891 for trunk

Timestamp:

Jan 31, 2020, 3:47:37 AM (6 years ago)

Author:

Steven Levine

Message:

Rework FreeCnrItem to ensure all CNRITEMs deleted.
Use WinSendMsg CMA_NEXT.
Was using preccNextRecord which is not recommended because control does
not maintain linkage after inserts and deletes.
Note: arccnrs.c still needs to be reworked to use common functions from filldir.c.

Location:

trunk/dll

Files:

• comp.c (modified) (45 diffs)
• dircnrs.h (modified) (4 diffs)
• errutil.c (modified) (13 diffs)
• errutil.h (modified) (3 diffs)
• filldir.c (modified) (26 diffs)
• flesh.c (modified) (26 diffs)
• init.c (modified) (9 diffs)

trunk/dll/comp.c

@@ -6 +6 @@
   Compare directories
 
-  Copyright (c) 1993-02 M. Kimes
-  Copyright (c) 2003, 2013 Steven H. Levine
+  Copyright (c) 1993-2002 M. Kimes
+  Copyright (c) 2003-2020 Steven H. Levine
 
   16 Oct 02 MK Baseline
@@ -89 +89 @@
   09 Mar 13 SHL SetButtonEnables: correct enable support for newish buttons
   10 Mar 13 GKY Improvrd readonly check on delete to allow cancel and don't ask again options
-                Added saymsg2 for this purpose
+                Added saymsg2 for this purpose
   10 Mar 13 GKY Fixes to snapshot file.
   14 Jun 15 GKY Changes to prvenet access violations when cmp is freed
+  28 Jan 20 SHL ActionCnrThread: report CM_INVALIDATERECORD failures
 
 ***********************************************************************/
@@ -150 +151 @@
 #include "excputil.h"                   // xbeginthread
 #include "info.h"                       // driveflags
-#include "worker.h"                     // MOVEIT
-#include "rename.h"                     // RenameProc
+#include "worker.h"                     // MOVEIT
+#include "rename.h"                     // RenameProc
 
 typedef struct
@@ -177 +178 @@
   HDIR hdir = HDIR_CREATE;
   ULONG ulFindCnt;
-  //CHAR szDate[DATE_BUF_BYTES];
-
-  // 13 Aug 07 SHL fixme to use FileToGet
+  // CHAR szDate[DATE_BUF_BYTES];
+
+  // 13 Aug 07 SHL FIXME to use FileToGet
   pffb = xmalloc(sizeof(FILEFINDBUF4L), pszSrcFile, __LINE__);
   if (pffb) {
@@ -188 +189 @@
       enddir++;
       ulFindCnt = 1;
-      // 13 Aug 07 SHL fixme to report errors
+      // 13 Aug 07 SHL FIXME to report errors
       if (!xDosFindFirst(mask,
                          &hdir,
@@ -198 +199 @@
           strcpy(enddir, pffb->achName);
           if (!(pffb->attrFile & FILE_DIRECTORY)) {
-            //FDateFormat(szDate, pffb->fdateLastWrite);
+            // FDateFormat(szDate, pffb->fdateLastWrite);
             fprintf(fp,
-                    "\"%s\",%u,%llu,%lu/%lu/%lu,%02u:%02u:%02u,%lu,%lu,N\n",
+                    "\"%s\",%u,%llu,%lu/%lu/%lu,%02u:%02u:%02u,%lu,%lu,N\n",
                     mask,
                     enddir - mask,
-                    pffb->cbFile,
-                    pffb->fdateLastWrite.year + 1980,
-                    pffb->fdateLastWrite.month,
-                    pffb->fdateLastWrite.day,
+                    pffb->cbFile,
+                    pffb->fdateLastWrite.year + 1980,
+                    pffb->fdateLastWrite.month,
+                    pffb->fdateLastWrite.day,
                     pffb->ftimeLastWrite.hours,
                     pffb->ftimeLastWrite.minutes,
@@ -572 +573 @@
                        MPFROM2SHORT(CMA_FIRST, CMA_ITEMORDER));
       pciD = WinSendMsg(hwndCnrD, CM_QUERYRECORD, MPVOID,
-                        MPFROM2SHORT(CMA_FIRST, CMA_ITEMORDER));
-      fConfirmAction =  WinQueryButtonCheckstate(cmp->hwnd, COMP_CONFIRMACTION);
+                        MPFROM2SHORT(CMA_FIRST, CMA_ITEMORDER));
+      fConfirmAction = WinQueryButtonCheckstate(cmp->hwnd, COMP_CONFIRMACTION);
       InitITimer(&itdSleep, 500);       // Sleep every 500 mSec
 
@@ -595 +596 @@
           case IDM_DELETE:
 
-            if (fConfirmAction && !dontask) {
-              rc = saymsg2(NULL, 0, cmp->hwnd, GetPString(IDS_CONFIRMDELETE), GetPString(IDS_DOYOUWISHTODELETE),
-                           pciS->pszFileName);
-              if (rc == 3 || rc == 4) {        
-                if (rc == 4)
-                  enddelete = TRUE;
-                break;
-              }
-              else if (rc == 2)
-                dontask = TRUE;
-            }
+            if (fConfirmAction && !dontask) {
+              rc = saymsg2(NULL, 0, cmp->hwnd, GetPString(IDS_CONFIRMDELETE), GetPString(IDS_DOYOUWISHTODELETE),
+                           pciS->pszFileName);
+              if (rc == 3 || rc == 4) {
+                if (rc == 4)
+                  enddelete = TRUE;
+                break;
+              }
+              else if (rc == 2)
+                dontask = TRUE;
+            }
+
             if (!unlinkf(pciS->pszFileName)) {
               WinSendMsg(hwndCnrS, CM_SETRECORDEMPHASIS, MPFROMP(pciS),
@@ -612 +614 @@
               if (!*pciD->pszFileName) {
                 // Other side is blank - remove from both sides
+
+#               ifdef PMPRINTF
+                PmPrintf_Report(pszSrcFile, __LINE__, "ActionCnrThread RemoveCnrItems pciS %p", pciS);
+#               endif
+
                 RemoveCnrItems(hwndCnrS, pciS, 1, CMA_FREE | CMA_INVALIDATE);
                 if (pciD->rc.flRecordAttr & CRA_SELECTED)
                   WinSendMsg(hwndCnrD, CM_SETRECORDEMPHASIS, MPFROMP(pciD),
                              MPFROM2SHORT(FALSE, CRA_SELECTED));
+
+#               ifdef PMPRINTF
+                PmPrintf_Report(pszSrcFile, __LINE__, "ActionCnrThread RemoveCnrItems pciD %p", pciD);
+#               endif
+
                 RemoveCnrItems(hwndCnrD, pciD, 1, CMA_FREE | CMA_INVALIDATE);
               }
               else {
                 // Other side is not blank - blank just this side
+
+#               ifdef PMPRINTF
+                PmPrintf_Report(pszSrcFile, __LINE__, "ActionCnrThread FreeCnrItemData pciS %p", pciS);
+#               endif
+
                 FreeCnrItemData(pciS);
                 // 29 Aug 08 SHL Point pci fields at NullStr to sync with FreeCnrItemData mods
@@ -626 +643 @@
                 pciS->rc.pszIcon = pciS->pszFileName;
                 pciS->flags = 0;        // Just on one side
-                WinSendMsg(hwndCnrS, CM_INVALIDATERECORD, MPFROMP(&pciS),
-                           MPFROM2SHORT(1, CMA_ERASE | CMA_TEXTCHANGED));
-                  pciD->flags = 0;      // Just on one side
-                  if (pciD->pszSubject != NullStr) {
-                    xfree(pciD->pszSubject, pszSrcFile, __LINE__);
-                    pciD->pszSubject = NullStr;
-                  }
-                }
+                if (!WinSendMsg(hwndCnrS, CM_INVALIDATERECORD, MPFROMP(&pciS),
+                                MPFROM2SHORT(1, CMA_ERASE | CMA_TEXTCHANGED))) {
+                  Win_Error(hwndCnrS, cmp->hwnd, pszSrcFile, __LINE__, "CM_INVALIDATERECORD");
+                }
+
+                pciD->flags = 0;        // Just on one side
+                if (pciD->pszSubject != NullStr) {
+                  xfree(pciD->pszSubject, pszSrcFile, __LINE__);
+                  pciD->pszSubject = NullStr;
+                }
+              }
+
               if (hwndCnrS == WinWindowFromID(cmp->hwnd, COMP_LEFTDIR))
                 cmp->cmp->totalleft--;
@@ -639 +660 @@
                 cmp->cmp->totalright--;
             }
-            break;
+            break; // IDM_DELETE
 
           case IDM_MOVE:
@@ -702 +723 @@
                 pciD->attrFile = pciS->attrFile;
                 pciD->pszDispAttr = pciS->pszDispAttr;
-                pciD->flags = 0;                // Just on one side
+                pciD->flags = 0;        // Just on one side
                 pciD->date = pciS->date;
                 pciD->time = pciS->time;
@@ -727 +748 @@
                   pciS->pszSubject = NullStr;
                 }
-                pciS->flags = 0;                // Just on one side
-
-                WinSendMsg(hwndCnrS, CM_INVALIDATERECORD, MPFROMP(&pciS),
-                           MPFROM2SHORT(1, CMA_ERASE | CMA_TEXTCHANGED));
-
-                WinSendMsg(hwndCnrD, CM_INVALIDATERECORD, MPFROMP(&pciD),
-                           MPFROM2SHORT(1, CMA_ERASE | CMA_TEXTCHANGED));
+                pciS->flags = 0;        // Just on one side
+
+                if (!WinSendMsg(hwndCnrS, CM_INVALIDATERECORD, MPFROMP(&pciS),
+                           MPFROM2SHORT(1, CMA_ERASE | CMA_TEXTCHANGED))) {
+                  Win_Error(hwndCnrS, cmp->hwnd, pszSrcFile, __LINE__, "CM_INVALIDATERECORD");
+                }
+
+                if (!WinSendMsg(hwndCnrD, CM_INVALIDATERECORD, MPFROMP(&pciD),
+                           MPFROM2SHORT(1, CMA_ERASE | CMA_TEXTCHANGED))) {
+                  Win_Error(hwndCnrD, cmp->hwnd, pszSrcFile, __LINE__, "CM_INVALIDATERECORD");
+                }
 
                 if (hwndCnrS == WinWindowFromID(cmp->hwnd, COMP_LEFTDIR))
@@ -868 +893 @@
         SleepIfNeeded(&itdSleep, 0);
       } // while
+
       WinPostMsg(cmp->hwnd, WM_TIMER, MPFROMLONG(ID_COMP_TIMER), 0);    // Force update
     Abort:
@@ -1077 +1103 @@
 
   if (numD != x) {
-    // Something out of sync - fixme to document why slow logic needed
+    // Something out of sync - FIXME to document why slow logic needed
     if (!slow) {
       slow = TRUE;
@@ -1202 +1228 @@
                   else if (memcmp(buf1, buf2, numread1))
                     break;
-                }       // while
+                } // while
               } // same len
             } // if open ok
@@ -1315 +1341 @@
         pciD = pciDa[x];
         CompSelectSetSelects(pciS,
-                             pciD,
-                             pciS->flags & CNRITEM_EASDIFFER,
-                             pciD->flags & CNRITEM_EASDIFFER,
-                             wantAnd);
+                             pciD,
+                             pciS->flags & CNRITEM_EASDIFFER,
+                             pciD->flags & CNRITEM_EASDIFFER,
+                             wantAnd);
       }
       SleepIfNeeded(&itdSleep, 0);
@@ -1596 +1622 @@
 
 # ifdef FORTIFY
-  // 10 May 08 SHL fixme to suppress W111
+  // 10 May 08 SHL FIXME to suppress W111
   Fortify_EnterScope();
 #  endif
@@ -1603 +1629 @@
     Runtime_Error(pszSrcFile, __LINE__, NULL);
 #   ifdef FORTIFY
-    // 10 May 08 SHL fixme to suppress W111
+    // 10 May 08 SHL FIXME to suppress W111
     Fortify_LeaveScope();
 #    endif
@@ -1648 +1674 @@
         lenr++;
       priority_normal();
-      // Clear containers
+      // Clear containers in case restarting
       RemoveCnrItems(hwndRight, NULL, 0, CMA_FREE | CMA_INVALIDATE);
       RemoveCnrItems(hwndLeft, NULL, 0, CMA_FREE | CMA_INVALIDATE);
@@ -1678 +1704 @@
         CHAR str[CCHMAXPATH * 2], *p;
         CHAR *moder = "r";
-        BOOL fFixedSnap = TRUE;
+        BOOL fFixedSnap = TRUE;
 
         memset(&fb4, 0, sizeof(fb4));
@@ -1744 +1770 @@
                       p = strchr(p, ',');
                       if (p) {
-                        p++;
-                        if (((strchr(p, '/') ? strchr(p, '/') : strchr(p, DateSeparator[0])) - strchr(p, ',')) > 5) {
-                          CHAR szTemp[30];
-                          CHAR *q;
-                          int i;
-
-                          memset(szTemp, 0, sizeof(szTemp));
-                          i =  (strchr(p, '/') ? strchr(p, '/') : strchr(p, DateSeparator[0])) - 3 - p;
-                          strncpy(&szTemp, p, i);
-                          for (q = szTemp;  q = strchr(szTemp, ',');) {
-                            strcpy(q, q + 1);
-                          }
-                          fb4.cbFile = atoll(szTemp);
-                          fFixedSnap = FALSE;
-
-                        }
-                        else
-                          fb4.cbFile = atoll(p);
-                        if (!strchr(p, '/'))
-                          fFixedSnap = FALSE;
-                        p = (strchr(p, '/') ? strchr(p, '/') : strchr(p, DateSeparator[0])) - 6;
-                        p = strchr(p, ',');
-                        if (p) {
-                          p++;
-                          if (ulDateFmt == 2 || ulDateFmt == 3 || fFixedSnap)
-                            fb4.fdateLastWrite.year = atol(p) - 1980;
-                          else if (ulDateFmt == 1)
-                            fb4.fdateLastWrite.day = atol(p);
-                          else
-                            fb4.fdateLastWrite.month = atol(p);
-                          p = strchr(p, '/') ?  strchr(p, '/') : strchr(p, DateSeparator[0]);
-                          if (p) {
-                            p++;
-                            if (ulDateFmt == 2 || ulDateFmt == 1 || fFixedSnap)
-                              fb4.fdateLastWrite.month = atol(p);
-                            else
-                              fb4.fdateLastWrite.day = atol(p);
-                            p = strchr(p, '/') ?  strchr(p, '/') : strchr(p, DateSeparator[0]);
-                            if (p) {
-                              p++;
-                              if (ulDateFmt == 2 || fFixedSnap)
-                                fb4.fdateLastWrite.day = atol(p);
-                              else if (ulDateFmt == 3)
-                                fb4.fdateLastWrite.month = atol(p);
-                              else
-                                fb4.fdateLastWrite.year = atol(p) - 1980;
+                        p++;
+                        if (((strchr(p, '/') ? strchr(p, '/') : strchr(p, DateSeparator[0])) - strchr(p, ',')) > 5) {
+                          CHAR szTemp[30];
+                          CHAR *q;
+                          int i;
+
+                          memset(szTemp, 0, sizeof(szTemp));
+                          i = (strchr(p, '/') ? strchr(p, '/') : strchr(p, DateSeparator[0])) - 3 - p;
+                          strncpy(&szTemp, p, i);
+                          for (q = szTemp; q = strchr(szTemp, ',');) {
+                            strcpy(q, q + 1);
+                          }
+                          fb4.cbFile = atoll(szTemp);
+                          fFixedSnap = FALSE;
+
+                        }
+                        else
+                          fb4.cbFile = atoll(p);
+                        if (!strchr(p, '/'))
+                          fFixedSnap = FALSE;
+                        p = (strchr(p, '/') ? strchr(p, '/') : strchr(p, DateSeparator[0])) - 6;
+                        p = strchr(p, ',');
+                        if (p) {
+                          p++;
+                          if (ulDateFmt == 2 || ulDateFmt == 3 || fFixedSnap)
+                            fb4.fdateLastWrite.year = atol(p) - 1980;
+                          else if (ulDateFmt == 1)
+                            fb4.fdateLastWrite.day = atol(p);
+                          else
+                            fb4.fdateLastWrite.month = atol(p);
+                          p = strchr(p, '/') ? strchr(p, '/') : strchr(p, DateSeparator[0]);
+                          if (p) {
+                            p++;
+                            if (ulDateFmt == 2 || ulDateFmt == 1 || fFixedSnap)
+                              fb4.fdateLastWrite.month = atol(p);
+                            else
+                              fb4.fdateLastWrite.day = atol(p);
+                            p = strchr(p, '/') ? strchr(p, '/') : strchr(p, DateSeparator[0]);
+                            if (p) {
+                              p++;
+                              if (ulDateFmt == 2 || fFixedSnap)
+                                fb4.fdateLastWrite.day = atol(p);
+                              else if (ulDateFmt == 3)
+                                fb4.fdateLastWrite.month = atol(p);
+                              else
+                                fb4.fdateLastWrite.year = atol(p) - 1980;
                               p = strchr(p, ',');
-                              if (p) {
+                              if (p) {
                                 p++;
                                 fb4.ftimeLastWrite.hours = atol(p);
-                                p = strchr(p, ':') ?  strchr(p, ':') : strchr(p, TimeSeparator[0]);
-                                if (p) {
+                                p = strchr(p, ':') ? strchr(p, ':') : strchr(p, TimeSeparator[0]);
+                                if (p) {
                                   p++;
                                   fb4.ftimeLastWrite.minutes = atol(p);
-                                  p = strchr(p, ':') ?  strchr(p, ':') : strchr(p, TimeSeparator[0]);
-                                  if (p) {
+                                  p = strchr(p, ':') ? strchr(p, ':') : strchr(p, TimeSeparator[0]);
+                                  if (p) {
                                     p++;
                                     fb4.ftimeLastWrite.twosecs = atol(p);
                                     p = strchr(p, ',');
-                                    if (p) {
+                                    if (p) {
                                       p++;
                                       fb4.attrFile = atol(p);
                                       p = strchr(p, ',');
-                                      if (p) {
+                                      if (p) {
                                         p++;
                                         fb4.cbList = atol(p) * 2;
@@ -1813 +1839 @@
                                           strupr(str + 1);
                                         else if (fForceLower)
-                                          strlwr(str + 1);
+                                          strlwr(str + 1);
                                         if (AddToFileList((str + 1) + lenr,
                                                           &fb4,
@@ -1835 +1861 @@
             } // while
           } // if have rightdir
-          fclose(fp);
-          if (!filesr)
-            saymsg(MB_OK | MB_ICONASTERISK, HWND_DESKTOP,
+          fclose(fp);
+          if (!filesr)
+            saymsg(MB_OK | MB_ICONASTERISK, HWND_DESKTOP,
                    GetPString(IDS_WARNINGTEXT),
                    GetPString(IDS_SNAPSHOTFILEBADFORMAT));
-        }
-        else
-          saymsg(MB_OK | MB_ICONASTERISK, HWND_DESKTOP,
-                 GetPString(IDS_WARNINGTEXT),
-                 GetPString(IDS_SNAPSHOTFILELOADFAILED), cmp->rightlist);
+        }
+        else
+          saymsg(MB_OK | MB_ICONASTERISK, HWND_DESKTOP,
+                 GetPString(IDS_WARNINGTEXT),
+                 GetPString(IDS_SNAPSHOTFILELOADFAILED), cmp->rightlist);
       } // if snapshot file
 
@@ -1905 +1931 @@
         while ((filesl && filesl[l]) || (filesr && filesr[r])) {
 
-          ULONG ulRecsToInsert; // limited to USHRT_MAX
+          ULONG ulRecsToInsert;         // limited to USHRT_MAX
 
           if (cmp->stop)
@@ -1971 +1997 @@
             pcil->pszDispAttr = FileAttrToString(pcil->attrFile);
             pcil->cbFile = filesl[l]->cbFile;
-            // 12 Jan 08 SHL fixme to use cached size here too
+            // 12 Jan 08 SHL FIXME to use cached size here too
             CommaFmtULL(szBuf, sizeof(szBuf), pcil->cbFile, ' ');
             pcil->pszFmtFileSize = xstrdup(szBuf, pszSrcFile, __LINE__);
@@ -1992 +2018 @@
             pcil->crtime.seconds = filesl[l]->crtime.twosecs * 2;
             pcil->crtime.minutes = filesl[l]->crtime.minutes;
-            pcil->crtime.hours = filesl[l]->crtime.hours;
-            DosRequestMutexSem(hmtxFiltering, SEM_INDEFINITE_WAIT);
+            pcil->crtime.hours = filesl[l]->crtime.hours;
+            DosRequestMutexSem(hmtxFiltering, SEM_INDEFINITE_WAIT);
             if (cmp && *cmp->dcd.mask.szMask) {
               if (!Filter((PMINIRECORDCORE)pcil, (PVOID)&cmp->dcd.mask)) {
                 pcil->rc.flRecordAttr |= CRA_FILTERED;
                 pcir->rc.flRecordAttr |= CRA_FILTERED;
-              }
-            }
-            DosReleaseMutexSem(hmtxFiltering);
+              }
+            }
+            DosReleaseMutexSem(hmtxFiltering);
           } // if on left
 
@@ -2013 +2039 @@
             pcir->pszDispAttr = FileAttrToString(pcir->attrFile);
             pcir->cbFile = filesr[r]->cbFile;
-            // 12 Jan 08 SHL fixme to used cached size here too
+            // 12 Jan 08 SHL FIXME to used cached size here too
             CommaFmtULL(szBuf, sizeof(szBuf), pcir->cbFile, ' ');
             pcir->pszFmtFileSize = xstrdup(szBuf, pszSrcFile, __LINE__);
@@ -2035 +2061 @@
             pcir->crtime.minutes = filesr[r]->crtime.minutes;
             pcir->crtime.hours = filesr[r]->crtime.hours;
-            // Bypass check if already filtered on left side
-            DosRequestMutexSem(hmtxFiltering, SEM_INDEFINITE_WAIT);
+            // Bypass check if already filtered on left side
+            DosRequestMutexSem(hmtxFiltering, SEM_INDEFINITE_WAIT);
             if (cmp && ~pcir->rc.flRecordAttr & CRA_FILTERED &&
                 *cmp->dcd.mask.szMask) {
@@ -2042 +2068 @@
                 pcil->rc.flRecordAttr |= CRA_FILTERED;
                 pcir->rc.flRecordAttr |= CRA_FILTERED;
-              }
-            }
-            DosReleaseMutexSem(hmtxFiltering);
+              }
+            }
+            DosReleaseMutexSem(hmtxFiltering);
           } // if on right
 
@@ -2181 +2207 @@
                             MPFROMP(pcirFirst), MPFROMP(&ri))) {
               Win_Error(hwndRight, cmp->hwnd, pszSrcFile, __LINE__, "CM_INSERTRECORD");
-              // 2011-05-29 SHL fixme?
+              // 2011-05-29 SHL FIXME?
               RemoveCnrItems(hwndLeft, NULL, 0, CMA_FREE | CMA_INVALIDATE);
               FreeCnrItemList(hwndRight, pcirFirst);
@@ -2318 +2344 @@
   WinEnableWindow(WinWindowFromID(hwnd, IDM_SELECTONE), fEnable);
   WinEnableWindow(WinWindowFromID(hwnd, IDM_SELECTNEWER), fEnable);
-  WinEnableWindow(WinWindowFromID(hwnd, IDM_SELECTEAS), fEnable);  // 2013-03-09 SHL
+  WinEnableWindow(WinWindowFromID(hwnd, IDM_SELECTEAS), fEnable);       // 2013-03-09 SHL
   WinEnableWindow(WinWindowFromID(hwnd, IDM_SELECTOLDER), fEnable);
   WinEnableWindow(WinWindowFromID(hwnd, IDM_SELECTBIGGER), fEnable);
@@ -2325 +2351 @@
   WinEnableWindow(WinWindowFromID(hwnd, IDM_DESELECTONE), fEnable);
   WinEnableWindow(WinWindowFromID(hwnd, IDM_DESELECTNEWER), fEnable);
-  WinEnableWindow(WinWindowFromID(hwnd, IDM_DESELECTEAS), fEnable); // 2013-03-09 SHL
+  WinEnableWindow(WinWindowFromID(hwnd, IDM_DESELECTEAS), fEnable);     // 2013-03-09 SHL
   WinEnableWindow(WinWindowFromID(hwnd, IDM_DESELECTOLDER), fEnable);
   WinEnableWindow(WinWindowFromID(hwnd, IDM_DESELECTBIGGER), fEnable);
@@ -2346 +2372 @@
   WinEnableWindow(WinWindowFromID(hwnd, COMP_INCLUDESUBDIRS), fEnable);
   WinEnableWindow(WinWindowFromID(hwnd, COMP_HIDENOTSELECTED), fEnable);
-  WinEnableWindow(WinWindowFromID(hwnd, COMP_CONFIRMACTION), fEnable); // 2013-03-09 SHL
+  WinEnableWindow(WinWindowFromID(hwnd, COMP_CONFIRMACTION), fEnable);  // 2013-03-09 SHL
 }
 
@@ -2404 +2430 @@
       {
         USHORT ids[] = {COMP_FRAME, COMP_LEFTDIR, COMP_RIGHTDIR, COMP_COLLECT,
-                        COMP_VIEW, COMP_NOTE, COMP_TOTALLEFT, COMP_SELLEFT, COMP_TOTALRIGHT,
-                        COMP_SELRIGHT, COMP_CNRMENU, COMP_DIRMENU, COMP_MENU,
-                        COMP_INCLUDESUBDIRS, COMP_SETDIRS, COMP_COPYLEFT, COMP_MOVELEFT,
-                        COMP_DELETELEFT, COMP_COPYRIGHT, COMP_MOVERIGHT, COMP_DELETERIGHT,
-                        COMP_TOTALLEFTHDR, COMP_SELLEFTHDR, COMP_TOTALRIGHTHDR,
-                        COMP_SELRIGHTHDR, COMP_FILTER, COMP_HIDENOTSELECTED, 0};
+                        COMP_VIEW, COMP_NOTE, COMP_TOTALLEFT, COMP_SELLEFT, COMP_TOTALRIGHT,
+                        COMP_SELRIGHT, COMP_CNRMENU, COMP_DIRMENU, COMP_MENU,
+                        COMP_INCLUDESUBDIRS, COMP_SETDIRS, COMP_COPYLEFT, COMP_MOVELEFT,
+                        COMP_DELETELEFT, COMP_COPYRIGHT, COMP_MOVERIGHT, COMP_DELETERIGHT,
+                        COMP_TOTALLEFTHDR, COMP_SELLEFTHDR, COMP_TOTALRIGHTHDR,
+                        COMP_SELRIGHTHDR, COMP_FILTER, COMP_HIDENOTSELECTED, 0};
         UINT x;
         CHAR s[24];
@@ -2569 +2595 @@
         pci = (PCNRITEM)pcown->pRecord;
         // 01 Aug 07 SHL if field null or blank, we draw
-        // fixme to document why - probably to optimize and bypass draw?
+        // FIXME to document why - probably to optimize and bypass draw?
         if (pci && (INT)pci != -1 && !*pci->pszFileName && pci->pszFileName != NullStr)
           return MRFROMLONG(TRUE);
@@ -2728 +2754 @@
         if (cmp) {
           PCNRITEM pci = (PCNRITEM)mp2;
-          USHORT id = COMP_CNRMENU;             // Assume container menu
+          USHORT id = COMP_CNRMENU;     // Assume container menu
 
           if (cmp->dcd.hwndLastMenu)
@@ -2779 +2805 @@
       case CN_BEGINEDIT:
       case CN_REALLOCPSZ:
-        // fixme to be gone - field edits not allowed?
+        // FIXME to be gone - field edits not allowed?
         Runtime_Error(pszSrcFile, __LINE__,
                       "CN_BEGINEDIT/CN_REALLOCPSZ unexpected");
@@ -2871 +2897 @@
                           CA_DETAILSVIEWTITLES | CA_OWNERDRAW;
       WinSendDlgItemMsg(hwnd, COMP_LEFTDIR, CM_SETCNRINFO, MPFROMP(&cnri),
-                        MPFROMLONG(CMA_CNRTITLE | CMA_FLWINDOWATTR));
+                        MPFROMLONG(CMA_CNRTITLE | CMA_FLWINDOWATTR));
       WinSetDlgItemText(hwnd, COMP_LISTLOADED, "");
       cnri.pszCnrTitle = cmp->rightdir;
@@ -2999 +3025 @@
 
   case WM_COMMAND:
-    // 29 Apr 09 SHL fixme to support more context menu items - IDM_VIEW, IDM_EDIT etc.
+    // 29 Apr 09 SHL FIXME to support more context menu items - IDM_VIEW, IDM_EDIT etc.
     switch (SHORT1FROMMP(mp1)) {
     case IDM_COMPARE:
@@ -3325 +3351 @@
         ULONG size = sizeof(SWP);
         USHORT ids[] = {COMP_FRAME, COMP_LEFTDIR, COMP_RIGHTDIR, COMP_COLLECT,
-                        COMP_VIEW, COMP_NOTE, COMP_TOTALLEFT, COMP_SELLEFT, COMP_TOTALRIGHT,
-                        COMP_SELRIGHT, COMP_CNRMENU, COMP_DIRMENU, COMP_MENU,
-                        COMP_INCLUDESUBDIRS, COMP_SETDIRS, COMP_COPYLEFT, COMP_MOVELEFT,
-                        COMP_DELETELEFT, COMP_COPYRIGHT, COMP_MOVERIGHT, COMP_DELETERIGHT,
-                        COMP_TOTALLEFTHDR, COMP_SELLEFTHDR, COMP_TOTALRIGHTHDR,
-                        COMP_SELRIGHTHDR, COMP_FILTER, COMP_HIDENOTSELECTED, 0};
+                        COMP_VIEW, COMP_NOTE, COMP_TOTALLEFT, COMP_SELLEFT, COMP_TOTALRIGHT,
+                        COMP_SELRIGHT, COMP_CNRMENU, COMP_DIRMENU, COMP_MENU,
+                        COMP_INCLUDESUBDIRS, COMP_SETDIRS, COMP_COPYLEFT, COMP_MOVELEFT,
+                        COMP_DELETELEFT, COMP_COPYRIGHT, COMP_MOVERIGHT, COMP_DELETERIGHT,
+                        COMP_TOTALLEFTHDR, COMP_SELLEFTHDR, COMP_TOTALRIGHTHDR,
+                        COMP_SELRIGHTHDR, COMP_FILTER, COMP_HIDENOTSELECTED, 0};
         UINT x;
         CHAR s[24];
         WinQueryWindowPos(hwnd, &swp);
         PrfWriteProfileData(fmprof, FM3Str, "CompDir.Position", (PVOID) &swp,
-                            size);
+                            size);
         for (x = 0; ids[x]; x++) {
           sprintf(s, "CompDir%i", ids[x]);
@@ -3348 +3374 @@
         Runtime_Error(pszSrcFile, __LINE__, NULL);
       else {
-        cmp->stop = TRUE;                       // In case thread running
+        cmp->stop = TRUE;               // In case thread running
         if (cmp->filling)
-          break;                                // UM_CONTAINER_FILLED will dismiss
+          break;                        // UM_CONTAINER_FILLED will dismiss
       }
       {
@@ -3387 +3413 @@
     case IDM_SELECTSAME:                // Name and size
     case IDM_INVERT:
-
-
       cmp = INSTDATA(hwnd);
       if (!cmp)
@@ -3533 +3557 @@
     cmp = INSTDATA(hwnd);
     if (cmp) {
-      // 17 Jan 08 SHL fixme to know if stop really needed?
+      // 17 Jan 08 SHL FIXME to know if stop really needed?
       WinStopTimer(WinQueryAnchorBlock(hwnd), hwnd, ID_COMP_TIMER);
       if (cmp->dcd.hwndLastMenu)
@@ -3547 +3571 @@
       DosReleaseMutexSem(hmtxFiltering);
     }
+
+#   ifdef PMPRINTF
+    PmPrintf_Report(pszSrcFile, __LINE__, "CompareDlgProc EmptyCnr Left");
+#   endif
     EmptyCnr(GetHwndLeft(hwnd));
+
+#   ifdef PMPRINTF
+    PmPrintf_Report(pszSrcFile, __LINE__, "CompareDlgProc EmptyCnr Right");
+#   endif
     EmptyCnr(GetHwndRight(hwnd));
+
     DosPostEventSem(CompactSem);
     break;

trunk/dll/dircnrs.h

@@ -6 +6 @@
   dircnrs common definitions
 
-  Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2001, 2015 Steven H. Levine
+  Copyright (c) 1993-1998 M. Kimes
+  Copyright (c) 2001-2020 Steven H. Levine
 
   05 Jan 08 SHL Move dircnrs.c definitions here
@@ -17 +17 @@
   20 Sep 15 GKY Add a flag to indicate when a directory needed to be Fleshed and a PCNRITEM
                 previous to try to keep the pci chain intact on renames, delete etc to PCNRITEM
+  29 Jan 20 SHL Get rid of unused pciPrevious
 
 ***********************************************************************/
@@ -62 +63 @@
   ULONG flags;
   BOOL fleshed;
-  struct _CNRITEM *pciPrevious;    // Address of pci we are linked to
 }
 CNRITEM, *PCNRITEM;
@@ -168 +168 @@
 MRESULT EXPENTRY SearchContainer(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2);
 
-// 05 Jan 08 SHL fixme for dircnrs.c globals to be here
+// 05 Jan 08 SHL FIXME for dircnrs.c globals to be here
 
 #ifdef DEFINE_GLOBALS

trunk/dll/errutil.c

@@ -6 +6 @@
   Error reporting
 
-  Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2004, 2015 Steven H. Levine
+  Copyright (c) 1993-1998 M. Kimes
+  Copyright (c) 2004-2020 Steven H. Levine
 
   12 Aug 04 SHL Comments
@@ -41 +41 @@
   15 Feb 14 GKY Improvements to saymsg2 some code cleanup
   16 Feb 14 GKY Rework readonly check on delete code so it actually works in a logical way
-                and so it works with move to trashcan inabled.
+                and so it works with move to trashcan inabled.
   09 Nov 13 SHL Use GetTidForThread in DbgMsg and tweak for for editors that understand file:line
+  28 Jan 20 SHL Add PmPrintf_Report
 
 ***********************************************************************/
@@ -66 +67 @@
 #include "fm3dll2.h"
 
+#ifdef PMPRINTF
+#define _PMPRINTF_                      // Enable debug macros
+#include "PMPRINTF.H"
+#endif
+
 #pragma data_seg(DATA1)
 
@@ -86 +92 @@
   va_list va;
 
-#if 1 // fixme to be selectable
+#if 1 // FIXME to be selectable
 
   static ULONG ul1stMSec;
@@ -94 +100 @@
 
   if (!ul1stMSec) {
-    ul1stMSec = msec;      // Avoid big delta 1st time
+    ul1stMSec = msec;                   // Avoid big delta 1st time
   }
 
@@ -124 +130 @@
  */
 
-// 2010-12-01 SHL fixme for ULONG to be APIRET
+// 2010-12-01 SHL FIXME for ULONG to be APIRET
 
 INT Dos_Error(ULONG mb_type, ULONG apiret, HWND hwndOwner,
@@ -240 +246 @@
   if (pszBuf[cBufBytes - 1]) {
     fprintf(stderr, "Buffer overflow in formatWinError - need %u bytes\n",
-            strlen(pszBuf) + 1);
+            strlen(pszBuf) + 1);
     fflush(stderr);
   }
@@ -263 +269 @@
     if (!hwndOwner)
       hwndOwner = HWND_DESKTOP;
-    // Find message offset in array of message offsets Assume 1 message - fixme?
+    // Find message offset in array of message offsets Assume 1 message - FIXME?
     pszOffset = ((PSZ) pErrInfoBlk) + pErrInfoBlk->offaoffszMsg;
     // Address error message in array of messages and append error message to source code linenumber
@@ -303 +309 @@
 }
 
+#ifdef PMPRINTF
+
+/**
+ * Format runtime error message and output using PmPrintf
+ * @note: Local errors written directly to stderr
+ * @note: If pszFmt is NULL a No Data error message is returned GKY 20 Feb 09 (Replaces Runtime_Error2)
+ */
+
+VOID PmPrintf_Report(PCSZ pszSrcFile, UINT uSrcLineNo, PCSZ pszFmt, ...)
+{
+  CHAR szMsg[4096];
+  va_list va;
+
+  // Format caller's message
+  if (!pszFmt)
+    pszFmt = PCSZ_NODATA;
+  va_start(va, pszFmt);
+  szMsg[sizeof(szMsg) - 1] = 0;
+  vsprintf(szMsg, pszFmt, va);
+  va_end(va);
+
+  if (szMsg[sizeof(szMsg) - 1]) {
+    fprintf(stderr, "Buffer overflow in PmPrintf_Report - need %u bytes\n", strlen(szMsg) + 1);
+    fflush(stderr);
+  }
+
+  if (strchr(szMsg, ' ') == NULL) {
+    strcat(szMsg, " ");
+    strcat(szMsg, GetPString(IDS_FAILEDTEXT));  // Assume simple function name
+  }
+
+  // Avoid leading \n in IDS_GENERR1TEXT
+  strcat(szMsg, " ");
+  sprintf(szMsg + strlen(szMsg),
+          GetPString(IDS_GENERR1TEXT) + 1, pszSrcFile, uSrcLineNo);
+
+  PmPrintfString(szMsg);
+
+} // PmPrintf_Report
+
+#endif
+
 /**
  * Format runtime error message and output using showMsg
@@ -369 +417 @@
 
 APIRET saymsg2(PCSZ pszButtonNames, int DefaultButton, HWND hwnd,
-               PCSZ pszTitle, PCSZ pszFmt, ...)
+               PCSZ pszTitle, PCSZ pszFmt, ...)
 {
   ULONG i;
@@ -412 +460 @@
     rc = WinMessageBox2(HWND_DESKTOP, hwnd,
                         szMsg, pszTitle, SM2_DIALOG,
-                        pmbInfo);
+                        pmbInfo);
     WinSetFocus(HWND_DESKTOP, SM2_DIALOG);
     free(pmbInfo);
@@ -460 +508 @@
   va_start(va, pszFmt);
   formatWinError(szMsg, sizeof(szMsg), hwndErr, hwndOwner, pszSrcFile,
-                 uSrcLineNo, pszFmt, va);
+                 uSrcLineNo, pszFmt, va);
   va_end(va);
 
@@ -484 +532 @@
   va_start(va, pszFmt);
   formatWinError(szMsg, sizeof(szMsg), hwndErr, hwndOwner, pszSrcFile, uSrcLineNo,
-                 pszFmt, va);
+                 pszFmt, va);
   va_end(va);
 

trunk/dll/errutil.h

@@ -6 +6 @@
   Error reporting utilities interface
 
-  Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2008, 2010 Steven H. Levine
+  Copyright (c) 1993-1998 M. Kimes
+  Copyright (c) 2008-2020 Steven H. Levine
 
   05 Jan 08 SHL Move from fm3dll.h to here
@@ -13 +13 @@
   08 Mar 09 GKY Remove Dos_Error2 (unused) and Runtime_Error2 (no advantage over using Runtime_Error)
   10 Mar 13 GKY Improvrd readonly check on delete to allow cancel and don't ask again options
-                Added saymsg2 for this purpose
+                Added saymsg2 for this purpose
+  28 Jan 20 SHL Add PmPrintfReport
 
 ***********************************************************************/
@@ -37 +38 @@
                         PCSZ pszSrcFile, UINT uSrcLineNo, PCSZ pszFmt, ...);
 
+#ifdef PMPRINTF
+VOID PmPrintf_Report(PCSZ pszSrcFile, UINT uSrcLineNo, PCSZ pszFmt, ...);
+#endif
+
 #endif // ERRUTIL_H

trunk/dll/filldir.c

@@ -6 +6 @@
   Fill Directory Tree Containers
 
-  Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2001, 2015 Steven H. Levine
+  Copyright (c) 1993-1998 M. Kimes
+  Copyright (c) 2001-2020 Steven H. Levine
 
   10 Jan 04 SHL ProcessDirectory: avoid most large drive failures
@@ -121 +121 @@
   24 Aug 15 GKY Remove fDummy code
   20 Sep 15 GKY Add code for Flesh to skip the directory entry added by Stubby (eliminate
-                use of NULL/Nullstr pszFileNames by Stubby). Add code to relink pci chain
-                following rename, delete, etc. Add "Expanding" window text.
+                use of NULL/Nullstr pszFileNames by Stubby). Add code to relink pci chain
+                following rename, delete, etc. Add "Expanding" window text.
   26 Sep 15 GKY Remove fInitialDriveScan code
+  28 Jan 20 SHL EmptyCnr: report more errors
+  29 Jan 20 SHL RemoveCnrItems: rework removal from prev/next chain
 
 ***********************************************************************/
@@ -168 +170 @@
 #include "pathutil.h"                   // AddBackslashToPath
 #include "tmrsvcs.h"                    // ITIMER_DESC
-
-#ifdef PMPRINTF
-#define  _PMPRINTF_                     // Enable debug macros
-#include "PMPRINTF.H"
-#endif
 
 // Data definitions
@@ -370 +367 @@
   ULONG flags = driveflags[toupper(*pci->pszFileName) - 'A'];
   BOOL fLoadSubjectForDrive = fLoadSubject && ~flags & DRIVE_NOLOADSUBJS;
-  BOOL fLoadLongNameForDrive = fLoadLongnames &&  //~flags & DRIVE_NOLONGNAMES &&
+  BOOL fLoadLongNameForDrive = fLoadLongnames &&        // ~flags & DRIVE_NOLONGNAMES &&
                                ~flags & DRIVE_NOLOADLONGS;
   if (fLoadSubjectForDrive || fLoadLongNameForDrive) {
@@ -626 +623 @@
   pci->rc.hptrIcon = hptr;
 
-
   // check to see if record should be visible
   DosRequestMutexSem(hmtxFiltering, SEM_INDEFINITE_WAIT);
@@ -821 +817 @@
                       const BOOL recurse,
                       const BOOL partial,
-                      CHAR *stopflag,
+                      CHAR *stopflag,
                       DIRCNRDATA *dcd,                  // Optional
                       ULONG *pulTotalFiles,             // Optional
-                      PULONGLONG pullTotalBytes,        // Optional
-                      CHAR *LoadedFirstChild)           // Optional
+                      PULONGLONG pullTotalBytes,        // Optional
+                      CHAR *LoadedFirstChild)           // Optional
 {
   /**
@@ -899 +895 @@
       do {
         /**
-         * remove . and .. and directories already added
-         * by Stubby from list if present
+         * remove . and .. and directories already added
+         * by Stubby from list if present
          * also counter file system bugs that sometimes
          * allows normal files to slip through when
@@ -911 +907 @@
         pffbFile = paffbFound;
         ulSelCnt = 0;
-        for (;;) {
+        for (;;) {
           if (!*pffbFile->achName ||
               (!filestoo && ~pffbFile->attrFile & FILE_DIRECTORY) ||
@@ -917 +913 @@
                !pffbFile->achName[0] || pffbFile->achName[0] == '.' &&
                (!pffbFile->achName[1] ||
-                (pffbFile->achName[1] == '.' && !pffbFile->achName[2])) ||
-               (LoadedFirstChild && !stricmp(LoadedFirstChild, pffbFile->achName)))) {
-                        // Got . or .. or file to be skipped
+                (pffbFile->achName[1] == '.' && !pffbFile->achName[2])) ||
+               (LoadedFirstChild && !stricmp(LoadedFirstChild, pffbFile->achName)))) {
+                        // Got . or .. or file to be skipped
           }
           else
@@ -957 +953 @@
                 ullBytes = FillInRecordFromFFB(hwndCnr, pci, pszFileSpec,
                                                pffbFile, partial, dcd);
-                pciNext = pci;
-                pci = (PCNRITEM) pci->rc.preccNextRecord;
-                if (pci && (INT) pci != -1)
-                  pci->pciPrevious = pciNext;
+                pciNext = pci;
+                pci = (PCNRITEM) pci->rc.preccNextRecord;
                 ullTotalBytes += ullBytes;
               } // for
@@ -1058 +1052 @@
               break;
             }
-            ulRecsToInsert = cAffbTotal - x <  USHRT_MAX  ? cAffbTotal - x : USHRT_MAX;
+            ulRecsToInsert = cAffbTotal - x < USHRT_MAX ? cAffbTotal - x : USHRT_MAX;
             pciFirst = WinSendMsg(hwndCnr, CM_ALLOCRECORD,
                                   MPFROMLONG(EXTRA_RECORD_BYTES), MPFROMLONG(ulRecsToInsert));
@@ -1071 +1065 @@
             else {
               // 04 Jan 08 SHL FIXME like comp.c to handle less than ulSelCnt records
-              if (hwndStatus && dcd && dcd->hwndFrame ==
-                  WinQueryActiveWindow(dcd->hwndParent)) {
-                WinSetWindowText(hwndStatus, (CHAR *) GetPString(LoadedFirstChild ?
-                                                                 IDS_PLEASEWAITEXPANDINGTEXT :
-                                                                 IDS_PLEASEWAITCOUNTINGTEXT));
+              if (hwndStatus && dcd && dcd->hwndFrame ==
+                  WinQueryActiveWindow(dcd->hwndParent)) {
+                WinSetWindowText(hwndStatus, (CHAR *) GetPString(LoadedFirstChild ?
+                                                                 IDS_PLEASEWAITEXPANDINGTEXT :
+                                                                 IDS_PLEASEWAITCOUNTINGTEXT));
               }
               pci = pciFirst;
@@ -1081 +1075 @@
           }
           ullBytes = FillInRecordFromFFB(hwndCnr, pci, pszFileSpec,
-                                         pffbFile, partial, dcd);
-          pciNext = pci;
-          pci = (PCNRITEM) pci->rc.preccNextRecord;
-          if (pci && (INT) pci != -1)
-            pci->pciPrevious = pciNext;
+                                         pffbFile, partial, dcd);
+          pciNext = pci;
+          pci = (PCNRITEM)pci->rc.preccNextRecord;
           ullTotalBytes += ullBytes;
           // 15 Sep 09 SHL allow timed updates to see
@@ -1196 +1188 @@
       }
       if ((pci->attrFile & FILE_DIRECTORY))
-        AddFleshWorkRequest(hwndCnr, pci, eStubby);
+        AddFleshWorkRequest(hwndCnr, pci, eStubby);
       pci = WinSendMsg(hwndCnr, CM_QUERYRECORD, MPFROMP(pci),
                        MPFROM2SHORT(CMA_NEXT, CMA_ITEMORDER));
@@ -1225 +1217 @@
                    dcd,
                    NULL,                // total files
-                   pullTotalBytes,
-                   0);
+                   pullTotalBytes,
+                   0);
   DosPostEventSem(CompactSem);
 
@@ -1253 +1245 @@
   ULONG ulDriveType;
   PCNRITEM pci, pciFirst = NULL;
-  PCNRITEM  pciNext;
-  PCNRITEM  pciParent = NULL;
+  PCNRITEM pciNext;
+  PCNRITEM pciParent = NULL;
   UINT iDrvNum;
   ULONG ulDriveMapMask;
@@ -1749 +1741 @@
 } // FillTreeCnr
 
-
 /**
  * Empty all records from a container and free associated storage and
@@ -1759 +1750 @@
   PFIELDINFO pfi;
 
-#if 0 // fixme to be gone or to be configurable
+#if 0 // FIXME to be gone or to be configurable
   {
     int state = _heapchk();
@@ -1768 +1759 @@
 
   // Remove all records
-  RemoveCnrItems(hwnd, NULL, 0, CMA_FREE);
+  if (RemoveCnrItems(hwnd, NULL, 0, CMA_FREE))
+    Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__,"RemoveCnrItems");
 
   // Remove field info descriptors
@@ -1786 +1778 @@
 VOID FreeCnrItemData(PCNRITEM pci)
 {
-
   // 2015-08-23 SHL FIXME debug
   if ((pci->pszSubject && (ULONG)pci->pszSubject < 0x10000) ||
@@ -1798 +1789 @@
   }
 
+# ifdef PMPRINTF
+  {
+    PSZ psz = pci->pszFileName;
+    if (!psz)
+      psz = "(NULL)";
+    else if (psz == NullStr)
+      psz = "NullStr";
+    PmPrintf_Report(pszSrcFile, __LINE__, "FreeCnrItemData freeing pci %p data for fileName \"%.260s\"",
+                    pci, psz);
+  }
+# endif
+
   if (pci->pszSubject) {
     if (pci->pszSubject != NullStr)
@@ -1823 +1826 @@
   }
 
-#if 1 // 2009-09-26 SHL FIXME debug dup free complaints
+#if 0 // 2009-09-26 SHL FIXME debug dup free complaints
   if (!pci->pszFileName)
     Runtime_Error(pszSrcFile, __LINE__, "FreeCnrItemData attempting to free %p data twice", pci);
@@ -1832 +1835 @@
   }
 #else
+# if 0                  // FIXME to be gone
   {
-    // 2015-08-23 SHL FIXME to work again now that Flesh/Stubby on thread
-    #define HIST_COUNT 50
+    static BOOL first;
+    if (!first) {
+      first=1;
+      DebugHereIAm();
+    }
+  }
+# endif
+  {
+    // Add CNRITEM to history list
+    // 2015-08-23 SHL FIXME to verify OK now that Flesh/Stubby on thread
+    #define HIST_CNT 5000
+    static INT volatile iHistLock;              // Cheap spin lock
     static struct {
       PCNRITEM pci;
       PSZ pszFileName;
-    } history[HIST_COUNT];
-    static volatile UINT iHistNdx;
-    UINT i;
+    } histList[HIST_CNT];
+    static volatile UINT iHistNdx;              // Last used
+    UINT iCurNdx;
 
     if (!pci->pszFileName) {
       // Looks like pci was already freed
-      // Try to locate original file name in history buffer
-      for (i = 0; i < HIST_COUNT && pci != history[i].pci; i++) { }     // Scan
-      if (i < HIST_COUNT) {
-        Runtime_Error(pszSrcFile, __LINE__, "FreeCnrItemData attempting to free %p data twice, fileName was %.260s",
-                      pci, history[i].pszFileName);
+      // Try to locate original file name in history list
+      for (iCurNdx = 0; iCurNdx < HIST_CNT && pci != histList[iCurNdx].pci; iCurNdx++) { }      // Scan
+      if (iCurNdx < HIST_CNT) {
+        PSZ psz = histList[iCurNdx].pszFileName;
+#       ifdef PMPRINTF
+        PmPrintf_Report(pszSrcFile, __LINE__, "FreeCnrItemData attempting to free %p data twice, fileName was \"%.260s\"",
+                       pci, psz == NullStr ? "NullStr" : psz);
+#       endif
+        Runtime_Error(pszSrcFile, __LINE__, "FreeCnrItemData attempting to free %p data twice, fileName was \"%.260s\"",
+                      pci, psz == NullStr ? "NullStr" : psz);
       } else {
+
+#       ifdef PMPRINTF
+        PmPrintf_Report(pszSrcFile, __LINE__, "FreeCnrItemData attempting to free %p data twice", pci);
+#       endif
         Runtime_Error(pszSrcFile, __LINE__, "FreeCnrItemData attempting to free %p data twice", pci);
       }
     }
     else {
+      // Add to history list
       PSZ psz;
       PSZ *ppsz;
-      // Grab a history slot
+      static PSZ pszNull = "(NULL)";
       // This should work well enoungh to prevent MT/SMP conflicts
-      for (;;) {
-        i = iHistNdx;
-        if (++i >= HIST_COUNT)
-          i = 0;
-        if (++iHistNdx >= HIST_COUNT)
-          iHistNdx = 0;
-        if (i == iHistNdx) break;
-      }
-      ppsz = &history[iHistNdx].pszFileName;
+      for (; ++iHistLock > 1; iHistLock--)
+        DosSleep(0);                    // Spin if list locked
+      if (++iHistNdx >= HIST_CNT)
+        iHistNdx = 0;
+      ppsz = &histList[iHistNdx].pszFileName;
       psz = *ppsz;
-      if (psz)
+      if (psz && psz != NullStr && psz != pszNull)
         free(psz);
-      if (pci->pszFileName && pci->pszFileName != NullStr)
-        *ppsz = strdup(pci->pszFileName);
+      if (pci->pszFileName) {
+         if (pci->pszFileName != NullStr)
+           *ppsz = strdup(pci->pszFileName);
+        else
+           *ppsz = NullStr;
+      }
       else
-        *ppsz = NULL;
-      history[iHistNdx].pci = pci;
+        *ppsz = pszNull;
+      histList[iHistNdx].pci = pci;
+      iHistLock--;
+
       if (pci->pszFileName != NullStr)
         free(pci->pszFileName);
@@ -1902 +1928 @@
 VOID FreeCnrItem(HWND hwnd, PCNRITEM pci)
 {
+# ifdef PMPRINTF
+  PmPrintf_Report(pszSrcFile, __LINE__, "FreeCnrItem freeing pci %p");
+# endif
+
   FreeCnrItemData(pci);
 
@@ -1949 +1979 @@
  * Remove item(s) from container and free associated storage if requested
  * @param pciFirst points to first item to remove or NULL to remove all
- * @param usCnt is remove count or 0 to remove all
- * @returns count of items remaining in container or -1 if error
+ * @param usCnt is 0 to remove all or 1 to remove specific record
+ * @param usFlags for CM_REMOVERECORD
+ * @returns count of items remaining to delete or -1 if error
  */
 
@@ -1957 +1988 @@
   INT remaining = usCnt;
   BOOL bIdlePrioritySet = FALSE;
-  // #define RCI_ITEMS_PER_TIMER_CHECK (10)
-  // 10 seems a very conservative number
-  //  USHORT usTimerCheckCountdown      = RCI_ITEMS_PER_TIMER_CHECK;
   PCNRITEM pci;
-  PCNRITEM pciPrevious;
   ITIMER_DESC itdSleep = { 0 };         // 30 May 11 GKY
 
-  if ((usCnt && !pciFirst) || (!usCnt && pciFirst)) {
-      Runtime_Error(pszSrcFile, __LINE__, "pciFirst %p usCnt %u mismatch", pciFirst, usCnt);
+  // Counted remove requires pciFirst and can only remove 1 record
+  // Remove all does not allow pciFirst
+  if ((usCnt && !pciFirst) || (usCnt != 1 && pciFirst)) {
+    Runtime_Error(pszSrcFile, __LINE__, "pciFirst %p usCnt %u mismatch", pciFirst, usCnt);
+    remaining = -1;
+  }
+  else if (!usFlags & CMA_FREE) {
+    Runtime_Error(pszSrcFile, __LINE__, "usFlags must have CMA_FREE set");
+    remaining = -1;
+  }
+  else if (!pciFirst) {
+    // Removing all - query first
+    pciFirst = (PCNRITEM)WinSendMsg(hwnd, CM_QUERYRECORD, MPVOID,
+                                    MPFROM2SHORT(CMA_FIRST, CMA_ITEMORDER));
+    if ((INT)pciFirst == -1) {
+      Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__,"CM_QUERYRECORD");
       remaining = -1;
-  }
-  else {
-    // Free our buffers if free requested
-    if (usFlags & CMA_FREE) {
-      if (pciFirst)
-        pci = pciFirst;
-      else {
-        pci = (PCNRITEM)WinSendMsg(hwnd, CM_QUERYRECORD, MPVOID,
-                                   MPFROM2SHORT(CMA_FIRST, CMA_ITEMORDER));
-        if ((INT)pci == -1) {
-          Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__,"CM_QUERYRECORD");
-          remaining = -1;
-          pci = NULL;
-        }
-      }
-      InitITimer(&itdSleep, 500);
-      while (pci) {
-        FreeCnrItemData(pci);
-        if (usCnt > 0)
-          pciPrevious = pci;
-        pci = (PCNRITEM)pci->rc.preccNextRecord;
-        if (!pci)
-          break;
-        if (usCnt > 0 && pciPrevious && pciPrevious->pciPrevious) {
-          pciPrevious->pciPrevious->rc.preccNextRecord = (MINIRECORDCORE *) pci;
-          pci->pciPrevious = pciPrevious->pciPrevious;
-          pciPrevious->pciPrevious = NULL;
-          pciPrevious->rc.preccNextRecord = NULL;
-        }
-        if (remaining && --remaining == 0)
-          break;
-        if (!bIdlePrioritySet) {
-          bIdlePrioritySet = !IdleIfNeeded(&itdSleep, 30);
-        }
-      } // while
-      if (bIdlePrioritySet)
-        priority_normal();
-
-      DosPostEventSem(CompactSem);
-    }
-  }
-  if (remaining != - 1) {
+    }
+  }
+
+  InitITimer(&itdSleep, 500);
+
+# ifdef PMPRINTF
+  PmPrintf_Report(pszSrcFile, __LINE__, "RemoveCnrItems freeing data pciFirst %p usCnt %d remaining %d",
+                  pciFirst, usCnt, remaining);
+# endif
+
+  // Free data
+  // 2020-01-28 SHL Rework to use CMA_NEXT - preccNextRecord method was never reliable
+  pci = pciFirst;
+  while (pci && (INT)pci != -1) {
+    FreeCnrItemData(pci);
+    if (remaining && --remaining == 0)
+      break;                    // pci point to last CNRITEM to be deleted
+    pci = WinSendMsg(hwnd, CM_QUERYRECORD, MPFROMP(pci),
+                     MPFROM2SHORT(CMA_NEXT, CMA_ITEMORDER));
+    if (!bIdlePrioritySet)
+      bIdlePrioritySet = !IdleIfNeeded(&itdSleep, 30);
+  } // while
+
+  if (bIdlePrioritySet)
+    priority_normal();
+
+  DosPostEventSem(CompactSem);
+
+  // Free CNRITEM record(s) if OK so far
+  if (remaining != -1 && pciFirst && (INT)pciFirst != -1) {
+#   ifdef PMPRINTF
+    PmPrintf_Report(pszSrcFile, __LINE__, "RemoveCnrItems CM_REMOVERECORD pciFirst %p usCnt %d", pciFirst, usCnt);
+#   endif
     remaining = (INT)WinSendMsg(hwnd, CM_REMOVERECORD, MPFROMP(&pciFirst), MPFROM2SHORT(usCnt, usFlags));
-    if (remaining == -1) {
+    if (remaining == -1)
       Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__,"CM_REMOVERECORD hwnd %x pci %p cnt %u", hwnd, pciFirst, usCnt);
-    }
+    else if (usCnt == 0 && remaining != 0)
+      Runtime_Error(pszSrcFile, __LINE__, "%u records remain after CM_REMOVERECORD", remaining);
   }
 

trunk/dll/flesh.c

@@ -6 +6 @@
   Drive tree container management
 
-  Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2005, 2015 Steven H. Levine
+  Copyright (c) 1993-1998 M. Kimes
+  Copyright (c) 2005-2020 Steven H. Levine
 
   24 May 05 SHL Rework Win_Error usage
@@ -38 +38 @@
   23 Aug 15 GKY Fixed code to notify on drive with no subdirectories in first 64 entries
   20 Sep 15 GKY Add code for Flesh to skip the directory entry added by Stubby (eliminate
-                use of NULL/Nullstr pszFileNames by Stubby). Add code in Stubby to insert a
-                complete container item. Add a flag to indicate when a directory needed to be
-                Fleshed
+                use of NULL/Nullstr pszFileNames by Stubby). Add code in Stubby to insert a
+                complete container item. Add a flag to indicate when a directory needed to be
+                Fleshed
   26 Sep 15 GKY Changes to speed up ExpandAll
   26 Sep 15 GKY WaitFleshWorkListEmpty now gives error message and returns if semaphore request
-                fails more than 5 consecutive times.
+                fails more than 5 consecutive times.
   27 Sep 15 GKY DosSleep times in WaitFleshWorkListEmpty set by caller
   10 Oct 15 GKY Don't use Flesh thread for floppy drive scans fix them getting mistakenly identified
-                as directories and add nonexistent subdirectories.
+                as directories and add nonexistent subdirectories.
+  25 Jan 20 SHL Complain if AddFleshWorkRequest returns empty string
+  27 Jan 20 SHL Avoid more traps if passed bogus pciParent
 
 ***********************************************************************/
@@ -81 +83 @@
 
 #ifdef PMPRINTF
-#define  _PMPRINTF_                     // Enable debug macros
+#define _PMPRINTF_                      // Enable debug macros
 #include "PMPRINTF.H"
 #endif
@@ -92 +94 @@
 static INT tidFleshWorkListThread = -1; // 2015-08-08 SHL
 
-static PCSZ pszFleshFocusPath;  // 2015-08-20 SHL
+static PCSZ pszFleshFocusPath;          // 2015-08-20 SHL
 
 #pragma data_seg(GLOBAL1)
@@ -193 +195 @@
                 ri.cRecordsInsert = 1;
                 ri.fInvalidateRecord = FALSE;
-                if (!WinSendMsg(hwndCnr,
+                if (!WinSendMsg(hwndCnr,
                                 CM_INSERTRECORD, MPFROMP(pciL), MPFROMP(&ri)))
                   FreeCnrItem(hwndCnr, pciL);
@@ -223 +225 @@
  * @param hwnCnr is container to receive CNRITEMs
  * @param pciParent is CNRITEM to have children inserted
- * @return TRUE if OK, FALSE is error detected
+ * @return TRUE if OK, FALSE if error detected
  */
 
@@ -241 +243 @@
   if (!pciParent->fleshed) {
     pciL = (PCNRITEM)WinSendMsg(hwndCnr,
-                                CM_QUERYRECORD,
-                                MPFROMP(pciParent),
-                                MPFROM2SHORT(CMA_FIRSTCHILD, CMA_ITEMORDER));
+                                CM_QUERYRECORD,
+                                MPFROMP(pciParent),
+                                MPFROM2SHORT(CMA_FIRSTCHILD, CMA_ITEMORDER));
     // Added by Stubby to create plus sign run Stubby on it here and skip it in ProcessDirectory
     if (pciL && (INT)pciL != -1) {
       AddFleshWorkRequest(hwndCnr, pciL, eStubby);
-      // 2015-08-06 SHL FIXME to ensure this can not happen
-      if (!*pciL->pszFileName || !strcmp(pciL->pszFileName, NullStr))
-        Runtime_Error(pszSrcFile, __LINE__, "Flesh called with pci %p pszFileName (null)",
-                      pciL);
+      /* Under some condtions AddFleshWorkRequest will return before pciL is populated
+         2015-08-06 SHL FIXME to ensure pciL->szFileName not empty string
+         2020-01-25 SHL FIXME to ensure pciL->szFileName not null
+      */
+      if (!pciL->pszFileName || !*pciL->pszFileName || !strcmp(pciL->pszFileName, NullStr))
+        DosSleep(250);
+      if (!pciL->pszFileName || !*pciL->pszFileName || !strcmp(pciL->pszFileName, NullStr)) {
+        Runtime_Error(pszSrcFile, __LINE__, "Flesh called with pci %p pszFileName %p = %s",
+                      pciL,
+                      pciL ? pciL->pszFileName : 0,
+                      pciL ? pciL->pszFileName ? pciL->pszFileName : "(null)" : "(null)");
+        return FALSE;
+      }
+
     }
     dcd = INSTDATA(hwndCnr);
@@ -269 +281 @@
                      dcd,
                      NULL,              // total files
-                     NULL,               // total bytes
-                     (pciL && (INT)pciL != -1) ? pciL->pszDisplayName : 0);
+                     NULL,              // total bytes
+                     (pciL && (INT)pciL != -1) ? pciL->pszDisplayName : 0);
     pciParent->fleshed = TRUE;
     return TRUE;
@@ -296 +308 @@
                                 MPFROM2SHORT(CMA_FIRSTCHILD, CMA_ITEMORDER));
     if (!pciL || (INT)pciL == -1)
-      break;   
+      break;
     RemoveCnrItems(hwndCnr, pciL, 1, CMA_FREE);
     removed = TRUE;
@@ -305 +317 @@
                CM_INVALIDATERECORD,
                MPFROMP(&pciParent),
-               MPFROM2SHORT(1, CMA_ERASE | CMA_REPOSITION));
+               MPFROM2SHORT(1, CMA_ERASE | CMA_REPOSITION));
     pciParent->fleshed = FALSE;
     DosSleep(1); // Let container items go away
@@ -347 +359 @@
   static BOOL brokenlan = FALSE, isbroken = FALSE;
 
-  if (!pciParent || (INT)pciParent == -1 || !*pciParent->pszFileName
-      || pciParent->pszFileName == NullStr || !hwndCnr)
+  // 2020-01-27 SHL FIXME to doc how can get here with unitialized pciParent
+  if (!pciParent || (INT)pciParent == -1||
+      !pciParent->pszFileName ||
+      !*pciParent->pszFileName ||
+      pciParent->pszFileName == NullStr ||
+      !hwndCnr) {
     return FALSE;
+  }
+
   // Build wildcard
   len = strlen(pciParent->pszFileName);
@@ -507 +525 @@
               (pffb->achName[1] != '.' || pffb->achName[2]))))
         {
-          // Got directory other than . or .. (or a file)
+          // Got directory other than . or .. (or a file)
           isadir = TRUE;
           break;
@@ -530 +548 @@
           }
           else {
-            RECORDINSERT ri;
-            CHAR szBuffer[CCHMAXPATH + 14];
-            CHAR *p;
-            HPOINTER hptr;
-
-            p = strchr(wildcard, '*');
-            *p = 0;;
-            BldFullPathName(szBuffer, wildcard, pffb->achName);
-            pci->pszFileName =  xstrdup(szBuffer, pszSrcFile, __LINE__); 
-            p = strrchr(pci->pszFileName, '\\');
-            p++;
-            pci->pszDisplayName = p; 
-            pci->rc.pszIcon = pci->pszDisplayName;
-            if (fForceUpper)
-              strupr(pci->pszFileName);
-            else if (fForceLower)
-              strlwr(pci->pszFileName);
-          
-            flags = driveflags[toupper(*pci->pszFileName) - 'A'];
-          
-            // get an icon to use with it
-            if (pffb->attrFile & FILE_DIRECTORY) {
-              // is directory
-              if (fNoIconsDirs ||
-                  (flags & DRIVE_NOLOADICONS) ||
-                  !isalpha(*pci->pszFileName)) {
-                hptr = (HPOINTER) 0;
-              }
-              else
-                hptr = WinLoadFileIcon(pci->pszFileName, FALSE);
-            }
-            else {
-              // is file
-              if (fNoIconsFiles ||
-                  (flags & DRIVE_NOLOADICONS) ||
-                  !isalpha(*pci->pszFileName)) {
-                hptr = (HPOINTER) 0;
-              }
-              else
-                hptr = WinLoadFileIcon(pci->pszFileName, FALSE);
-          
-              if (!hptr || IsDefaultIcon(hptr))
-                hptr = IDFile(pci->pszFileName);
-            }
-          
-            if (!hptr) {
-              hptr = pffb->attrFile & FILE_DIRECTORY ?
-                     hptrDir : pffb->attrFile & FILE_SYSTEM ?
-                     hptrSystem : pffb->attrFile & FILE_HIDDEN ?
-                     hptrHidden : pffb->attrFile & FILE_READONLY ?
-                     hptrReadonly : hptrFile;
-            }
-            pci->rc.hptrIcon = hptr;
+            RECORDINSERT ri;
+            CHAR szBuffer[CCHMAXPATH + 14];
+            CHAR *p;
+            HPOINTER hptr;
+
+            p = strchr(wildcard, '*');
+            *p = 0;;
+            BldFullPathName(szBuffer, wildcard, pffb->achName);
+            pci->pszFileName = xstrdup(szBuffer, pszSrcFile, __LINE__);
+            p = strrchr(pci->pszFileName, '\\');
+            p++;
+            pci->pszDisplayName = p;
+            pci->rc.pszIcon = pci->pszDisplayName;
+            if (fForceUpper)
+              strupr(pci->pszFileName);
+            else if (fForceLower)
+              strlwr(pci->pszFileName);
+
+            flags = driveflags[toupper(*pci->pszFileName) - 'A'];
+
+            // get an icon to use with it
+            if (pffb->attrFile & FILE_DIRECTORY) {
+              // is directory
+              if (fNoIconsDirs ||
+                  (flags & DRIVE_NOLOADICONS) ||
+                  !isalpha(*pci->pszFileName)) {
+                hptr = (HPOINTER) 0;
+              }
+              else
+                hptr = WinLoadFileIcon(pci->pszFileName, FALSE);
+            }
+            else {
+              // is file
+              if (fNoIconsFiles ||
+                  (flags & DRIVE_NOLOADICONS) ||
+                  !isalpha(*pci->pszFileName)) {
+                hptr = (HPOINTER) 0;
+              }
+              else
+                hptr = WinLoadFileIcon(pci->pszFileName, FALSE);
+
+              if (!hptr || IsDefaultIcon(hptr))
+                hptr = IDFile(pci->pszFileName);
+            }
+
+            if (!hptr) {
+              hptr = pffb->attrFile & FILE_DIRECTORY ?
+                     hptrDir : pffb->attrFile & FILE_SYSTEM ?
+                     hptrSystem : pffb->attrFile & FILE_HIDDEN ?
+                     hptrHidden : pffb->attrFile & FILE_READONLY ?
+                     hptrReadonly : hptrFile;
+            }
+            pci->rc.hptrIcon = hptr;
             memset(&ri, 0, sizeof(RECORDINSERT));
             ri.cb = sizeof(RECORDINSERT);
@@ -590 +608 @@
             ri.cRecordsInsert = 1;
             ri.fInvalidateRecord = TRUE;
-            if (!WinSendMsg(hwndCnr,
+            if (!WinSendMsg(hwndCnr,
                             CM_INSERTRECORD, MPFROMP(pci), MPFROMP(&ri))) {
               // Assume busy and try again
-              DosSleep(50); 
+              DosSleep(50);
               WinSetFocus(HWND_DESKTOP, hwndCnr);
-              if (WinIsWindow((HAB)0, hwndCnr)) {
+              if (WinIsWindow((HAB)0, hwndCnr)) {
                 if (!WinSendMsg(hwndCnr,
                                 CM_INSERTRECORD, MPFROMP(pci), MPFROMP(&ri))) {
@@ -602 +620 @@
                   FreeCnrItem(hwndCnr, pci);
                 }
-                else
-                  ok = TRUE;
+                else
+                  ok = TRUE;
               }
             }
@@ -652 +670 @@
 
 HMTX hmtxFleshWork;
-HEV  hevFleshWorkListChanged;
+HEV hevFleshWorkListChanged;
 
 /**
@@ -691 +709 @@
  */
 
-
 BOOL AddFleshWorkRequest(HWND hwndCnr, PCNRITEM pci, FLESHWORKACTION action)
 {
@@ -702 +719 @@
     return FALSE;
 
-
   xDosRequestMutexSem(hmtxFleshWork, SEM_INDEFINITE_WAIT);
 
@@ -749 +765 @@
  * @parse pszFileName is dependent pathName
  */
-
 
 VOID WaitFleshWorkListEmpty(PCSZ pszDirName, ULONG ulSleep)
@@ -761 +776 @@
   INT rcCount = 0;
 
-  if (tid == 1 || tid == tidFleshWorkListThread) { // 11 Oct 15 GKY Fixme did we intend to keep this
+  // 11 Oct 15 GKY FIXME did we intend to keep this
+  if (tid == 1 || tid == tidFleshWorkListThread) {
     Runtime_Error(pszSrcFile, __LINE__, "WaitFleshWorkListEmpty called by tid %u", tid);
-    return;             // Avoid hang
+    return;                             // Avoid hang
   }
   // Can not wait if call from thread 1 or FleshWorkListThread
@@ -775 +791 @@
       rc = xDosRequestMutexSem(hmtxFleshWork, SEM_INDEFINITE_WAIT);
       if (rc) {
-        rcCount++;
-        if (rcCount < 6)
-          continue;                     // Maybe should return ???
-        else {
-          Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
-                    PCSZ_DOSREQUESTMUTEXSEM);
-          return;
-        }
+        rcCount++;
+        if (rcCount < 6)
+          continue;                     // Maybe should return ???
+        else {
+          Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
+                    PCSZ_DOSREQUESTMUTEXSEM);
+          return;
+        }
 
       }
@@ -800 +816 @@
       if (!item) {
         if (waited)
-          DosSleep(ulSleep);            // Let PM do some work
+          DosSleep(ulSleep);            // Let PM do some work
         break;                          // Dependents gone from work list
       }
@@ -871 +887 @@
           if (!item) {
             xfree((PSZ)pszFleshFocusPath, pszSrcFile, __LINE__);
-            pszFleshFocusPath = NULL;           // Revert to normal
+            pszFleshFocusPath = NULL;   // Revert to normal
           }
           else
@@ -886 +902 @@
         // Wait for new items to be added to list
         if (!item) {
-          ULONG ul;
-          xDosWaitEventSem(hevFleshWorkListChanged, SEM_INDEFINITE_WAIT);
-          xDosResetEventSem(hevFleshWorkListChanged, &ul);
-          continue;
+          ULONG ul;
+          xDosWaitEventSem(hevFleshWorkListChanged, SEM_INDEFINITE_WAIT);
+          xDosResetEventSem(hevFleshWorkListChanged, &ul);
+          continue;
         }
 
-        if (WinIsWindow((HAB)0, item->hwndCnr)) {
+        if (WinIsWindow((HAB)0, item->hwndCnr)) {
 
           switch (item->action) {
-          case eUnFlesh:
-            UnFlesh(item->hwndCnr, item->pci);
+          case eUnFlesh:
+            UnFlesh(item->hwndCnr, item->pci);
             break;
           case eFleshEnv:
@@ -902 +918 @@
             break;
           case eStubby:
-            priority_bumped();
-            Stubby(item->hwndCnr, item->pci);
-            priority_normal();
+            priority_bumped();
+            Stubby(item->hwndCnr, item->pci);
+            priority_normal();
             break;
           case eFlesh:
@@ -915 +931 @@
           } // switch
 
-
         } // if window
 

trunk/dll/init.c

@@ -218 +218 @@
 #include "systemf.h"                    // runemf2
 
-#if 0
-#define  __PMPRINTF__
+#ifdef PMPRINTF
+#define  _PMPRINTF_                     // Enable debug macros
 #include "PMPRINTF.H"
 #endif
@@ -748 +748 @@
   }
 
-#if 0
+#ifdef PMPRINTF
   PmPrintfDisplayInterfaceVersionInfo();
   PmPrintfQueueNameThisProcess(NULL);
@@ -940 +940 @@
         strcpy(inipath, profile);
       }
-    } //fixme the DosCopies probably fail if the INI isn't in the FM2 directory GKY 06 Aug 11
+    } // FIXME the DosCopies probably fail if the INI isn't in the FM2 directory GKY 06 Aug 11
     if (!*inipath)
       strcpy(inipath, profile);
@@ -953 +953 @@
         fWantFirstTimeInit = TRUE;
     }
-    if (!fWantFirstTimeInit) { //Check the ini file header and restore from backup if corupted
+    if (!fWantFirstTimeInit) {
+      // Check the ini file header and restore from backup if corupted
       if (!CheckFileHeader(inipath, "\xff\xff\xff\xff\x14\x00\x00\x00", 0L)) {
         saymsg(MB_ENTER,HWND_DESKTOP, GetPString(IDS_DEBUG_STRING),
@@ -984 +985 @@
     }
 
-    // 10 Jan 08 SHL fixme to do first time if new ini
+    // 10 Jan 08 SHL FIXME to do first time if new ini
     // 10 Jan 08 SHL post UM_FIRSTTIME to main window
     if (!fmprof) {
@@ -1225 +1226 @@
   prntabspaces = 8;
   CollectorsortFlags = sortFlags = SORT_FILENAME | SORT_DIRSFIRST;
-  //Get default Country info
+  // Get default Country info
   {
     COUNTRYCODE Country    = {0};
@@ -1261 +1262 @@
       fLVM = TRUE;
 
-    //Check for unlock.exe
+    // Check for unlock.exe
     if (!xDosQueryAppType(PCSZ_UNLOCKEXE, &ulAppType))
       fUnlock = TRUE;
@@ -1324 +1325 @@
   editor = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
   if (!editor)
-    return 0; //already complained
+    return 0; // already complained
   viewer = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
   if (!viewer)
-    return 0; //already complained
+    return 0; // already complained
   virus = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
   if (!virus)
-    return 0; //already complained
+    return 0; // already complained
   compare = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
   if (!compare)
-    return 0; //already complained
+    return 0; // already complained
   binview = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
   if (!binview)
-    return 0; //already complained
+    return 0; // already complained
   bined = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
   if (!bined)
-    return 0; //already complained
+    return 0; // already complained
   dircompare = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
   if (!dircompare)
-    return 0; //already complained
+    return 0; // already complained
   ftprun = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
   if (!ftprun)
-    return 0; //already complained
+    return 0; // already complained
   httprun = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
   if (!httprun)
-    return 0; //already complained
+    return 0; // already complained
   mailrun = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
   if (!mailrun)
-    return 0; //already complained
+    return 0; // already complained
   pszTreeEnvVarList = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
   if (!pszTreeEnvVarList)
-    return 0; //already complained
+    return 0; // already complained
   size = sizeof(BOOL);
   PrfQueryProfileData(fmprof, FM3Str, "DontSuggestAgain", &fDontSuggestAgain, &size);
@@ -1803 +1804 @@
   int ok = 0;
 
-  // fixme to do useful check - was missing in base source
+  // FIXME to do useful check - was missing in base source
 
 #if 0