Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/07: [CRT] Make ML based asm code GAS compatible
by Timo Kreuzer 10 Nov '23

10 Nov '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a34f1ed03cd5c34e9fac9… commit a34f1ed03cd5c34e9fac95f72a9e2eb3947b84cc Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Oct 28 18:52:25 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Nov 10 19:20:24 2023 +0200 [CRT] Make ML based asm code GAS compatible Our transpiler asmpp cannot handle rip relative addressing for "[symbol]". --- sdk/lib/crt/math/libm_sse2/fmod.asm | 2 +- sdk/lib/crt/math/libm_sse2/fmodf.asm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/lib/crt/math/libm_sse2/fmod.asm b/sdk/lib/crt/math/libm_sse2/fmod.asm index cc1fb710997..880b12cf3ac 100644 --- a/sdk/lib/crt/math/libm_sse2/fmod.asm +++ b/sdk/lib/crt/math/libm_sse2/fmod.asm @@ -142,7 +142,7 @@ fmod PROC FRAME jmp @fail @fail: - lea rcx, [@fmodz] ; fname + lea rcx, @fmodz ; fname mov edx, FPCODEFMOD ; opcode ; mov r8, INDEF ; value mov r9d, DOMAIN ; type diff --git a/sdk/lib/crt/math/libm_sse2/fmodf.asm b/sdk/lib/crt/math/libm_sse2/fmodf.asm index 5e7aa2578fd..ddc4aca5e7e 100644 --- a/sdk/lib/crt/math/libm_sse2/fmodf.asm +++ b/sdk/lib/crt/math/libm_sse2/fmodf.asm @@ -142,7 +142,7 @@ fmodf PROC FRAME jmp @fail @fail: - lea rcx, [@fmodfz] ; fname + lea rcx, @fmodfz ; fname mov edx, FPCODEFMOD ; opcode ; mov r8d, [rsp] ; value mov r9d, DOMAIN ; type

1 0

[reactos] 03/03: [CRT] Fix parameter check for _memicmp on NT 6+
by Timo Kreuzer 10 Nov '23

10 Nov '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d4993c67cd8e9bb724cee… commit d4993c67cd8e9bb724ceeb26e0b252273c8184e1 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Sep 19 18:32:00 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Nov 10 19:19:22 2023 +0200 [CRT] Fix parameter check for _memicmp on NT 6+ Fixes a crash in msvcrt_winetest:string --- sdk/lib/crt/mem/memicmp.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/sdk/lib/crt/mem/memicmp.c b/sdk/lib/crt/mem/memicmp.c index b98608b3242..e99d9b2a2a2 100644 --- a/sdk/lib/crt/mem/memicmp.c +++ b/sdk/lib/crt/mem/memicmp.c @@ -8,6 +8,19 @@ int CDECL _memicmp(const void *s1, const void *s2, size_t n) { + if (NtCurrentPeb()->OSMajorVersion >= 6) + { + if (!s1 || !s2) + { + if (n != 0) + { + MSVCRT_INVALID_PMT(NULL, EINVAL); + return _NLSCMPERROR; + } + return 0; + } + } + if (n != 0) { const unsigned char *p1 = s1, *p2 = s2;

1 0

[reactos] 02/03: [CRT] Add parameter check to _mbscmp
by Timo Kreuzer 10 Nov '23

10 Nov '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=840dfdc3a112f2f5bb968… commit 840dfdc3a112f2f5bb968cd8e32650fdda320b94 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Sep 19 04:15:02 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Nov 10 19:19:22 2023 +0200 [CRT] Add parameter check to _mbscmp Fixes crash in msvcrt_winetest::string --- sdk/lib/crt/mbstring/mbscmp.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sdk/lib/crt/mbstring/mbscmp.c b/sdk/lib/crt/mbstring/mbscmp.c index 611d086cc45..8f93a5fc838 100644 --- a/sdk/lib/crt/mbstring/mbscmp.c +++ b/sdk/lib/crt/mbstring/mbscmp.c @@ -1,10 +1,14 @@ #include <mbstring.h> #include <string.h> +#include <precomp.h> /* * @implemented */ int _mbscmp(const unsigned char *str1, const unsigned char *str2) { + if (!MSVCRT_CHECK_PMT(str1 && str2)) + return _NLSCMPERROR; + return strcmp((const char*)str1, (char*)str2); }

1 0

[reactos] 01/03: [CRT][MSVCRT] Import _gcvt and _gcvt_s from wine and export _gcvt_s on Vista+
by Timo Kreuzer 10 Nov '23

10 Nov '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=86f98baaf8874e7854362… commit 86f98baaf8874e785436241859f1c20dd677f7b9 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Sep 10 19:00:54 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Nov 10 19:19:22 2023 +0200 [CRT][MSVCRT] Import _gcvt and _gcvt_s from wine and export _gcvt_s on Vista+ Fixes a crash in msvcrt_winetest string --- dll/win32/msvcrt/msvcrt.spec | 2 +- sdk/lib/crt/stdlib/gcvt.c | 93 +++++++++++++++++++++++++++++++------------- 2 files changed, 68 insertions(+), 27 deletions(-) diff --git a/dll/win32/msvcrt/msvcrt.spec b/dll/win32/msvcrt/msvcrt.spec index 9f2c5a55eb6..6a7b5372c51 100644 --- a/dll/win32/msvcrt/msvcrt.spec +++ b/dll/win32/msvcrt/msvcrt.spec @@ -549,7 +549,7 @@ @ stub -version=0x600+ _fwscanf_l @ stub -version=0x600+ _fwscanf_s_l @ cdecl _gcvt(double long str) -@ stub -version=0x600+ _gcvt_s +@ cdecl -version=0x600+ _gcvt_s(ptr ptr double long) @ cdecl -version=0x600+ _get_doserrno(ptr) @ stub -version=0x600+ _get_environ @ cdecl -version=0x600+ _get_errno(ptr) diff --git a/sdk/lib/crt/stdlib/gcvt.c b/sdk/lib/crt/stdlib/gcvt.c index 644478fafbb..56fbce83fca 100644 --- a/sdk/lib/crt/stdlib/gcvt.c +++ b/sdk/lib/crt/stdlib/gcvt.c @@ -1,32 +1,73 @@ -/* Copyright (C) 1998 DJ Delorie, see COPYING.DJ for details */ +/* + * msvcrt.dll math functions + * + * Copyright 2003 Alexandre Julliard <julliard(a)winehq.org> + * Copyright 2010 Piotr Caban <piotr(a)codeweavers.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + #include <precomp.h> -/* - * @implemented +/*********************************************************************** + * _gcvt (MSVCRT.@) */ -char * -_gcvt (double value, int ndigits, char *buf) +char* CDECL _gcvt(double number, int ndigit, char* buff) { - char *p = buf; - - sprintf (buf, "%-#.*g", ndigits, value); - - /* It seems they expect us to return .XXXX instead of 0.XXXX */ - if (*p == '-') - p++; - if (*p == '0' && p[1] == '.') - memmove (p, p + 1, strlen (p + 1) + 1); - - /* They want Xe-YY, not X.e-YY, and XXXX instead of XXXX. */ - p = strchr (buf, 'e'); - if (!p) - { - p = buf + strlen (buf); - /* They don't want trailing zeroes. */ - while (p[-1] == '0' && p > buf + 2) - *--p = '\0'; + if (!buff) { + *_errno() = EINVAL; + return NULL; + } + + if (ndigit < 0) { + *_errno() = ERANGE; + return NULL; } - if (p > buf && p[-1] == '.') - memmove (p - 1, p, strlen (p) + 1); - return buf; + + sprintf(buff, "%.*g", ndigit, number); + return buff; +} + +/*********************************************************************** + * _gcvt_s (MSVCRT.@) + */ +int CDECL _gcvt_s(char* buff, size_t size, double number, int digits) +{ + int len; + + if (!buff) { + *_errno() = EINVAL; + return EINVAL; + } + + if (digits < 0 || digits >= size) { + if (size) + buff[0] = '\0'; + + *_errno() = ERANGE; + return ERANGE; + } + + len = _scprintf("%.*g", digits, number); + if (len > size) { + buff[0] = '\0'; + *_errno() = ERANGE; + return ERANGE; + } + + sprintf(buff, "%.*g", digits, number); + return 0; }

1 0

[reactos] 06/06: [RTL_APITEST] Move RtlIntSafe test from kmtest to rtl_apitest
by Timo Kreuzer 10 Nov '23

