fix off by 1 error in GetTextRaw() (#4317)

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

diff --git a/src/msw/thread.cpp b/src/msw/thread.cpp
index 9a0bdbb46cf4ee4152ef09720a69e9cc018cf2d0..301144ac1445c8c39d1c7bd7b9ea2fd0d68495e9 100644 (file)
--- a/src/msw/thread.cpp
+++ b/src/msw/thread.cpp
@@ -21,13 +21,16 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

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

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

+    #include "wx/module.h"

 #endif
 
 #endif
 

-#if wxUSE_THREADS
-

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


@@ -36,8 +39,6 @@
 #include "wx/msw/seh.h"
 
 #include "wx/except.h"
 #include "wx/msw/seh.h"
 
 #include "wx/except.h"

-#include "wx/module.h"
-#include "wx/thread.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


@@ -75,7 +76,7 @@
     #include <process.h>
 
     // the return type of the thread function entry point
     #include <process.h>
 
     // the return type of the thread function entry point

-    typedef unsigned THREAD_RETVAL;
+    typedef wxUIntPtr THREAD_RETVAL;

 
     // the calling convention of the thread function entry point
     #define THREAD_CALLCONV __stdcall
 
     // the calling convention of the thread function entry point
     #define THREAD_CALLCONV __stdcall


@@ -85,6 +86,8 @@
     #define THREAD_CALLCONV WINAPI
 #endif
 
     #define THREAD_CALLCONV WINAPI
 #endif
 

+static const THREAD_RETVAL THREAD_ERROR_EXIT = (THREAD_RETVAL)-1;
+

 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------


@@ -177,7 +180,8 @@ public:
     bool IsOk() const { return m_mutex != NULL; }
 
     wxMutexError Lock() { return LockTimeout(INFINITE); }
     bool IsOk() const { return m_mutex != NULL; }
 
     wxMutexError Lock() { return LockTimeout(INFINITE); }

-    wxMutexError TryLock() { return LockTimeout(0); }
+    wxMutexError Lock(unsigned long ms) { return LockTimeout(ms); }
+    wxMutexError TryLock();

     wxMutexError Unlock();
 
 private:
     wxMutexError Unlock();
 
 private:


@@ -195,7 +199,7 @@ wxMutexInternal::wxMutexInternal(wxMutexType WXUNUSED(mutexType))
     m_mutex = ::CreateMutex
                 (
                     NULL,       // default secutiry attributes
     m_mutex = ::CreateMutex
                 (
                     NULL,       // default secutiry attributes

-                    false,      // not initially locked
+                    FALSE,      // not initially locked

                     NULL        // no name
                 );
 
                     NULL        // no name
                 );
 


@@ -216,6 +220,14 @@ wxMutexInternal::~wxMutexInternal()
     }
 }
 
     }
 }
 

+wxMutexError wxMutexInternal::TryLock()
+{
+    const wxMutexError rc = LockTimeout(0);
+
+    // we have a special return code for timeout in this case
+    return rc == wxMUTEX_TIMEOUT ? wxMUTEX_BUSY : rc;
+}
+

 wxMutexError wxMutexInternal::LockTimeout(DWORD milliseconds)
 {
     DWORD rc = ::WaitForSingleObject(m_mutex, milliseconds);
 wxMutexError wxMutexInternal::LockTimeout(DWORD milliseconds)
 {
     DWORD rc = ::WaitForSingleObject(m_mutex, milliseconds);


@@ -236,7 +248,7 @@ wxMutexError wxMutexInternal::LockTimeout(DWORD milliseconds)
             break;
 
         case WAIT_TIMEOUT:
             break;
 
         case WAIT_TIMEOUT:

-            return wxMUTEX_BUSY;
+            return wxMUTEX_TIMEOUT;

 
         case WAIT_ABANDONED:        // checked for above
         default:
 
         case WAIT_ABANDONED:        // checked for above
         default:


@@ -354,14 +366,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

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


@@ -436,6 +456,10 @@ public:
     // really start the thread (if it's not already dead)
     static THREAD_RETVAL DoThreadStart(wxThread *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() )


@@ -477,20 +501,31 @@ private:
     wxThreadInternal& m_thrImpl;
 };
 
     wxThreadInternal& m_thrImpl;
 };
 

