Skip to content

W
wine-winehq
Commit c03b7fd9 authored by Piotr Caban's avatar Piotr Caban Committed by Alexandre Julliard
Browse files
Options

msvcrt: Throw improper_lock exception in critical_section::lock and try_lock_for.

Signed-off-by: 's avatarPiotr Caban <piotr@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent e71edd0a
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 11 deletions
dlls/msvcrt/lock.c
View file @ c03b7fd9
......@@ -366,10 +366,8 @@ void __thiscall critical_section_lock(critical_section *this)
TRACE("(%p)\n", this);
if(this->unk_thread_id == GetCurrentThreadId()) {
FIXME("throw exception\n");
return;
}
if(this->unk_thread_id == GetCurrentThreadId())
throw_exception(EXCEPTION_IMPROPER_LOCK, 0, "Already locked");
memset(&q, 0, sizeof(q));
last = InterlockedExchangePointer(&this->tail, &q);
......@@ -394,10 +392,8 @@ MSVCRT_bool __thiscall critical_section_try_lock(critical_section *this)
TRACE("(%p)\n", this);
if(this->unk_thread_id == GetCurrentThreadId()) {
FIXME("throw exception\n");
if(this->unk_thread_id == GetCurrentThreadId())
return FALSE;
}
memset(&q, 0, sizeof(q));
if(!InterlockedCompareExchangePointer(&this->tail, &q, NULL)) {
......@@ -466,10 +462,8 @@ MSVCRT_bool __thiscall critical_section_try_lock_for(
TRACE("(%p %d)\n", this, timeout);
if(this->unk_thread_id == GetCurrentThreadId()) {
FIXME("throw exception\n");
return FALSE;
}
if(this->unk_thread_id == GetCurrentThreadId())
throw_exception(EXCEPTION_IMPROPER_LOCK, 0, "Already locked");
if(!(q = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*q))))
return critical_section_try_lock(this);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment