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

trunk/dll/killproc.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2005, 2006 Steven H. Levine
+  Copyright (c) 2005, 2008 Steven H. Levine
 
   24 May 05 SHL Rework Win_Error usage
@@ -19 +19 @@
   02 Sep 07 SHL Expand FillKillListThread2 stack to avoid exception in __TNK
   16 JUL 08 GKY Use TMP directory for temp files
+  10 Dec 08 SHL Integrate exception handler support
 
 ***********************************************************************/
@@ -25 +26 @@
 #include <string.h>
 #include <ctype.h>
-#include <process.h>
+// #include <process.h>
 #include <limits.h>
 
@@ -53 +54 @@
 #include "misc.h"                       // PostMsg
 #include "fortify.h"
+#include "excputil.h"                   // xbeginthread
 
 // Data definitions
@@ -451 +453 @@
       listdone = FALSE;
       if (fUseQProcStat) {
-        if (_beginthread(FillKillListThread2,
-                         NULL, 65536 + 8192, (PVOID)&hwnd) != -1)
+        if (xbeginthread(FillKillListThread2,
+                         65536 + 8192,
+                         &hwnd,
+                         pszSrcFile,
+                         __LINE__) == -1)
+        {
+          WinDismissDlg(hwnd, 0);
+        }
+        else
           DosSleep(100);                // 05 Aug 07 GKY 250
+      }
+      else if (fUseQSysState)
+        if (xbeginthread(FillKillListThread3,
+                         65536,
+                         &hwnd,
+                         pszSrcFile,
+                         __LINE__) == -1)
+        {
+          WinDismissDlg(hwnd, 0);
+        }
         else
-            WinDismissDlg(hwnd, 0);
-      }
-      else if (fUseQSysState)
-        if (_beginthread(FillKillListThread3,
-                         NULL, 65536, (PVOID) & hwnd) != -1)
           DosSleep(100);//05 Aug 07 GKY 250
+      else {
+        if (xbeginthread(FillKillListThread,
+                         65536,
+                         &hwnd,
+                         pszSrcFile,
+                         __LINE__) == -1)
+        {
+          WinDismissDlg(hwnd, 0);
+        }
         else
-            WinDismissDlg(hwnd, 0);
-      else {
-        if (_beginthread(FillKillListThread,
-                         NULL, 65536, (PVOID) & hwnd) != -1)
           DosSleep(100);                // 05 Aug 07 GKY 250
-        else
-          WinDismissDlg(hwnd, 0);
       }
       break;