No CloseHandle on thread handles which were obtained via GetCurrentThreadId.

2 files changed, 9 insertions, 2 deletions

diff --git a/pr/include/md/_wince.h b/pr/include/md/_wince.h
index 02194c54..776e09bd 100644
--- a/pr/include/md/_wince.h
+++ b/pr/include/md/_wince.h
@@ -99,6 +99,7 @@ struct _MDThread {
                                          * wait queue of some cond var.
                                          * PR_FALSE otherwise.  */
     HANDLE           handle;            /* Win32 thread handle */
+    PRBool           noCloseHandle;     /* Whether or not to CloseHandle */
     PRUint32         id;
     void            *sp;                /* only valid when suspended */
     PRUint32         magic;             /* for debugging */
diff --git a/pr/src/md/windows/w95thred.c b/pr/src/md/windows/w95thred.c
index d7c31df9..5c3826ba 100644
--- a/pr/src/md/windows/w95thred.c
+++ b/pr/src/md/windows/w95thred.c
@@ -104,6 +104,7 @@ _PR_MD_INIT_THREAD(PRThread *thread)
         ** On WinCE the thread ID is the same as the real thread handle.
         */
         thread->md.handle = (HANDLE)GetCurrentThreadId();
+        thread->md.noCloseHandle = PR_TRUE;
 #endif
     }
 
@@ -217,8 +218,13 @@ _PR_MD_CLEAN_THREAD(PRThread *thread)
     }
 
     if (thread->md.handle) {
-        rv = CloseHandle(thread->md.handle);
-        PR_ASSERT(rv);
+        if(PR_FALSE == thread->md.noCloseHandle) {
+            rv = CloseHandle(thread->md.handle);
+            PR_ASSERT(rv);
+        }
+        else {
+            thread->md.noCloseHandle = PR_FALSE; /* reused? insurance.... */
+        }
         thread->md.handle = 0;
     }
 }