Changeset 1335 for trunk/dll/collect.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/collect.c (modified) (11 diffs)

trunk/dll/collect.c

@@ +1 @@
+
 /***********************************************************************
 
@@ -52 +53 @@
                 DIRCNRDATA struct) into a new struct: DETAILS_SETTINGS.
   20 Jul 08 GKY Add save/append filename to clipboard.
-                Change menu wording to make these easier to find
+                Change menu wording to make these easier to find
   25 Aug 08 GKY Check TMP directory space warn if lee than 5 MiB prevent archiver from opening if
-                less than 10 KiB (It hangs and can't be closed)
+                less than 10 KiB (It hangs and can't be closed)
+  10 Dec 08 SHL Integrate exception handler support
 
 ***********************************************************************/
@@ -63 +65 @@
 #include <share.h>
 #include <limits.h>
-#include <process.h>                    // _beginthread
+// #include <process.h>                 // _beginthread
 
 #define INCL_DOS                        // QSV_MS_COUNT
@@ -87 +89 @@
 #include "notebook.h"                   // CfgDlgProc
 #include "command.h"                    // RunCommand
-#include "worker.h"                     // Action, MassAction
-#include "notify.h"                     // AddNote
-#include "misc.h"                       // AdjustCnrColsForPref, AdjustDetailsSwitches, CnrDirectEdit,
+#include "worker.h"             // Action, MassAction
+#include "notify.h"             // AddNote
+#include "misc.h"               // AdjustCnrColsForPref, AdjustDetailsSwitches, CnrDirectEdit,
                                         // LoadDetailsSwitches, OpenEdit, QuickPopup, SayFilter
                                         // SaySort, SayView, SetCnrCols, SetDetailsSwitches
@@ -97 +99 @@
 #include "collect.h"
 #include "common.h"                     // CommonCnrProc, CommonCreateTextChildren, CommonFrameWndProc
-                                        // CommonTextPaint
+                                // CommonTextPaint
 #include "select.h"                     // DeselectAll, HideAll, RemoveAll, SelectAll, SelectList
 #include "dirsize.h"                    // DirSizeProc
@@ -128 +130 @@
 #include "wrappers.h"                   // xDosFindFirst
 #include "fortify.h"
+#include "excputil.h"                   // xbeginthread
 
 // Data definitions
@@ -981 +984 @@
           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);
@@ -1018 +1024 @@
           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);
@@ -1452 +1461 @@
                    MPFROMLONG(CMA_XVERTSPLITBAR));
 
-        if (_beginthread(MakeObjWin, NULL, 245760, (PVOID)dcd) == -1) {
+        if (xbeginthread(MakeObjWin,
+                         245760,
+                         dcd,
+                         pszSrcFile,
+                         __LINE__) == -1)
+        {
           Runtime_Error(pszSrcFile, __LINE__,
                         GetPString(IDS_COULDNTSTARTTHREADTEXT));
@@ -1495 +1509 @@
         OpenDirCnr(HWND_DESKTOP, hwndMain, dcd->hwndFrame, FALSE, (PSZ) mp1);
       else if (mp1 && IsFile(mp1) == 1 &&
-               CheckDriveSpaceAvail(ArcTempRoot, ullDATFileSpaceNeeded, ullTmpSpaceNeeded) != 2)
+               CheckDriveSpaceAvail(ArcTempRoot, ullDATFileSpaceNeeded, ullTmpSpaceNeeded) != 2)
         StartArcCnr(HWND_DESKTOP,
                     dcd->hwndFrame, (CHAR *)mp1, 4, (ARC_TYPE *) mp2);
@@ -2196 +2210 @@
               switch (SHORT1FROMMP(mp1)) {
               case IDM_DOITYOURSELF:
-              case IDM_APPENDTOCLIP:
-              case IDM_APPENDTOCLIPFILENAME:
+              case IDM_APPENDTOCLIP:
+              case IDM_APPENDTOCLIPFILENAME:
               case IDM_SAVETOCLIP:
-              case IDM_SAVETOCLIPFILENAME:
+              case IDM_SAVETOCLIPFILENAME:
               case IDM_ARCHIVE:
               case IDM_ARCHIVEM: