Changeset 1335 for trunk/dll/treecnr.c

Timestamp:

Dec 13, 2008, 12:49:02 AM (17 years ago)

Author:

Steven Levine

Message:

Ticket 26: Add exception handlers to all threads using xbeginthread

File:

• trunk/dll/treecnr.c (modified) (16 diffs)

trunk/dll/treecnr.c

@@ +1 @@
+
 /***********************************************************************
 
@@ -50 +51 @@
   19 Oct 08 GKY Fixed context menu to be "drives" menu on unformatted drives
   28 Nov 08 GKY Remove unneeded DosEnterCriSec calls
+  10 Dec 08 SHL Integrate exception handler support
 
 ***********************************************************************/
@@ -56 +58 @@
 #include <string.h>
 #include <ctype.h>
-#include <process.h>                    // _beginthread
+// #include <process.h>                 // _beginthread
 
 #define INCL_DOS
@@ -79 +81 @@
 #include "notebook.h"                   // CfgDlgProc
 #include "command.h"                    // RunCommand
-#include "worker.h"                     // Action, MassAction
+#include "worker.h"             // Action, MassAction
 #include "mainwnd.h"                    // BubbleHelp, FindDirCnrByName, GetNextWindowPos
 #include "misc.h"                       // CnrDirectEdit, EmphasizeButton, FindDirCnr
-                                        // FindDirCnr, FixSwitchList, OpenEdit, QuickPopup
-                                        // SetSortChecks, SwitchCommand, CheckMenu
-                                        // CurrentRecord, IsFm2Window
+                                // FindDirCnr, FixSwitchList, OpenEdit, QuickPopup
+                                // SetSortChecks, SwitchCommand, CheckMenu
+                                // CurrentRecord, IsFm2Window
 #include "common.h"                     // CommonCnrProc, CommonDriveCmd, CommonFrameWndProc
-                                        // CommonTextProc
+                                // CommonTextProc
 #include "valid.h"                      // CheckDrive, DriveFlagsOne, IsValidDrive
 #include "chklist.h"                    // DropListProc
@@ -116 +118 @@
 #include "fortify.h"
 #include "init.h"                       // GetTidForWindow
+#include "excputil.h"                   // xbeginthread
 
 // Data definitions
@@ -614 +617 @@
     // DbgMsg(pszSrcFile, __LINE__, "UM_SHOWME mp1 %p mp2 %p", mp1, mp2);       // 14 Aug 07 SHL fixme
     if (mp1) {
+#     ifdef FORTIFY
+      Fortify_BecomeOwner(mp1);
+#     endif
       dcd = INSTDATA(hwnd);
       // DbgMsg(pszSrcFile, __LINE__, "UM_SHOWME dcd %p", dcd); // 14 Aug 07 SHL fixme
@@ -809 +815 @@
       WinSendMsg(dcd->hwndCnr,
                  CM_SCROLLWINDOW,
-                 MPFROMSHORT(CMA_HORIZONTAL), MPFROMLONG(-1));
+                 MPFROMSHORT(CMA_HORIZONTAL), MPFROMLONG(-1));
       //if (!fInitialDriveScan) {
-        //DosWaitEventSem(DriveScanStart, 20000);
-         while (StubbyScanCount != 0)
-            DosSleep(50);
-        /*pulPostCt = xmallocz(sizeof(ULONG), pszSrcFile, __LINE__);
-        if (pulPostCt) {
-          DosResetEventSem(DriveScanStart, pulPostCt);
-          free(pulPostCt);
-        } */
+        //DosWaitEventSem(DriveScanStart, 20000);
+         while (StubbyScanCount != 0)
+            DosSleep(50);
+        /*pulPostCt = xmallocz(sizeof(ULONG), pszSrcFile, __LINE__);
+        if (pulPostCt) {
+          DosResetEventSem(DriveScanStart, pulPostCt);
+          free(pulPostCt);
+        } */
       //}
       //else
@@ -884 +890 @@
           wk->li = (LISTINFO *) mp1;
           strcpy(wk->directory, dcd->directory);