10 Nov '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a3d22bba1af38a8f85857… commit a3d22bba1af38a8f8585736257767000466485aa Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat May 20 12:02:03 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Nov 10 19:00:41 2023 +0200 [RTL_APITEST] Move RtlIntSafe test from kmtest to rtl_apitest --- modules/rostests/apitests/ntdll/testlist.c | 2 ++ modules/rostests/apitests/rtl/CMakeLists.txt | 2 +- modules/rostests/{kmtests => apitests}/rtl/RtlIntSafe.c | 13 ++++++------- modules/rostests/apitests/rtl/testlist.c | 3 +++ modules/rostests/kmtests/CMakeLists.txt | 2 +- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/modules/rostests/apitests/ntdll/testlist.c b/modules/rostests/apitests/ntdll/testlist.c index cc19972f5aa..641a756f261 100644 --- a/modules/rostests/apitests/ntdll/testlist.c +++ b/modules/rostests/apitests/ntdll/testlist.c @@ -79,6 +79,7 @@ extern void func_RtlGetUnloadEventTrace(void); extern void func_RtlHandle(void); extern void func_RtlImageDirectoryEntryToData(void); extern void func_RtlImageRvaToVa(void); +extern void func_RtlIntSafe(void); extern void func_RtlIsNameLegalDOS8Dot3(void); extern void func_RtlMemoryStream(void); extern void func_RtlMultipleAllocateHeap(void); @@ -176,6 +177,7 @@ const struct test winetest_testlist[] = { "RtlHandle", func_RtlHandle }, { "RtlImageDirectoryEntryToData", func_RtlImageDirectoryEntryToData }, { "RtlImageRvaToVa", func_RtlImageRvaToVa }, + { "RtlIntSafe", func_RtlIntSafe }, { "RtlIsNameLegalDOS8Dot3", func_RtlIsNameLegalDOS8Dot3 }, { "RtlMemoryStream", func_RtlMemoryStream }, { "RtlMultipleAllocateHeap", func_RtlMultipleAllocateHeap }, diff --git a/modules/rostests/apitests/rtl/CMakeLists.txt b/modules/rostests/apitests/rtl/CMakeLists.txt index 7c74792dfd5..13bd9b7a718 100644 --- a/modules/rostests/apitests/rtl/CMakeLists.txt +++ b/modules/rostests/apitests/rtl/CMakeLists.txt @@ -1,7 +1,7 @@ list(APPEND SOURCE - # To be filled + RtlIntSafe.c ) if(ARCH STREQUAL "i386") diff --git a/modules/rostests/kmtests/rtl/RtlIntSafe.c b/modules/rostests/apitests/rtl/RtlIntSafe.c similarity index 97% rename from modules/rostests/kmtests/rtl/RtlIntSafe.c rename to modules/rostests/apitests/rtl/RtlIntSafe.c index bc8bd2854ec..bb00bc354c6 100644 --- a/modules/rostests/kmtests/rtl/RtlIntSafe.c +++ b/modules/rostests/apitests/rtl/RtlIntSafe.c @@ -5,8 +5,7 @@ * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> */ -#define KMT_EMULATE_KERNEL -#include <kmt_test.h> +#include <rtltests.h> #define ENABLE_INTSAFE_SIGNED_FUNCTIONS #include <ntintsafe.h> @@ -76,7 +75,7 @@ START_TEST(RtlIntSafe) TEST_CONVERSION(Long, LONG, UInt, UINT, uint, 0, 0, STATUS_SUCCESS); TEST_CONVERSION(Long, LONG, UInt, UINT, uint, 5, 5, STATUS_SUCCESS); - TEST_CONVERSION(Long, LONG, UInt, UINT, uint, LONG_MAX, LONG_MAX, STATUS_SUCCESS); + TEST_CONVERSION(Long, LONG, UInt, UINT, uint, INT_MAX, INT_MAX, STATUS_SUCCESS); TEST_CONVERSION(Long, LONG, UInt, UINT, uint, -1, (UINT)-1, STATUS_INTEGER_OVERFLOW); TEST_CONVERSION(Long, LONG, UInt, UINT, uint, LONG_MIN, (UINT)-1, STATUS_INTEGER_OVERFLOW); @@ -129,15 +128,15 @@ START_TEST(RtlIntSafe) TEST_ADD(Int8, INT8, int, INT8_MIN, -1, (INT8)-1, STATUS_INTEGER_OVERFLOW); TEST_ADD(Int8, INT8, int, INT8_MIN, INT8_MIN, (INT8)-1, STATUS_INTEGER_OVERFLOW); - TEST_ADD(LongLong, LONGLONG, longlong, 0, 0, 0, STATUS_SUCCESS); - TEST_ADD(LongLong, LONGLONG, longlong, 5, 5, 10, STATUS_SUCCESS); + TEST_ADD(LongLong, LONGLONG, longlong, 0, 0, (LONGLONG)0, STATUS_SUCCESS); + TEST_ADD(LongLong, LONGLONG, longlong, 5, 5, (LONGLONG)10, STATUS_SUCCESS); TEST_ADD(LongLong, LONGLONG, longlong, 0, LONGLONG_MAX, LONGLONG_MAX, STATUS_SUCCESS); TEST_ADD(LongLong, LONGLONG, longlong, LONGLONG_MAX, 0, LONGLONG_MAX, STATUS_SUCCESS); TEST_ADD(LongLong, LONGLONG, longlong, LONGLONG_MAX - 1, 1, LONGLONG_MAX, STATUS_SUCCESS); TEST_ADD(LongLong, LONGLONG, longlong, LONGLONG_MAX, 1, (LONGLONG)-1, STATUS_INTEGER_OVERFLOW); TEST_ADD(LongLong, LONGLONG, longlong, LONGLONG_MAX, INT8_MAX, (LONGLONG)-1, STATUS_INTEGER_OVERFLOW); - TEST_ADD(LongLong, LONGLONG, longlong, 0, -1, -1, STATUS_SUCCESS); - TEST_ADD(LongLong, LONGLONG, longlong, -1, 0, -1, STATUS_SUCCESS); + TEST_ADD(LongLong, LONGLONG, longlong, 0, -1, (LONGLONG)-1, STATUS_SUCCESS); + TEST_ADD(LongLong, LONGLONG, longlong, -1, 0, (LONGLONG)-1, STATUS_SUCCESS); TEST_ADD(LongLong, LONGLONG, longlong, 0, LONGLONG_MIN, LONGLONG_MIN, STATUS_SUCCESS); TEST_ADD(LongLong, LONGLONG, longlong, LONGLONG_MIN, 0, LONGLONG_MIN, STATUS_SUCCESS); TEST_ADD(LongLong, LONGLONG, longlong, LONGLONG_MAX, LONGLONG_MIN, (LONGLONG)-1, STATUS_SUCCESS); diff --git a/modules/rostests/apitests/rtl/testlist.c b/modules/rostests/apitests/rtl/testlist.c index ca7ad4c2a50..1eeed3b056b 100644 --- a/modules/rostests/apitests/rtl/testlist.c +++ b/modules/rostests/apitests/rtl/testlist.c @@ -4,9 +4,12 @@ #include <apitest.h> extern void func_RtlCaptureContext(void); +extern void func_RtlIntSafe(void); const struct test winetest_testlist[] = { + { "RtlIntSafe", func_RtlIntSafe }, + #ifdef _M_AMD64 { "RtlCaptureContext", func_RtlCaptureContext }, #endif diff --git a/modules/rostests/kmtests/CMakeLists.txt b/modules/rostests/kmtests/CMakeLists.txt index 4dd5572b13a..40c710f0a46 100644 --- a/modules/rostests/kmtests/CMakeLists.txt +++ b/modules/rostests/kmtests/CMakeLists.txt @@ -18,7 +18,7 @@ list(APPEND COMMON_SOURCE example/GuardedMemory.c rtl/RtlAvlTree.c rtl/RtlException.c - rtl/RtlIntSafe.c + ../apitests/rtl/RtlIntSafe.c rtl/RtlMemory.c rtl/RtlRegistry.c rtl/RtlSplayTree.c

1 0

[reactos] 05/06: [RTL_APITEST] Add rtl_unittest
by Timo Kreuzer 10 Nov '23