+/* static */
+void wxThreadInternal::DoThreadOnExit(wxThread *thread)
+{
+    wxTRY
+    {
+        thread->OnExit();
+    }
+    wxCATCH_ALL( wxTheApp->OnUnhandledException(); )
+}
+
+/* static */

 THREAD_RETVAL wxThreadInternal::DoThreadStart(wxThread *thread)
 {
 THREAD_RETVAL wxThreadInternal::DoThreadStart(wxThread *thread)
 {

-    THREAD_RETVAL rc = (THREAD_RETVAL)-1;
+    wxON_BLOCK_EXIT1(DoThreadOnExit, thread);
+
+    THREAD_RETVAL rc = THREAD_ERROR_EXIT;

 
     wxTRY
     {
 
     wxTRY
     {

-        wxON_BLOCK_EXIT_OBJ0(*thread, wxThread::OnExit);
-

         // 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 (THREAD_RETVAL)-1;
+            return THREAD_ERROR_EXIT;

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


@@ -500,9 +535,10 @@ THREAD_RETVAL wxThreadInternal::DoThreadStart(wxThread *thread)
     return rc;
 }
 
     return rc;
 }
 

+/* static */

 THREAD_RETVAL THREAD_CALLCONV wxThreadInternal::WinThreadStart(void *param)
 {
 THREAD_RETVAL THREAD_CALLCONV wxThreadInternal::WinThreadStart(void *param)
 {

-    THREAD_RETVAL rc = (THREAD_RETVAL)-1;
+    THREAD_RETVAL rc = THREAD_ERROR_EXIT;

 
     wxThread * const thread = (wxThread *)param;
 
 
     wxThread * const thread = (wxThread *)param;
 


@@ -513,14 +549,16 @@ THREAD_RETVAL THREAD_CALLCONV wxThreadInternal::WinThreadStart(void *param)
     // start the user code at all then
     const bool hasExited = thread->m_internal->GetState() == STATE_EXITED;
 
     // start the user code at all then
     const bool hasExited = thread->m_internal->GetState() == STATE_EXITED;
 

-    if ( !hasExited )
+    // run the thread function itself inside a SEH try/except block
+    wxSEH_TRY

     {
     {

-        wxSEH_TRY
-        {
+        if ( hasExited )
+            DoThreadOnExit(thread);
+        else

             rc = DoThreadStart(thread);
             rc = DoThreadStart(thread);

-        }
-        wxSEH_HANDLE((THREAD_RETVAL)-1)

     }
     }

+    wxSEH_HANDLE(THREAD_ERROR_EXIT)
+

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


@@ -626,7 +664,7 @@ bool wxThreadInternal::Create(wxThread *thread, unsigned int stackSize)
 
 wxThreadError wxThreadInternal::Kill()
 {
 
 wxThreadError wxThreadInternal::Kill()
 {

-    if ( !::TerminateThread(m_hThread, (DWORD)-1) )
+    if ( !::TerminateThread(m_hThread, THREAD_ERROR_EXIT) )

     {
         wxLogSysError(_("Couldn't terminate thread"));
 
     {
         wxLogSysError(_("Couldn't terminate thread"));
 


@@ -652,7 +690,7 @@ wxThreadInternal::WaitForTerminate(wxCriticalSection& cs,
     // from Wait()) or ask it to terminate (when called from Delete())
     bool shouldDelete = threadToDelete != NULL;
 
     // from Wait()) or ask it to terminate (when called from Delete())
     bool shouldDelete = threadToDelete != NULL;
 

-    wxThread::ExitCode rc = 0;
+    DWORD rc = 0;

 
     // we might need to resume the thread if it's currently stopped
     bool shouldResume = false;
 
     // we might need to resume the thread if it's currently stopped
     bool shouldResume = false;


@@ -725,18 +763,16 @@ wxThreadInternal::WaitForTerminate(wxCriticalSection& cs,
             }
         }
 
             }
         }
 

-#if !defined(QS_ALLPOSTMESSAGE)
-#define QS_ALLPOSTMESSAGE 0
-#endif
-
-        result = ::MsgWaitForMultipleObjects
-                 (
-                   1,              // number of objects to wait for
-                   &m_hThread,     // the objects
-                   false,          // don't wait for all objects
-                   INFINITE,       // no timeout
-                   QS_ALLINPUT|QS_ALLPOSTMESSAGE   // return as soon as there are any events
-                 );
+        wxAppTraits *traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
+        if ( traits )
+        {
+            result = traits->WaitForThread(m_hThread);
+        }
+        else // can't wait for the thread
+        {
+            // so kill it below
+            result = 0xFFFFFFFF;
+        }

 
         switch ( result )
         {
 
         switch ( result )
         {


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

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

                     if ( traits && !traits->DoMessageFromThreadWait() )
                     {
                         // WM_QUIT received: kill the thread
                     if ( traits && !traits->DoMessageFromThreadWait() )
                     {
                         // WM_QUIT received: kill the thread


@@ -790,16 +823,16 @@ wxThreadInternal::WaitForTerminate(wxCriticalSection& cs,
     // terminated if the "if" above hadn't been taken
     for ( ;; )
     {
     // terminated if the "if" above hadn't been taken
     for ( ;; )
     {

-        if ( !::GetExitCodeThread(m_hThread, (LPDWORD)&rc) )
+        if ( !::GetExitCodeThread(m_hThread, &rc) )

         {
             wxLogLastError(wxT("GetExitCodeThread"));
 
         {
             wxLogLastError(wxT("GetExitCodeThread"));
 

-            rc = (wxThread::ExitCode)-1;
+            rc = THREAD_ERROR_EXIT;

 
             break;
         }
 
 
             break;
         }
 

-        if ( (DWORD)rc != STILL_ACTIVE )
+        if ( rc != STILL_ACTIVE )

             break;
 
         // give the other thread some time to terminate, otherwise we may be
             break;
 
         // give the other thread some time to terminate, otherwise we may be


@@ -808,14 +841,13 @@ wxThreadInternal::WaitForTerminate(wxCriticalSection& cs,
     }
 
     if ( pRc )
     }
 
     if ( pRc )

-        *pRc = rc;
+        *pRc = wxUIntToPtr(rc);

 
     // we don't need the thread handle any more in any case
     Free();
 
 
 
     // we don't need the thread handle any more in any case
     Free();
 
 

-    return rc == (wxThread::ExitCode)-1 ? wxTHREAD_MISC_ERROR
-                                        : wxTHREAD_NO_ERROR;
+    return rc == THREAD_ERROR_EXIT ? wxTHREAD_MISC_ERROR : wxTHREAD_NO_ERROR;

 }
 
 bool wxThreadInternal::Suspend()
 }
 
 bool wxThreadInternal::Suspend()


@@ -884,11 +916,6 @@ void wxThread::Yield()
     ::Sleep(0);
 }
 
     ::Sleep(0);
 }
 

-void wxThread::Sleep(unsigned long milliseconds)
-{
-    ::Sleep(milliseconds);
-}
-

 int wxThread::GetCPUCount()
 {
     SYSTEM_INFO si;
 int wxThread::GetCPUCount()
 {
     SYSTEM_INFO si;


@@ -965,7 +992,7 @@ bool wxThread::SetConcurrency(size_t WXUNUSED_IN_WINCE(level))
     // set it: we can't link to SetProcessAffinityMask() because it doesn't
     // exist in Win9x, use RT binding instead
 
     // set it: we can't link to SetProcessAffinityMask() because it doesn't
     // exist in Win9x, use RT binding instead
 

-    typedef BOOL (*SETPROCESSAFFINITYMASK)(HANDLE, DWORD);
+    typedef BOOL (WINAPI *SETPROCESSAFFINITYMASK)(HANDLE, DWORD_PTR);

 
     // can use static var because we're always in the main thread here
     static SETPROCESSAFFINITYMASK pfnSetProcessAffinityMask = NULL;
 
     // can use static var because we're always in the main thread here
     static SETPROCESSAFFINITYMASK pfnSetProcessAffinityMask = NULL;


@@ -1065,13 +1092,13 @@ wxThreadError wxThread::Resume()
 
 wxThread::ExitCode wxThread::Wait()
 {
 
 wxThread::ExitCode wxThread::Wait()
 {

+    ExitCode rc = (ExitCode)THREAD_ERROR_EXIT;
+

     // although under Windows we can wait for any thread, it's an error to
     // wait for a detached one in wxWin API
     // although under Windows we can wait for any thread, it's an error to
     // wait for a detached one in wxWin API

-    wxCHECK_MSG( !IsDetached(), (ExitCode)-1,
+    wxCHECK_MSG( !IsDetached(), rc,

                  _T("wxThread::Wait(): can't wait for detached thread") );
 
                  _T("wxThread::Wait(): can't wait for detached thread") );
 

-    ExitCode rc = (ExitCode)-1;
-

     (void)m_internal->WaitForTerminate(m_critsect, &rc);
 
     return rc;
     (void)m_internal->WaitForTerminate(m_critsect, &rc);
 
     return rc;


@@ -1119,7 +1146,7 @@ void wxThread::Exit(ExitCode status)
     }
 
 #ifdef wxUSE_BEGIN_THREAD
     }
 
 #ifdef wxUSE_BEGIN_THREAD

-    _endthreadex((unsigned)status);
+    _endthreadex(wxPtrToUInt(status));

 #else // !VC++
     ::ExitThread((DWORD)status);
 #endif // VC++/!VC++
 #else // !VC++
     ::ExitThread((DWORD)status);
 #endif // VC++/!VC++


@@ -1261,7 +1288,7 @@ void wxThreadModule::OnExit()
 // not a mutex, so the names are a bit confusing
 // ----------------------------------------------------------------------------
 
 // not a mutex, so the names are a bit confusing
 // ----------------------------------------------------------------------------
 

-void WXDLLIMPEXP_BASE wxMutexGuiEnter()
+void wxMutexGuiEnterImpl()

 {
     // this would dead lock everything...
     wxASSERT_MSG( !wxThread::IsMain(),
 {
     // this would dead lock everything...
     wxASSERT_MSG( !wxThread::IsMain(),


@@ -1283,7 +1310,7 @@ void WXDLLIMPEXP_BASE wxMutexGuiEnter()
     gs_critsectGui->Enter();
 }
 
     gs_critsectGui->Enter();
 }
 

-void WXDLLIMPEXP_BASE wxMutexGuiLeave()
+void wxMutexGuiLeaveImpl()

 {
     wxCriticalSectionLocker enter(*gs_critsectWaitingForGui);
 
 {
     wxCriticalSectionLocker enter(*gs_critsectWaitingForGui);
 


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

-