Changeset 1077

Timestamp:

07/18/08 20:11:54 (3 months ago)

Author:

stevenhl

Message:

Enhance Fortify infrastructure
Add Fortify_SetOwner Fortify_ChangeOwner Fortify_ChangeScope
Add FORTIFY_VERBOSE_SCOPE_ENTER_EXIT support
Add more fm/2 Fortify tooling and rework existing tooling for correct nesting
Still lots to do for cross-thread allocations
Add misc.h
Add walkem.h

Location:

trunk

Files:

• dll/arccnrs.c (modified) (28 diffs)
• dll/collect.c (modified) (31 diffs)
• dll/dircnrs.c (modified) (20 diffs)
• dll/filldir.c (modified) (3 diffs)
• dll/fortify.c (modified) (10 diffs)
• dll/fortify.h (modified) (5 diffs)
• dll/init.c (modified) (7 diffs)
• dll/killproc.c (modified) (7 diffs)
• dll/mainwnd.c (modified) (191 diffs)
• dll/makelist.c (modified) (4 diffs)
• dll/makelist.h (modified) (2 diffs)
• dll/misc.c (modified) (8 diffs)
• dll/misc.h (added)
• dll/objwin.c (modified) (2 diffs)
• dll/treecnr.c (modified) (23 diffs)
• dll/ufortify.h (modified) (2 diffs)
• dll/walkem.c (modified) (11 diffs)
• dll/walkem.h (added)
• dll/worker.c (modified) (10 diffs)
• fm3.c (modified) (4 diffs)

trunk/dll/arccnrs.c

@@ -339 +339 @@
   if (pai->pszFileName && pai->pszFileName != NullStr) {
     psz = pai->pszFileName;
-    pai->pszFileName = NULL;
+    pai->pszFileName = NULL;            // 08 Jul 08 SHL was NulStr
     free(psz);
   }