10 Nov '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bdf52a986814f4b3ae333… commit bdf52a986814f4b3ae333aca99225750e084a2ad Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat May 20 09:36:13 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Nov 10 19:00:41 2023 +0200 [RTL_APITEST] Add rtl_unittest First test is RtlCaptureContext --- modules/rostests/apitests/CMakeLists.txt | 1 + modules/rostests/apitests/ntdll/CMakeLists.txt | 5 +- modules/rostests/apitests/ntdll/testlist.c | 4 + modules/rostests/apitests/rtl/CMakeLists.txt | 56 +++++ .../apitests/rtl/amd64/RtlCaptureContext-asm.s | 182 +++++++++++++++ .../apitests/rtl/amd64/RtlCaptureContext.c | 243 +++++++++++++++++++++ .../rostests/apitests/rtl/i386/RtlCaptureContext.c | 18 ++ modules/rostests/apitests/rtl/ldrstubs.c | 17 ++ modules/rostests/apitests/rtl/rtltests.h | 12 + modules/rostests/apitests/rtl/testlist.c | 15 ++ modules/rostests/kmtests/CMakeLists.txt | 10 + modules/rostests/kmtests/include/rtltests.h | 5 + modules/rostests/kmtests/kmtest/testlist.c | 4 + modules/rostests/kmtests/kmtest_drv/testlist.c | 4 + 14 files changed, 574 insertions(+), 2 deletions(-) diff --git a/modules/rostests/apitests/CMakeLists.txt b/modules/rostests/apitests/CMakeLists.txt index ebc0bdfd4b5..4bb4e2ef024 100644 --- a/modules/rostests/apitests/CMakeLists.txt +++ b/modules/rostests/apitests/CMakeLists.txt @@ -40,6 +40,7 @@ add_subdirectory(ole32) add_subdirectory(opengl32) add_subdirectory(pefile) add_subdirectory(powrprof) +add_subdirectory(rtl) add_subdirectory(sdk) add_subdirectory(setupapi) add_subdirectory(sfc) diff --git a/modules/rostests/apitests/ntdll/CMakeLists.txt b/modules/rostests/apitests/ntdll/CMakeLists.txt index b6ce3a1cf4d..acc24d45a3e 100644 --- a/modules/rostests/apitests/ntdll/CMakeLists.txt +++ b/modules/rostests/apitests/ntdll/CMakeLists.txt @@ -101,7 +101,8 @@ list(APPEND SOURCE StackOverflow.c SystemInfo.c UserModeException.c - Timer.c) + Timer.c + precomp.h) if(ARCH STREQUAL "i386") add_asm_files(ntdll_apitest_asm i386/NtContinue.S) @@ -126,7 +127,7 @@ set_target_properties(ntdll_apitest ENABLE_EXPORTS TRUE DEFINE_SYMBOL "") -target_link_libraries(ntdll_apitest wine uuid ${PSEH_LIB}) +target_link_libraries(ntdll_apitest rtl_test_lib wine uuid ${PSEH_LIB}) set_module_type(ntdll_apitest win32cui) add_importlibs(ntdll_apitest msvcrt advapi32 kernel32 ntdll) add_pch(ntdll_apitest precomp.h "${PCH_SKIP_SOURCE}") diff --git a/modules/rostests/apitests/ntdll/testlist.c b/modules/rostests/apitests/ntdll/testlist.c index 438cc56a172..cc19972f5aa 100644 --- a/modules/rostests/apitests/ntdll/testlist.c +++ b/modules/rostests/apitests/ntdll/testlist.c @@ -54,6 +54,7 @@ extern void func_NtUnloadDriver(void); extern void func_NtWriteFile(void); extern void func_RtlAllocateHeap(void); extern void func_RtlBitmap(void); +extern void func_RtlCaptureContext(void); extern void func_RtlComputePrivatizedDllName_U(void); extern void func_RtlCopyMappedMemory(void); extern void func_RtlCriticalSection(void); @@ -194,6 +195,9 @@ const struct test winetest_testlist[] = { "StackOverflow", func_StackOverflow }, { "TimerResolution", func_TimerResolution }, { "UserModeException", func_UserModeException }, +#ifdef _M_AMD64 + { "RtlCaptureContext", func_RtlCaptureContext }, +#endif { 0, 0 } }; diff --git a/modules/rostests/apitests/rtl/CMakeLists.txt b/modules/rostests/apitests/rtl/CMakeLists.txt new file mode 100644 index 00000000000..7c74792dfd5 --- /dev/null +++ b/modules/rostests/apitests/rtl/CMakeLists.txt @@ -0,0 +1,56 @@ + + +list(APPEND SOURCE + # To be filled +) + +if(ARCH STREQUAL "i386") + list(APPEND SOURCE + i386/RtlCaptureContext.c + ) +elseif(ARCH STREQUAL "amd64") + list(APPEND ASM_SOURCE + amd64/RtlCaptureContext-asm.s + ) + list(APPEND SOURCE + amd64/RtlCaptureContext.c + ) +elseif(ARCH STREQUAL "arm") + list(APPEND SOURCE + # To be filled + ) +endif() + +add_asm_files(rtl_test_asm ${ASM_SOURCE}) + +add_library(rtl_test_lib + ${SOURCE} + ${rtl_test_asm} +) + +target_compile_definitions(rtl_test_lib PRIVATE _RTL_TEST _NTSYSTEM_) + +add_dependencies(rtl_test_lib asm) + +if(NOT MSVC) + set_source_files_properties(RtlGetFullPathName_UstrEx.c PROPERTIES COMPILE_FLAGS "-Wno-format") + + # Avoid "universal character names are only valid in C++ and C99" error. + set_property(TARGET rtl_test_lib PROPERTY C_STANDARD 99) +endif() + +# RTL tests with static linkage (called unittest, so it won't run in rosautotest) +add_executable(rtl_unittest + testlist.c + ldrstubs.c) +target_compile_definitions(rtl_unittest PRIVATE _RTL_TEST _NTSYSTEM_) +target_link_libraries(rtl_unittest rtl_test_lib rtl rtl_um rtl_vista wine uuid ${PSEH_LIB}) +set_module_type(rtl_unittest win32cui) +add_importlibs(rtl_unittest msvcrt advapi32 kernel32 ntdll) +target_compile_definitions(rtl_unittest PRIVATE KMT_USER_MODE NTDDI_VERSION=NTDDI_WS03SP1) + +add_rostests_file(TARGET rtl_unittest) + +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + target_compile_options(rtl_unittest PRIVATE -Wno-format) +endif() diff --git a/modules/rostests/apitests/rtl/amd64/RtlCaptureContext-asm.s b/modules/rostests/apitests/rtl/amd64/RtlCaptureContext-asm.s new file mode 100644 index 00000000000..35eb91169bf --- /dev/null +++ b/modules/rostests/apitests/rtl/amd64/RtlCaptureContext-asm.s @@ -0,0 +1,182 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Test helper for x64 RtlCaptureContext + * COPYRIGHT: Copyright 2022 Timo Kreuzer <timo.kreuzer(a)reactos.org> + */ + +#include <asm.inc> +#include <ksamd64.inc> + +.code64 + +EXTERN RtlCaptureContext:PROC + +FUNC ZeroContext + + pushfq + .ALLOCSTACK 8 + push rax + .PUSHREG rax + push rcx + .PUSHREG rcx + push rdi + .PUSHREG rdi + .ENDPROLOG + + mov rdi, rcx + mov rcx, CONTEXT_FRAME_LENGTH + xor eax, eax + cld + rep stosb + + pop rdi + pop rcx + pop rax + popfq + ret + +ENDFUNC + +// +// VOID +// RtlCaptureContextWrapper ( +// _Inout_ PCONTEXT InOutContext, +// _Out_ PCONTEXT CapturedContext); +// +PUBLIC RtlCaptureContextWrapper +FUNC RtlCaptureContextWrapper + + // Generate a KEXCEPTION_FRAME on the stack + GENERATE_EXCEPTION_FRAME + + // Save parameters + mov [rsp + ExP1Home], rcx + mov [rsp + ExP2Home], rdx + + // Save current EFlags + pushfq + pop qword ptr [rsp + ExP3Home] + + // Load integer registers from InOutContext + mov rax, [rcx + CxRax] + mov rdx, [rcx + CxRdx] + mov rbx, [rcx + CxRbx] + mov rbp, [rcx + CxRbp] + mov rsi, [rcx + CxRsi] + mov rdi, [rcx + CxRdi] + mov r8, [rcx + CxR8] + mov r9, [rcx + CxR9] + mov r10, [rcx + CxR10] + mov r11, [rcx + CxR11] + mov r12, [rcx + CxR12] + mov r13, [rcx + CxR13] + mov r14, [rcx + CxR14] + mov r15, [rcx + CxR15] + + // Load floating point registers from InOutContext + fxrstor [rcx + CxFltSave] + + // Load MxCsr (this overwrites the value from FltSave) + ldmxcsr [rcx + CxMxCsr] + + // Load XMM registers + movaps xmm0, [rcx + CxXmm0] + movaps xmm1, [rcx + CxXmm1] + movaps xmm2, [rcx + CxXmm2] + movaps xmm3, [rcx + CxXmm3] + movaps xmm4, [rcx + CxXmm4] + movaps xmm5, [rcx + CxXmm5] + movaps xmm6, [rcx + CxXmm6] + movaps xmm7, [rcx + CxXmm7] + movaps xmm8, [rcx + CxXmm8] + movaps xmm9, [rcx + CxXmm9] + movaps xmm10, [rcx + CxXmm10] + movaps xmm11, [rcx + CxXmm11] + movaps xmm12, [rcx + CxXmm12] + movaps xmm13, [rcx + CxXmm13] + movaps xmm14, [rcx + CxXmm14] + movaps xmm15, [rcx + CxXmm15] + + // Load EFlags + push qword ptr [rcx + CxEFlags] + popfq + + // Capture the context + mov rcx, [rsp + ExP2Home] + call RtlCaptureContext +ReturnAddress: + + // Save the returned rcx + mov [rsp + ExP4Home], rcx + + // Restore original rcx + mov rcx, [rsp + ExP1Home] + + // Zero out the context (this does not clobber any registers/flags) + call ZeroContext + + // Save returned Eflags + pushfq + pop qword ptr [rcx + CxEFlags] + + // Restore original EFLags + push qword ptr [rsp + ExP3Home] + popfq + + // Save returned integer registers to InOutContext + mov [rcx + CxRax], rax + mov [rcx + CxRdx], rdx + mov [rcx + CxRbx], rbx + mov [rcx + CxRbp], rbp + mov [rcx + CxRsi], rsi + mov [rcx + CxRdi], rdi + mov [rcx + CxR8], r8 + mov [rcx + CxR9], r9 + mov [rcx + CxR10], r10 + mov [rcx + CxR11], r11 + mov [rcx + CxR12], r12 + mov [rcx + CxR13], r13 + mov [rcx + CxR14], r14 + mov [rcx + CxR15], r15 + + // Save the returned rcx in the context + mov rax, [rsp + ExP4Home] + mov [rcx + CxRcx], rax + + // Save returned floating point registers to InOutContext + stmxcsr [rcx + CxMxCsr] + fxsave [rcx + CxFltSave] + movaps [rcx + CxXmm0], xmm0 + movaps [rcx + CxXmm1], xmm1 + movaps [rcx + CxXmm2], xmm2 + movaps [rcx + CxXmm3], xmm3 + movaps [rcx + CxXmm4], xmm4 + movaps [rcx + CxXmm5], xmm5 + movaps [rcx + CxXmm6], xmm6 + movaps [rcx + CxXmm7], xmm7 + movaps [rcx + CxXmm8], xmm8 + movaps [rcx + CxXmm9], xmm9 + movaps [rcx + CxXmm10], xmm10 + movaps [rcx + CxXmm11], xmm11 + movaps [rcx + CxXmm12], xmm12 + movaps [rcx + CxXmm13], xmm13 + movaps [rcx + CxXmm14], xmm14 + movaps [rcx + CxXmm15], xmm15 + + // Save the expected return address + lea rax, ReturnAddress[rip] + mov [rcx + CxRip], rax + + // Save the expected stored rsp + mov [rcx + CxRsp], rsp + + // Restore the registers from the KEXCEPTION_FRAME + RESTORE_EXCEPTION_STATE + + ret + +ENDFUNC + + +END diff --git a/modules/rostests/apitests/rtl/amd64/RtlCaptureContext.c b/modules/rostests/apitests/rtl/amd64/RtlCaptureContext.c new file mode 100644 index 00000000000..80917428485 --- /dev/null +++ b/modules/rostests/apitests/rtl/amd64/RtlCaptureContext.c @@ -0,0 +1,243 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Test for x64 RtlCaptureContext + * COPYRIGHT: Copyright 2022 Timo Kreuzer <timo.kreuzer(a)reactos.org> + */ + +#include <rtltests.h> + +VOID +RtlCaptureContextWrapper( + _Inout_ PCONTEXT InOutContext, + _Out_ PCONTEXT CapturedContext); + +START_TEST(RtlCaptureContext) +{ + CONTEXT OriginalContext, InOutContext, CapturedContext; + SIZE_T Index, MaxIndex; + PUSHORT Buffer; + + /* Initialize a pattern */ + MaxIndex = sizeof(OriginalContext) / sizeof(USHORT); + Buffer = (PUSHORT)&OriginalContext; + for (Index = 0; Index < MaxIndex; Index++) + { + Buffer[Index] = Index; + } + + /* Set all valid bits in EFlags */ + OriginalContext.EFlags = 0xE7F; + + /* Set up a valid floating point state */ + OriginalContext.FltSave.ControlWord = 0x27f; + OriginalContext.FltSave.StatusWord = 0x1234; + OriginalContext.FltSave.TagWord = 0xab; + OriginalContext.FltSave.Reserved1 = 0x75; + OriginalContext.FltSave.MxCsr = 0x1f80; // Valid Mask is 2FFFF + OriginalContext.FltSave.MxCsr_Mask = 0xabcde; + + /* Set up a unique MxCsr. This one will overwrite FltSave.MxCsr */ + OriginalContext.MxCsr = 0xffff; // Valid Mask is 0xFFFF + + /* Copy the original buffer */ + InOutContext = OriginalContext; + + /* Fill the output buffer with bogus */ + RtlFillMemory(&CapturedContext, sizeof(CapturedContext), 0xCC); + + /* Call the wrapper function */ + RtlCaptureContextWrapper(&InOutContext, &CapturedContext); + + /* These fields are not changed */ + ok_eq_hex64(CapturedContext.P1Home, 0xccccccccccccccccULL); + ok_eq_hex64(CapturedContext.P2Home, 0xccccccccccccccccULL); + ok_eq_hex64(CapturedContext.P3Home, 0xccccccccccccccccULL); + ok_eq_hex64(CapturedContext.P4Home, 0xccccccccccccccccULL); + ok_eq_hex64(CapturedContext.P5Home, 0xccccccccccccccccULL); + ok_eq_hex64(CapturedContext.P6Home, 0xccccccccccccccccULL); + ok_eq_hex64(CapturedContext.Dr0, 0xccccccccccccccccULL); + ok_eq_hex64(CapturedContext.Dr1, 0xccccccccccccccccULL); + ok_eq_hex64(CapturedContext.Dr2, 0xccccccccccccccccULL); + ok_eq_hex64(CapturedContext.Dr3, 0xccccccccccccccccULL); + ok_eq_hex64(CapturedContext.Dr6, 0xccccccccccccccccULL); + ok_eq_hex64(CapturedContext.Dr7, 0xccccccccccccccccULL); + ok_eq_hex64(CapturedContext.VectorControl, 0xccccccccccccccccULL); + ok_eq_hex64(CapturedContext.DebugControl, 0xccccccccccccccccULL); + ok_eq_hex64(CapturedContext.LastBranchToRip, 0xccccccccccccccccULL); + ok_eq_hex64(CapturedContext.LastBranchFromRip, 0xccccccccccccccccULL); + ok_eq_hex64(CapturedContext.LastExceptionToRip, 0xccccccccccccccccULL); + ok_eq_hex64(CapturedContext.LastExceptionFromRip, 0xccccccccccccccccULL); + for (Index = 0; Index < ARRAYSIZE(CapturedContext.FltSave.Reserved4); Index++) + { + ok_eq_hex64(CapturedContext.FltSave.Reserved4[Index], 0xcc); + } + for (Index = 0; Index < ARRAYSIZE(CapturedContext.VectorRegister); Index++) + { + ok_eq_hex64(CapturedContext.VectorRegister[Index].Low, 0xccccccccccccccccULL); + ok_eq_hex64(CapturedContext.VectorRegister[Index].High, 0xccccccccccccccccULL); + } + + /* ContextFlags is set */ + ok_eq_hex(CapturedContext.ContextFlags, CONTEXT_FULL | CONTEXT_SEGMENTS); + + /* These vallues are as passed in */ + ok_eq_hex(CapturedContext.MxCsr, OriginalContext.MxCsr); + ok_eq_hex64(CapturedContext.Rax, OriginalContext.Rax); + ok_eq_hex64(CapturedContext.Rcx, (ULONG64)&CapturedContext); + ok_eq_hex64(CapturedContext.Rdx, OriginalContext.Rdx); + ok_eq_hex64(CapturedContext.Rbx, OriginalContext.Rbx); + ok_eq_hex64(CapturedContext.Rbp, OriginalContext.Rbp); + ok_eq_hex64(CapturedContext.Rsi, OriginalContext.Rsi); + ok_eq_hex64(CapturedContext.Rdi, OriginalContext.Rdi); + ok_eq_hex64(CapturedContext.R8, OriginalContext.R8); + ok_eq_hex64(CapturedContext.R9, OriginalContext.R9); + ok_eq_hex64(CapturedContext.R10, OriginalContext.R10); + ok_eq_hex64(CapturedContext.R11, OriginalContext.R11); + ok_eq_hex64(CapturedContext.R12, OriginalContext.R12); + ok_eq_hex64(CapturedContext.R13, OriginalContext.R13); + ok_eq_hex64(CapturedContext.R14, OriginalContext.R14); + ok_eq_hex64(CapturedContext.R15, OriginalContext.R15); + + ok_eq_xmm(CapturedContext.Xmm0, OriginalContext.Xmm0); + ok_eq_xmm(CapturedContext.Xmm1, OriginalContext.Xmm1); + ok_eq_xmm(CapturedContext.Xmm2, OriginalContext.Xmm2); + ok_eq_xmm(CapturedContext.Xmm3, OriginalContext.Xmm3); + ok_eq_xmm(CapturedContext.Xmm4, OriginalContext.Xmm4); + ok_eq_xmm(CapturedContext.Xmm5, OriginalContext.Xmm5); + ok_eq_xmm(CapturedContext.Xmm6, OriginalContext.Xmm6); + ok_eq_xmm(CapturedContext.Xmm7, OriginalContext.Xmm7); + ok_eq_xmm(CapturedContext.Xmm8, OriginalContext.Xmm8); + ok_eq_xmm(CapturedContext.Xmm9, OriginalContext.Xmm9); + ok_eq_xmm(CapturedContext.Xmm10, OriginalContext.Xmm10); + ok_eq_xmm(CapturedContext.Xmm11, OriginalContext.Xmm11); + ok_eq_xmm(CapturedContext.Xmm12, OriginalContext.Xmm12); + ok_eq_xmm(CapturedContext.Xmm13, OriginalContext.Xmm13); + ok_eq_xmm(CapturedContext.Xmm14, OriginalContext.Xmm14); + ok_eq_xmm(CapturedContext.Xmm15, OriginalContext.Xmm15); + + /* Some EFlags fields are cleared */ + ok_eq_hex64(CapturedContext.EFlags, OriginalContext.EFlags & ~0x28); + +#ifndef KMT_KERNEL_MODE // User mode + ok_eq_hex(CapturedContext.FltSave.ControlWord, 0x27f); + ok_eq_hex(CapturedContext.FltSave.StatusWord, OriginalContext.FltSave.StatusWord); + ok_eq_hex(CapturedContext.FltSave.TagWord, OriginalContext.FltSave.TagWord); + ok_eq_hex(CapturedContext.FltSave.Reserved1, 0x00); + ok_eq_hex(CapturedContext.FltSave.MxCsr_Mask, 0xffff); + ok_eq_hex(CapturedContext.FltSave.ErrorOpcode, 0x00000083); + ok_eq_hex(CapturedContext.FltSave.ErrorOffset, 0x00850084); + ok_eq_hex(CapturedContext.FltSave.ErrorSelector, 0x0086); + ok_eq_hex(CapturedContext.FltSave.Reserved2, 0x0000); + ok_eq_hex(CapturedContext.FltSave.DataOffset, 0x00890088); + ok_eq_hex(CapturedContext.FltSave.DataSelector, 0x008a); + ok_eq_hex(CapturedContext.FltSave.Reserved3, 0x0000); +#else + ok_eq_hex(CapturedContext.FltSave.ControlWord, 0xcccc); + ok_eq_hex(CapturedContext.FltSave.StatusWord, 0xcccc); + ok_eq_hex(CapturedContext.FltSave.TagWord, 0xcc); + ok_eq_hex(CapturedContext.FltSave.Reserved1, 0xcc); + ok_eq_hex(CapturedContext.FltSave.MxCsr_Mask, 0xcccccccc); + ok_eq_hex(CapturedContext.FltSave.ErrorOpcode, 0xcccc); + ok_eq_hex(CapturedContext.FltSave.ErrorOffset, 0xcccccccc); + ok_eq_hex(CapturedContext.FltSave.ErrorSelector, 0xcccc); + ok_eq_hex(CapturedContext.FltSave.Reserved2, 0xcccc); + ok_eq_hex(CapturedContext.FltSave.DataOffset, 0xcccccccc); + ok_eq_hex(CapturedContext.FltSave.DataSelector, 0xcccc); + ok_eq_hex(CapturedContext.FltSave.Reserved3, 0xcccc); +#endif + + /* We get the value from OriginalContext.MxCsr, since we set that later in the wrapper */ + ok_eq_hex(CapturedContext.FltSave.MxCsr, OriginalContext.MxCsr); + + /* Legacy floating point registers are truncated to 10 bytes */ + ok_eq_hex64(CapturedContext.Legacy[0].Low, OriginalContext.Legacy[0].Low); + ok_eq_hex64(CapturedContext.Legacy[0].High, OriginalContext.Legacy[0].High & 0xFF); + ok_eq_hex64(CapturedContext.Legacy[1].Low, OriginalContext.Legacy[1].Low); + ok_eq_hex64(CapturedContext.Legacy[1].High, OriginalContext.Legacy[1].High & 0xFF); + ok_eq_hex64(CapturedContext.Legacy[2].Low, OriginalContext.Legacy[2].Low); + ok_eq_hex64(CapturedContext.Legacy[2].High, OriginalContext.Legacy[2].High & 0xFF); + ok_eq_hex64(CapturedContext.Legacy[3].Low, OriginalContext.Legacy[3].Low); + ok_eq_hex64(CapturedContext.Legacy[3].High, OriginalContext.Legacy[3].High & 0xFF); + ok_eq_hex64(CapturedContext.Legacy[4].Low, OriginalContext.Legacy[4].Low); + ok_eq_hex64(CapturedContext.Legacy[4].High, OriginalContext.Legacy[4].High & 0xFF); + ok_eq_hex64(CapturedContext.Legacy[5].Low, OriginalContext.Legacy[5].Low); + ok_eq_hex64(CapturedContext.Legacy[5].High, OriginalContext.Legacy[5].High & 0xFF); + ok_eq_hex64(CapturedContext.Legacy[6].Low, OriginalContext.Legacy[6].Low); + ok_eq_hex64(CapturedContext.Legacy[6].High, OriginalContext.Legacy[6].High & 0xFF); + ok_eq_hex64(CapturedContext.Legacy[7].Low, OriginalContext.Legacy[7].Low); + ok_eq_hex64(CapturedContext.Legacy[7].High, OriginalContext.Legacy[7].High & 0xFF); + + /* We don't pass in segments, but expect the default values */ + ok_eq_hex(CapturedContext.SegCs, 0x33); + ok_eq_hex(CapturedContext.SegDs, 0x2b); + ok_eq_hex(CapturedContext.SegEs, 0x2b); + ok_eq_hex(CapturedContext.SegFs, 0x53); + ok_eq_hex(CapturedContext.SegGs, 0x2b); + ok_eq_hex(CapturedContext.SegSs, 0x2b); + + /* For Rsp and Rip we get the expected value back from the asm wrapper */ + ok_eq_hex64(CapturedContext.Rsp, InOutContext.Rsp); + ok_eq_hex64(CapturedContext.Rip, InOutContext.Rip); + + /* Check that these registers are not modified by RtlCaptureContext */ + ok_eq_xmm(InOutContext.Xmm0, OriginalContext.Xmm0); + ok_eq_xmm(InOutContext.Xmm1, OriginalContext.Xmm1); + ok_eq_xmm(InOutContext.Xmm2, OriginalContext.Xmm2); + ok_eq_xmm(InOutContext.Xmm3, OriginalContext.Xmm3); + ok_eq_xmm(InOutContext.Xmm4, OriginalContext.Xmm4); + ok_eq_xmm(InOutContext.Xmm5, OriginalContext.Xmm5); + ok_eq_xmm(InOutContext.Xmm6, OriginalContext.Xmm6); + ok_eq_xmm(InOutContext.Xmm7, OriginalContext.Xmm7); + ok_eq_xmm(InOutContext.Xmm8, OriginalContext.Xmm8); + ok_eq_xmm(InOutContext.Xmm9, OriginalContext.Xmm9); + ok_eq_xmm(InOutContext.Xmm10, OriginalContext.Xmm10); + ok_eq_xmm(InOutContext.Xmm11, OriginalContext.Xmm11); + ok_eq_xmm(InOutContext.Xmm12, OriginalContext.Xmm12); + ok_eq_xmm(InOutContext.Xmm13, OriginalContext.Xmm13); + ok_eq_xmm(InOutContext.Xmm14, OriginalContext.Xmm14); + ok_eq_xmm(InOutContext.Xmm15, OriginalContext.Xmm15); + ok_eq_hex64(InOutContext.Rdx, OriginalContext.Rdx); + ok_eq_hex64(InOutContext.Rbx, OriginalContext.Rbx); + ok_eq_hex64(InOutContext.Rbp, OriginalContext.Rbp); + ok_eq_hex64(InOutContext.Rsi, OriginalContext.Rsi); + ok_eq_hex64(InOutContext.Rdi, OriginalContext.Rdi); + ok_eq_hex64(InOutContext.R8, OriginalContext.R8); + ok_eq_hex64(InOutContext.R9, OriginalContext.R9); + ok_eq_hex64(InOutContext.R10, OriginalContext.R10); + ok_eq_hex64(InOutContext.R11, OriginalContext.R11); + ok_eq_hex64(InOutContext.R12, OriginalContext.R12); + ok_eq_hex64(InOutContext.R13, OriginalContext.R13); + ok_eq_hex64(InOutContext.R14, OriginalContext.R14); + ok_eq_hex64(InOutContext.R15, OriginalContext.R15); + + /* Eflags is changed (parity is flaky) */ + ok_eq_hex64(InOutContext.EFlags & ~0x04, OriginalContext.EFlags & 0x782); + + /* MxCsr is the one we passed in in OriginalContext.MxCsr */ + ok_eq_hex(InOutContext.MxCsr, OriginalContext.MxCsr); + ok_eq_hex(InOutContext.FltSave.MxCsr, OriginalContext.MxCsr); + + /* Rcx still points to the captured context */ + ok_eq_hex64(InOutContext.Rcx, (ULONG64)&CapturedContext); + + /* Rax contains eflags */ + ok_eq_hex64(InOutContext.Rax, CapturedContext.EFlags); + + /* Second run with minimal EFLags/MxCsr */ + OriginalContext.EFlags = 0x200; + OriginalContext.MxCsr = 0x0000; + InOutContext = OriginalContext; + RtlFillMemory(&CapturedContext, sizeof(CapturedContext), 0xCC); + RtlCaptureContextWrapper(&InOutContext, &CapturedContext); + + /* Captured Eflags has reserved flag set (which is always 1) */ + ok_eq_hex64(CapturedContext.EFlags, OriginalContext.EFlags | 2); + + /* Parity flag is flaky */ + ok_eq_hex64(InOutContext.EFlags & ~4, CapturedContext.EFlags); + + /* MxCsr is captured/returned as passed in */ + ok_eq_hex64(InOutContext.MxCsr, CapturedContext.MxCsr); + ok_eq_hex64(CapturedContext.MxCsr, OriginalContext.MxCsr); +} diff --git a/modules/rostests/apitests/rtl/i386/RtlCaptureContext.c b/modules/rostests/apitests/rtl/i386/RtlCaptureContext.c new file mode 100644 index 00000000000..eccf129b633 --- /dev/null +++ b/modules/rostests/apitests/rtl/i386/RtlCaptureContext.c @@ -0,0 +1,18 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Test for x86 RtlCaptureContext + * COPYRIGHT: Copyright 2022 Timo Kreuzer <timo.kreuzer(a)reactos.org> + */ + +#include <rtltests.h> + +VOID +RtlCaptureContextWrapper( + _Inout_ PCONTEXT InOutContext, + _Out_ PCONTEXT CapturedContext); + +START_TEST(RtlCaptureContext) +{ + // TODO +} diff --git a/modules/rostests/apitests/rtl/ldrstubs.c b/modules/rostests/apitests/rtl/ldrstubs.c new file mode 100644 index 00000000000..c04ac0837bb --- /dev/null +++ b/modules/rostests/apitests/rtl/ldrstubs.c @@ -0,0 +1,17 @@ +#include <rtltests.h> +#include <pseh/pseh2.h> +#include <compat_undoc.h> +#include <compatguid_undoc.h> + +#define NDEBUG +#include <debug.h> + +BOOLEAN LdrpShutdownInProgress; +HANDLE LdrpShutdownThreadId; + +VOID +NTAPI +LdrpInitializeProcessCompat(PVOID pProcessActctx, PVOID* pOldShimData) +{ +} + diff --git a/modules/rostests/apitests/rtl/rtltests.h b/modules/rostests/apitests/rtl/rtltests.h new file mode 100644 index 00000000000..f6bf7c007e8 --- /dev/null +++ b/modules/rostests/apitests/rtl/rtltests.h @@ -0,0 +1,12 @@ + +#pragma once + +#include <stdio.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include <apitest.h> +#include <ndk/ntndk.h> +#include <strsafe.h> diff --git a/modules/rostests/apitests/rtl/testlist.c b/modules/rostests/apitests/rtl/testlist.c new file mode 100644 index 00000000000..ca7ad4c2a50 --- /dev/null +++ b/modules/rostests/apitests/rtl/testlist.c @@ -0,0 +1,15 @@ +#define __ROS_LONG64__ + +#define STANDALONE +#include <apitest.h> + +extern void func_RtlCaptureContext(void); + +const struct test winetest_testlist[] = +{ +#ifdef _M_AMD64 + { "RtlCaptureContext", func_RtlCaptureContext }, +#endif + + { 0, 0 } +}; diff --git a/modules/rostests/kmtests/CMakeLists.txt b/modules/rostests/kmtests/CMakeLists.txt index da4d3288342..4dd5572b13a 100644 --- a/modules/rostests/kmtests/CMakeLists.txt +++ b/modules/rostests/kmtests/CMakeLists.txt @@ -26,6 +26,16 @@ list(APPEND COMMON_SOURCE rtl/RtlStrSafe.c rtl/RtlUnicodeString.c) +if(ARCH STREQUAL "i386") + +elseif(ARCH STREQUAL "amd64") + add_asm_files(kmtest_common_asm ../apitests/rtl/amd64/RtlCaptureContext-asm.s) + list(APPEND COMMON_SOURCE + ../apitests/rtl/amd64/RtlCaptureContext.c + ${kmtest_common_asm} + ) +endif() + # # kmtest_drv.sys driver # diff --git a/modules/rostests/kmtests/include/rtltests.h b/modules/rostests/kmtests/include/rtltests.h new file mode 100644 index 00000000000..ec53f937fd7 --- /dev/null +++ b/modules/rostests/kmtests/include/rtltests.h @@ -0,0 +1,5 @@ + +#pragma once + +#define KMT_EMULATE_KERNEL +#include <kmt_test.h> diff --git a/modules/rostests/kmtests/kmtest/testlist.c b/modules/rostests/kmtests/kmtest/testlist.c index 5461e2ffe37..9f9197e3bff 100644 --- a/modules/rostests/kmtests/kmtest/testlist.c +++ b/modules/rostests/kmtests/kmtest/testlist.c @@ -25,6 +25,7 @@ KMT_TESTFUNC Test_MmMapLockedPagesSpecifyCache; KMT_TESTFUNC Test_NtCreateSection; KMT_TESTFUNC Test_PoIrp; KMT_TESTFUNC Test_RtlAvlTree; +KMT_TESTFUNC Test_RtlCaptureContext; KMT_TESTFUNC Test_RtlException; KMT_TESTFUNC Test_RtlIntSafe; KMT_TESTFUNC Test_RtlMemory; @@ -69,5 +70,8 @@ const KMT_TEST TestList[] = { "RtlUnicodeString", Test_RtlUnicodeString }, { "TcpIpTdi", Test_TcpIpTdi }, { "TcpIpConnect", Test_TcpIpConnect }, +#ifdef _M_AMD64 + { "RtlCaptureContext", Test_RtlCaptureContext }, +#endif { NULL, NULL }, }; diff --git a/modules/rostests/kmtests/kmtest_drv/testlist.c b/modules/rostests/kmtests/kmtest_drv/testlist.c index 73daeba02df..1bc9fd00336 100644 --- a/modules/rostests/kmtests/kmtest_drv/testlist.c +++ b/modules/rostests/kmtests/kmtest_drv/testlist.c @@ -71,6 +71,7 @@ KMT_TESTFUNC Test_SeLogonSession; KMT_TESTFUNC Test_SeQueryInfoToken; KMT_TESTFUNC Test_SeTokenFiltering; KMT_TESTFUNC Test_RtlAvlTree; +KMT_TESTFUNC Test_RtlCaptureContext; KMT_TESTFUNC Test_RtlException; KMT_TESTFUNC Test_RtlIntSafe; KMT_TESTFUNC Test_RtlIsValidOemCharacter; @@ -167,5 +168,8 @@ const KMT_TEST TestList[] = { "ZwCreateSection", Test_ZwCreateSection }, { "ZwMapViewOfSection", Test_ZwMapViewOfSection }, { "ZwWaitForMultipleObjects", Test_ZwWaitForMultipleObjects}, +#ifdef _M_AMD64 + { "RtlCaptureContext", Test_RtlCaptureContext }, +#endif { NULL, NULL } };

