ntdll/tests: Always remove hook trampoline in test_kiuserexceptiondispatcher().

As it is not removed by the hook itself if the hook is not called in the last test. Fixes test failures on Win 2003. Signed-off-by: Paul Gofman <pgofman@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

ntdll/tests: Always remove hook trampoline in test_kiuserexceptiondispatcher().
d4052e0d · Paul Gofman · Alexandre Julliard · 0fa46138 · d4052e0d
Commit d4052e0d authored Aug 13, 2020 by Paul Gofman Committed by Alexandre Julliard Aug 13, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

exception.c dlls/ntdll/tests/exception.c +3 -0

No files found.
--- a/dlls/ntdll/tests/exception.c
+++ b/dlls/ntdll/tests/exception.c
@@ -1886,6 +1886,9 @@ static void test_kiuserexceptiondispatcher(void)
    ok(got_exception, "Handler was not called.\n");
    ok(hook_called || broken(!hook_called) /* 2003 */, "Hook was not called.\n");

+    memcpy(pKiUserExceptionDispatcher, saved_KiUserExceptionDispatcher_bytes,
+            sizeof(saved_KiUserExceptionDispatcher_bytes));
+
    RemoveVectoredExceptionHandler(vectored_handler);
    ret = VirtualProtect(pKiUserExceptionDispatcher, sizeof(saved_KiUserExceptionDispatcher_bytes),
            old_protect2, &old_protect2);