Ros-diffs

ros-diffs@reactos.org

12 participants
81034 discussions

[reactos] 05/07: [CMAKE] Use baseaddress64.cmake for all 64 bit builds

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9cc4d8994bb471d5e6aa1… commit 9cc4d8994bb471d5e6aa1de6308bbf4a5015e479 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Oct 28 22:20:36 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Nov 10 19:20:24 2023 +0200 [CMAKE] Use baseaddress64.cmake for all 64 bit builds - Rename baseaddress_msvc_x64.cmake to baseaddress64.cmake - Include it for all compilers and 64 bit architectures --- CMakeLists.txt | 10 ++++------ sdk/cmake/{baseaddress_msvc_x64.cmake => baseaddress64.cmake} | 0 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 12dd07e5085..3583b78b894 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -336,14 +336,12 @@ Enable this if the module uses typeid or dynamic_cast. You will probably need to add_subdirectory(sdk/include/reactos/mc) add_subdirectory(sdk/include/asm) - if(NO_ROSSYM) + if(ARCH MATCHES "64$") + include(sdk/cmake/baseaddress64.cmake) + elseif(NO_ROSSYM) include(sdk/cmake/baseaddress_dwarf.cmake) elseif(MSVC) - if (ARCH STREQUAL "amd64") - include(sdk/cmake/baseaddress_msvc_x64.cmake) - else() - include(sdk/cmake/baseaddress_msvc.cmake) - endif() + include(sdk/cmake/baseaddress_msvc.cmake) else() include(sdk/cmake/baseaddress.cmake) endif() diff --git a/sdk/cmake/baseaddress_msvc_x64.cmake b/sdk/cmake/baseaddress64.cmake similarity index 100% rename from sdk/cmake/baseaddress_msvc_x64.cmake rename to sdk/cmake/baseaddress64.cmake

1 year, 2 months

