From 18bd3f693b45626446e16e088f6f5f5c42677ce1 Mon Sep 17 00:00:00 2001
From: Eric Pouech <Eric.Pouech@wanadoo.fr>
Date: Sun, 25 Jun 2000 12:54:11 +0000
Subject: [PATCH] Fixed bad exception handler chain termination.

---
 win32/except.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/win32/except.c b/win32/except.c
index 550a6ea5e2d..889b0c881e5 100644
--- a/win32/except.c
+++ b/win32/except.c
@@ -84,7 +84,18 @@ DWORD WINAPI UnhandledExceptionFilter(PEXCEPTION_POINTERS epointers)
     req->first   = 0;
     req->context = *epointers->ContextRecord;
     if (!server_call_noerr( REQ_EXCEPTION_EVENT )) *epointers->ContextRecord = req->context;
-    if (req->status == DBG_CONTINUE) return EXCEPTION_CONTINUE_EXECUTION;
+    switch (req->status)
+    {
+    case DBG_CONTINUE: 
+       return EXCEPTION_CONTINUE_EXECUTION;
+    case DBG_EXCEPTION_NOT_HANDLED: 
+       TerminateProcess( GetCurrentProcess(), epointers->ExceptionRecord->ExceptionCode );
+       break; /* not reached */
+    case 0: /* no debugger is present */
+       break;
+    default: 	
+       FIXME("Unsupported yet debug continue value %d (please report)\n", req->status);
+    }
 
     if (pdb->top_filter)
     {
@@ -142,7 +153,7 @@ DWORD WINAPI UnhandledExceptionFilter(PEXCEPTION_POINTERS epointers)
 	  WaitForSingleObject(hEvent, INFINITE);
 	  ret = EXCEPTION_CONTINUE_SEARCH;
        } else {
-	  ERR("Couldn't start debugger (%s)\n", buffer);
+	  ERR("Couldn't start debugger (%s) (%ld)\n", buffer, GetLastError());
        }
        CloseHandle(hEvent);
     } else {