Revert "[threads] Make OSEvent alertable to fix bug #51653" (#4346)

[mono.git] / mono / utils / os-event-win32.c

diff --git a/mono/utils/os-event-win32.c b/mono/utils/os-event-win32.c
index 33fb867d654e01ea6811ad317e7fd1bd24fc7262..e28833c0d8f1141623cfe8ccbc41a65787fa83c7 100644 (file)
--- a/mono/utils/os-event-win32.c
+++ b/mono/utils/os-event-win32.c
@@ -64,14 +64,14 @@ mono_os_event_reset (MonoOSEvent *event)
 }
 
 MonoOSEventWaitRet
-mono_os_event_wait_one (MonoOSEvent *event, guint32 timeout, gboolean alertable)
+mono_os_event_wait_one (MonoOSEvent *event, guint32 timeout)
 {
        DWORD res;
 
        g_assert (event);
        g_assert (event->handle);
 
-       res = WaitForSingleObjectEx (event->handle, timeout, alertable);
+       res = WaitForSingleObjectEx (event->handle, timeout, TRUE);
        if (res == WAIT_OBJECT_0)
                return MONO_OS_EVENT_WAIT_RET_SUCCESS_0;
        else if (res == WAIT_IO_COMPLETION)
@@ -85,7 +85,7 @@ mono_os_event_wait_one (MonoOSEvent *event, guint32 timeout, gboolean alertable)
 }
 
 MonoOSEventWaitRet
-mono_os_event_wait_multiple (MonoOSEvent **events, gsize nevents, gboolean waitall, guint32 timeout, gboolean alertable)
+mono_os_event_wait_multiple (MonoOSEvent **events, gsize nevents, gboolean waitall, guint32 timeout)
 {
        DWORD res;
        gpointer handles [MONO_OS_EVENT_WAIT_MAXIMUM_OBJECTS];
@@ -96,7 +96,7 @@ mono_os_event_wait_multiple (MonoOSEvent **events, gsize nevents, gboolean waita
        g_assert (nevents <= MONO_OS_EVENT_WAIT_MAXIMUM_OBJECTS);
 
        if (nevents == 1)
-               return mono_os_event_wait_one (events [0], timeout, alertable);
+               return mono_os_event_wait_one (events [0], timeout);
 
        for (i = 0; i < nevents; ++i) {
                g_assert (events [i]);
@@ -104,7 +104,7 @@ mono_os_event_wait_multiple (MonoOSEvent **events, gsize nevents, gboolean waita
                handles [i] = events [i]->handle;
        }
 
-       res = WaitForMultipleObjectsEx (nevents, handles, waitall, timeout, alertable);
+       res = WaitForMultipleObjectsEx (nevents, handles, waitall, timeout, TRUE);
        if (res >= WAIT_OBJECT_0 && res < WAIT_OBJECT_0 + MONO_OS_EVENT_WAIT_MAXIMUM_OBJECTS)
                return MONO_OS_EVENT_WAIT_RET_SUCCESS_0 + (res - WAIT_OBJECT_0);
        else if (res == WAIT_IO_COMPLETION)