MSW compile fixes.

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

diff --git a/src/msw/thread.cpp b/src/msw/thread.cpp
index 36fc19ef8e22a7b6ff14196f8270dd5ab32bf21a..2a692e374d939aca6e8ba5240e543d88baad1583 100644 (file)
--- a/src/msw/thread.cpp
+++ b/src/msw/thread.cpp
@@ -75,7 +75,8 @@
     // this is where _beginthreadex() is declared
     #include <process.h>
 
     // this is where _beginthreadex() is declared
     #include <process.h>
 

-    // the return type of the thread function entry point
+    // the return type of the thread function entry point: notice that this
+    // type can't hold a pointer under Win64

     typedef unsigned THREAD_RETVAL;
 
     // the calling convention of the thread function entry point
     typedef unsigned THREAD_RETVAL;
 
     // the calling convention of the thread function entry point


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

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

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


@@ -142,7 +145,7 @@ static bool gs_waitingForThread = false;
 // wxCriticalSection
 // ----------------------------------------------------------------------------
 
 // wxCriticalSection
 // ----------------------------------------------------------------------------
 

-wxCriticalSection::wxCriticalSection()
+wxCriticalSection::wxCriticalSection( wxCriticalSectionType WXUNUSED(critSecType) )

 {
     wxCOMPILE_TIME_ASSERT( sizeof(CRITICAL_SECTION) <= sizeof(wxCritSectBuffer),
                            wxCriticalSectionBufferTooSmall );
 {
     wxCOMPILE_TIME_ASSERT( sizeof(CRITICAL_SECTION) <= sizeof(wxCritSectBuffer),
                            wxCriticalSectionBufferTooSmall );


@@ -187,11 +190,14 @@ private:
 
     HANDLE m_mutex;
 
 
     HANDLE m_mutex;
 

+    unsigned long m_owningThread;
+    wxMutexType m_type;
+

     DECLARE_NO_COPY_CLASS(wxMutexInternal)
 };
 
 // all mutexes are recursive under Win32 so we don't use mutexType
     DECLARE_NO_COPY_CLASS(wxMutexInternal)
 };
 
 // all mutexes are recursive under Win32 so we don't use mutexType

-wxMutexInternal::wxMutexInternal(wxMutexType WXUNUSED(mutexType))
+wxMutexInternal::wxMutexInternal(wxMutexType mutexType)

 {
     // create a nameless (hence intra process and always private) mutex
     m_mutex = ::CreateMutex
 {
     // create a nameless (hence intra process and always private) mutex
     m_mutex = ::CreateMutex


@@ -201,10 +207,14 @@ wxMutexInternal::wxMutexInternal(wxMutexType WXUNUSED(mutexType))
                     NULL        // no name
                 );
 
                     NULL        // no name
                 );
 

+    m_type = mutexType;
+    m_owningThread = 0;
+

     if ( !m_mutex )
     {
         wxLogLastError(_T("CreateMutex()"));
     }
     if ( !m_mutex )
     {
         wxLogLastError(_T("CreateMutex()"));
     }

+

 }
 
 wxMutexInternal::~wxMutexInternal()
 }
 
 wxMutexInternal::~wxMutexInternal()


