fix for opening files with VC++ 8 (closes bug 994337)

[wxWidgets.git] / src / msw / thread.cpp

diff --git a/src/msw/thread.cpp b/src/msw/thread.cpp
index 4c9b11e4405a12ca330cbc952ac86e2bc68dfe67..0a1d611ca4c8ecc48d0ba8e3b17afc0888fa180f 100644 (file)
--- a/src/msw/thread.cpp
+++ b/src/msw/thread.cpp
@@ -300,7 +300,7 @@ private:
 
 wxSemaphoreInternal::wxSemaphoreInternal(int initialcount, int maxcount)
 {
 
 wxSemaphoreInternal::wxSemaphoreInternal(int initialcount, int maxcount)
 {

-#ifndef __WXWINCE__
+#if !defined(_WIN32_WCE) || (_WIN32_WCE >= 300)

     if ( maxcount == 0 )
     {
         // make it practically infinite
     if ( maxcount == 0 )
     {
         // make it practically infinite


@@ -353,7 +353,7 @@ wxSemaError wxSemaphoreInternal::WaitTimeout(unsigned long milliseconds)
 
 wxSemaError wxSemaphoreInternal::Post()
 {
 
 wxSemaError wxSemaphoreInternal::Post()
 {

-#ifndef __WXWINCE__
+#if !defined(_WIN32_WCE) || (_WIN32_WCE >= 300)

     if ( !::ReleaseSemaphore(m_semaphore, 1, NULL /* ptr to previous count */) )
 #endif
     {
     if ( !::ReleaseSemaphore(m_semaphore, 1, NULL /* ptr to previous count */) )
 #endif
     {


@@ -484,7 +484,9 @@ THREAD_RETVAL THREAD_CALLCONV wxThreadInternal::WinThreadStart(void *param)
 
     // first of all, check whether we hadn't been cancelled already and don't
     // start the user code at all then
 
     // first of all, check whether we hadn't been cancelled already and don't
     // start the user code at all then

-    if ( thread->m_internal->GetState() == STATE_EXITED )
+    bool isExited = (thread->m_internal->GetState() == STATE_EXITED);
+
+    if ( isExited )

     {
         rc = (THREAD_RETVAL)-1;
     }
     {
         rc = (THREAD_RETVAL)-1;
     }


@@ -499,17 +501,23 @@ THREAD_RETVAL THREAD_CALLCONV wxThreadInternal::WinThreadStart(void *param)
         }
 
         rc = (THREAD_RETVAL)thread->Entry();
         }
 
         rc = (THREAD_RETVAL)thread->Entry();

+    }
+
+    thread->OnExit();

 
 

+    // save IsDetached because thread object can be deleted by joinable
+    // threads after state is changed to STATE_EXITED.
+    bool isDetached = thread->IsDetached();
+
+    if (!isExited)
+    {

         // enter m_critsect before changing the thread state
         wxCriticalSectionLocker lock(thread->m_critsect);
         // enter m_critsect before changing the thread state
         wxCriticalSectionLocker lock(thread->m_critsect);

-

         thread->m_internal->SetState(STATE_EXITED);
     }
 
         thread->m_internal->SetState(STATE_EXITED);
     }
 

-    thread->OnExit();
-

     // the thread may delete itself now if it wants, we don't need it any more
     // the thread may delete itself now if it wants, we don't need it any more

-    thread->m_internal->LetDie();
+    if (isDetached) thread->m_internal->LetDie();

 
     return rc;
 }
 
     return rc;
 }


@@ -518,7 +526,7 @@ void wxThreadInternal::SetPriority(unsigned int priority)
 {
     m_priority = priority;
 
 {
     m_priority = priority;
 

-    // translate wxWindows priority to the Windows one
+    // translate wxWidgets priority to the Windows one

     int win_priority;
     if (m_priority <= 20)
         win_priority = THREAD_PRIORITY_LOWEST;
     int win_priority;
     if (m_priority <= 20)
         win_priority = THREAD_PRIORITY_LOWEST;


@@ -732,7 +740,7 @@ wxThreadInternal::WaitForTerminate(wxCriticalSection& cs,
                     //
                     // NB: we still must include QS_ALLINPUT even when waiting
                     //     in a secondary thread because if it had created some
                     //
                     // NB: we still must include QS_ALLINPUT even when waiting
                     //     in a secondary thread because if it had created some

-                    //     window somehow (possible not even using wxWindows)
+                    //     window somehow (possible not even using wxWidgets)

                     //     the system might dead lock then
                     if ( wxThread::IsMain() )
                     {
                     //     the system might dead lock then
                     if ( wxThread::IsMain() )
                     {


@@ -769,15 +777,24 @@ wxThreadInternal::WaitForTerminate(wxCriticalSection& cs,
     // although the thread might be already in the EXITED state it might not
     // have terminated yet and so we are not sure that it has actually
     // terminated if the "if" above hadn't been taken
     // although the thread might be already in the EXITED state it might not
     // have terminated yet and so we are not sure that it has actually
     // terminated if the "if" above hadn't been taken

-    do
+    for ( ;; )

     {
         if ( !::GetExitCodeThread(m_hThread, (LPDWORD)&rc) )
         {
             wxLogLastError(wxT("GetExitCodeThread"));
 
             rc = (wxThread::ExitCode)-1;
     {
         if ( !::GetExitCodeThread(m_hThread, (LPDWORD)&rc) )
         {
             wxLogLastError(wxT("GetExitCodeThread"));
 
             rc = (wxThread::ExitCode)-1;

+
+            break;

         }
         }

-    } while ( (DWORD)rc == STILL_ACTIVE );
+
+        if ( (DWORD)rc != STILL_ACTIVE )
+            break;
+
+        // give the other thread some time to terminate, otherwise we may be
+        // starving it
+        ::Sleep(1);
+    }

 
     if ( pRc )
         *pRc = rc;
 
     if ( pRc )
         *pRc = rc;


@@ -846,7 +863,7 @@ wxThread *wxThread::This()
 
 bool wxThread::IsMain()
 {
 
 bool wxThread::IsMain()
 {

-    return ::GetCurrentThreadId() == gs_idMainThread;
+    return ::GetCurrentThreadId() == gs_idMainThread || gs_idMainThread == 0;

 }
 
 void wxThread::Yield()
 }
 
 void wxThread::Yield()


@@ -876,7 +893,10 @@ unsigned long wxThread::GetCurrentId()
 
 bool wxThread::SetConcurrency(size_t level)
 {
 
 bool wxThread::SetConcurrency(size_t level)
 {

-#ifndef __WXWINCE__
+#ifdef __WXWINCE__
+    wxUnusedVar(level);
+    return false;
+#else

     wxASSERT_MSG( IsMain(), _T("should only be called from the main thread") );
 
     // ok only for the default one
     wxASSERT_MSG( IsMain(), _T("should only be called from the main thread") );
 
     // ok only for the default one


@@ -885,7 +905,7 @@ bool wxThread::SetConcurrency(size_t level)
 
     // get system affinity mask first
     HANDLE hProcess = ::GetCurrentProcess();
 
     // get system affinity mask first
     HANDLE hProcess = ::GetCurrentProcess();

-    DWORD dwProcMask, dwSysMask;
+    DWORD_PTR dwProcMask, dwSysMask;

     if ( ::GetProcessAffinityMask(hProcess, &dwProcMask, &dwSysMask) == 0 )
     {
         wxLogLastError(_T("GetProcessAffinityMask"));
     if ( ::GetProcessAffinityMask(hProcess, &dwProcMask, &dwSysMask) == 0 )
     {
         wxLogLastError(_T("GetProcessAffinityMask"));


@@ -966,8 +986,9 @@ bool wxThread::SetConcurrency(size_t level)
 
         return false;
     }
 
         return false;
     }

-#endif
+

     return true;
     return true;

+#endif // __WXWINCE__/!__WXWINCE__

 }
 
 // ctor and dtor
 }
 
 // ctor and dtor