From f63138d04991ce87722424f959279f03cbb29c09 Mon Sep 17 00:00:00 2001 From: Piotr Caban Date: Wed, 13 Nov 2019 22:07:31 +0100 Subject: [PATCH] ucrtbase: Set invalid parameter handler for all misc tests. Signed-off-by: Piotr Caban Signed-off-by: Alexandre Julliard --- dlls/ucrtbase/tests/misc.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 3a1598fee22..fb81cf220ec 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -430,6 +430,9 @@ static void test_invalid_parameter_handler(void) ret = p__set_invalid_parameter_handler(NULL); ok(ret == global_invalid_parameter_handler, "ret = %p\n", ret); + + ret = p__set_invalid_parameter_handler(global_invalid_parameter_handler); + ok(!ret, "ret != NULL\n"); } static void test__get_narrow_winmain_command_line(char *path) @@ -539,8 +542,6 @@ static void test__sopen_dispatch(void) p__close(fd); unlink(tempf); - p__set_invalid_parameter_handler(global_invalid_parameter_handler); - SET_EXPECT(global_invalid_parameter_handler); fd = 0; ret = p_sopen_dispatch(tempf, _O_CREAT, _SH_DENYWR, 0xff, &fd, 1); @@ -553,8 +554,6 @@ static void test__sopen_dispatch(void) unlink(tempf); } - p__set_invalid_parameter_handler(NULL); - free(tempf); } @@ -578,8 +577,6 @@ static void test__sopen_s(void) p__close(fd); unlink(tempf); - p__set_invalid_parameter_handler(global_invalid_parameter_handler); - /* _sopen_s() invokes invalid parameter handler on invalid pmode */ SET_EXPECT(global_invalid_parameter_handler); fd = 0; @@ -587,7 +584,6 @@ static void test__sopen_s(void) ok(ret == EINVAL, "got %d\n", ret); ok(fd == -1, "got fd %d\n", fd); CHECK_CALLED(global_invalid_parameter_handler); - p__set_invalid_parameter_handler(NULL); free(tempf); }