From 4799c86d0189be2370f675c0c8ced4e0542fe1d6 Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Thu, 28 Aug 2025 14:05:34 +0300 Subject: [PATCH] [MSVCRT_APITEST] Fix test condition for strtoul on ReactOS Wine msvcrt behaves like Vista+ here. Also disable related static_crt tests, because it isn't even well defined how they should behave and what to compare it to. --- modules/rostests/apitests/crt/tcstoul.h | 6 +++++- modules/rostests/apitests/crt/testlist.c | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/rostests/apitests/crt/tcstoul.h b/modules/rostests/apitests/crt/tcstoul.h index 240f65384f6..bfdf8f46cb7 100644 --- a/modules/rostests/apitests/crt/tcstoul.h +++ b/modules/rostests/apitests/crt/tcstoul.h @@ -63,7 +63,11 @@ START_TEST(tcstoul) StartSeh() Result = _tcstoul(NULL, NULL, 0); - EndSeh((GetNTVersion() >= _WIN32_WINNT_VISTA) ? 0 : STATUS_ACCESS_VIOLATION); +#ifdef TEST_CRTDLL + EndSeh(STATUS_ACCESS_VIOLATION); +#else + EndSeh(((GetNTVersion() >= _WIN32_WINNT_VISTA) || is_reactos()) ? 0 : STATUS_ACCESS_VIOLATION); +#endif StartSeh() Result = _tcstoul(_T(""), NULL, 0); diff --git a/modules/rostests/apitests/crt/testlist.c b/modules/rostests/apitests/crt/testlist.c index d7ad583d5da..706cc6b5b83 100644 --- a/modules/rostests/apitests/crt/testlist.c +++ b/modules/rostests/apitests/crt/testlist.c @@ -56,8 +56,8 @@ const struct test winetest_testlist[] = { "sprintf", func_sprintf }, { "strcpy", func_strcpy }, { "strlen", func_strlen }, - { "strtoul", func_strtoul }, - { "wcstoul", func_wcstoul }, + //{ "strtoul", func_strtoul }, + //{ "wcstoul", func_wcstoul }, { "wctomb", func_wctomb }, { "wcstombs", func_wcstombs }, { "ceil", func_ceil },