1 0

[reactos] 04/06: [CRT] Define _NTSYSTEM_ in 2 files to force using import-stubs
by Timo Kreuzer 10 Nov '23

10 Nov '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=51b5d846e9f01782e3d72… commit 51b5d846e9f01782e3d729a9a8e03c2a4df49cb4 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat May 20 21:08:58 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Nov 10 19:00:41 2023 +0200 [CRT] Define _NTSYSTEM_ in 2 files to force using import-stubs This prevents the code from linking to __imp_*, which would pull in the symbol from the import library (e.g. kernel32), which creates problems with the GNU linker, which doesn't like to have the import and a static definition at the same time. --- sdk/lib/crt/startup/crt_handler.c | 2 +- sdk/lib/crt/startup/gs_support.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk/lib/crt/startup/crt_handler.c b/sdk/lib/crt/startup/crt_handler.c index a01ab8d7abf..5f102bb774a 100644 --- a/sdk/lib/crt/startup/crt_handler.c +++ b/sdk/lib/crt/startup/crt_handler.c @@ -11,7 +11,7 @@ #include <memory.h> #include <signal.h> #include <stdio.h> - +#define _NTSYSTEM_ #include <windef.h> #include <winbase.h> diff --git a/sdk/lib/crt/startup/gs_support.c b/sdk/lib/crt/startup/gs_support.c index 1a6d70d38cd..a8027b38c7a 100644 --- a/sdk/lib/crt/startup/gs_support.c +++ b/sdk/lib/crt/startup/gs_support.c @@ -3,7 +3,7 @@ * This file is part of the w64 mingw-runtime package. * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ - +#define _NTSYSTEM_ #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN #endif @@ -116,7 +116,7 @@ __report_gsfailure (ULONG_PTR StackCookie) RtlCaptureContext (&GS_ContextRecord); controlPC = GS_ContextRecord.Rip; - fctEntry = RtlLookupFunctionEntry (controlPC, &imgBase, NULL); + fctEntry = RtlLookupFunctionEntry(controlPC, &imgBase, NULL); if (fctEntry != NULL) { RtlVirtualUnwind (UNW_FLAG_NHANDLER, imgBase, controlPC, fctEntry,