@@ -1230 +1230 @@
 
   switch (msg) {
+  case WM_CREATE:
+    DbgMsg(pszSrcFile, __LINE__, "WM_CREATE mp1 %p mp2 %p", mp1, mp2);  // 18 Jul 08 SHL fixme
+    break;
+
   case DM_PRINTOBJECT:
   case DM_DISCARDOBJECT:
@@ -1347 +1351 @@
 
   case UM_SETUP:
+#   ifdef FORTIFY
+    Fortify_EnterScope();
+#   endif
     dcd = WinQueryWindowPtr(hwnd, QWL_USER);
     if (!dcd) {
@@ -1353 +1360 @@
     }
     else {
+#     ifdef FORTIFY
+      Fortify_ChangeOwner(dcd);
+#     endif
       /* set unique id */
       WinSetWindowUShort(hwnd, QWS_ID, ARCOBJ_FRAME + (ARC_FRAME - dcd->id));
@@ -1500 +1510 @@
 
       if (li && li->list && li->list[0]) {
-        printf("%x/r", li->type); fflush(stdout);
+        printf("%x/r", li->type); fflush(stdout);
         switch (li->type) {
         case IDM_ARCHIVE:
@@ -1565 +1575 @@
         case IDM_DELETE:
           {
-            CHAR *endofit;
-            PSZ pszCmdLine;
+            CHAR *endofit;
+            PSZ pszCmdLine;
             INT z;
             CHECKLIST ck;
@@ -1592 +1602 @@
             li->list = ck.list;
             if (!li->list || !li->list[0])
-              break;
-            pszCmdLine = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
-            if (!pszCmdLine)
-              break;
+              break;
+            pszCmdLine = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
+            if (!pszCmdLine)
+              break;
             strcpy(pszCmdLine, li->type == IDM_DELETE ?
                          dcd->info->delete :
@@ -1613 +1623 @@
                       (fArcStuffVisible ? 0 : BACKGROUND | MINIMIZED),
                       hwnd, pszSrcFile, __LINE__, NullStr, NULL, "%s", pszCmdLine);
-              *endofit = 0;
-              free(pszCmdLine);
+              *endofit = 0;
+              free(pszCmdLine);
             } while (li->list[x]);
             PostMsg(dcd->hwndCnr, UM_RESCAN, MPFROMSHORT(1), MPVOID);
@@ -1639 +1649 @@
         case IDM_OPENSETTINGS:
           {
-            CHAR *endofit, *ptr;
-            PSZ pszCmdLine;
+            CHAR *endofit, *ptr;
+            PSZ pszCmdLine;
             INT z;
             if ((li->type == IDM_EXTRACT && !li->info->extract) ||
@@ -1699 +1709 @@
             }
             if (!li->list || !li->list[0])
-              break;
-            pszCmdLine = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
-            if (!pszCmdLine)
-              break;
+              break;
+            pszCmdLine = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
+            if (!pszCmdLine)
+              break;
             strcpy(pszCmdLine,
                    (li->type == IDM_EXTRACT ||
@@ -1739 +1749 @@
                       (fArcStuffVisible ? 0 : BACKGROUND | MINIMIZED) |
                       WAIT, hwnd, pszSrcFile, __LINE__,
-                      li->targetpath, NULL, "%s", pszCmdLine);
+                      li->targetpath, NULL, "%s", pszCmdLine);
               *endofit = 0;
             } while (li->list[x]);
@@ -1757 +1767 @@
                 p = xmalloc(strlen(temp) + strlen(li->targetpath) + 2,
                             pszSrcFile, __LINE__);
-                if (p) {
-                  BldFullPathName(p, li->targetpath, temp);
+                if (p) {
+                  BldFullPathName(p, li->targetpath, temp);
                   /*strcpy(p, li->targetpath);
                   if (p[strlen(p) - 1] != '\\')
@@ -1827 +1837 @@
                     }
                   }
-                }
+                }
                 BldFullPathName(pszCmdLine, li->targetpath, li->list[x]);
                 temp = li->list[x];
-                li->list[x] = xstrdup(pszCmdLine, pszSrcFile, __LINE__);
+                li->list[x] = xstrdup(pszCmdLine, pszSrcFile, __LINE__);
                 if (!li->list[x])
                   li->list[x] = temp;
                 else
                   xfree(temp, pszSrcFile, __LINE__);
-              }
-              free(pszCmdLine);
+              }
+              free(pszCmdLine);
               if (li->type == IDM_VIEW || li->type == IDM_EDIT) {
 
@@ -1856 +1866 @@
               if (li->type == IDM_MCIPLAY) {
 
-                FILE *fp;
-                CHAR szTempFile[CCHMAXPATH];
-
-                BldFullPathName(szTempFile, pTmpDir, "$FM2PLAY.$$$");
+                FILE *fp;
+                CHAR szTempFile[CCHMAXPATH];
+
+                BldFullPathName(szTempFile, pTmpDir, "$FM2PLAY.$$$");
                 fp = xfopen(szTempFile, "w", pszSrcFile, __LINE__);
                 if (fp) {
@@ -1866 +1876 @@
                     fprintf(fp, "%s\n", li->list[x]);
                   fprintf(fp, ";end\n");
-                  fclose(fp);
-                  strrev(szTempFile);
-                  strcat(szTempFile, "@/");
-                  strrev(szTempFile);
+                  fclose(fp);
+                  strrev(szTempFile);
+                  strcat(szTempFile, "@/");
+                  strrev(szTempFile);
                   RunFM2Util("FM2PLAY.EXE", szTempFile);
                 }
@@ -1913 +1923 @@
                        li->type == IDM_OPENSETTINGS) {
                 WORKER *wk;
-#               ifdef FORTIFY
-                Fortify_EnterScope();
-#               endif
+#               ifdef FORTIFY
+                Fortify_EnterScope();
+#               endif
                 wk = xmallocz(sizeof(WORKER), pszSrcFile, __LINE__);
                 if (!wk)
-                  FreeListInfo(li);
+                  FreeListInfo(li);
                 else {
-                  wk->size = sizeof(WORKER);
-                  wk->hwndCnr = dcd->hwndCnr;
-                  wk->hwndParent = dcd->hwndParent;
-                  wk->hwndFrame = dcd->hwndFrame;
-                  wk->hwndClient = dcd->hwndClient;
-                  wk->li = li;
-                  strcpy(wk->directory, dcd->directory);
-                  if (_beginthread(Action, NULL, 122880, (PVOID) wk) == -1) {
-                    Runtime_Error(pszSrcFile, __LINE__,
-                                  GetPString(IDS_COULDNTSTARTTHREADTEXT));
-                    free(wk);
-                    FreeListInfo((LISTINFO *) mp1);
-#                   ifdef FORTIFY
-                    Fortify_LeaveScope();
-#                   endif
-                  }
-        }
-
+                  wk->size = sizeof(WORKER);
+                  wk->hwndCnr = dcd->hwndCnr;
+                  wk->hwndParent = dcd->hwndParent;
+                  wk->hwndFrame = dcd->hwndFrame;
+                  wk->hwndClient = dcd->hwndClient;
+                  wk->li = li;
+                  strcpy(wk->directory, dcd->directory);
+                  if (_beginthread(Action, NULL, 122880, (PVOID) wk) == -1) {
+                    Runtime_Error(pszSrcFile, __LINE__,
+                                  GetPString(IDS_COULDNTSTARTTHREADTEXT));
+                    free(wk);
+                    FreeListInfo((LISTINFO *) mp1);
+                  }
+                }
+#               ifdef FORTIFY
+                Fortify_LeaveScope();
+#               endif
               }
               else {
@@ -1954 +1963 @@
                     else
                       viewtype = 0;
+#                   ifdef FORTIFY
+                    Fortify_EnterScope();
+#                   endif
                     temp = xstrdup(li->list[x], pszSrcFile, __LINE__);
                     if (temp) {
@@ -1964 +1976 @@
                         free(temp);
                     }
+#                   ifdef FORTIFY
+                    DosSleep(1);        // Allow MassAction to take ownership
+                    Fortify_LeaveScope();
+#                   endif
                   }
                 }
@@ -2020 +2036 @@
       if (li->type != IDM_OPENDEFAULT && li->type != IDM_OPENSETTINGS)
       {
-        FreeListInfo(li);
+        FreeListInfo(li);
       }
     }
@@ -2045 +2061 @@
       free(dcd);
 #     ifdef FORTIFY
-      //Fortify_LeaveScope();
-#      endif
+      Fortify_LeaveScope();
+#     endif
       WinSetWindowPtr(dcd->hwndCnr, QWL_USER, NULL);
     }
@@ -2592 +2608 @@
 
       if ((INT)mp1 == 5 || (INT)mp1 == 13 || (INT)mp1 == 21)
-        hwnd = StartViewer(HWND_DESKTOP, (INT)mp1,
-                           (CHAR *)mp2, dcd->hwndFrame);
+        hwnd = StartViewer(HWND_DESKTOP, (INT)mp1,
+                           (CHAR *)mp2, dcd->hwndFrame);
       else
-        hwnd = StartMLEEditor(dcd->hwndParent,
-                              (INT)mp1, (CHAR *)mp2, dcd->hwndFrame);
+        hwnd = StartMLEEditor(dcd->hwndParent,
+                              (INT)mp1, (CHAR *)mp2, dcd->hwndFrame);
       free((CHAR *)mp2);
       return MRFROMLONG(hwnd);
@@ -2953 +2969 @@
         {
           LISTINFO *li;
-#         ifdef FORTIFY
-          Fortify_EnterScope();
-#          endif
+#         ifdef FORTIFY
+          Fortify_EnterScope();
+#         endif
           li = xmallocz(sizeof(LISTINFO), pszSrcFile, __LINE__);
           if (li) {
@@ -3015 +3031 @@
             case IDM_VIRUSSCAN:
             case IDM_OPENDEFAULT:
-            case IDM_OPENSETTINGS:
-            case IDM_MCIPLAY:
+            case IDM_OPENSETTINGS:
+            case IDM_MCIPLAY:
               strcpy(li->targetpath, dcd->workdir);
               break;
@@ -3031 +3047 @@
                 UnHilite(hwnd, TRUE, &dcd->lastselection, 0);
             }
-            else {
+            else {
               free(li);
-#             ifdef FORTIFY
-              Fortify_LeaveScope();
-#              endif
-            }
-          }
+            }
+          }
+#         ifdef FORTIFY
+          Fortify_LeaveScope();
+#         endif
         }
         break;
@@ -3509 +3525 @@
 #     ifdef FORTIFY
       Fortify_EnterScope();
-#      endif
+#     endif
       dcd = xmallocz(sizeof(DIRCNRDATA), pszSrcFile, __LINE__);
       if (!dcd) {
@@ -3519 +3535 @@
         dcd->id = id;
         dcd->type = ARC_FRAME;
-        if (!pTmpDir) {
-          save_dir2(dcd->workdir);
-          if (dcd->workdir[strlen(dcd->workdir) - 1] != '\\')
-            strcat(dcd->workdir, "\\");
-          sprintf(dcd->workdir + strlen(dcd->workdir), "%s.%03x",
-                  ArcTempRoot, (clock() & 4095));
-        }
-        else
-          sprintf(dcd->workdir, "%s.%03x",
-                  ArcTempRoot, (clock() & 4095));
+        if (!pTmpDir) {
+          save_dir2(dcd->workdir);
+          if (dcd->workdir[strlen(dcd->workdir) - 1] != '\\')
+            strcat(dcd->workdir, "\\");
+          sprintf(dcd->workdir + strlen(dcd->workdir), "%s.%03x",
+                  ArcTempRoot, (clock() & 4095));
+        }
+        else
+          sprintf(dcd->workdir, "%s.%03x",
+                  ArcTempRoot, (clock() & 4095));
         strcpy(dcd->arcname, fullname);
         if (*extractpath) {
@@ -3598 +3614 @@
                      IDS_WINCREATEWINDOW);
           PostMsg(hwndClient, WM_CLOSE, MPVOID, MPVOID);
-          free(dcd);
-#         ifdef FORTIFY
-          Fortify_LeaveScope();
-#          endif
+          free(dcd);
           hwndFrame = (HWND) 0;
         }
@@ -3692 +3705 @@
         }
       }
+#     ifdef FORTIFY
+      Fortify_LeaveScope();
+#     endif
     }
   }

trunk/dll/collect.c

@@ -50 +50 @@
   06 Jul 08 GKY Update delete/undelete to include move to and open XWP trashcan
   11 Jul 08 JBS Ticket 230: Simplified code and eliminated some local variables by incorporating
-                all the details view settings (both the global variables and those in the
-                DIRCNRDATA struct) into a new struct: DETAILS_SETTINGS.
+                all the details view settings (both the global variables and those in the
+                DIRCNRDATA struct) into a new struct: DETAILS_SETTINGS.
 
 ***********************************************************************/
@@ -78 +78 @@
 #include "tmrsvcs.h"                    // ITIMER_DESC
 #include "notebook.h"                   // CfgDlgProc
-#include "command.h"                    // RunCommand
+#include "command.h"                    // RunCommand
 #include "fm3dll.h"
 
@@ -466 +466 @@
   switch (msg) {
   case WM_CREATE:
+    // 18 Jul 08 SHL fixme to doc why messsage gets lost
+    DbgMsg(pszSrcFile, __LINE__, "WM_CREATE mp1 %p mp2 %p", mp1, mp2);  // 18 Jul 08 SHL fixme
     break;
 
@@ -505 +507 @@
 
   case UM_SETUP:
+#   ifdef FORTIFY
+    Fortify_EnterScope();
+#   endif
     dcd = WinQueryWindowPtr(hwnd, QWL_USER);
     if (dcd) {
+#     ifdef FORTIFY
+      Fortify_ChangeOwner(dcd);
+#     endif
       /* set unique id */
       WinSetWindowUShort(hwnd,
@@ -601 +609 @@
             nm = 1;
             hdir = HDIR_CREATE;
-            DosError(FERR_DISABLEHARDERR);
-            if (FindCnrRecord(dcd->hwndCnr,
+            DosError(FERR_DISABLEHARDERR);
+            if (FindCnrRecord(dcd->hwndCnr,
                               li->list[x],
                               NULL,
                               FALSE,
                               FALSE,
-                              TRUE)) {
-              pci = UpdateCnrRecord(dcd->hwndCnr, li->list[x], FALSE, dcd);
-              if (Filter((PMINIRECORDCORE) pci, (PVOID) & dcd->mask)) {
-                pci->rc.flRecordAttr &= ~CRA_FILTERED;
-                WinSendMsg(dcd->hwndCnr, CM_INVALIDATERECORD, MPVOID,
-                           MPFROM2SHORT(0, CMA_REPOSITION | CMA_ERASE));
-              }
-              pci = (PCNRITEM) pci->rc.preccNextRecord;
+                              TRUE)) {
+              pci = UpdateCnrRecord(dcd->hwndCnr, li->list[x], FALSE, dcd);
+              if (Filter((PMINIRECORDCORE) pci, (PVOID) & dcd->mask)) {
+                pci->rc.flRecordAttr &= ~CRA_FILTERED;
+                WinSendMsg(dcd->hwndCnr, CM_INVALIDATERECORD, MPVOID,
+                           MPFROM2SHORT(0, CMA_REPOSITION | CMA_ERASE));
+              }
+              pci = (PCNRITEM) pci->rc.preccNextRecord;
               if (pciP)
                 pciP->rc.preccNextRecord = (PMINIRECORDCORE) pci;
               else
-                pciFirst = pci;
-            }
+                pciFirst = pci;
+            }
             else if (*li->list[x] &&
                 !DosQueryPathInfo(li->list[x], FIL_QUERYFULLNAME,
@@ -631 +639 @@
                                &fb4, sizeof(fb4), &nm, FIL_QUERYEASIZEL)) {
               DosFindClose(hdir);
-              priority_normal();
-                *fb4.achName = 0;
-                ullTotalBytes = FillInRecordFromFFB(dcd->hwndCnr,
-                                                    pci,
+              priority_normal();
+                *fb4.achName = 0;
+                ullTotalBytes = FillInRecordFromFFB(dcd->hwndCnr,
+                                                    pci,
                                                     fullname, &fb4, FALSE, dcd);
-                dcd->ullTotalBytes += ullTotalBytes;
-                pciP = pci;
-                pci = (PCNRITEM) pci->rc.preccNextRecord;
+                dcd->ullTotalBytes += ullTotalBytes;
+                pciP = pci;
+                pci = (PCNRITEM) pci->rc.preccNextRecord;
             }
             else {
@@ -647 +655 @@
                 pciP->rc.preccNextRecord = (PMINIRECORDCORE) pci;
               else
-                pciFirst = pci;
-              if (pciT)
-                FreeCnrItemData(pciT); // FreeCnrItem(hwnd, pciT);
+                pciFirst = pci;
+              if (pciT)
+                FreeCnrItemData(pciT); // FreeCnrItem(hwnd, pciT);
               ulMaxFiles--;             // Remember gone
             }
@@ -680 +688 @@
   case UM_COLLECTFROMFILE:
     dcd = WinQueryWindowPtr(hwnd, QWL_USER);
+#   ifdef FORTIFY
+    Fortify_EnterScope();
+#   endif
+
     if (dcd && mp1) {
       FILESTATUS4L fs4;
@@ -690 +702 @@
       size_t c;
 
+#     ifdef FORTIFY
+      Fortify_ChangeOwner(mp1);
+#     endif
+
       fp = _fsopen((CHAR *)mp1, "r", SH_DENYNO);
       if (fp) {
@@ -722 +738 @@
             }
             /* fullname now contains name of file to collect */
-            DosError(FERR_DISABLEHARDERR);
-            if (FindCnrRecord(dcd->hwndCnr,
+            DosError(FERR_DISABLEHARDERR);
+            if (FindCnrRecord(dcd->hwndCnr,
                               fullname,
                               NULL,
                               FALSE,
                               FALSE,
-                              TRUE)) {
-              pci = UpdateCnrRecord(dcd->hwndCnr, fullname, FALSE, dcd);
-              if (Filter((PMINIRECORDCORE) pci, (PVOID) & dcd->mask)) {
-                pci->rc.flRecordAttr &= ~CRA_FILTERED;
-                WinSendMsg(dcd->hwndCnr, CM_INVALIDATERECORD, MPVOID,
-                           MPFROM2SHORT(0, CMA_REPOSITION | CMA_ERASE));
-              }
-              /*pci = (PCNRITEM) pci->rc.preccNextRecord;
+                              TRUE)) {
+              pci = UpdateCnrRecord(dcd->hwndCnr, fullname, FALSE, dcd);
+              if (Filter((PMINIRECORDCORE) pci, (PVOID) & dcd->mask)) {
+                pci->rc.flRecordAttr &= ~CRA_FILTERED;
+                WinSendMsg(dcd->hwndCnr, CM_INVALIDATERECORD, MPVOID,
+                           MPFROM2SHORT(0, CMA_REPOSITION | CMA_ERASE));
+              }
+              /*pci = (PCNRITEM) pci->rc.preccNextRecord;
               if (pciP)
                 pciP->rc.preccNextRecord = (PMINIRECORDCORE) pci;
               else
-                pciFirst = pci;*/
-            }
+                pciFirst = pci;*/
+            }
             else if (IsFullName(fullname) &&
                 !IsRoot(fullname) &&
@@ -746 +762 @@
                                   FIL_QUERYEASIZEL,
                                   &fs4,
-                                  sizeof(fs4)))  {
+                                  sizeof(fs4))) {
               /* collect it */
               pci = WinSendMsg(dcd->hwndCnr,
@@ -791 +807 @@
 #   ifdef FORTIFY
     Fortify_LeaveScope();
-#    endif
+#   endif
     return 0;
 
@@ -890 +906 @@
 
   case UM_MASSACTION:
+#   ifdef FORTIFY
+    Fortify_EnterScope();
+#   endif
     if (mp1) {
+#     ifdef FORTIFY
+      Fortify_ChangeOwner(mp1);
+#     endif
       dcd = WinQueryWindowPtr(hwnd, QWL_USER);
       if (dcd) {
         WORKER *wk;
-#       ifdef FORTIFY
-        Fortify_EnterScope();
-#        endif
         wk = xmallocz(sizeof(WORKER), pszSrcFile, __LINE__);
         if (!wk)