-          if (_beginthread(MassAction, NULL, 122880, (PVOID) wk) == -1) {
-            Runtime_Error(pszSrcFile, __LINE__,
-                          GetPString(IDS_COULDNTSTARTTHREADTEXT));
+          if (xbeginthread(MassAction,
+                           122880,
+                           wk,
+                           pszSrcFile,
+                           __LINE__) == -1)
+          {
             free(wk);
             FreeListInfo((LISTINFO *) mp1);
@@ -922 +931 @@
           wk->li = (LISTINFO *) mp1;
           strcpy(wk->directory, dcd->directory);
-          if (_beginthread(Action, NULL, 122880, (PVOID) wk) == -1) {
-            Runtime_Error(pszSrcFile, __LINE__,
-                          GetPString(IDS_COULDNTSTARTTHREADTEXT));
+          if (xbeginthread(Action,
+                           122880,
+                           wk,
+                           pszSrcFile,
+                           __LINE__) == -1)
+          {
             free(wk);
             FreeListInfo((LISTINFO *) mp1);
@@ -1130 +1142 @@
       pci = (PCNRITEM) CurrentRecord(hwnd);
       if (pci && (INT) pci != -1) {
-        if (IsRoot(pci->pszFileName) || !DosQueryFSInfo(toupper(*pci->pszFileName) - '@',
-                                                       FSIL_ALLOC, &fsa,
-                                                       sizeof(FSALLOCATE)))
+        if (IsRoot(pci->pszFileName) || !DosQueryFSInfo(toupper(*pci->pszFileName) - '@',
+                                                       FSIL_ALLOC, &fsa,
+                                                       sizeof(FSALLOCATE)))
           menuHwnd = CheckMenu(hwndMainMenu, &TreeMenu, TREE_POPUP);
         else {
@@ -1256 +1268 @@
 
   case UM_SETUP:
+#   ifdef FORTIFY
+    // Balance WM_DESTROY
+    Fortify_EnterScope();
+#   endif
+
     if (!dcd) {
       Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
@@ -1314 +1331 @@
                    MPFROMLONG(CMA_FLWINDOWATTR | CMA_LINESPACING |
                               CMA_CXTREEINDENT | CMA_PSORTRECORD));
-        if (_beginthread(MakeObjWin, NULL, 327680, (PVOID) dcd) == -1) {
-          Runtime_Error(pszSrcFile, __LINE__,
-                        GetPString(IDS_COULDNTSTARTTHREADTEXT));
+        if (xbeginthread(MakeObjWin,
+                         327680,
+                         dcd,
+                         pszSrcFile,
+                         __LINE__) == -1)
+        {
           PostMsg(hwnd, WM_CLOSE, MPVOID, MPVOID);
-          // return 0;
         }
         else
@@ -2440 +2459 @@
           pci = (PCNRITEM) CurrentRecord(hwnd);
           if (pci && (INT) pci != -1) {
-            pszTempDir = xstrdup(pci->pszFileName, pszSrcFile, __LINE__);
-            if (pszTempDir)
+            pszTempDir = xstrdup(pci->pszFileName, pszSrcFile, __LINE__);
+            if (pszTempDir)
               MakeValidDir(pszTempDir);
           }
           else
-            pszTempDir = xstrdup(pFM2SaveDirectory, pszSrcFile, __LINE__);
-          if (pszTempDir) {
-            if (WinDlgBox(HWND_DESKTOP, dcd->hwndParent,
-                          WalkAllDlgProc,
-                          FM3ModHandle, WALK_FRAME, MPFROMP(pszTempDir))) {
-              if (!WinSendMsg(hwnd, UM_SHOWME, MPFROMP(pszTempDir), MPFROMLONG(1)))
-                free(pszTempDir);
-            }
-            else
-              free(pszTempDir);
-          }
+            pszTempDir = xstrdup(pFM2SaveDirectory, pszSrcFile, __LINE__);
+          if (pszTempDir) {
+            if (WinDlgBox(HWND_DESKTOP, dcd->hwndParent,
+                          WalkAllDlgProc,
+                          FM3ModHandle, WALK_FRAME, MPFROMP(pszTempDir))) {
+              if (!WinSendMsg(hwnd, UM_SHOWME, MPFROMP(pszTempDir), MPFROMLONG(1)))
+                free(pszTempDir);
+            }
+            else
+              free(pszTempDir);
+          }
         }
         break;
@@ -3031 +3050 @@
 
   case WM_DESTROY:
+#   ifdef FORTIFY
+    DbgMsg(pszSrcFile, __LINE__, "WM_DESTROY hwnd %p TID %u", hwnd, GetTidForThread()); // 18 Jul 08 SHL fixme
+#   endif
     if (TreeCnrMenu)
       WinDestroyWindow(TreeCnrMenu);
@@ -3050 +3072 @@
     }
 #   ifdef FORTIFY
-    // if (dcd)
-    //  Fortify_ChangeScope(dcd, -1);
     Fortify_LeaveScope();
-    // if (dcd)
-    //  Fortify_ChangeScope(dcd, -1);
 #   endif
     break; // WM_DESTROY
@@ -3121 +3139 @@
         if (!WinCreateWindow(hwndFrame,
                              WC_TREEOPENBUTTON,
-                             "#303",
+                             "#303",
                              WS_VISIBLE | BS_PUSHBUTTON | BS_NOPOINTERFOCUS | BS_BITMAP,
                              ((swp.cx -