libfreerdp-utils: remove wait_obj dependency in thread util

diff --git a/include/freerdp/utils/thread.h b/include/freerdp/utils/thread.h
index ef92627..4ab09bd 100644 (file)
--- a/include/freerdp/utils/thread.h
+++ b/include/freerdp/utils/thread.h
@@ -22,7 +22,6 @@
 
 #include <freerdp/api.h>
 #include <freerdp/types.h>
-#include <freerdp/utils/wait_obj.h>
 
 #ifndef _WIN32
 #include <pthread.h>
@@ -47,15 +46,15 @@ FREERDP_API void freerdp_thread_start(freerdp_thread* thread, void* func, void*
 FREERDP_API void freerdp_thread_stop(freerdp_thread* thread);
 FREERDP_API void freerdp_thread_free(freerdp_thread* thread);
 
-#define freerdp_thread_wait(_t) wait_obj_select(_t->signals, _t->num_signals, -1)
-#define freerdp_thread_wait_timeout(_t, _timeout) wait_obj_select(_t->signals, _t->num_signals, _timeout)
-#define freerdp_thread_is_stopped(_t) wait_obj_is_set(_t->signals[0])
+#define freerdp_thread_wait(_t) ((WaitForMultipleObjects(_t->num_signals, _t->signals, FALSE, INFINITE) == WAIT_FAILED) ? -1 : 0)
+#define freerdp_thread_wait_timeout(_t, _timeout) ((WaitForMultipleObjects(_t->num_signals, _t->signals, FALSE, _timeout) == WAIT_FAILED) ? -1 : 0)
+#define freerdp_thread_is_stopped(_t) (WaitForSingleObject(_t->signals[0], 0) == WAIT_OBJECT_0)
 #define freerdp_thread_is_running(_t) (_t->status == 1)
 #define freerdp_thread_quit(_t) do { \
        _t->status = -1; \
-       wait_obj_clear(_t->signals[0]); } while (0)
-#define freerdp_thread_signal(_t) wait_obj_set(_t->signals[1])
-#define freerdp_thread_reset(_t) wait_obj_clear(_t->signals[1])
+       ResetEvent(_t->signals[0]); } while (0)
+#define freerdp_thread_signal(_t) SetEvent(_t->signals[1])
+#define freerdp_thread_reset(_t) ResetEvent(_t->signals[1])
 #define freerdp_thread_lock(_t) WaitForSingleObject(_t->mutex, INFINITE)
 #define freerdp_thread_unlock(_t) ReleaseMutex(_t->mutex)
 

diff --git a/libfreerdp/utils/thread.c b/libfreerdp/utils/thread.c
index ff3188e..3f78e21 100644 (file)
--- a/libfreerdp/utils/thread.c
+++ b/libfreerdp/utils/thread.c
@@ -46,8 +46,8 @@ freerdp_thread* freerdp_thread_new(void)
        ZeroMemory(thread, sizeof(freerdp_thread));
 
        thread->mutex = CreateMutex(NULL, FALSE, NULL);
-       thread->signals[0] = wait_obj_new();
-       thread->signals[1] = wait_obj_new();
+       thread->signals[0] = CreateEvent(NULL, TRUE, FALSE, NULL);
+       thread->signals[1] = CreateEvent(NULL, TRUE, FALSE, NULL);
        thread->num_signals = 2;
 
        return thread;
@@ -74,9 +74,9 @@ void freerdp_thread_stop(freerdp_thread* thread)
 {
        int i = 0;
 
-       wait_obj_set(thread->signals[0]);
+       SetEvent(thread->signals[0]);
 
-       while (thread->status > 0 && i < 1000)
+       while ((thread->status > 0) && (i < 1000))
        {
                i++;
                freerdp_usleep(100000);
@@ -88,7 +88,7 @@ void freerdp_thread_free(freerdp_thread* thread)
        int i;
 
        for (i = 0; i < thread->num_signals; i++)
-               wait_obj_free(thread->signals[i]);
+               CloseHandle(thread->signals[i]);
 
        thread->num_signals = 0;