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

trunk/dll/mle.c

@@ -7 +7 @@
 
   Copyright (c) 1993-97 M. Kimes
-  Copyright (c) 2004, 2007 Steven H.Levine
+  Copyright (c) 2004, 2008 Steven H.Levine
 
   01 Aug 04 SHL Rework lstrip/rstrip usage
@@ -21 +21 @@
   22 Jun 08 GKY Fixed memory buffer access after it had been freed
   06 Jul 08 GKY Rework LoadThread logic with Steven's help
+  10 Dec 08 SHL Integrate exception handler support
 
 ***********************************************************************/
@@ -28 +29 @@
 #include <ctype.h>
 #include <share.h>
-#include <process.h>                    // _beginthread
+// #include <process.h>                 // _beginthread
 
 #define INCL_DOS
@@ -55 +56 @@
 #include "misc.h"                       // PostMsg
 #include "fortify.h"
+#include "excputil.h"                   // xbeginthread
 
 static PSZ pszSrcFile = __FILE__;
@@ -60 +62 @@
 #define FAKEROT 1
 #define DOROT13(c)     (!isalpha((c)))?(c):((((c) >= (char) 'A') && \
-        ((c) <= (char) 'M')) || (((c) >= (char) 'a') && ((c) <= (char) 'm')))?((c) + (char) 0xd)\
-        :((((c) >= (char) 'N') && ((c) <= (char) 'Z')) || (((c) >= (char) 'n') && ((c) <= (char) 'z')))?\
-        ((c) - (char) 0xd):(c)
+        ((c) <= (char) 'M')) || (((c) >= (char) 'a') && ((c) <= (char) 'm')))?((c) + (char) 0xd)\
+        :((((c) >= (char) 'N') && ((c) <= (char) 'Z')) || (((c) >= (char) 'n') && ((c) <= (char) 'z')))?\
+        ((c) - (char) 0xd):(c)
 
 /*((FAKEROT==0)?(c):(FAKEROT==1)?(!isalpha((c)))?(c):((((c) >= (char) 'A') && \
-        ((c) <= (char) 'M')) || (((c) >= (char) 'a') && ((c) <= (char) 'm')))?((c) + (char) 0xd)\
-        :((((c) >= (char) 'N') && ((c) <= (char) 'Z')) || (((c) >= (char) 'n') && ((c) <= (char) 'z')))?\
-        ((c) - (char) 0xd):(c):((c) >= (char) '!') ? ((((c) + (char) 47) > (char) '~') ? ((c) - (char) 47) :\
-        ((c) + (char) 47)) : (c))*/
+        ((c) <= (char) 'M')) || (((c) >= (char) 'a') && ((c) <= (char) 'm')))?((c) + (char) 0xd)\
+        :((((c) >= (char) 'N') && ((c) <= (char) 'Z')) || (((c) >= (char) 'n') && ((c) <= (char) 'z')))?\
+        ((c) - (char) 0xd):(c):((c) >= (char) '!') ? ((((c) + (char) 47) > (char) '~') ? ((c) - (char) 47) :\
+        ((c) + (char) 47)) : (c))*/
 
 LONG MLEgetlinetext(HWND h, LONG l, CHAR * buf, INT maxlen)