1 0

[reactos] 03/06: [APITESTS] Share ok_eq_* macros between apitests and kmtests
by Timo Kreuzer 10 Nov '23

10 Nov '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=520cf2294d6ee932ba68b… commit 520cf2294d6ee932ba68bc07d357930a26da5e8a Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Aug 11 14:06:02 2022 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Nov 10 19:00:41 2023 +0200 [APITESTS] Share ok_eq_* macros between apitests and kmtests This makes it possible to share sources between kmtest and apitests, e.g. for rtl. --- modules/rostests/apitests/include/apitest.h | 32 ++++++++++++++++++++++ modules/rostests/apitests/ntdll/NtContinue.c | 5 ---- .../RtlDosApplyFileIsolationRedirection_Ustr.c | 3 -- .../apitests/ntdll/RtlDosSearchPath_Ustr.c | 4 --- modules/rostests/kmtests/include/kmt_test.h | 3 ++ 5 files changed, 35 insertions(+), 12 deletions(-) diff --git a/modules/rostests/apitests/include/apitest.h b/modules/rostests/apitests/include/apitest.h index 50bf98b5930..d0cfb711d18 100644 --- a/modules/rostests/apitests/include/apitest.h +++ b/modules/rostests/apitests/include/apitest.h @@ -54,4 +54,36 @@ #define ok_hr(status, expected) ok_hex(status, expected) #define ok_hr_(file, line, status, expected) ok_hex_(file, line, status, expected) +#define ok_eq_print(value, expected, spec) ok((value) == (expected), #value " = " spec ", expected " spec "\n", value, expected) +#define ok_eq_pointer(value, expected) ok_eq_print(value, expected, "%p") +#define ok_eq_int(value, expected) ok_eq_print(value, expected, "%d") +#define ok_eq_uint(value, expected) ok_eq_print(value, expected, "%u") +#define ok_eq_long(value, expected) ok_eq_print(value, expected, "%ld") +#define ok_eq_ulong(value, expected) ok_eq_print(value, expected, "%lu") +#define ok_eq_longlong(value, expected) ok_eq_print(value, expected, "%I64d") +#define ok_eq_ulonglong(value, expected) ok_eq_print(value, expected, "%I64u") +#define ok_eq_char(value, expected) ok_eq_print(value, expected, "%c") +#define ok_eq_wchar(value, expected) ok_eq_print(value, expected, "%C") +#ifndef _WIN64 +#define ok_eq_size(value, expected) ok_eq_print(value, (SIZE_T)(expected), "%lu") +#define ok_eq_longptr(value, expected) ok_eq_print(value, (LONG_PTR)(expected), "%ld") +#define ok_eq_ulongptr(value, expected) ok_eq_print(value, (ULONG_PTR)(expected), "%lu") +#elif defined _WIN64 +#define ok_eq_size(value, expected) ok_eq_print(value, (SIZE_T)(expected), "%I64u") +#define ok_eq_longptr(value, expected) ok_eq_print(value, (LONG_PTR)(expected), "%I64d") +#define ok_eq_ulongptr(value, expected) ok_eq_print(value, (ULONG_PTR)(expected), "%I64u") +#endif /* defined _WIN64 */ +#define ok_eq_hex(value, expected) ok_eq_print(value, expected, "0x%08lx") +#define ok_bool_true(value, desc) ok((value) == TRUE, desc " FALSE, expected TRUE\n") +#define ok_bool_false(value, desc) ok((value) == FALSE, desc " TRUE, expected FALSE\n") +#define ok_eq_bool(value, expected) ok((value) == (expected), #value " = %s, expected %s\n", \ + (value) ? "TRUE" : "FALSE", \ + (expected) ? "TRUE" : "FALSE") +#define ok_eq_str(value, expected) ok(!strcmp(value, expected), #value " = \"%s\", expected \"%s\"\n", value, expected) +#define ok_eq_wstr(value, expected) ok(!wcscmp(value, expected), #value " = \"%ls\", expected \"%ls\"\n", value, expected) +#define ok_eq_tag(value, expected) ok_eq_print(value, expected, "0x%08lx") + +#define ok_eq_hex64(value, expected) ok_eq_print(value, expected, "%I64x") +#define ok_eq_xmm(value, expected) ok((value).Low == (expected).Low, #value " = %I64x'%08I64x, expected %I64x'%08I64x\n", (value).Low, (value).High, (expected).Low, (expected).High) + #endif /* _APITEST_H */ diff --git a/modules/rostests/apitests/ntdll/NtContinue.c b/modules/rostests/apitests/ntdll/NtContinue.c index f159c7bf3f7..5d533f9f2ef 100644 --- a/modules/rostests/apitests/ntdll/NtContinue.c +++ b/modules/rostests/apitests/ntdll/NtContinue.c @@ -14,11 +14,6 @@ #pragma runtime_checks("s", off) #endif -#define ok_eq_print(value, expected, spec) ok((value) == (expected), #value " = " spec ", expected " spec "\n", value, expected) -#define ok_eq_hex(value, expected) ok_eq_print(value, expected, "%lx") -#define ok_eq_hex64(value, expected) ok_eq_print(value, expected, "%I64x") -#define ok_eq_xmm(value, expected) ok((value).Low == (expected).Low, #value " = %I64x'%08I64x, expected %I64x'%08I64x\n", (value).Low, (value).High, (expected).Low, (expected).High) - #ifdef _M_IX86 #define NTC_SEGMENT_BITS (0xFFFF) #define NTC_EFLAGS_BITS (0x3C0CD5) diff --git a/modules/rostests/apitests/ntdll/RtlDosApplyFileIsolationRedirection_Ustr.c b/modules/rostests/apitests/ntdll/RtlDosApplyFileIsolationRedirection_Ustr.c index 4dff2668bea..7ab2aa4af61 100644 --- a/modules/rostests/apitests/ntdll/RtlDosApplyFileIsolationRedirection_Ustr.c +++ b/modules/rostests/apitests/ntdll/RtlDosApplyFileIsolationRedirection_Ustr.c @@ -7,9 +7,6 @@ #include "precomp.h" -#define ok_eq_hex(value, expected) ok((value) == (expected), #value " = 0x%lx, expected 0x%lx\n", value, expected) -#define ok_eq_pointer(value, expected) ok((value) == (expected), #value " = %p, expected %p\n", value, expected) - #define EXPECT_IN_SAME_DIR (WCHAR*)0xdead UNICODE_STRING DotDll = RTL_CONSTANT_STRING(L".DLL"); diff --git a/modules/rostests/apitests/ntdll/RtlDosSearchPath_Ustr.c b/modules/rostests/apitests/ntdll/RtlDosSearchPath_Ustr.c index 6a4de4ee8fe..29794bf4e8d 100644 --- a/modules/rostests/apitests/ntdll/RtlDosSearchPath_Ustr.c +++ b/modules/rostests/apitests/ntdll/RtlDosSearchPath_Ustr.c @@ -23,10 +23,6 @@ RtlDosSearchPath_Ustr( ); */ -#define ok_eq_ulong(value, expected) ok((value) == (expected), #value " = %lu, expected %lu\n", value, expected) -#define ok_eq_hex(value, expected) ok((value) == (expected), #value " = 0x%lx, expected 0x%lx\n", value, expected) -#define ok_eq_pointer(value, expected) ok((value) == (expected), #value " = %p, expected %p\n", value, expected) - #define ok_eq_ustr(str1, str2) do { \ ok((str1)->Buffer == (str2)->Buffer, "Buffer modified\n"); \ ok((str1)->Length == (str2)->Length, "Length modified\n"); \ diff --git a/modules/rostests/kmtests/include/kmt_test.h b/modules/rostests/kmtests/include/kmt_test.h index 4f25d6580b8..2f0315a48b5 100644 --- a/modules/rostests/kmtests/include/kmt_test.h +++ b/modules/rostests/kmtests/include/kmt_test.h @@ -264,6 +264,9 @@ VOID KmtFreeGuarded(PVOID Pointer); #define ok_eq_wstr(value, expected) ok(!wcscmp(value, expected), #value " = \"%ls\", expected \"%ls\"\n", value, expected) #define ok_eq_tag(value, expected) ok_eq_print(value, expected, "0x%08lx") +#define ok_eq_hex64(value, expected) ok_eq_print(value, expected, "%I64x") +#define ok_eq_xmm(value, expected) ok((value).Low == (expected).Low, #value " = %I64x'%08I64x, expected %I64x'%08I64x\n", (value).Low, (value).High, (expected).Low, (expected).High) + #define KMT_MAKE_CODE(ControlCode) CTL_CODE(FILE_DEVICE_UNKNOWN, \ 0xC00 + (ControlCode), \ METHOD_BUFFERED, \