[reactos] 04/07: [CMAKE] Add support for "IMAGEBASE default" and use it for test/sample dlls

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2b7246fd3cd47e17601b1… commit 2b7246fd3cd47e17601b17bfb621d7919968a31c Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Nov 7 18:50:52 2023 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Nov 10 19:20:24 2023 +0200 [CMAKE] Add support for "IMAGEBASE default" and use it for test/sample dlls --- modules/rostests/apitests/kernel32/redirptest/CMakeLists.txt | 4 ++-- modules/rostests/apitests/localspl/dll/CMakeLists.txt | 2 +- modules/rostests/apitests/win32u/win32u_2k3sp2/CMakeLists.txt | 2 +- modules/rostests/apitests/win32u/win32u_vista/CMakeLists.txt | 2 +- modules/rostests/apitests/win32u/win32u_xpsp2/CMakeLists.txt | 2 +- sdk/cmake/CMakeMacros.cmake | 4 +++- sdk/tools/gen_baseaddress.py | 3 +++ subsystems/mvdm/samples/testvdd/CMakeLists.txt | 2 +- 8 files changed, 13 insertions(+), 8 deletions(-) diff --git a/modules/rostests/apitests/kernel32/redirptest/CMakeLists.txt b/modules/rostests/apitests/kernel32/redirptest/CMakeLists.txt index f074d2be718..0b5778c8b81 100644 --- a/modules/rostests/apitests/kernel32/redirptest/CMakeLists.txt +++ b/modules/rostests/apitests/kernel32/redirptest/CMakeLists.txt @@ -12,12 +12,12 @@ list(APPEND SOURCE2 ${CMAKE_CURRENT_BINARY_DIR}/redirtest.def) add_library(redirtest1 MODULE ${SOURCE1}) -set_module_type(redirtest1 win32dll) +set_module_type(redirtest1 win32dll IMAGEBASE default) add_importlibs(redirtest1 msvcrt kernel32 ntdll) add_rostests_file(TARGET redirtest1 RENAME kernel32test_versioned.dll) add_library(redirtest2 MODULE ${SOURCE2}) -set_module_type(redirtest2 win32dll) +set_module_type(redirtest2 win32dll IMAGEBASE default) add_importlibs(redirtest2 msvcrt kernel32 ntdll) add_rostests_file(TARGET redirtest2 SUBDIR testdata RENAME kernel32test_versioned.dll) add_rostests_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/redirtest2.manifest" SUBDIR testdata) diff --git a/modules/rostests/apitests/localspl/dll/CMakeLists.txt b/modules/rostests/apitests/localspl/dll/CMakeLists.txt index 77d7eac49f9..c4a15381aec 100644 --- a/modules/rostests/apitests/localspl/dll/CMakeLists.txt +++ b/modules/rostests/apitests/localspl/dll/CMakeLists.txt @@ -9,7 +9,7 @@ list(APPEND SOURCE add_library(localspl_apitest.dll MODULE ${SOURCE}) target_link_libraries(localspl_apitest.dll wine ${PSEH_LIB}) -set_module_type(localspl_apitest.dll win32dll) +set_module_type(localspl_apitest.dll win32dll IMAGEBASE default) add_importlibs(localspl_apitest.dll spoolss advapi32 msvcrt kernel32 ntdll) set_target_properties(localspl_apitest.dll PROPERTIES SUFFIX "") add_rostests_file(TARGET localspl_apitest.dll) diff --git a/modules/rostests/apitests/win32u/win32u_2k3sp2/CMakeLists.txt b/modules/rostests/apitests/win32u/win32u_2k3sp2/CMakeLists.txt index 021fba309c2..8c086a367a4 100644 --- a/modules/rostests/apitests/win32u/win32u_2k3sp2/CMakeLists.txt +++ b/modules/rostests/apitests/win32u/win32u_2k3sp2/CMakeLists.txt @@ -7,5 +7,5 @@ add_library(win32u_2k3sp2 MODULE ${win32u_2k3sp2_asm} ${CMAKE_CURRENT_BINARY_DIR}/win32u_2k3sp2.def) -set_module_type(win32u_2k3sp2 module) +set_module_type(win32u_2k3sp2 module IMAGEBASE default) add_dependencies(win32u_2k3sp2 psdk) diff --git a/modules/rostests/apitests/win32u/win32u_vista/CMakeLists.txt b/modules/rostests/apitests/win32u/win32u_vista/CMakeLists.txt index 38737886d0c..743ded25e1f 100644 --- a/modules/rostests/apitests/win32u/win32u_vista/CMakeLists.txt +++ b/modules/rostests/apitests/win32u/win32u_vista/CMakeLists.txt @@ -7,5 +7,5 @@ add_library(win32u_vista MODULE ${win32u_vista_asm} ${CMAKE_CURRENT_BINARY_DIR}/win32u_vista.def) -set_module_type(win32u_vista module) +set_module_type(win32u_vista module IMAGEBASE default) add_dependencies(win32u_vista psdk) diff --git a/modules/rostests/apitests/win32u/win32u_xpsp2/CMakeLists.txt b/modules/rostests/apitests/win32u/win32u_xpsp2/CMakeLists.txt index 457d5c1868a..6939993703a 100644 --- a/modules/rostests/apitests/win32u/win32u_xpsp2/CMakeLists.txt +++ b/modules/rostests/apitests/win32u/win32u_xpsp2/CMakeLists.txt @@ -7,5 +7,5 @@ add_library(win32u_xpsp2 MODULE ${win32u_xpsp2_asm} ${CMAKE_CURRENT_BINARY_DIR}/win32u_xpsp2.def) -set_module_type(win32u_xpsp2 module) +set_module_type(win32u_xpsp2 module IMAGEBASE default) add_dependencies(win32u_xpsp2 psdk) diff --git a/sdk/cmake/CMakeMacros.cmake b/sdk/cmake/CMakeMacros.cmake index b72b40b3cd9..6fcf476da69 100644 --- a/sdk/cmake/CMakeMacros.cmake +++ b/sdk/cmake/CMakeMacros.cmake @@ -643,7 +643,9 @@ function(set_module_type MODULE TYPE) # Set base address if(__module_IMAGEBASE) - set_image_base(${MODULE} ${__module_IMAGEBASE}) + if(NOT ${__module_IMAGEBASE} STREQUAL "default") + set_image_base(${MODULE} ${__module_IMAGEBASE}) + endif() elseif(${TYPE} STREQUAL win32dll) if(DEFINED baseaddress_${MODULE}) set_image_base(${MODULE} ${baseaddress_${MODULE}}) diff --git a/sdk/tools/gen_baseaddress.py b/sdk/tools/gen_baseaddress.py index f9d9f293543..e54afcfdf25 100644 --- a/sdk/tools/gen_baseaddress.py +++ b/sdk/tools/gen_baseaddress.py @@ -205,7 +205,10 @@ EXCLUDE = ( 'dllexport_test_dll1.dll', 'dllexport_test_dll2.dll', 'dllimport_test.dll', + 'localspl_apitest.dll', 'MyEventProvider.dll', + 'redirtest1.dll', + 'redirtest2.dll', 'w32kdll_2k3sp2.dll', 'w32kdll_ros.dll', 'w32kdll_xpsp2.dll', diff --git a/subsystems/mvdm/samples/testvdd/CMakeLists.txt b/subsystems/mvdm/samples/testvdd/CMakeLists.txt index c813da97c1d..5a4000faba3 100644 --- a/subsystems/mvdm/samples/testvdd/CMakeLists.txt +++ b/subsystems/mvdm/samples/testvdd/CMakeLists.txt @@ -8,7 +8,7 @@ list(APPEND SOURCE add_library(testvdd MODULE ${SOURCE}) #set_module_type(testvdd win32dll UNICODE ENTRYPOINT VDDInitialize) -set_module_type(testvdd win32dll UNICODE) +set_module_type(testvdd win32dll UNICODE IMAGEBASE default) target_link_libraries(testvdd ${PSEH_LIB})

