X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5eba4394790ca9b4da50d7a9ea369d3f623f0af1..40452e05839d958474a8be831632975035af3384:/src/msw/thread.cpp diff --git a/src/msw/thread.cpp b/src/msw/thread.cpp index f949283aad..469ced786b 100644 --- a/src/msw/thread.cpp +++ b/src/msw/thread.cpp @@ -777,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 - do + for ( ;; ) { 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; @@ -893,7 +902,7 @@ bool wxThread::SetConcurrency(size_t level) // get system affinity mask first HANDLE hProcess = ::GetCurrentProcess(); - DWORD dwProcMask, dwSysMask; + DWORD_PTR dwProcMask, dwSysMask; if ( ::GetProcessAffinityMask(hProcess, &dwProcMask, &dwSysMask) == 0 ) { wxLogLastError(_T("GetProcessAffinityMask")); @@ -974,7 +983,8 @@ bool wxThread::SetConcurrency(size_t level) return false; } -#endif +#endif // !__WXWINCE__ + return true; }