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

trunk/dll/comp.c

@@ +1 @@
+
 /***********************************************************************
 
@@ -57 +58 @@
                 DIRCNRDATA struct) into a new struct: DETAILS_SETTINGS.
   08 Sep 08 SHL Avoid aliased pszLongName pointer in ActionCnrThread IDM_MOVE
+  10 Dec 08 SHL Integrate exception handler support
 
 ***********************************************************************/
@@ -64 +66 @@
 #include <share.h>
 #include <io.h>
-#include <process.h>                    // _beginthread
+// #include <process.h>                 // _endthread
 
 #define INCL_DOS
@@ -111 +113 @@
 #include "notebook.h"                   // External compare/dircompare
 #include "commafmt.h"                   // CommaFmtULL
-#include "fortify.h"                    // 06 May 08 SHL
+#include "fortify.h"                    // 06 May 08 SHL added
+#include "excputil.h"                   // xbeginthread
 
 typedef struct
@@ -385 +388 @@
         break;
       }
-      if (_beginthread(CompareFilesThread, NULL, 65536, (PVOID)fc) == -1) {
-        Runtime_Error(pszSrcFile, __LINE__,
-                      GetPString(IDS_COULDNTSTARTTHREADTEXT));
+      if (xbeginthread(CompareFilesThread,
+                       65536,
+                       fc,
+                       pszSrcFile,
+                       __LINE__) == -1)
+      {
         WinDismissDlg(hwnd, 0);
       }
@@ -1515 +1521 @@
     Fortify_LeaveScope();
 #    endif
-    _endthread();
+    return;                             // 10 Dec 08 SHL was _endthread
   }
 
@@ -2696 +2702 @@
         *forthread = *cmp;
         forthread->cmp = cmp;
-        if (_beginthread(FillCnrsThread, NULL, 122880, (PVOID)forthread) ==
-            -1) {
-          Runtime_Error(pszSrcFile, __LINE__,
-                        GetPString(IDS_COULDNTSTARTTHREADTEXT));
+        if (xbeginthread(FillCnrsThread,
+                         122880,
+                         forthread,
+                         pszSrcFile,
+                         __LINE__) == -1)
+        {
           WinDismissDlg(hwnd, 0);
           free(forthread);
@@ -2981 +2989 @@
               strcpy(sf->dirname, cmp->rightdir);
             sf->recurse = cmp->includesubdirs;
-            if (_beginthread(StartSnap, NULL, 65536, (PVOID)sf) == -1) {
-              Runtime_Error(pszSrcFile, __LINE__,
-                            GetPString(IDS_COULDNTSTARTTHREADTEXT));
+            if (xbeginthread(StartSnap,
+                             65536,
+                             sf,
+                             pszSrcFile,
+                             __LINE__) == -1)
+            {
               free(sf);
             }
@@ -3032 +3043 @@
           forthread->cmp = cmp;
           forthread->action = SHORT1FROMMP(mp1);
-          if (_beginthread(ActionCnrThread, NULL, 122880, (PVOID)forthread)
-              == -1) {
-            Runtime_Error(pszSrcFile, __LINE__,
-                          GetPString(IDS_COULDNTSTARTTHREADTEXT));
+          if (xbeginthread(ActionCnrThread,
+                           122880,
+                           forthread,
+                           pszSrcFile,
+                           __LINE__) == -1)
+          {
             free(forthread);
           }
@@ -3155 +3168 @@
           forthread->cmp = cmp;
           forthread->action = SHORT1FROMMP(mp1);
-          if (_beginthread(SelectCnrsThread, NULL, 65536, (PVOID)forthread)
-              == -1) {
-            Runtime_Error(pszSrcFile, __LINE__,
-                          GetPString(IDS_COULDNTSTARTTHREADTEXT));
+          if (xbeginthread(SelectCnrsThread,
+                           65536,
+                           forthread,
+                           pszSrcFile,
+                           __LINE__) == -1)
+          {
             free(forthread);
           }