''

3 files changed, 105 insertions, 8 deletions

diff --git a/pthread_win32_attach_detach_np.c b/pthread_win32_attach_detach_np.c
index 191b0b0..d839c70 100644
--- a/pthread_win32_attach_detach_np.c
+++ b/pthread_win32_attach_detach_np.c
@@ -263,6 +263,8 @@ pthread_win32_thread_detach_np ()
 
       if (sp != NULL) // otherwise Win32 thread with no implicit POSIX handle.
 	{
+	  HANDLE threadH = sp->threadH;
+
 	  ptw32_callUserDestroyRoutines (sp->ptHandle);
 
 	  (void) pthread_mutex_lock (&sp->cancelLock);
@@ -277,15 +279,10 @@ pthread_win32_thread_detach_np ()
 	    {
 	      ptw32_threadDestroy (sp->ptHandle);
 
-#if ! defined (__MINGW32__) || defined (__MSVCRT__) || defined (__DMC__)
-	      /*
-	       * See documentation for endthread vs endthreadex.
-	       */
-	      if (sp->threadH != 0)
+	      if (threadH != 0)
 	        {
-	          CloseHandle (sp->threadH);
+	          CloseHandle (threadH);
 	        }
-#endif
 
 	      TlsSetValue (ptw32_selfThreadKey->key, NULL);
 	    }
diff --git a/tests/detach1.c b/tests/detach1.c
new file mode 100644
index 0000000..b0835c5
--- /dev/null
+++ b/tests/detach1.c
@@ -0,0 +1,88 @@
+/*
+ * Test for pthread_detach().
+ *
+ *
+ * --------------------------------------------------------------------------
+ *
+ *      Pthreads-win32 - POSIX Threads Library for Win32
+ *      Copyright(C) 1998 John E. Bossom
+ *      Copyright(C) 1999,2005 Pthreads-win32 contributors
+ * 
+ *      Contact Email: rpj@callisto.canberra.edu.au
+ * 
+ *      The current list of contributors is contained
+ *      in the file CONTRIBUTORS included with the source
+ *      code distribution. The list can also be seen at the
+ *      following World Wide Web location:
+ *      http://sources.redhat.com/pthreads-win32/contributors.html
+ * 
+ *      This library is free software; you can redistribute it and/or
+ *      modify it under the terms of the GNU Lesser General Public
+ *      License as published by the Free Software Foundation; either
+ *      version 2 of the License, or (at your option) any later version.
+ * 
+ *      This library is distributed in the hope that it will be useful,
+ *      but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *      Lesser General Public License for more details.
+ * 
+ *      You should have received a copy of the GNU Lesser General Public
+ *      License along with this library in the file COPYING.LIB;
+ *      if not, write to the Free Software Foundation, Inc.,
+ *      59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ * --------------------------------------------------------------------------
+ *
+ * Depends on API functions: pthread_create(), pthread_detach(), pthread_exit().
+ */
+
+#include "test.h"
+
+void *
+func(void * arg)
+{
+    int i = (int) arg;
+
+    Sleep(i * 100);
+
+    pthread_exit(arg);
+
+    /* Never reached. */
+    exit(1);
+}
+
+int
+main(int argc, char * argv[])
+{
+	pthread_t id[4];
+	int i;
+
+	/* Create a few threads and then exit. */
+	for (i = 0; i < 4; i++)
+	  {
+	    assert(pthread_create(&id[i], NULL, func, (void *) i) == 0);
+	  }
+
+	/* Some threads will finish before they are detached, some after. */
+	Sleep(2 * 100 + 50);
+
+	for (i = 0; i < 4; i++)
+	  {
+	    assert(pthread_detach(id[i]) == 0);
+	  }
+
+	Sleep(6 * 100);
+
+	/*
+	 * Check that all threads are now invalid.
+	 * This relies on unique thread IDs - e.g. works with
+	 * pthreads-w32 or Solaris, but may not work for Linux, BSD etc.
+	 */
+	for (i = 0; i < 4; i++)
+	  {
+	    assert(pthread_kill(id[i], 0) == ESRCH);
+	  }
+
+	/* Success. */
+	return 0;
+}
diff --git a/tests/reuse2.c b/tests/reuse2.c
index 9851dde..e573a31 100644
--- a/tests/reuse2.c
+++ b/tests/reuse2.c
@@ -84,15 +84,27 @@ enum {
 };
 
 
+static int dummy = 19;
 static long done = 0;
 
 void * func(void * arg)
 {
+  int i;
+  int j;
+
   sched_yield();
 
+  for (i = 1; i < 10000; i++)
+    {
+      if (i * dummy % dummy == 0)
+	{
+	  j = dummy;
+        }
+    }
+
   InterlockedIncrement(&done);
 
-  return (void *) 0; 
+  return (void *) j; 
 }
  
 int