1 year, 2 months

[reactos] 03/07: [FUSION] Provide baseaddress for fusion_1_1 and fusion_2_0

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=58f1201eae54bec0bc7df… commit 58f1201eae54bec0bc7df1c2b838aadda7f65eac Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Oct 29 22:17:51 2023 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Nov 10 19:20:24 2023 +0200 [FUSION] Provide baseaddress for fusion_1_1 and fusion_2_0 These DLLs are also named fusion.dll. Give them the same baseaddress as fusion.dll --- dll/win32/fusion/fusion_1_1/CMakeLists.txt | 2 ++ dll/win32/fusion/fusion_2_0/CMakeLists.txt | 2 ++ sdk/tools/gen_baseaddress.py | 1 - 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dll/win32/fusion/fusion_1_1/CMakeLists.txt b/dll/win32/fusion/fusion_1_1/CMakeLists.txt index 7a36802d264..1c0c7f1379f 100644 --- a/dll/win32/fusion/fusion_1_1/CMakeLists.txt +++ b/dll/win32/fusion/fusion_1_1/CMakeLists.txt @@ -1,4 +1,6 @@ +set(baseaddress_fusion_1_1 ${baseaddress_fusion}) + set(fusion_folder "${CMAKE_CURRENT_SOURCE_DIR}/..") spec2def(fusion.dll fusion.spec) diff --git a/dll/win32/fusion/fusion_2_0/CMakeLists.txt b/dll/win32/fusion/fusion_2_0/CMakeLists.txt index b91372f9fa7..d2b562033f1 100644 --- a/dll/win32/fusion/fusion_2_0/CMakeLists.txt +++ b/dll/win32/fusion/fusion_2_0/CMakeLists.txt @@ -1,4 +1,6 @@ +set(baseaddress_fusion_2_0 ${baseaddress_fusion}) + set(fusion_folder "${CMAKE_CURRENT_SOURCE_DIR}/..") spec2def(fusion.dll fusion.spec) diff --git a/sdk/tools/gen_baseaddress.py b/sdk/tools/gen_baseaddress.py index e7a691424da..f9d9f293543 100644 --- a/sdk/tools/gen_baseaddress.py +++ b/sdk/tools/gen_baseaddress.py @@ -104,7 +104,6 @@ EXCLUDE = ( 'framebuf.dll', 'framebuf_new.dll', 'ftfd.dll', - 'fusion.dll', 'genincdata.dll', 'hal.dll', 'halaacpi.dll',

1 year, 2 months

[reactos] 02/07: [ASMPP] Improve handling of rip relative addressing

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2245dd78f5c75dbbefdd7… commit 2245dd78f5c75dbbefdd7e926ce90033d67dee2d Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Oct 28 18:52:48 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Nov 10 19:20:24 2023 +0200 [ASMPP] Improve handling of rip relative addressing --- sdk/tools/asmpp/asmpp.cpp | 80 ++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 72 insertions(+), 8 deletions(-) diff --git a/sdk/tools/asmpp/asmpp.cpp b/sdk/tools/asmpp/asmpp.cpp index 39f7bdbfc70..32b8a09c088 100644 --- a/sdk/tools/asmpp/asmpp.cpp +++ b/sdk/tools/asmpp/asmpp.cpp @@ -296,27 +296,54 @@ vector<TOKEN_DEF> g_TokenList = // FIXME: use context? unsigned int g_label_number = 0; -vector<string> g_identifiers; +bool g_processing_jmp = false; + +enum class IDTYPE +{ + Memory, + Register, + Label, + Constant, + Macro, + Instruction, + String, + Unknown +}; + +struct IDENTIFIER +{ + string Name; + IDTYPE Type; +}; + +vector<IDENTIFIER> g_identifiers; + +static +void +add_identifier(Token& tok, IDTYPE type) +{ + g_identifiers.push_back(IDENTIFIER{ tok.str(), type }); + //fprintf(stderr, "Added id: '%s'\n", tok.str().c_str()); +} void add_mem_id(Token& tok) { - g_identifiers.push_back(tok.str()); - //fprintf(stderr, "Added mem id: '%s'\n", tok.str().c_str()); + add_identifier(tok, IDTYPE::Memory); } bool is_mem_id(Token& tok) { - for (auto id : g_identifiers) + for (IDENTIFIER& identifier : g_identifiers) { - if (id == tok.str()) + if (identifier.Name == tok.str()) { - return true; + return identifier.Type == IDTYPE::Memory; } } - return false; + return true; } bool @@ -587,10 +614,13 @@ size_t translate_instruction_param(TokenList& tokens, size_t index, const vector case TOKEN_TYPE::Operator: if (tok.str() == ",") return index; + return translate_token(tokens, index, macro_params); case TOKEN_TYPE::Identifier: index = translate_token(tokens, index, macro_params); - if (is_mem_id(tok)) + if (is_mem_id(tok) && + !is_string_in_list(macro_params, tok.str()) && + !g_processing_jmp) { printf("[rip]"); } @@ -604,8 +634,36 @@ size_t translate_instruction_param(TokenList& tokens, size_t index, const vector return index; } +static +bool +is_jmp_or_call(const Token& tok) +{ + const char* inst_list[] = { + "jmp", "call", "ja", "jae", "jb", "jbe", "jc", "jcxz", "je", "jecxz", "jg", "jge", + "jl", "jle", "jna", "jnae", "jnb", "jnbe", "jnc", "jne", "jng", "jnge", "jnl", "jnle", + "jno", "jnp", "jns", "jnz", "jo", "jp", "jpe", "jpo", "jrcxz", "js", "jz", "loop", "loope", + "loopne", "loopnz", "loopz" + }; + + for (const char* inst : inst_list) + { + if (iequals(tok.str(), inst)) + { + return true; + } + } + + return false; +} + size_t translate_instruction(TokenList& tokens, size_t index, const vector<string>& macro_params) { + // Check for jump/call instructions + if (is_jmp_or_call(tokens[index])) + { + g_processing_jmp = true; + } + // Translate the instruction itself index = translate_token(tokens, index, macro_params); @@ -624,6 +682,7 @@ size_t translate_instruction(TokenList& tokens, size_t index, const vector<strin { case TOKEN_TYPE::Comment: case TOKEN_TYPE::NewLine: + g_processing_jmp = false; return index; case TOKEN_TYPE::WhiteSpace: @@ -637,6 +696,7 @@ size_t translate_instruction(TokenList& tokens, size_t index, const vector<strin } } + g_processing_jmp = false; return index; } @@ -891,6 +951,7 @@ translate_identifier_construct(TokenList& tokens, size_t index, const vector<str { printf("%s:", tok.str().c_str()); } + add_identifier(tok, IDTYPE::Label); return index + 2; } @@ -912,6 +973,7 @@ translate_identifier_construct(TokenList& tokens, size_t index, const vector<str case TOKEN_TYPE::KW_EQU: //printf("%s%s", tok.str().c_str(), tok1.str().c_str()); printf("#define %s ", tok.str().c_str()); + add_identifier(tok, IDTYPE::Constant); return translate_expression(tokens, index + 3, macro_params); case TOKEN_TYPE::KW_TEXTEQU: @@ -921,6 +983,7 @@ translate_identifier_construct(TokenList& tokens, size_t index, const vector<str string textdef = tok4.str(); printf("#define %s %s", tok.str().c_str(), textdef.substr(1, textdef.size() - 2).c_str()); + add_identifier(tok, IDTYPE::Constant); return index + 5; } @@ -940,6 +1003,7 @@ translate_identifier_construct(TokenList& tokens, size_t index, const vector<str #endif index += 2; } + add_identifier(tok, IDTYPE::Label); break; }

1 year, 2 months

[reactos] 01/07: [CRT] Make ML based asm code GAS compatible

by Timo Kreuzer

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 year, 2 months

[reactos] 03/03: [CRT] Fix parameter check for _memicmp on NT 6+

by Timo Kreuzer

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 year, 2 months

[reactos] 02/03: [CRT] Add parameter check to _mbscmp

by Timo Kreuzer

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 year, 2 months

[reactos] 01/03: [CRT][MSVCRT] Import _gcvt and _gcvt_s from wine and export _gcvt_s on Vista+

by Timo Kreuzer

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 year, 2 months

[reactos] 06/06: [RTL_APITEST] Move RtlIntSafe test from kmtest to rtl_apitest

by Timo Kreuzer

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 year, 2 months

[reactos] 05/06: [RTL_APITEST] Add rtl_unittest

by Timo Kreuzer

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 year, 2 months

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