kernelbase: Remove unnecessary handler from LocalLock.

Signed-off-by: Rémi Bernon <rbernon@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

kernelbase: Remove unnecessary handler from LocalLock.
e358731f · Rémi Bernon · Alexandre Julliard · 2fcb072f · e358731f
Commit e358731f authored Apr 04, 2022 by Rémi Bernon Committed by Alexandre Julliard Apr 04, 2022
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 11 deletions

memory.c dlls/kernelbase/memory.c +4 -11

No files found.
--- a/dlls/kernelbase/memory.c
+++ b/dlls/kernelbase/memory.c
@@ -774,6 +774,7 @@ HLOCAL WINAPI DECLSPEC_HOTPATCH LocalFree( HLOCAL handle )
 */
 LPVOID WINAPI DECLSPEC_HOTPATCH LocalLock( HLOCAL handle )
 {
+    HANDLE heap = GetProcessHeap();
    struct mem_entry *mem;
    void *ret = NULL;

@@ -794,9 +795,7 @@ LPVOID WINAPI DECLSPEC_HOTPATCH LocalLock( HLOCAL handle )
        return ret;
    }

-    RtlLockHeap( GetProcessHeap() );
-    __TRY
-    {
+    RtlLockHeap( heap );
    if ((mem = unsafe_mem_from_HLOCAL( handle )))
    {
        ret = mem->ptr;
@@ -808,14 +807,8 @@ LPVOID WINAPI DECLSPEC_HOTPATCH LocalLock( HLOCAL handle )
        WARN_(globalmem)( "invalid handle %p\n", handle );
        SetLastError( ERROR_INVALID_HANDLE );
    }
-    }
-    __EXCEPT_PAGE_FAULT
-    {
-        WARN_(globalmem)( "(%p): Page fault occurred ! Caused by bug ?\n", handle );
-        SetLastError( ERROR_INVALID_HANDLE );
-    }
-    __ENDTRY
-    RtlUnlockHeap( GetProcessHeap() );
+    RtlUnlockHeap( heap );
+
    return ret;
 }