From 56b6abd5ea9cff53d1fd06e6aacb8173bc48c5cb Mon Sep 17 00:00:00 2001 From: Piotr Caban Date: Mon, 18 Oct 2021 14:57:29 +0200 Subject: [PATCH] ucrtbase: Fix fopen x mode test failures. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51894 Signed-off-by: Piotr Caban Signed-off-by: Alexandre Julliard (cherry picked from commit 658473332756991b2db05dd3fa70ea6dcc520750) Signed-off-by: Michael Stefaniuc --- dlls/ucrtbase/tests/misc.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 8dc1a1b2f8e..876b0f7b989 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -1377,17 +1377,18 @@ static void test_fopen_exclusive( void ) DWORD len; FILE *fp; - if (!GetProcAddress(GetModuleHandleA("ucrtbase.dll"), "__std_terminate")) - { - win_skip("skipping fopen x mode tests.\n"); - return; - } - len = GetTempPathA(MAX_PATH, path); ok(len, "GetTempPathA failed\n"); strcat(path, "\\fileexcl.tst"); + SET_EXPECT(global_invalid_parameter_handler); fp = fopen(path, "wx"); + if(called_global_invalid_parameter_handler) + { + win_skip("skipping fopen x mode tests.\n"); + return; + } + expect_global_invalid_parameter_handler = FALSE; ok(fp != NULL, "creating file with mode wx failed\n"); fclose(fp); @@ -1414,7 +1415,7 @@ static void test_fopen_exclusive( void ) ok(!fp, "creating file with mode xw succeeded\n"); fp = fopen(path, "wbx"); - ok(fp != NULL, "creating file with mode wx failed\n"); + ok(fp != NULL, "creating file with mode wbx failed\n"); fclose(fp); unlink(path); }