diff options
Diffstat (limited to 'src/VBox/Main/src-all/ProgressImpl.cpp')
| -rw-r--r-- | src/VBox/Main/src-all/ProgressImpl.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/VBox/Main/src-all/ProgressImpl.cpp b/src/VBox/Main/src-all/ProgressImpl.cpp index 6fa4eab43..3d78b2bc2 100644 --- a/src/VBox/Main/src-all/ProgressImpl.cpp +++ b/src/VBox/Main/src-all/ProgressImpl.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -819,10 +819,10 @@ STDMETHODIMP Progress::WaitForCompletion(LONG aTimeout) while (!mCompleted && (fForever || timeLeft > 0)) { mWaitersCount++; - alock.leave(); + alock.release(); vrc = RTSemEventMultiWait(mCompletedSem, fForever ? RT_INDEFINITE_WAIT : (RTMSINTERVAL)timeLeft); - alock.enter(); + alock.acquire(); mWaitersCount--; /* the last waiter resets the semaphore */ @@ -883,10 +883,10 @@ STDMETHODIMP Progress::WaitForOperationCompletion(ULONG aOperation, LONG aTimeou && (fForever || timeLeft > 0)) { mWaitersCount ++; - alock.leave(); + alock.release(); vrc = RTSemEventMultiWait(mCompletedSem, fForever ? RT_INDEFINITE_WAIT : (unsigned) timeLeft); - alock.enter(); + alock.acquire(); mWaitersCount--; /* the last waiter resets the semaphore */ @@ -1234,7 +1234,7 @@ HRESULT Progress::notifyComplete(HRESULT aResultCode, /** * Marks the operation as complete and attaches full error info. * - * See com::SupportErrorInfoImpl::setError(HRESULT, const GUID &, const wchar_t + * See VirtualBoxBase::setError(HRESULT, const GUID &, const wchar_t * *, const char *, ...) for more info. * * @param aResultCode Operation result (error) code, must not be S_OK. @@ -1663,9 +1663,9 @@ STDMETHODIMP CombinedProgress::WaitForCompletion(LONG aTimeout) while (!mCompleted && (forever || timeLeft > 0)) { - alock.leave(); + alock.release(); rc = mProgresses.back()->WaitForCompletion(forever ? -1 : (LONG) timeLeft); - alock.enter(); + alock.acquire(); if (SUCCEEDED(rc)) rc = checkProgress(); @@ -1747,11 +1747,11 @@ STDMETHODIMP CombinedProgress::WaitForOperationCompletion(ULONG aOperation, LONG while (!mCompleted && aOperation >= m_ulCurrentOperation && (forever || timeLeft > 0)) { - alock.leave(); + alock.release(); /* wait for the appropriate progress operation completion */ rc = mProgresses[progress]-> WaitForOperationCompletion(operation, forever ? -1 : (LONG) timeLeft); - alock.enter(); + alock.acquire(); if (SUCCEEDED(rc)) rc = checkProgress(); |