non-PCH build fix (according to Tinderbox).

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

diff --git a/src/msw/thread.cpp b/src/msw/thread.cpp
index 615451a3f5fdc3672a41775927999f344aed79fa..ee7fec670d7dc528a62ed77011bcc87b246122db 100644 (file)
--- a/src/msw/thread.cpp
+++ b/src/msw/thread.cpp
@@ -10,10 +10,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "thread.h"
-#endif
-

 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------


@@ -25,20 +21,24 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_THREADS
+
+#include "wx/thread.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

+    #include "wx/msw/missing.h"

     #include "wx/intl.h"
     #include "wx/app.h"
     #include "wx/intl.h"
     #include "wx/app.h"

+    #include "wx/module.h"

 #endif
 
 #endif
 

-#if wxUSE_THREADS
-

 #include "wx/apptrait.h"
 #include "wx/apptrait.h"

+#include "wx/scopeguard.h"

 
 #include "wx/msw/private.h"
 
 #include "wx/msw/private.h"

-#include "wx/msw/missing.h"
+#include "wx/msw/seh.h"

 
 

-#include "wx/module.h"
-#include "wx/thread.h"
+#include "wx/except.h"

 
 // must have this symbol defined to get _beginthread/_endthread declarations
 #ifndef _MT
 
 // must have this symbol defined to get _beginthread/_endthread declarations
 #ifndef _MT