1 0

[reactos] 02/06: [RTL] Add object library rtl_um
by Timo Kreuzer 10 Nov '23

10 Nov '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5ecead80e3595d2b06e58… commit 5ecead80e3595d2b06e589e62a01e8230e0a5d40 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat May 27 15:29:19 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Nov 10 19:00:41 2023 +0200 [RTL] Add object library rtl_um --- dll/ntdll/CMakeLists.txt | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dll/ntdll/CMakeLists.txt b/dll/ntdll/CMakeLists.txt index 6d383bd6df4..3fee0a79ce1 100644 --- a/dll/ntdll/CMakeLists.txt +++ b/dll/ntdll/CMakeLists.txt @@ -17,6 +17,13 @@ include_directories( BEFORE include ${REACTOS_SOURCE_DIR}/sdk/include/reactos/subsys) +add_library(rtl_um OBJECT + rtl/libsupp.c + rtl/uilist.c + rtl/version.c) +target_link_libraries(rtl_um ${PSEH_LIB}) +add_dependencies(rtl_um psdk) + list(APPEND SOURCE dbg/dbgui.c ldr/ldrapi.c @@ -24,9 +31,6 @@ list(APPEND SOURCE ldr/ldrpe.c ldr/ldrutils.c ldr/verifier.c - rtl/libsupp.c - rtl/uilist.c - rtl/version.c etw/trace.c) if(ARCH STREQUAL "i386") @@ -57,7 +61,7 @@ set_module_type(ntdll win32dll ENTRYPOINT 0) set_subsystem(ntdll console) ################# END HACK ################# -target_link_libraries(ntdll csrlib rtl rtl_vista ntdllsys libcntpr uuid ${PSEH_LIB}) +target_link_libraries(ntdll csrlib rtl rtl_um rtl_vista ntdllsys libcntpr uuid ${PSEH_LIB}) if (STACK_PROTECTOR) target_sources(ntdll PRIVATE $<TARGET_OBJECTS:gcc_ssp_nt>)