@@ -196 +198 @@
         bstripcr(temp);
         if (*temp) {
-          if (ftp) {
-            if (fFtpRunWPSDefault) {
-              CHAR WPSDefaultFtpRun[CCHMAXPATH], WPSDefaultFtpRunDir[CCHMAXPATH];
-
-              size = sizeof(WPSDefaultFtpRun);
-              PrfQueryProfileData(HINI_USERPROFILE, "WPURLDEFAULTSETTINGS",
-                                  "DefaultBrowserExe", WPSDefaultFtpRun, &size);
-              size = sizeof(WPSDefaultFtpRunDir);
-              PrfQueryProfileData(HINI_USERPROFILE, "WPURLDEFAULTSETTINGS",
-                                  "DefaultWorkingDir", WPSDefaultFtpRunDir, &size);
-              runemf2(SEPARATE | WINDOWED,
-                      h, pszSrcFile, __LINE__,
-                      WPSDefaultFtpRunDir,
-                      fLibPathStrictFtpRun ? "SET LIBPATHSTRICT=TRUE" : NULL,
-                      "%s %s", WPSDefaultFtpRun, temp);
-            }
-            else
-              runemf2(SEPARATE | WINDOWED,
-                      h, pszSrcFile, __LINE__,
-                      ftprundir, NULL, "%s %s", ftprun, temp);
-          }
-          else
-            if (fHttpRunWPSDefault) {
-              CHAR WPSDefaultHttpRun[CCHMAXPATH], WPSDefaultHttpRunDir[CCHMAXPATH];
-
-              size = sizeof(WPSDefaultHttpRun);
-              PrfQueryProfileData(HINI_USERPROFILE, "WPURLDEFAULTSETTINGS",
-                                  "DefaultBrowserExe", WPSDefaultHttpRun, &size);
-              size = sizeof(WPSDefaultHttpRunDir);
-              PrfQueryProfileData(HINI_USERPROFILE, "WPURLDEFAULTSETTINGS",
-                                  "DefaultWorkingDir", WPSDefaultHttpRunDir, &size);
-              runemf2(SEPARATE | WINDOWED,
-                      h, pszSrcFile, __LINE__,
-                      WPSDefaultHttpRunDir,
-                      fLibPathStrictHttpRun ? "SET LIBPATHSTRICT=TRUE" : NULL,
-                      "%s %s", WPSDefaultHttpRun, temp);
-            }
-            else
-              runemf2(SEPARATE | WINDOWED,
-                      h, pszSrcFile, __LINE__,
-                      httprundir, NULL, "%s %s", httprun, temp);
+          if (ftp) {
+            if (fFtpRunWPSDefault) {
+              CHAR WPSDefaultFtpRun[CCHMAXPATH], WPSDefaultFtpRunDir[CCHMAXPATH];
+
+              size = sizeof(WPSDefaultFtpRun);
+              PrfQueryProfileData(HINI_USERPROFILE, "WPURLDEFAULTSETTINGS",
+                                  "DefaultBrowserExe", WPSDefaultFtpRun, &size);
+              size = sizeof(WPSDefaultFtpRunDir);
+              PrfQueryProfileData(HINI_USERPROFILE, "WPURLDEFAULTSETTINGS",
+                                  "DefaultWorkingDir", WPSDefaultFtpRunDir, &size);
+              runemf2(SEPARATE | WINDOWED,
+                      h, pszSrcFile, __LINE__,
+                      WPSDefaultFtpRunDir,
+                      fLibPathStrictFtpRun ? "SET LIBPATHSTRICT=TRUE" : NULL,
+                      "%s %s", WPSDefaultFtpRun, temp);
+            }
+            else
+              runemf2(SEPARATE | WINDOWED,
+                      h, pszSrcFile, __LINE__,
+                      ftprundir, NULL, "%s %s", ftprun, temp);
+          }
+          else
+            if (fHttpRunWPSDefault) {
+              CHAR WPSDefaultHttpRun[CCHMAXPATH], WPSDefaultHttpRunDir[CCHMAXPATH];
+
+              size = sizeof(WPSDefaultHttpRun);
+              PrfQueryProfileData(HINI_USERPROFILE, "WPURLDEFAULTSETTINGS",
+                                  "DefaultBrowserExe", WPSDefaultHttpRun, &size);
+              size = sizeof(WPSDefaultHttpRunDir);
+              PrfQueryProfileData(HINI_USERPROFILE, "WPURLDEFAULTSETTINGS",
+                                  "DefaultWorkingDir", WPSDefaultHttpRunDir, &size);
+              runemf2(SEPARATE | WINDOWED,
+                      h, pszSrcFile, __LINE__,
+                      WPSDefaultHttpRunDir,
+                      fLibPathStrictHttpRun ? "SET LIBPATHSTRICT=TRUE" : NULL,
+                      "%s %s", WPSDefaultHttpRun, temp);
+            }
+            else
+              runemf2(SEPARATE | WINDOWED,
+                      h, pszSrcFile, __LINE__,
+                      httprundir, NULL, "%s %s", httprun, temp);
         }
       }
@@ -609 +611 @@
           free(buffer);
 #         ifdef FORTIFY
-          Fortify_LeaveScope();
+          Fortify_LeaveScope();
 #          endif
         }
@@ -813 +815 @@
       }
       else
-        PostMsg(bkg->hwndReport, bkg->msg, MPVOID, MPVOID);
+        PostMsg(bkg->hwndReport, bkg->msg, MPVOID, MPVOID);
       DecrThreadUsage();
       WinTerminate(thab);
@@ -826 +828 @@
   Fortify_LeaveScope();
 #  endif
-  _endthread();
+  // _endthread();                      // 10 Dec 08 SHL
 }
 
@@ -837 +839 @@
 
   BKGLOAD *bkg;
-  INT rc;
 
   bkg = xmallocz(sizeof(BKGLOAD), pszSrcFile, __LINE__);
@@ -848 +849 @@
   bkg->h = h;
   strcpy(bkg->filename, filename);
-  rc = _beginthread(LoadThread, NULL, 65536, bkg);
-  if (rc == -1)
-    Runtime_Error(pszSrcFile, __LINE__,
-                  GetPString(IDS_COULDNTSTARTTHREADTEXT));
-  return rc;
+  return xbeginthread(LoadThread,
+                      65536,
+                      bkg,
+                      pszSrcFile,
+                      __LINE__);
 }