@@ -355,14 +355,22 @@ wxSemaError wxSemaphoreInternal::Post()
 {
 #if !defined(_WIN32_WCE) || (_WIN32_WCE >= 300)
     if ( !::ReleaseSemaphore(m_semaphore, 1, NULL /* ptr to previous count */) )
 {
 #if !defined(_WIN32_WCE) || (_WIN32_WCE >= 300)
     if ( !::ReleaseSemaphore(m_semaphore, 1, NULL /* ptr to previous count */) )

-#endif

     {
     {

-        wxLogLastError(_T("ReleaseSemaphore"));
-
-        return wxSEMA_MISC_ERROR;
+        if ( GetLastError() == ERROR_TOO_MANY_POSTS )
+        {
+            return wxSEMA_OVERFLOW;
+        }
+        else
+        {
+            wxLogLastError(_T("ReleaseSemaphore"));
+            return wxSEMA_MISC_ERROR;
+        }

     }
 
     return wxSEMA_NO_ERROR;
     }
 
     return wxSEMA_NO_ERROR;

+#else
+    return wxSEMA_MISC_ERROR;
+#endif

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -431,9 +439,16 @@ public:
     HANDLE GetHandle() const { return m_hThread; }
     DWORD  GetId() const { return m_tid; }
 
     HANDLE GetHandle() const { return m_hThread; }
     DWORD  GetId() const { return m_tid; }
 

-    // thread function
+    // the thread function forwarding to DoThreadStart

     static THREAD_RETVAL THREAD_CALLCONV WinThreadStart(void *thread);
 
     static THREAD_RETVAL THREAD_CALLCONV WinThreadStart(void *thread);
 

+    // really start the thread (if it's not already dead)
+    static THREAD_RETVAL DoThreadStart(wxThread *thread);
+
+    // call OnExit() on the thread
+    static void DoThreadOnExit(wxThread *thread);
+
+

     void KeepAlive()
     {
         if ( m_thread->IsDetached() )
     void KeepAlive()
     {
         if ( m_thread->IsDetached() )


@@ -475,45 +490,77 @@ private:
     wxThreadInternal& m_thrImpl;
 };
 
     wxThreadInternal& m_thrImpl;
 };
 

-
-THREAD_RETVAL THREAD_CALLCONV wxThreadInternal::WinThreadStart(void *param)
+/* static */
+void wxThreadInternal::DoThreadOnExit(wxThread *thread)

 {
 {

-    THREAD_RETVAL rc;
+    wxTRY
+    {
+        thread->OnExit();
+    }
+    wxCATCH_ALL( wxTheApp->OnUnhandledException(); )
+}

 
 

-    wxThread * const thread = (wxThread *)param;
+/* static */
+THREAD_RETVAL wxThreadInternal::DoThreadStart(wxThread *thread)
+{
+    wxON_BLOCK_EXIT1(DoThreadOnExit, thread);

 
 

-    // first of all, check whether we hadn't been cancelled already and don't
-    // start the user code at all then
-    const bool hasExited = thread->m_internal->GetState() == STATE_EXITED;
+    THREAD_RETVAL rc = (THREAD_RETVAL)-1;

 
 

-    if ( hasExited )
-    {
-        rc = (THREAD_RETVAL)-1;
-    }
-    else // do run thread
+    wxTRY

     {
         // store the thread object in the TLS
         if ( !::TlsSetValue(gs_tlsThisThread, thread) )
         {
             wxLogSysError(_("Can not start thread: error writing TLS."));
 
     {
         // store the thread object in the TLS
         if ( !::TlsSetValue(gs_tlsThisThread, thread) )
         {
             wxLogSysError(_("Can not start thread: error writing TLS."));
 

-            return (DWORD)-1;
+            return (THREAD_RETVAL)-1;

         }
 
         rc = (THREAD_RETVAL)thread->Entry();
     }
         }
 
         rc = (THREAD_RETVAL)thread->Entry();
     }

+    wxCATCH_ALL( wxTheApp->OnUnhandledException(); )
+
+    return rc;
+}
+
+/* static */
+THREAD_RETVAL THREAD_CALLCONV wxThreadInternal::WinThreadStart(void *param)
+{
+    THREAD_RETVAL rc = (THREAD_RETVAL)-1;
+
+    wxThread * const thread = (wxThread *)param;
+
+    // each thread has its own SEH translator so install our own a.s.a.p.
+    DisableAutomaticSETranslator();
+
+    // first of all, check whether we hadn't been cancelled already and don't
+    // start the user code at all then
+    const bool hasExited = thread->m_internal->GetState() == STATE_EXITED;
+
+    // run the thread function itself inside a SEH try/except block
+    wxSEH_TRY
+    {
+        if ( hasExited )
+            DoThreadOnExit(thread);
+        else
+            rc = DoThreadStart(thread);
+    }
+    wxSEH_HANDLE((THREAD_RETVAL)-1)

 
 

-    thread->OnExit();

 
     // save IsDetached because thread object can be deleted by joinable
     // threads after state is changed to STATE_EXITED.
 
     // save IsDetached because thread object can be deleted by joinable
     // threads after state is changed to STATE_EXITED.

-    bool isDetached = thread->IsDetached();
-
+    const bool isDetached = thread->IsDetached();

     if ( !hasExited )
     {
         // enter m_critsect before changing the thread state
     if ( !hasExited )
     {
         // enter m_critsect before changing the thread state

-        wxCriticalSectionLocker lock(thread->m_critsect);
+        //
+        // NB: can't use wxCriticalSectionLocker here as we use SEH and it's
+        //     incompatible with C++ object dtors
+        thread->m_critsect.Enter();

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

+        thread->m_critsect.Leave();

     }
 
     // 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


@@ -741,12 +788,6 @@ wxThreadInternal::WaitForTerminate(wxCriticalSection& cs,
                 //     the system might dead lock then
                 if ( wxThread::IsMain() )
                 {
                 //     the system might dead lock then
                 if ( wxThread::IsMain() )
                 {

-                    // it looks that sometimes WAIT_OBJECT_0 + 1 is
-                    // returned but there are no messages in the thread
-                    // queue -- prevent DoMessageFromThreadWait() from
-                    // blocking inside ::GetMessage() forever in this case
-                    ::PostMessage(NULL, WM_NULL, 0, 0);
-

                     wxAppTraits *traits = wxTheApp ? wxTheApp->GetTraits()
                                                    : NULL;
 
                     wxAppTraits *traits = wxTheApp ? wxTheApp->GetTraits()
                                                    : NULL;
 


@@ -888,10 +929,9 @@ unsigned long wxThread::GetCurrentId()
     return (unsigned long)::GetCurrentThreadId();
 }
 
     return (unsigned long)::GetCurrentThreadId();
 }
 

-bool wxThread::SetConcurrency(size_t level)
+bool wxThread::SetConcurrency(size_t WXUNUSED_IN_WINCE(level))

 {
 #ifdef __WXWINCE__
 {
 #ifdef __WXWINCE__

-    wxUnusedVar(level);

     return false;
 #else
     wxASSERT_MSG( IsMain(), _T("should only be called from the main thread") );
     return false;
 #else
     wxASSERT_MSG( IsMain(), _T("should only be called from the main thread") );


@@ -930,7 +970,7 @@ bool wxThread::SetConcurrency(size_t level)
             dwProcMask |= bit;
 
             // another process added
             dwProcMask |= bit;
 
             // another process added

-            if ( !--level )
+            if ( --level == 0 )

             {
                 // and that's enough
                 break;
             {
                 // and that's enough
                 break;


@@ -1350,4 +1390,3 @@ bool WXDLLIMPEXP_BASE wxIsWaitingForThread()
 #include "wx/thrimpl.cpp"
 
 #endif // wxUSE_THREADS
 #include "wx/thrimpl.cpp"
 
 #endif // wxUSE_THREADS

-