@@ -228,19 +238,25 @@ wxMutexError wxMutexInternal::TryLock()
 
 wxMutexError wxMutexInternal::LockTimeout(DWORD milliseconds)
 {
 
 wxMutexError wxMutexInternal::LockTimeout(DWORD milliseconds)
 {

-    DWORD rc = ::WaitForSingleObject(m_mutex, milliseconds);
-    if ( rc == WAIT_ABANDONED )
+    if (m_type == wxMUTEX_DEFAULT)

     {
     {

-        // the previous caller died without releasing the mutex, but now we can
-        // really lock it
-        wxLogDebug(_T("WaitForSingleObject() returned WAIT_ABANDONED"));
-
-        // use 0 timeout, normally we should always get it
-        rc = ::WaitForSingleObject(m_mutex, 0);
+        // Don't allow recursive
+        if (m_owningThread != 0)
+        {
+            if (m_owningThread == wxThread::GetCurrentId())
+                return wxMUTEX_DEAD_LOCK;
+        }

     }
 
     }
 

+    DWORD rc = ::WaitForSingleObject(m_mutex, milliseconds);

     switch ( rc )
     {
     switch ( rc )
     {

+        case WAIT_ABANDONED:
+            // the previous caller died without releasing the mutex, so even
+            // though we did get it, log a message about this
+            wxLogDebug(_T("WaitForSingleObject() returned WAIT_ABANDONED"));
+            // fall through
+

         case WAIT_OBJECT_0:
             // ok
             break;
         case WAIT_OBJECT_0:
             // ok
             break;


@@ -248,7 +264,6 @@ wxMutexError wxMutexInternal::LockTimeout(DWORD milliseconds)
         case WAIT_TIMEOUT:
             return wxMUTEX_TIMEOUT;
 
         case WAIT_TIMEOUT:
             return wxMUTEX_TIMEOUT;
 

-        case WAIT_ABANDONED:        // checked for above

         default:
             wxFAIL_MSG(wxT("impossible return value in wxMutex::Lock"));
             // fall through
         default:
             wxFAIL_MSG(wxT("impossible return value in wxMutex::Lock"));
             // fall through


@@ -258,11 +273,20 @@ wxMutexError wxMutexInternal::LockTimeout(DWORD milliseconds)
             return wxMUTEX_MISC_ERROR;
     }
 
             return wxMUTEX_MISC_ERROR;
     }
 

+    if (m_type == wxMUTEX_DEFAULT)
+    {
+        // required for checking recursiveness
+        m_owningThread = wxThread::GetCurrentId();
+    }
+

     return wxMUTEX_NO_ERROR;
 }
 
 wxMutexError wxMutexInternal::Unlock()
 {
     return wxMUTEX_NO_ERROR;
 }
 
 wxMutexError wxMutexInternal::Unlock()
 {

+    // required for checking recursiveness
+    m_owningThread = 0;
+

     if ( !::ReleaseMutex(m_mutex) )
     {
         wxLogLastError(_T("ReleaseMutex()"));
     if ( !::ReleaseMutex(m_mutex) )
     {
         wxLogLastError(_T("ReleaseMutex()"));


@@ -514,7 +538,7 @@ THREAD_RETVAL wxThreadInternal::DoThreadStart(wxThread *thread)
 {
     wxON_BLOCK_EXIT1(DoThreadOnExit, thread);
 
 {
     wxON_BLOCK_EXIT1(DoThreadOnExit, thread);
 

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

 
     wxTRY
     {
 
     wxTRY
     {


@@ -523,10 +547,10 @@ THREAD_RETVAL wxThreadInternal::DoThreadStart(wxThread *thread)
         {
             wxLogSysError(_("Can not start thread: error writing TLS."));
 
         {
             wxLogSysError(_("Can not start thread: error writing TLS."));
 

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

         }
 
         }
 

-        rc = (THREAD_RETVAL)thread->Entry();
+        rc = wxPtrToUInt(thread->Entry());

     }
     wxCATCH_ALL( wxTheApp->OnUnhandledException(); )
 
     }
     wxCATCH_ALL( wxTheApp->OnUnhandledException(); )
 


@@ -536,7 +560,7 @@ THREAD_RETVAL wxThreadInternal::DoThreadStart(wxThread *thread)
 /* static */
 THREAD_RETVAL THREAD_CALLCONV wxThreadInternal::WinThreadStart(void *param)
 {
 /* static */
 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;
 


@@ -555,7 +579,7 @@ THREAD_RETVAL THREAD_CALLCONV wxThreadInternal::WinThreadStart(void *param)
         else
             rc = DoThreadStart(thread);
     }
         else
             rc = DoThreadStart(thread);
     }

-    wxSEH_HANDLE((THREAD_RETVAL)-1)
+    wxSEH_HANDLE(THREAD_ERROR_EXIT)

 
 
     // save IsDetached because thread object can be deleted by joinable
 
 
     // save IsDetached because thread object can be deleted by joinable


@@ -662,7 +686,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"));
 


@@ -688,7 +712,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;


@@ -821,16 +845,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


@@ -839,14 +863,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()


@@ -915,11 +938,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;


@@ -996,7 +1014,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;


@@ -1096,13 +1114,13 @@ wxThreadError wxThread::Resume()
 
 wxThread::ExitCode wxThread::Wait()
 {
 
 wxThread::ExitCode wxThread::Wait()
 {

+    ExitCode rc = wxUIntToPtr(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;


@@ -1150,7 +1168,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++


@@ -1292,7 +1310,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(),


@@ -1314,7 +1332,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);