1 0

[reactos] 01/06: [RTL] Get rid of x86 asm version of RtlpGetStackLimits
by Timo Kreuzer 10 Nov '23

10 Nov '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4bd1e819986d818347413… commit 4bd1e819986d8183474130d34e9539560aac44d7 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat May 20 11:59:09 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Nov 10 19:00:41 2023 +0200 [RTL] Get rid of x86 asm version of RtlpGetStackLimits There is no point in writing this function in asm. --- dll/ntdll/dispatch/i386/dispatch.S | 16 ---------------- dll/ntdll/rtl/libsupp.c | 2 -- ntoskrnl/ntos.cmake | 2 +- ntoskrnl/rtl/i386/{stack.S => prefetch.S} | 22 ---------------------- ntoskrnl/rtl/libsupp.c | 7 +++++-- 5 files changed, 6 insertions(+), 43 deletions(-) diff --git a/dll/ntdll/dispatch/i386/dispatch.S b/dll/ntdll/dispatch/i386/dispatch.S index 0ef4d37cc37..7564f394565 100644 --- a/dll/ntdll/dispatch/i386/dispatch.S +++ b/dll/ntdll/dispatch/i386/dispatch.S @@ -275,20 +275,4 @@ PUBLIC _KiFastSystemCallRet@0 .ENDP -PUBLIC _RtlpGetStackLimits@8 -_RtlpGetStackLimits@8: - - /* Get the stack limits */ - mov eax, [fs:TEB_STACK_LIMIT] - mov ecx, [fs:TEB_STACK_BASE] - - /* Return them */ - mov edx, [esp+4] - mov [edx], eax - mov edx, [esp+8] - mov [edx], ecx - - /* return */ - ret 8 - END diff --git a/dll/ntdll/rtl/libsupp.c b/dll/ntdll/rtl/libsupp.c index e25892e4001..7053bf401d7 100644 --- a/dll/ntdll/rtl/libsupp.c +++ b/dll/ntdll/rtl/libsupp.c @@ -330,7 +330,6 @@ RtlWalkFrameChain(OUT PVOID *Callers, } #endif -#ifdef _AMD64_ VOID NTAPI RtlpGetStackLimits( @@ -341,7 +340,6 @@ RtlpGetStackLimits( *HighLimit = (ULONG_PTR)NtCurrentTeb()->NtTib.StackBase; return; } -#endif BOOLEAN NTAPI diff --git a/ntoskrnl/ntos.cmake b/ntoskrnl/ntos.cmake index a85cb19e39a..47e7c01eda3 100644 --- a/ntoskrnl/ntos.cmake +++ b/ntoskrnl/ntos.cmake @@ -309,7 +309,7 @@ if(ARCH STREQUAL "i386") ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/i386/trap.s ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/i386/usercall_asm.S ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/i386/zeropage.S - ${REACTOS_SOURCE_DIR}/ntoskrnl/rtl/i386/stack.S) + ${REACTOS_SOURCE_DIR}/ntoskrnl/rtl/i386/prefetch.S) list(APPEND SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/config/i386/cmhardwr.c ${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/i386/kdx86.c diff --git a/ntoskrnl/rtl/i386/stack.S b/ntoskrnl/rtl/i386/prefetch.S similarity index 72% rename from ntoskrnl/rtl/i386/stack.S rename to ntoskrnl/rtl/i386/prefetch.S index 767aef6c414..5a0afa0e8e6 100644 --- a/ntoskrnl/rtl/i386/stack.S +++ b/ntoskrnl/rtl/i386/prefetch.S @@ -16,28 +16,6 @@ EXTERN _KePrefetchNTAGranularity:DWORD /* FUNCTIONS *****************************************************************/ .code -PUBLIC _RtlpGetStackLimits@8 -_RtlpGetStackLimits@8: - - /* Get the current thread */ - mov eax, [fs:KPCR_CURRENT_THREAD] - - /* Get the stack limits */ - mov ecx, [eax+KTHREAD_STACK_LIMIT] - mov edx, [eax+KTHREAD_INITIAL_STACK] - sub edx, SIZEOF_FX_SAVE_AREA - - /* Return them */ - mov eax, [esp+4] - mov [eax], ecx - - mov eax, [esp+8] - mov [eax], edx - - /* return */ - ret 8 - - PUBLIC @RtlPrefetchMemoryNonTemporal@8 @RtlPrefetchMemoryNonTemporal@8: diff --git a/ntoskrnl/rtl/libsupp.c b/ntoskrnl/rtl/libsupp.c index 66ae4254a73..1a6ac697a7c 100644 --- a/ntoskrnl/rtl/libsupp.c +++ b/ntoskrnl/rtl/libsupp.c @@ -506,7 +506,6 @@ RtlWalkFrameChain(OUT PVOID *Callers, #endif -#if defined(_M_AMD64) || defined(_M_ARM) VOID NTAPI RtlpGetStackLimits( @@ -514,10 +513,14 @@ RtlpGetStackLimits( OUT PULONG_PTR HighLimit) { PKTHREAD CurrentThread = KeGetCurrentThread(); +#ifdef _M_IX86 + * HighLimit = (ULONG_PTR)CurrentThread->InitialStack - + sizeof(FX_SAVE_AREA); +#else *HighLimit = (ULONG_PTR)CurrentThread->InitialStack; +#endif *LowLimit = (ULONG_PTR)CurrentThread->StackLimit; } -#endif /* RTL Atom Tables ************************************************************/

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs