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

Signed-off-by: Piotr Caban <piotr@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

msvcrt: Throw improper_lock exception in critical_section::lock and try_lock_for.
c03b7fd9 · Piotr Caban · Alexandre Julliard · e71edd0a · c03b7fd9
Commit c03b7fd9 authored Mar 27, 2017 by Piotr Caban Committed by Alexandre Julliard Mar 27, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 11 deletions

lock.c dlls/msvcrt/lock.c +5 -11

No files found.
--- a/dlls/msvcrt/lock.c
+++ b/dlls/msvcrt/lock.c
@@ -366,10 +366,8 @@ void __thiscall critical_section_lock(critical_section *this)
    TRACE("(%p)\n", this);
-    if(this->unk_thread_id == GetCurrentThreadId()) {
+    if(this->unk_thread_id == GetCurrentThreadId())
-        FIXME("throw exception\n");
+        throw_exception(EXCEPTION_IMPROPER_LOCK, 0, "Already locked");
-        return;
-    }
    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()) {
+    if(this->unk_thread_id == GetCurrentThreadId())
-        FIXME("throw exception\n");
        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()) {
+    if(this->unk_thread_id == GetCurrentThreadId())
-        FIXME("throw exception\n");
+        throw_exception(EXCEPTION_IMPROPER_LOCK, 0, "Already locked");
-        return FALSE;
-    }
    if(!(q = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*q))))
        return critical_section_try_lock(this);