kernel32/tests: Get rid of assert() in thread.c

André Hentschel nerv at dawncrow.de
Fri Feb 21 15:07:38 CST 2014


---
 dlls/kernel32/tests/thread.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c
index ae60d88..20d7ae3 100644
--- a/dlls/kernel32/tests/thread.c
+++ b/dlls/kernel32/tests/thread.c
@@ -21,7 +21,6 @@
 /* Define _WIN32_WINNT to get SetThreadIdealProcessor on Windows */
 #define _WIN32_WINNT 0x0600
 
-#include <assert.h>
 #include <stdarg.h>
 #include <stdio.h>
 
@@ -137,34 +136,36 @@ static void init_thread_sync_helpers(void)
 static BOOL sync_threads_and_run_one(DWORD sync_id, DWORD my_id)
 {
   LONG num = InterlockedIncrement(&num_synced);
-  assert(-1 <= num && num <= 1);
   if (num == 1)
   {
       ResetEvent( stop_event );
       SetEvent( start_event );
   }
-  else
+  else if (!num || num == -1)
   {
     DWORD ret = WaitForSingleObject(start_event, 10000);
     ok(ret == WAIT_OBJECT_0, "WaitForSingleObject failed %x\n",ret);
   }
+  else
+    ok(0, "InterlockedIncrement returned %d", num);
   return sync_id == my_id;
 }
 
 static void resync_after_run(void)
 {
   LONG num = InterlockedDecrement(&num_synced);
-  assert(-1 <= num && num <= 1);
   if (num == -1)
   {
       ResetEvent( start_event );
       SetEvent( stop_event );
   }
-  else
+  else if (!num || num == -1)
   {
     DWORD ret = WaitForSingleObject(stop_event, 10000);
     ok(ret == WAIT_OBJECT_0, "WaitForSingleObject failed\n");
   }
+  else
+    ok(0, "InterlockedIncrement returned %d", num);
 }
 
 static void cleanup_thread_sync_helpers(void)
-- 
1.8.1.2





More information about the wine-patches mailing list