Revert "RT4526: Call TerminateProcess, not ExitProcess"

This reverts commit 9c1a9ccf65d0ea1912675d3a622fa8e51b524b9e.

TerminateProcess is asynchronous, so the code as written in the above
commit is not correct. It is also probably not needed in the speed
case. Reverting in order to figure out the correct solution.

Reviewed-by: Rich Salz <rsalz@openssl.org>

diff --git a/apps/speed.c b/apps/speed.c
index f439d0d93192b7bf10d3d917cf2225a3a24e905e..3b162e1058ca28314444e8d7876319459c4a1b3e 100644 (file)
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -314,7 +314,7 @@ static double Time_F(int s)
         if (thr == NULL) {
             DWORD err = GetLastError();
             BIO_printf(bio_err, "unable to CreateThread (%lu)", err);
-            TerminateProcess(GetCurrentProcess(), err);
+            ExitProcess(err);
         }
         while (!schlock)
             Sleep(0);           /* scheduler spinlock */

diff --git a/ms/uplink.c b/ms/uplink.c
index 2096f2cacf56c299275a6cf98cf6d22c36ba63c6..7f7abfbe57eb985433b2155153ebbf5ca2de77c6 100644 (file)
--- a/ms/uplink.c
+++ b/ms/uplink.c
@@ -28,7 +28,7 @@ static TCHAR msg[128];
 static void unimplemented(void)
 {
     OPENSSL_showfatal(sizeof(TCHAR) == sizeof(char) ? "%s\n" : "%S\n", msg);
-    TerminateProcess(GetCurrentProcess(), 1);
+    ExitProcess(1);
 }
 
 void OPENSSL_Uplink(volatile void **table, int index)