Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 02/30: [NDK] SYSDBG: Add SysDbgGetLiveKernelDump enum value and structures for kernel live dump.
by Hermès Bélusca-Maïto 28 Jan '25

28 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4d37135884e5504be66a5… commit 4d37135884e5504be66a51884804c6af896e4b17 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Mar 12 20:29:21 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jan 28 22:00:28 2025 +0100 [NDK] SYSDBG: Add SysDbgGetLiveKernelDump enum value and structures for kernel live dump. For more information, see: https://crashdmp.wordpress.com/2014/08/04/livedump-1-0-is-available/ https://github.com/lilhoser/livedump https://gary-nebbett.blogspot.com/2016/04/examining-windows-kernel-mode-sta… https://github.com/processhacker/phnt --- sdk/include/ndk/kdtypes.h | 84 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/sdk/include/ndk/kdtypes.h b/sdk/include/ndk/kdtypes.h index 8ebd21a6f7e..77b5545cfed 100644 --- a/sdk/include/ndk/kdtypes.h +++ b/sdk/include/ndk/kdtypes.h @@ -98,6 +98,9 @@ typedef enum _SYSDBG_COMMAND SysDbgGetUmAttachPid = 35, SysDbgClearUmAttachPid = 36, #endif +#if (NTDDI_VERSION >= NTDDI_WINBLUE) // NTDDI_WIN81 + SysDbgGetLiveKernelDump = 37, +#endif } SYSDBG_COMMAND; // @@ -164,6 +167,87 @@ typedef struct _SYSDBG_TRIAGE_DUMP PHANDLE Handles; } SYSDBG_TRIAGE_DUMP, *PSYSDBG_TRIAGE_DUMP; +#if (NTDDI_VERSION >= NTDDI_WINBLUE) // NTDDI_WIN81 + +typedef union _SYSDBG_LIVEDUMP_CONTROL_FLAGS +{ + struct + { + ULONG UseDumpStorageStack : 1; + ULONG CompressMemoryPagesData : 1; + ULONG IncludeUserSpaceMemoryPages : 1; +#if (NTDDI_VERSION >= NTDDI_WIN10_RS4) + ULONG AbortIfMemoryPressure : 1; +#if (NTDDI_VERSION >= NTDDI_WIN11) + ULONG SelectiveDump : 1; + ULONG Reserved : 27; +#else + ULONG Reserved : 28; +#endif // (NTDDI_VERSION >= NTDDI_WIN11) +#else + ULONG Reserved : 29; +#endif // (NTDDI_VERSION >= NTDDI_WIN10_RS4) + }; + ULONG AsUlong; +} SYSDBG_LIVEDUMP_CONTROL_FLAGS; + +typedef union _SYSDBG_LIVEDUMP_CONTROL_ADDPAGES +{ + struct + { + ULONG HypervisorPages : 1; +#if (NTDDI_VERSION >= NTDDI_WIN11) + ULONG NonEssentialHypervisorPages : 1; + ULONG Reserved : 30; +#else + ULONG Reserved : 31; +#endif + }; + ULONG AsUlong; +} SYSDBG_LIVEDUMP_CONTROL_ADDPAGES; + +#if (NTDDI_VERSION >= NTDDI_WIN11) + +typedef struct _SYSDBG_LIVEDUMP_SELECTIVE_CONTROL +{ + ULONG Version; + ULONG Size; + union + { + ULONGLONG Flags; + struct + { + ULONGLONG ThreadKernelStacks : 1; + ULONGLONG ReservedFlags : 63; + }; + }; + ULONGLONG Reserved[4]; +} SYSDBG_LIVEDUMP_SELECTIVE_CONTROL, *PSYSDBG_LIVEDUMP_SELECTIVE_CONTROL; + +#define SYSDBG_LIVEDUMP_CONTROL_VERSION 1 +#define SYSDBG_LIVEDUMP_CONTROL_VERSION_WIN11 2 + +#endif // (NTDDI_VERSION >= NTDDI_WIN11) + +typedef struct _SYSDBG_LIVEDUMP_CONTROL +{ + ULONG Version; + ULONG BugCheckCode; + ULONG_PTR BugCheckParam1; + ULONG_PTR BugCheckParam2; + ULONG_PTR BugCheckParam3; + ULONG_PTR BugCheckParam4; + PVOID DumpFileHandle; + PVOID CancelEventHandle; + SYSDBG_LIVEDUMP_CONTROL_FLAGS Flags; + SYSDBG_LIVEDUMP_CONTROL_ADDPAGES AddPagesControl; +#if (NTDDI_VERSION >= NTDDI_WIN11) + PSYSDBG_LIVEDUMP_SELECTIVE_CONTROL SelectiveControl; +#endif +} SYSDBG_LIVEDUMP_CONTROL, *PSYSDBG_LIVEDUMP_CONTROL; + +#endif // (NTDDI_VERSION >= NTDDI_WINBLUE) + // // KD Structures //

1 0

[reactos] 01/30: [NDK] SYSDBG: Add versioning info for Vista+ commands.
by Hermès Bélusca-Maïto 28 Jan '25

28 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b5007e09b1d072e5659d2… commit b5007e09b1d072e5659d226f0a702cefac1c7bd7 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Sep 29 20:28:13 2024 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jan 28 22:00:27 2025 +0100 [NDK] SYSDBG: Add versioning info for Vista+ commands. --- sdk/include/ndk/kdtypes.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sdk/include/ndk/kdtypes.h b/sdk/include/ndk/kdtypes.h index 26eb130cc57..8ebd21a6f7e 100644 --- a/sdk/include/ndk/kdtypes.h +++ b/sdk/include/ndk/kdtypes.h @@ -91,11 +91,13 @@ typedef enum _SYSDBG_COMMAND SysDbgGetTriageDump = 29, SysDbgGetKdBlockEnable = 30, SysDbgSetKdBlockEnable = 31, +#if (NTDDI_VERSION >= NTDDI_VISTA) SysDbgRegisterForUmBreakInfo = 32, SysDbgGetUmBreakPid = 33, SysDbgClearUmBreakPid = 34, SysDbgGetUmAttachPid = 35, SysDbgClearUmAttachPid = 36, +#endif } SYSDBG_COMMAND; //

1 0

[reactos] 02/02: [UCRTSUPPORT] Add wine c++ exception code
by Timo Kreuzer 28 Jan '25

28 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ae0fa8ba497a01a88b4db… commit ae0fa8ba497a01a88b4dbd58193e227e733b984f Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Nov 16 15:08:06 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Jan 28 22:50:04 2025 +0200 [UCRTSUPPORT] Add wine c++ exception code --- dll/win32/ucrtbase/ucrtbase.spec | 80 ++++++++++++++++++++-------------------- sdk/lib/crt/misc/tls.c | 2 + sdk/lib/crt/ucrtsupport.cmake | 53 +++++++++++++++++++++++++- sdk/lib/crt/wine/cpp.c | 11 ++++-- sdk/lib/crt/wine/except.c | 2 +- 5 files changed, 103 insertions(+), 45 deletions(-) diff --git a/dll/win32/ucrtbase/ucrtbase.spec b/dll/win32/ucrtbase/ucrtbase.spec index c137b8080bc..e56735016dc 100644 --- a/dll/win32/ucrtbase/ucrtbase.spec +++ b/dll/win32/ucrtbase/ucrtbase.spec @@ -17,7 +17,7 @@ @ cdecl -stub _Cbuild(ptr double double) @ stub _Cmulcc @ stub _Cmulcr -@ cdecl -stub _CreateFrameInfo(ptr ptr) +@ cdecl _CreateFrameInfo(ptr ptr) @ cdecl -dbg _CrtCheckMemory() @ cdecl -dbg _CrtDbgReport(long str long str str) @ cdecl -dbg _CrtDbgReportW(long wstr long wstr wstr) @@ -46,19 +46,19 @@ @ cdecl -dbg _CrtSetReportHook2() # FIXME: params @ cdecl -dbg _CrtSetReportHookW2() # FIXME: params @ cdecl -dbg _CrtSetReportMode() # FIXME: params -@ stdcall -stub _CxxThrowException(ptr ptr) +@ stdcall _CxxThrowException(ptr ptr) @ cdecl -arch=i386 -norelay _EH_prolog() @ cdecl _Exit(long) @ stub _FCbuild @ stub _FCmulcc @ stub _FCmulcr -@ cdecl -stub _FindAndUnlinkFrame(ptr) +@ cdecl _FindAndUnlinkFrame(ptr) @ stub _GetImageBase @ stub _GetThrowImageBase @ cdecl _Getdays() @ cdecl _Getmonths() @ cdecl _Gettnames() -@ cdecl -stub _IsExceptionObjectToBeDestroyed(ptr) +@ cdecl _IsExceptionObjectToBeDestroyed(ptr) @ stub _LCbuild @ stub _LCmulcc @ stub _LCmulcr @@ -75,29 +75,29 @@ @ cdecl _W_Getmonths() @ cdecl _W_Gettnames() @ cdecl _Wcsftime(ptr long wstr ptr ptr) -@ cdecl -stub __AdjustPointer(ptr ptr) +@ cdecl __AdjustPointer(ptr ptr) @ stub __BuildCatchObject @ stub __BuildCatchObjectHelper @ cdecl -arch=!i386 __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler @ cdecl -stub -arch=!i386 __C_specific_handler_noexcept(ptr long ptr ptr) -@ cdecl -stub __CxxDetectRethrow(ptr) -@ cdecl -stub __CxxExceptionFilter(ptr ptr long ptr) -@ cdecl -stub -norelay __CxxFrameHandler(ptr ptr ptr ptr) -@ cdecl -stub -norelay __CxxFrameHandler2(ptr ptr ptr ptr) __CxxFrameHandler -@ cdecl -stub -norelay __CxxFrameHandler3(ptr ptr ptr ptr) __CxxFrameHandler +@ cdecl __CxxDetectRethrow(ptr) +@ cdecl __CxxExceptionFilter(ptr ptr long ptr) +@ cdecl -norelay __CxxFrameHandler(ptr ptr ptr ptr) +@ cdecl -norelay __CxxFrameHandler2(ptr ptr ptr ptr) __CxxFrameHandler +@ cdecl -norelay __CxxFrameHandler3(ptr ptr ptr ptr) __CxxFrameHandler @ cdecl -stub -arch=x86_64 __CxxFrameHandler4(ptr long ptr ptr) -@ stdcall -stub -arch=i386 __CxxLongjmpUnwind(ptr) -@ cdecl -stub __CxxQueryExceptionSize() -@ cdecl -stub __CxxRegisterExceptionObject(ptr ptr) -@ cdecl -stub __CxxUnregisterExceptionObject(ptr long) -@ cdecl -stub __DestructExceptionObject(ptr) +@ stdcall -arch=i386 __CxxLongjmpUnwind(ptr) +@ cdecl __CxxQueryExceptionSize() +@ cdecl __CxxRegisterExceptionObject(ptr ptr) +@ cdecl __CxxUnregisterExceptionObject(ptr long) +@ cdecl __DestructExceptionObject(ptr) @ stub __FrameUnwindFilter @ stub __GetPlatformExceptionInfo @ stub __NLG_Dispatch2 @ stub __NLG_Return2 -@ cdecl -stub __RTCastToVoid(ptr) -@ cdecl -stub __RTDynamicCast(ptr long ptr ptr long) -@ cdecl -stub __RTtypeid(ptr) +@ cdecl __RTCastToVoid(ptr) +@ cdecl __RTDynamicCast(ptr long ptr ptr long) +@ cdecl __RTtypeid(ptr) @ stub __TypeMatch @ cdecl ___lc_codepage_func() @ cdecl ___lc_collate_cp_func() @@ -114,8 +114,8 @@ @ cdecl __conio_common_vcwprintf_s(int64 wstr ptr ptr) @ cdecl __conio_common_vcwscanf(int64 wstr ptr ptr) @ cdecl -stub -arch=i386 __control87_2(long long ptr ptr) -@ cdecl -stub __current_exception() -@ cdecl -stub __current_exception_context() +@ cdecl __current_exception() +@ cdecl __current_exception_context() @ cdecl __daylight() @ cdecl __dcrt_get_wide_environment_from_os() # FIXME: params @ cdecl __dcrt_initial_narrow_environment() @@ -170,18 +170,18 @@ @ cdecl __p__wenviron() @ cdecl __p__wpgmptr() @ cdecl __pctype_func() -@ cdecl -stub __processing_throw() +@ cdecl __processing_throw() @ cdecl __pwctype_func() @ cdecl __pxcptinfoptrs() @ cdecl __report_gsfailure() @ cdecl __setusermatherr(ptr) -@ cdecl -stub __std_exception_copy(ptr ptr) -@ cdecl -stub __std_exception_destroy(ptr) +@ cdecl __std_exception_copy(ptr ptr) +@ cdecl __std_exception_destroy(ptr) @ cdecl __std_terminate() terminate -@ cdecl -stub __std_type_info_compare(ptr ptr) -@ cdecl -stub __std_type_info_destroy_list(ptr) -@ cdecl -stub __std_type_info_hash(ptr) -@ cdecl -stub __std_type_info_name(ptr ptr) +@ cdecl __std_type_info_compare(ptr ptr) +@ cdecl __std_type_info_destroy_list(ptr) +@ cdecl __std_type_info_hash(ptr) +@ cdecl __std_type_info_name(ptr ptr) @ cdecl __stdio_common_vfprintf(int64 ptr str ptr ptr) @ cdecl __stdio_common_vfprintf_p(int64 ptr str ptr ptr) @ cdecl __stdio_common_vfprintf_s(int64 ptr str ptr ptr) @@ -210,7 +210,7 @@ @ cdecl __tzname() @ cdecl __unDName(ptr str long ptr ptr long) @ cdecl __unDNameEx(ptr str long ptr ptr ptr long) -@ cdecl -stub __uncaught_exception() +@ cdecl __uncaught_exception() @ cdecl -stub __uncaught_exceptions() @ cdecl __wcserror(wstr) @ cdecl __wcserror_s(ptr long wstr) @@ -267,7 +267,7 @@ @ cdecl _chdrive(long) @ cdecl _chgsign(double) @ cdecl _chgsignf(float) -@ cdecl -stub -arch=i386 -norelay _chkesp() +@ cdecl -arch=i386 -norelay _chkesp() @ cdecl _chmod(str long) @ cdecl _chsize(long long) @ cdecl _chsize_s(long int64) @@ -323,7 +323,7 @@ @ cdecl -stub _except1(long long double double long ptr) @ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr) @ cdecl -arch=i386 _except_handler3(ptr ptr ptr ptr) -@ cdecl -stub -arch=i386 _except_handler4_common(ptr ptr ptr ptr ptr ptr) +@ cdecl -arch=i386 _except_handler4_common(ptr ptr ptr ptr ptr ptr) @ varargs _execl(str str) @ varargs _execle(str str) @ varargs _execlp(str str) @@ -375,7 +375,7 @@ @ cdecl _flushall() @ cdecl _fpclass(double) @ cdecl -stub -arch=!i386 _fpclassf(float) -@ cdecl -stub _fpieee_flt(long ptr ptr) +@ cdecl _fpieee_flt(long ptr ptr) @ cdecl -stub _fpreset() @ cdecl _fputc_nolock(long ptr) @ cdecl _fputchar(long) @@ -430,7 +430,7 @@ @ cdecl _get_thread_local_invalid_parameter_handler() @ cdecl _get_timezone(ptr) @ cdecl _get_tzname(ptr str long long) -@ cdecl -stub _get_unexpected() +@ cdecl _get_unexpected() @ cdecl _get_wide_winmain_command_line() @ cdecl _get_wpgmptr(ptr) @ cdecl _getc_nolock(ptr) _fgetc_nolock @@ -481,7 +481,7 @@ @ cdecl _invalid_parameter_noinfo() @ cdecl _invalid_parameter_noinfo_noreturn() @ cdecl _invoke_watson(wstr wstr wstr long long) -@ stub _is_exception_typeof +@ cdecl _is_exception_typeof(ptr ptr) @ cdecl _isalnum_l(long ptr) @ cdecl _isalpha_l(long ptr) @ cdecl _isatty(long) @@ -612,7 +612,7 @@ @ cdecl _loaddll(str) @ cdecl -arch=win64 _local_unwind(ptr ptr) ntdll._local_unwind @ cdecl -arch=i386 _local_unwind2(ptr long) -@ cdecl -stub -arch=i386 _local_unwind4(ptr ptr long) +@ cdecl -arch=i386 _local_unwind4(ptr ptr long) @ cdecl _localtime32(ptr) @ cdecl _localtime32_s(ptr ptr) @ cdecl _localtime64(ptr) @@ -1902,7 +1902,7 @@ @ cdecl _pclose(ptr) @ cdecl _pipe(ptr long long) @ cdecl _popen(str str) -@ cdecl -stub _purecall() +@ cdecl _purecall() @ cdecl _putc_nolock(long ptr) _fputc_nolock @ cdecl _putch(long) @ cdecl _putch_nolock(long) @@ -1937,8 +1937,8 @@ @ cdecl _seh_filter_dll(long ptr) # __CppXcptFilter @ cdecl _seh_filter_exe(long ptr) # _XcptFilter @ cdecl -arch=win64 _set_FMA3_enable(long) -@ stdcall -stub -arch=i386 _seh_longjmp_unwind4(ptr) -@ stdcall -stub -arch=i386 _seh_longjmp_unwind(ptr) +@ stdcall -arch=i386 _seh_longjmp_unwind4(ptr) +@ stdcall -arch=i386 _seh_longjmp_unwind(ptr) @ cdecl -stub -arch=i386 _set_SSE2_enable(long) @ cdecl _set_abort_behavior(long long) @ cdecl _set_app_type(long) @@ -1951,8 +1951,8 @@ @ cdecl _set_new_handler(ptr) @ cdecl _set_new_mode(long) @ cdecl _set_printf_count_output(long) -@ cdecl -stub _set_purecall_handler(ptr) -@ cdecl -stub _set_se_translator(ptr) +@ cdecl _set_purecall_handler(ptr) +@ cdecl _set_se_translator(ptr) @ cdecl _set_thread_local_invalid_parameter_handler(ptr) @ cdecl _seterrormode(long) @ cdecl -arch=i386 -norelay _setjmp3(ptr long) @@ -2549,7 +2549,7 @@ @ cdecl -stub scalbnf(float long) # float scalbnf(float x, int exp); @ cdecl scalbnl(double long) scalbn # long double scalbnl(long double x, int exp); @ cdecl set_terminate(ptr) -@ cdecl -stub set_unexpected(ptr) +@ cdecl set_unexpected(ptr) @ cdecl setbuf(ptr ptr) @ cdecl -arch=arm,x86_64 -norelay -private setjmp(ptr ptr) _setjmp @ cdecl setlocale(long str) diff --git a/sdk/lib/crt/misc/tls.c b/sdk/lib/crt/misc/tls.c index da5f918d22a..568bd17be65 100644 --- a/sdk/lib/crt/misc/tls.c +++ b/sdk/lib/crt/misc/tls.c @@ -41,8 +41,10 @@ thread_data_t *msvcrt_get_thread_data(void) ptr->tid = GetCurrentThreadId(); ptr->handle = INVALID_HANDLE_VALUE; ptr->random_seed = 1; +#ifndef __UCRTSUPPORT__ ptr->locinfo = MSVCRT_locale->locinfo; ptr->mbcinfo = MSVCRT_locale->mbcinfo; +#endif /* !__UCRTSUPPORT__ */ } SetLastError( err ); return ptr; diff --git a/sdk/lib/crt/ucrtsupport.cmake b/sdk/lib/crt/ucrtsupport.cmake index 18216a5483f..2f558d96db5 100644 --- a/sdk/lib/crt/ucrtsupport.cmake +++ b/sdk/lib/crt/ucrtsupport.cmake @@ -2,21 +2,67 @@ list(APPEND UCRTSUPP_SOURCE ${CRT_FLOAT_SOURCE} ${CRT_MATH_SOURCE} + misc/amsg.c + misc/purecall.c + misc/tls.c + wine/cpp.c + wine/except.c wine/undname.c ) list(APPEND UCRTSUPP_ASM_SOURCE - ${CRT_EXCEPT_ASM_SOURCE} ${CRT_FLOAT_ASM_SOURCE} ${CRT_MATH_ASM_SOURCE} ${CRT_SETJMP_ASM_SOURCE} + ${CRT_WINE_ASM_SOURCE} ) +if(ARCH STREQUAL "i386") + list(APPEND UCRTSUPP_SOURCE + except/i386/CxxHandleV8Frame.c + wine/except_i386.c + ) + list(APPEND UCRTSUPP_ASM_SOURCE + except/i386/__CxxFrameHandler3.s + except/i386/chkesp.s + wine/rosglue_i386.s + ) + if(MSVC) + list(APPEND UCRTSUPP_ASM_SOURCE + except/i386/cpp.s + except/i386/prolog.s + ) + endif() +elseif(ARCH STREQUAL "amd64") + list(APPEND UCRTSUPP_SOURCE + wine/except_x86_64.c + ) + if(MSVC) + list(APPEND UCRTSUPP_ASM_SOURCE + except/amd64/cpp.s + ) + endif() +elseif(ARCH STREQUAL "arm") + list(APPEND UCRTSUPP_SOURCE + wine/except_arm.c + ) + if(MSVC) + list(APPEND UCRTSUPP_ASM_SOURCE + except/arm/cpp.s + ) + endif() +elseif(ARCH STREQUAL "arm64") + list(APPEND UCRTSUPP_SOURCE + wine/except_arm64.c + ) +endif() + add_asm_files(ucrtsupp_asm ${UCRTSUPP_ASM_SOURCE}) add_library(ucrtsupport ${UCRTSUPP_SOURCE} ${ucrtsupp_asm}) target_link_libraries(ucrtsupport chkstk ${PSEH_LIB}) target_compile_definitions(ucrtsupport PRIVATE + __UCRTSUPPORT__ CRTDLL _MSVCRT_LIB_ _MSVCRT_ @@ -24,6 +70,11 @@ target_compile_definitions(ucrtsupport PRIVATE USE_MSVCRT_PREFIX __MINGW_IMPORT=extern __fma3_lib_init=__acrt_initialize_fma3 + set_terminate=_wine_set_terminate + terminate=_wine_terminate + _get_terminate=_wine_get_terminate + unexpected=_wine_unexpected + __pxcptinfoptrs=_wine__pxcptinfoptrs ) #add_pch(crt precomp.h) add_dependencies(ucrtsupport psdk asm) diff --git a/sdk/lib/crt/wine/cpp.c b/sdk/lib/crt/wine/cpp.c index a256569584b..d7cc32aefc7 100644 --- a/sdk/lib/crt/wine/cpp.c +++ b/sdk/lib/crt/wine/cpp.c @@ -1025,7 +1025,7 @@ void WINAPI _CxxThrowException( void *object, const cxx_exception_type *type ) } #endif -#if _MSVCR_VER >= 80 +#if _MSVCR_VER >= 80 || defined(__UCRTSUPPORT__) /********************************************************************* * ?_is_exception_typeof@@YAHABVtype_info@@PAU_EXCEPTION_POINTERS@@@Z @@ -1063,6 +1063,8 @@ int __cdecl _is_exception_typeof(const type_info *ti, EXCEPTION_POINTERS *ep) } } __EXCEPT_PAGE_FAULT + { + } __ENDTRY if(ret == -1) @@ -1104,6 +1106,8 @@ int __cdecl _is_exception_typeof(const type_info *ti, EXCEPTION_POINTERS *ep) } } __EXCEPT_PAGE_FAULT + { + } __ENDTRY if(ret == -1) @@ -1123,6 +1127,7 @@ void CDECL __clean_type_info_names_internal(void *p) /********************************************************************* * ?_name_internal_method@type_info@@QBEPBDPAU__type_info_node@@@Z (MSVCR100.@) */ +const char * __thiscall type_info_name_internal_method(type_info * _this, struct __type_info_node *node); DEFINE_THISCALL_WRAPPER(type_info_name_internal_method,8) const char * __thiscall type_info_name_internal_method(type_info * _this, struct __type_info_node *node) { @@ -1472,14 +1477,14 @@ bool __cdecl __ExceptionPtrCompare(const exception_ptr *ep1, const exception_ptr #endif /* _MSVCR_VER >= 100 */ -#if _MSVCR_VER >= 80 +#if _MSVCR_VER >= 80 || defined(__UCRTSUPPORT__) void* __cdecl __AdjustPointer(void *obj, const this_ptr_offsets *off) { return get_this_pointer(off, obj); } #endif -#if _MSVCR_VER >= 140 +#if _MSVCR_VER >= 140 || defined(__UCRTSUPPORT__) typedef struct { diff --git a/sdk/lib/crt/wine/except.c b/sdk/lib/crt/wine/except.c index 4679560dae5..8750379225b 100644 --- a/sdk/lib/crt/wine/except.c +++ b/sdk/lib/crt/wine/except.c @@ -487,7 +487,7 @@ struct __std_exception_data { char dofree; }; -#if _MSVCR_VER>=140 +#if _MSVCR_VER>=140 || defined(__UCRTSUPPORT__) /********************************************************************* * __std_exception_copy (UCRTBASE.@)

1 0

[reactos] 01/02: [CRT] Split MSVC C++ aliases from cpp.s to cpp_alias.s
by Timo Kreuzer 28 Jan '25

28 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e2d69ad98cc10402e8772… commit e2d69ad98cc10402e87722d52e940ed53da48869 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Nov 14 18:36:07 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Jan 28 22:50:04 2025 +0200 [CRT] Split MSVC C++ aliases from cpp.s to cpp_alias.s --- sdk/lib/crt/except/amd64/cpp.s | 58 -------------- sdk/lib/crt/except/amd64/{cpp.s => cpp_alias.s} | 25 ------ sdk/lib/crt/except/arm/cpp.s | 52 ------------ sdk/lib/crt/except/arm/{cpp.s => cpp_alias.s} | 44 ----------- sdk/lib/crt/except/except.cmake | 9 ++- sdk/lib/crt/except/i386/cpp.s | 79 ------------------ sdk/lib/crt/except/i386/{cpp.s => cpp_alias.s} | 101 ------------------------ 7 files changed, 6 insertions(+), 362 deletions(-) diff --git a/sdk/lib/crt/except/amd64/cpp.s b/sdk/lib/crt/except/amd64/cpp.s index ad869b8d609..c4f472d65a1 100644 --- a/sdk/lib/crt/except/amd64/cpp.s +++ b/sdk/lib/crt/except/amd64/cpp.s @@ -28,62 +28,4 @@ DEFINE_EXCEPTION_VTABLE bad_typeid, ??_7bad_typeid@@6B@ DEFINE_EXCEPTION_VTABLE bad_cast, ??_7bad_cast@@6B@ DEFINE_EXCEPTION_VTABLE __non_rtti_object, ??_7__non_rtti_object@@6B@ - -MACRO(DEFINE_ALIAS, alias, orig) -EXTERN &orig:ABS -ALIAS <&alias> = <&orig> -ENDM - -DEFINE_ALIAS ??3@YAXPEAX@Z, operator_delete -DEFINE_ALIAS ??_U@YAPEAX_K@Z, operator_new -DEFINE_ALIAS ??_U@YAPEAX_KHPEBDH@Z, operator_new_dbg -DEFINE_ALIAS ??_V@YAXPEAX@Z, operator_delete -DEFINE_ALIAS ??2@YAPEAX_K@Z, operator_new -DEFINE_ALIAS ??2@YAPEAX_KHPEBDH@Z, operator_new_dbg -DEFINE_ALIAS ?_query_new_handler@@YAP6AHI@ZXZ, _query_new_handler -DEFINE_ALIAS ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z, _set_new_handler -DEFINE_ALIAS ?set_new_handler@@YAP6AXXZP6AXXZ@Z, set_new_handler -DEFINE_ALIAS ?_query_new_mode@@YAHXZ, _query_new_mode -DEFINE_ALIAS ?_set_new_mode@@YAHH@Z, _set_new_mode -DEFINE_ALIAS ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z, _set_se_translator -DEFINE_ALIAS ?set_terminate@@YAP6AXXZP6AXXZ@Z, set_terminate -DEFINE_ALIAS ?set_unexpected@@YAP6AXXZP6AXXZ@Z, set_unexpected -DEFINE_ALIAS ?terminate@@YAXXZ, terminate -DEFINE_ALIAS ?unexpected@@YAXXZ, unexpected -DEFINE_ALIAS ?what@exception@@UEBAPEBDXZ, exception_what -DEFINE_ALIAS ??0exception@@QEAA@AEBQEBDH@Z, exception_ctor_noalloc -DEFINE_ALIAS ??0exception@@QEAA@AEBV0@@Z, exception_copy_ctor -DEFINE_ALIAS ??0exception@@QEAA@XZ, exception_default_ctor -DEFINE_ALIAS ??1exception@@UEAA@XZ, exception_dtor -DEFINE_ALIAS ??4exception@@QEAAAEAV0@AEBV0@@Z, exception_opequals -DEFINE_ALIAS ??1type_info@@UEAA@XZ, type_info_dtor -DEFINE_ALIAS ??0__non_rtti_object@@QEAA@AEBV0@@Z, __non_rtti_object_copy_ctor -DEFINE_ALIAS ??0__non_rtti_object@@QEAA@PEBD@Z, __non_rtti_object_ctor -DEFINE_ALIAS ??0bad_cast@@AAE@PBQBD@Z, bad_cast_ctor -DEFINE_ALIAS ??0bad_cast@@AEAA@PEBQEBD@Z, bad_cast_ctor -DEFINE_ALIAS ??0bad_cast@@QAE@ABQBD@Z, bad_cast_ctor -DEFINE_ALIAS ??0bad_cast@@QEAA@AEBQEBD@Z, bad_cast_ctor -DEFINE_ALIAS ??0bad_cast@@QEAA@AEBV0@@Z, bad_cast_copy_ctor -DEFINE_ALIAS ??0bad_cast@@QEAA@PEBD@Z, bad_cast_ctor_charptr -DEFINE_ALIAS ??0bad_typeid@@QEAA@AEBV0@@Z, bad_typeid_copy_ctor -DEFINE_ALIAS ??0bad_typeid@@QEAA@PEBD@Z, bad_typeid_ctor -DEFINE_ALIAS ??0exception@@QEAA@AEBQEBD@Z, exception_ctor -DEFINE_ALIAS ??1__non_rtti_object@@UEAA@XZ, __non_rtti_object_dtor -DEFINE_ALIAS ??1bad_cast@@UEAA@XZ, bad_cast_dtor -DEFINE_ALIAS ??1bad_typeid@@UEAA@XZ, bad_typeid_dtor -DEFINE_ALIAS ??4bad_cast@@QEAAAEAV0@AEBV0@@Z, bad_cast_opequals -DEFINE_ALIAS ??4bad_typeid@@QEAAAEAV0@AEBV0@@Z, bad_typeid_opequals -DEFINE_ALIAS ??8type_info@@QEBAHAEBV0@@Z, type_info_opequals_equals -DEFINE_ALIAS ??9type_info@@QEBAHAEBV0@@Z, type_info_opnot_equals -DEFINE_ALIAS ??_Fbad_cast@@QEAAXXZ, bad_cast_default_ctor -DEFINE_ALIAS ??_Fbad_typeid@@QEAAXXZ, bad_typeid_default_ctor -DEFINE_ALIAS ?_query_new_handler@@YAP6AH_K@ZXZ, _query_new_handler -DEFINE_ALIAS ?_set_new_handler@@YAP6AH_K@ZP6AH0@Z@Z, _set_new_handler -DEFINE_ALIAS ?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z, _set_se_translator -DEFINE_ALIAS ?before@type_info@@QEBAHAEBV1@@Z, type_info_before -DEFINE_ALIAS ?name@type_info@@QEBAPEBDXZ, type_info_name -DEFINE_ALIAS ?raw_name@type_info@@QEBAPEBDXZ, type_info_raw_name -DEFINE_ALIAS ??4__non_rtti_object@@QEAAAEAV0@AEBV0@@Z, __non_rtti_object_opequals - END - diff --git a/sdk/lib/crt/except/amd64/cpp.s b/sdk/lib/crt/except/amd64/cpp_alias.s similarity index 82% copy from sdk/lib/crt/except/amd64/cpp.s copy to sdk/lib/crt/except/amd64/cpp_alias.s index ad869b8d609..a7da20ad93c 100644 --- a/sdk/lib/crt/except/amd64/cpp.s +++ b/sdk/lib/crt/except/amd64/cpp_alias.s @@ -5,30 +5,6 @@ .code64 .align 4 -MACRO(START_VTABLE, shortname, cxxname) -EXTERN shortname&_rtti:PROC -EXTERN &shortname&_vector_dtor:PROC - .quad shortname&_rtti -PUBLIC &shortname&_vtable -&shortname&_vtable: -PUBLIC &cxxname -&cxxname: - .quad &shortname&_vector_dtor -ENDM - -MACRO(DEFINE_EXCEPTION_VTABLE, shortname, cxxname) - START_VTABLE shortname, cxxname - EXTERN exception_what:ABS - .quad exception_what -ENDM - -START_VTABLE type_info, __dummyname_type_info -DEFINE_EXCEPTION_VTABLE exception, ??_7exception@@6B@ -DEFINE_EXCEPTION_VTABLE bad_typeid, ??_7bad_typeid@@6B@ -DEFINE_EXCEPTION_VTABLE bad_cast, ??_7bad_cast@@6B@ -DEFINE_EXCEPTION_VTABLE __non_rtti_object, ??_7__non_rtti_object@@6B@ - - MACRO(DEFINE_ALIAS, alias, orig) EXTERN &orig:ABS ALIAS <&alias> = <&orig> @@ -86,4 +62,3 @@ DEFINE_ALIAS ?raw_name@type_info@@QEBAPEBDXZ, type_info_raw_name DEFINE_ALIAS ??4__non_rtti_object@@QEAAAEAV0@AEBV0@@Z, __non_rtti_object_opequals END - diff --git a/sdk/lib/crt/except/arm/cpp.s b/sdk/lib/crt/except/arm/cpp.s index 5a45e587189..ddc1498896b 100644 --- a/sdk/lib/crt/except/arm/cpp.s +++ b/sdk/lib/crt/except/arm/cpp.s @@ -13,58 +13,6 @@ TEXTAREA - MACRO - DEFINE_ALIAS $FuncName, $Target - LCLS _FuncName - LCLS _Target -_FuncName SETS "|$FuncName|" -_Target SETS "|$Target|" - IMPORT $_FuncName, WEAK $_Target - MEND - - DEFINE_ALIAS ??0__non_rtti_object@@QAA@ABV0@@Z, __non_rtti_object_copy_ctor - DEFINE_ALIAS ??0__non_rtti_object@@QAA@PBD@Z, __non_rtti_object_ctor - DEFINE_ALIAS ??0bad_cast@@AAA@PBQBD@Z, bad_cast_ctor // private: __cdecl bad_cast::bad_cast(char const * const *) - DEFINE_ALIAS ??0bad_cast@@QAA@ABV0@@Z, bad_cast_copy_ctor // public: __cdecl bad_cast::bad_cast(class bad_cast const &) - DEFINE_ALIAS ??0bad_cast@@QAA@PBD@Z, bad_cast_ctor // public: __cdecl bad_cast::bad_cast(char const *) - DEFINE_ALIAS ??0bad_typeid@@QAA@ABV0@@Z, bad_typeid_copy_ctor // public: __cdecl bad_typeid::bad_typeid(class bad_typeid const &) - DEFINE_ALIAS ??0bad_typeid@@QAA@PBD@Z, bad_typeid_ctor // public: __cdecl bad_typeid::bad_typeid(char const *) - DEFINE_ALIAS ??0exception@@QAA@ABQBD@Z, exception_ctor // public: __cdecl exception::exception(char const * const &) - DEFINE_ALIAS ??0exception@@QAA@ABQBDH@Z, exception_ctor_noalloc // public: __cdecl exception::exception(char const * const &,int) - DEFINE_ALIAS ??0exception@@QAA@ABV0@@Z, exception_copy_ctor // public: __cdecl exception::exception(class exception const &) - DEFINE_ALIAS ??0exception@@QAA@XZ, exception_default_ctor // public: __cdecl exception::exception(void) - DEFINE_ALIAS ??1__non_rtti_object@@UAA@XZ, __non_rtti_object_dtor // public: virtual __cdecl __non_rtti_object::~__non_rtti_object(void) - DEFINE_ALIAS ??1bad_cast@@UAA@XZ, bad_cast_dtor // public: virtual __cdecl bad_cast::~bad_cast(void) - DEFINE_ALIAS ??1bad_typeid@@UAA@XZ, bad_typeid_dtor // public: virtual __cdecl bad_typeid::~bad_typeid(void) - DEFINE_ALIAS ??1exception@@UAA@XZ, exception_dtor // public: virtual __cdecl exception::~exception(void) - DEFINE_ALIAS ??1type_info@@UAA@XZ, type_info_dtor // public: virtual __cdecl type_info::~type_info(void) - DEFINE_ALIAS ??2@YAPAXI@Z, operator_new // void * __cdecl operator new(unsigned int) - DEFINE_ALIAS ??2@YAPAXIHPBDH@Z, operator_new_dbg // void * __cdecl operator new(unsigned int,int,char const *,int) - DEFINE_ALIAS ??3@YAXPAX@Z, operator_delete // void __cdecl operator delete(void *) - DEFINE_ALIAS ??4__non_rtti_object@@QAAAAV0@ABV0@@Z, __non_rtti_object_opequals // public: class __non_rtti_object & __cdecl __non_rtti_object::operator=(class __non_rtti_object const &) - DEFINE_ALIAS ??4bad_cast@@QAAAAV0@ABV0@@Z, bad_cast_opequals // public: class bad_cast & __cdecl bad_cast::operator=(class bad_cast const &) - DEFINE_ALIAS ??4bad_typeid@@QAAAAV0@ABV0@@Z, bad_typeid_opequals // public: class bad_typeid & __cdecl bad_typeid::operator=(class bad_typeid const &) - DEFINE_ALIAS ??4exception@@QAAAAV0@ABV0@@Z, exception_opequals // public: class exception & __cdecl exception::operator=(class exception const &) - DEFINE_ALIAS ??8type_info@@QBAHABV0@@Z, type_info_opequals_equals // public: int __cdecl type_info::operator==(class type_info const &)const - DEFINE_ALIAS ??9type_info@@QBAHABV0@@Z, type_info_opnot_equals // public: int __cdecl type_info::operator!=(class type_info const &)const - DEFINE_ALIAS ??_Fbad_cast@@QAAXXZ, bad_cast_default_ctor // public: void __cdecl bad_cast::`default constructor closure'(void) - DEFINE_ALIAS ??_Fbad_typeid@@QAAXXZ, bad_typeid_default_ctor // public: void __cdecl bad_typeid::`default constructor closure'(void) - DEFINE_ALIAS ??_U@YAPAXI@Z, operator_new // void * __cdecl operator new[](unsigned int) - DEFINE_ALIAS ??_U@YAPAXIHPBDH@Z, operator_new_dbg // void * __cdecl operator new[](unsigned int,int,char const *,int) - DEFINE_ALIAS ??_V@YAXPAX@Z, operator_delete // void __cdecl operator delete[](void *) - DEFINE_ALIAS ?_query_new_handler@@YAP6AHI@ZXZ, _query_new_handler // int (__cdecl*__cdecl _query_new_handler(void))(unsigned int) - DEFINE_ALIAS ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z, _set_new_handler // int (__cdecl*__cdecl _set_new_handler(int (__cdecl*)(unsigned int)))(unsigned int) - DEFINE_ALIAS ?_set_new_mode@@YAHH@Z, _set_new_mode // int __cdecl _set_new_mode(int) - DEFINE_ALIAS ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z, _set_se_translator // void (__cdecl*__cdecl _set_se_translator(void (__cdecl*)(unsigned int,struct _EXCEPTION_POINTERS *)))(unsigned int,struct _EXCEPTION_POINTERS *) - DEFINE_ALIAS ?before@type_info@@QBAHABV1@@Z, type_info_before // public: int __cdecl type_info::before(class type_info const &)const - DEFINE_ALIAS ?name@type_info@@QBAPBDXZ, type_info_name // public: char const * __cdecl type_info::name(void)const - DEFINE_ALIAS ?raw_name@type_info@@QBAPBDXZ, type_info_raw_name // public: char const * __cdecl type_info::raw_name(void)const - DEFINE_ALIAS ?set_terminate@@YAP6AXXZP6AXXZ@Z, set_terminate // void (__cdecl*__cdecl set_terminate(void (__cdecl*)(void)))(void) - DEFINE_ALIAS ?set_unexpected@@YAP6AXXZP6AXXZ@Z, set_unexpected // void (__cdecl*__cdecl set_unexpected(void (__cdecl*)(void)))(void) - DEFINE_ALIAS ?terminate@@YAXXZ, terminate // void __cdecl terminate(void) - DEFINE_ALIAS ?unexpected@@YAXXZ, unexpected // void __cdecl unexpected(void) - DEFINE_ALIAS ?what@exception@@UBAPBDXZ, exception_what // public: virtual char const * __cdecl exception::what(void)const - #undef _MSVCRT_ MACRO START_VTABLE $ShortName, $CxxName diff --git a/sdk/lib/crt/except/arm/cpp.s b/sdk/lib/crt/except/arm/cpp_alias.s similarity index 83% copy from sdk/lib/crt/except/arm/cpp.s copy to sdk/lib/crt/except/arm/cpp_alias.s index 5a45e587189..7b6ae45683e 100644 --- a/sdk/lib/crt/except/arm/cpp.s +++ b/sdk/lib/crt/except/arm/cpp_alias.s @@ -65,49 +65,5 @@ _Target SETS "|$Target|" DEFINE_ALIAS ?unexpected@@YAXXZ, unexpected // void __cdecl unexpected(void) DEFINE_ALIAS ?what@exception@@UBAPBDXZ, exception_what // public: virtual char const * __cdecl exception::what(void)const - #undef _MSVCRT_ - MACRO - START_VTABLE $ShortName, $CxxName - LCLS RttiName - LCLS VtblName - LCLS DtorName - LCLS CxxLabel -CxxLabel SETS "|$CxxName|" -RttiName SETS "|$ShortName._rtti|" -VtblName SETS "|":CC:"$ShortName._vtable|" -DtorName SETS "|":CC:"$ShortName._vector_dtor|" - EXTERN $RttiName - DCD $RttiName - EXPORT $VtblName -$VtblName - EXPORT $CxxLabel -$CxxLabel - EXTERN $DtorName - DCD $DtorName - MEND - - MACRO - DEFINE_EXCEPTION_VTABLE $ShortName, $CxxName - START_VTABLE $ShortName, $CxxName - EXTERN exception_what - DCD exception_what - MEND - - START_VTABLE type_info, __dummyname_type_info - DEFINE_EXCEPTION_VTABLE exception, ??_7exception@@6B@ - DEFINE_EXCEPTION_VTABLE bad_typeid, ??_7bad_typeid@@6B@ - DEFINE_EXCEPTION_VTABLE bad_cast, ??_7bad_cast@@6B@ - DEFINE_EXCEPTION_VTABLE __non_rtti_object, ??_7__non_rtti_object@@6B@ - - GBLS FuncName - - //EXTERN operator_delete - //__ExportName ??3@YAXPAX@Z - //b operator_delete - - //EXTERN operator_new - //__ExportName ??_U@YAPAXI@Z - //b operator_new - END /* EOF */ diff --git a/sdk/lib/crt/except/except.cmake b/sdk/lib/crt/except/except.cmake index 656853c097c..add149de4ec 100644 --- a/sdk/lib/crt/except/except.cmake +++ b/sdk/lib/crt/except/except.cmake @@ -13,7 +13,8 @@ if(ARCH STREQUAL "i386") ) if(MSVC) list(APPEND CRT_EXCEPT_ASM_SOURCE - except/i386/cpp.s) + except/i386/cpp.s + except/i386/cpp_alias.s) endif() elseif(ARCH STREQUAL "amd64") list(APPEND LIBCNTPR_EXCEPT_SOURCE @@ -28,7 +29,8 @@ elseif(ARCH STREQUAL "amd64") ) if(MSVC) list(APPEND CRT_EXCEPT_ASM_SOURCE - except/amd64/cpp.s) + except/amd64/cpp.s + except/amd64/cpp_alias.s) endif() elseif(ARCH STREQUAL "arm") list(APPEND LIBCNTPR_EXCEPT_SOURCE @@ -53,7 +55,8 @@ elseif(ARCH STREQUAL "arm") ) if(MSVC) list(APPEND CRT_EXCEPT_ASM_SOURCE - except/arm/cpp.s) + except/arm/cpp.s + except/arm/cpp_alias.s) endif() endif() diff --git a/sdk/lib/crt/except/i386/cpp.s b/sdk/lib/crt/except/i386/cpp.s index 99e2748edd6..7c524938dd4 100644 --- a/sdk/lib/crt/except/i386/cpp.s +++ b/sdk/lib/crt/except/i386/cpp.s @@ -7,55 +7,6 @@ EXTERN _cxx_frame_handler:PROC -MACRO(DEFINE_THISCALL_ALIAS, cxxname, target) -#ifdef _USE_ML - EXTERN ___thiscall&target:PROC - ALIAS <&cxxname> = <___thiscall&target> -#else - PUBLIC cxxname - .weakref &cxxname, &target -#endif -ENDM - -DEFINE_THISCALL_ALIAS ??0exception@@QAE@ABQBD@Z, _exception_ctor -DEFINE_THISCALL_ALIAS ??0exception@@QAE@ABQBDH@Z, _exception_ctor_noalloc -DEFINE_THISCALL_ALIAS ??0exception@@QAE@ABV0@@Z, _exception_copy_ctor -DEFINE_THISCALL_ALIAS ??0exception@@QAE@XZ, _exception_default_ctor -DEFINE_THISCALL_ALIAS ??1exception@@UAE@XZ, _exception_dtor -DEFINE_THISCALL_ALIAS ??4exception@@QAEAAV0@ABV0@@Z, _exception_opequals -DEFINE_THISCALL_ALIAS ??_Eexception@@UAEPAXI@Z, _exception_vector_dtor -DEFINE_THISCALL_ALIAS ??_Gexception@@UAEPAXI@Z, _exception_scalar_dtor -DEFINE_THISCALL_ALIAS ?what@exception@@UBEPBDXZ, _exception_what -DEFINE_THISCALL_ALIAS ??0bad_typeid@@QAE@ABV0@@Z, _bad_typeid_copy_ctor -DEFINE_THISCALL_ALIAS ??0bad_typeid@@QAE@PBD@Z, _bad_typeid_ctor -DEFINE_THISCALL_ALIAS ??_Fbad_typeid@@QAEXXZ, _bad_typeid_default_ctor -DEFINE_THISCALL_ALIAS ??1bad_typeid@@UAE@XZ, _bad_typeid_dtor -DEFINE_THISCALL_ALIAS ??4bad_typeid@@QAEAAV0@ABV0@@Z, _bad_typeid_opequals -DEFINE_THISCALL_ALIAS ??_Ebad_typeid@@UAEPAXI@Z, _bad_typeid_vector_dtor -DEFINE_THISCALL_ALIAS ??_Gbad_typeid@@UAEPAXI@Z, _bad_typeid_scalar_dtor -DEFINE_THISCALL_ALIAS ??0__non_rtti_object@@QAE@ABV0@@Z, ___non_rtti_object_copy_ctor -DEFINE_THISCALL_ALIAS ??0__non_rtti_object@@QAE@PBD@Z, ___non_rtti_object_ctor -DEFINE_THISCALL_ALIAS ??1__non_rtti_object@@UAE@XZ, ___non_rtti_object_dtor -DEFINE_THISCALL_ALIAS ??4__non_rtti_object@@QAEAAV0@ABV0@@Z, ___non_rtti_object_opequals -DEFINE_THISCALL_ALIAS ??_E__non_rtti_object@@UAEPAXI@Z, ___non_rtti_object_vector_dtor -DEFINE_THISCALL_ALIAS ??_G__non_rtti_object@@UAEPAXI@Z, ___non_rtti_object_scalar_dtor -DEFINE_THISCALL_ALIAS ??0bad_cast@@AAE@PBQBD@Z, _bad_cast_ctor -DEFINE_THISCALL_ALIAS ??0bad_cast@@QAE@ABQBD@Z, _bad_cast_ctor -DEFINE_THISCALL_ALIAS ??0bad_cast@@QAE@ABV0@@Z, _bad_cast_copy_ctor -DEFINE_THISCALL_ALIAS ??0bad_cast@@QAE@PBD@Z, _bad_cast_ctor_charptr -DEFINE_THISCALL_ALIAS ??_Fbad_cast@@QAEXXZ, _bad_cast_default_ctor -DEFINE_THISCALL_ALIAS ??1bad_cast@@UAE@XZ, _bad_cast_dtor -DEFINE_THISCALL_ALIAS ??4bad_cast@@QAEAAV0@ABV0@@Z, _bad_cast_opequals -DEFINE_THISCALL_ALIAS ??_Ebad_cast@@UAEPAXI@Z, _bad_cast_vector_dtor -DEFINE_THISCALL_ALIAS ??_Gbad_cast@@UAEPAXI@Z, _bad_cast_scalar_dtor -DEFINE_THISCALL_ALIAS ??8type_info@@QBEHABV0@@Z, _type_info_opequals_equals -DEFINE_THISCALL_ALIAS ??9type_info@@QBEHABV0@@Z, _type_info_opnot_equals -DEFINE_THISCALL_ALIAS ?before@type_info@@QBEHABV1@@Z, _type_info_before -DEFINE_THISCALL_ALIAS ??1type_info@@UAE@XZ, _type_info_dtor -DEFINE_THISCALL_ALIAS ?name@type_info@@QBEPBDXZ, _type_info_name -DEFINE_THISCALL_ALIAS ?raw_name@type_info@@QBEPBDXZ, _type_info_raw_name - - #undef _MSVCRT_ MACRO(START_VTABLE, shortname, cxxname) EXTERN _&shortname&_rtti:PROC @@ -80,36 +31,6 @@ DEFINE_EXCEPTION_VTABLE bad_typeid, ??_7bad_typeid@@6B@ DEFINE_EXCEPTION_VTABLE bad_cast, ??_7bad_cast@@6B@ DEFINE_EXCEPTION_VTABLE __non_rtti_object, ??_7__non_rtti_object@@6B@ -EXTERN _operator_delete:PROC -PUBLIC ??3@YAXPAX@Z -??3@YAXPAX@Z: - jmp _operator_delete - -EXTERN _operator_new:PROC -PUBLIC ??_U@YAPAXI@Z -??_U@YAPAXI@Z: - jmp _operator_new - - -MACRO(DEFINE_ALIAS, alias, orig, type) -EXTERN &orig:&type -ALIAS <&alias> = <&orig> -ENDM - -DEFINE_ALIAS ??_V@YAXPAX@Z, _operator_delete, PROC -DEFINE_ALIAS ??2@YAPAXI@Z, _operator_new, PROC -DEFINE_ALIAS ?_query_new_handler@@YAP6AHI@ZXZ, __query_new_handler, PROC -DEFINE_ALIAS ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z, __set_new_handler, PROC -DEFINE_ALIAS ?set_new_handler@@YAP6AXXZP6AXXZ@Z, _set_new_handler, PROC -DEFINE_ALIAS ?_query_new_mode@@YAHXZ, __query_new_mode, PROC -DEFINE_ALIAS ?_set_new_mode@@YAHH@Z, __set_new_mode, PROC -DEFINE_ALIAS ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z, __set_se_translator, PROC -DEFINE_ALIAS ?set_terminate@@YAP6AXXZP6AXXZ@Z, _set_terminate, PROC -DEFINE_ALIAS ?set_unexpected@@YAP6AXXZP6AXXZ@Z, _set_unexpected, PROC -DEFINE_ALIAS ?terminate@@YAXXZ, _terminate, PROC -DEFINE_ALIAS ?unexpected@@YAXXZ, _unexpected, PROC - - // void call_copy_ctor( void *func, void *this, void *src, int has_vbase ); PUBLIC _call_copy_ctor _call_copy_ctor: diff --git a/sdk/lib/crt/except/i386/cpp.s b/sdk/lib/crt/except/i386/cpp_alias.s similarity index 63% copy from sdk/lib/crt/except/i386/cpp.s copy to sdk/lib/crt/except/i386/cpp_alias.s index 99e2748edd6..384a3ed0f52 100644 --- a/sdk/lib/crt/except/i386/cpp.s +++ b/sdk/lib/crt/except/i386/cpp_alias.s @@ -5,8 +5,6 @@ .code .align 4 -EXTERN _cxx_frame_handler:PROC - MACRO(DEFINE_THISCALL_ALIAS, cxxname, target) #ifdef _USE_ML EXTERN ___thiscall&target:PROC @@ -55,31 +53,6 @@ DEFINE_THISCALL_ALIAS ??1type_info@@UAE@XZ, _type_info_dtor DEFINE_THISCALL_ALIAS ?name@type_info@@QBEPBDXZ, _type_info_name DEFINE_THISCALL_ALIAS ?raw_name@type_info@@QBEPBDXZ, _type_info_raw_name - -#undef _MSVCRT_ -MACRO(START_VTABLE, shortname, cxxname) -EXTERN _&shortname&_rtti:PROC -EXTERN ___thiscall_&shortname&_vector_dtor:PROC - .long _&shortname&_rtti -PUBLIC _&shortname&_vtable -_&shortname&_vtable: -PUBLIC &cxxname -&cxxname: - .long ___thiscall_&shortname&_vector_dtor -ENDM - -MACRO(DEFINE_EXCEPTION_VTABLE, shortname, cxxname) - START_VTABLE shortname, cxxname - EXTERN ___thiscall_exception_what:PROC - .long ___thiscall_exception_what -ENDM - -START_VTABLE type_info, __dummyname_type_info -DEFINE_EXCEPTION_VTABLE exception, ??_7exception@@6B@ -DEFINE_EXCEPTION_VTABLE bad_typeid, ??_7bad_typeid@@6B@ -DEFINE_EXCEPTION_VTABLE bad_cast, ??_7bad_cast@@6B@ -DEFINE_EXCEPTION_VTABLE __non_rtti_object, ??_7__non_rtti_object@@6B@ - EXTERN _operator_delete:PROC PUBLIC ??3@YAXPAX@Z ??3@YAXPAX@Z: @@ -90,7 +63,6 @@ PUBLIC ??_U@YAPAXI@Z ??_U@YAPAXI@Z: jmp _operator_new - MACRO(DEFINE_ALIAS, alias, orig, type) EXTERN &orig:&type ALIAS <&alias> = <&orig> @@ -109,78 +81,5 @@ DEFINE_ALIAS ?set_unexpected@@YAP6AXXZP6AXXZ@Z, _set_unexpected, PROC DEFINE_ALIAS ?terminate@@YAXXZ, _terminate, PROC DEFINE_ALIAS ?unexpected@@YAXXZ, _unexpected, PROC - -// void call_copy_ctor( void *func, void *this, void *src, int has_vbase ); -PUBLIC _call_copy_ctor -_call_copy_ctor: - push ebp - CFI_ADJUST_CFA_OFFSET 4 - CFI_REL_OFFSET ebp, 0 - mov ebp, esp - CFI_DEF_CFA_REGISTER ebp - push 1 - mov ecx, [ebp + 12] - push dword ptr [ebp + 16] - call dword ptr [ebp + 8] - leave - CFI_DEF_CFA esp, 4 - CFI_SAME_VALUE ebp - ret - -// void DECLSPEC_NORETURN continue_after_catch( cxx_exception_frame* frame, void *addr ); -PUBLIC _continue_after_catch -_continue_after_catch: - mov edx, [esp + 4] - mov eax, [esp + 8] - mov esp, [edx - 4] - lea ebp, [edx + 12] - jmp eax - -// void DECLSPEC_NORETURN call_finally_block( void *code_block, void *base_ptr ); -PUBLIC _call_finally_block -_call_finally_block: - mov ebp, [esp +8] - jmp dword ptr [esp + 4] - -// int call_filter( int (*func)(PEXCEPTION_POINTERS), void *arg, void *ebp ); -PUBLIC _call_filter -_call_filter: - push ebp - push [esp + 12] - mov ebp, [esp + 20] - call dword ptr [esp + 12] - pop ebp - pop ebp - ret - -// void *call_handler( void * (*func)(void), void *ebp ); -PUBLIC _call_handler -_call_handler: - push ebp - push ebx - push esi - push edi - mov ebp, [esp + 24] - call dword ptr [esp + 20] - pop edi - pop esi - pop ebx - pop ebp - ret - - -PUBLIC ___CxxFrameHandler -___CxxFrameHandler: - push 0 - push 0 - push eax - push[esp + 28] - push[esp + 28] - push[esp + 28] - push[esp + 28] - call _cxx_frame_handler - add esp, 28 - ret - END

1 0

[reactos] 03/03: [KMTESTS] Temporarily disable the debugger disable/reenable tests (#7424)
by Hermès Bélusca-Maïto 28 Jan '25

28 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=40ea0811982ca7faaf4d2… commit 40ea0811982ca7faaf4d243128e793a986d29649 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jan 12 20:01:20 2025 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jan 28 15:54:04 2025 +0100 [KMTESTS] Temporarily disable the debugger disable/reenable tests (#7424) They will be re-enabled ONCE our KDBG and KDCOM dlls correctly support disabling and re-enabling. --- modules/rostests/kmtests/ntos_kd/NtSystemDebugControl.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/rostests/kmtests/ntos_kd/NtSystemDebugControl.c b/modules/rostests/kmtests/ntos_kd/NtSystemDebugControl.c index 021fc6b0fcf..352ed6c9f57 100644 --- a/modules/rostests/kmtests/ntos_kd/NtSystemDebugControl.c +++ b/modules/rostests/kmtests/ntos_kd/NtSystemDebugControl.c @@ -180,6 +180,11 @@ START_TEST(NtSystemDebugControl) * the next tests are going to change its state */ WasDebuggerEnabled = SharedUserData->KdDebuggerEnabled; +// +// FIXME: Re-enable ONCE our KDBG and KDCOM dlls support disabling and re-enabling. +// + DBG_UNREFERENCED_LOCAL_VARIABLE(WasDebuggerEnabled); +#if 0 /* Try to disable or enable the debugger, depending on its original state */ if (WasDebuggerEnabled) Command = SysDbgDisableKernelDebugger; // 22 @@ -219,6 +224,8 @@ START_TEST(NtSystemDebugControl) ok_eq_hex_test(Command, Status, STATUS_SUCCESS); else ok_eq_hex_test(Command, Status, STATUS_DEBUGGER_INACTIVE); +#endif +// END FIXME /* Supported commands */

1 0

[reactos] 02/03: [KMTESTS] Add tests for KdSystemDebugControl and NtSystemDebugControl (#7424)
by Hermès Bélusca-Maïto 28 Jan '25

28 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=94cb4d6c0c6d8146e57cd… commit 94cb4d6c0c6d8146e57cda1689473a63f2b73f33 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Sep 4 23:03:49 2024 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jan 28 15:53:58 2025 +0100 [KMTESTS] Add tests for KdSystemDebugControl and NtSystemDebugControl (#7424) Tested on Windows 2003 SP1. Partially tested (but not completely) on higher versions. --- modules/rostests/kmtests/CMakeLists.txt | 2 + modules/rostests/kmtests/kmtest/testlist.c | 2 + modules/rostests/kmtests/kmtest_drv/testlist.c | 2 + .../kmtests/ntos_kd/KdSystemDebugControl.c | 151 +++++++++++ .../kmtests/ntos_kd/NtSystemDebugControl.c | 293 +++++++++++++++++++++ 5 files changed, 450 insertions(+) diff --git a/modules/rostests/kmtests/CMakeLists.txt b/modules/rostests/kmtests/CMakeLists.txt index 40c710f0a46..373ffb887c3 100644 --- a/modules/rostests/kmtests/CMakeLists.txt +++ b/modules/rostests/kmtests/CMakeLists.txt @@ -80,6 +80,7 @@ list(APPEND KMTEST_DRV_SOURCE ntos_io/IoIrp.c ntos_io/IoMdl.c ntos_io/IoVolume.c + ntos_kd/KdSystemDebugControl.c ntos_ke/KeApc.c ntos_ke/KeDevQueue.c ntos_ke/KeDpc.c @@ -164,6 +165,7 @@ list(APPEND KMTEST_SOURCE ntos_io/IoCreateFile_user.c ntos_io/IoDeviceObject_user.c ntos_io/IoReadWrite_user.c + ntos_kd/NtSystemDebugControl.c ntos_mm/MmMapLockedPagesSpecifyCache_user.c ntos_mm/NtCreateSection_user.c ntos_po/PoIrp_user.c diff --git a/modules/rostests/kmtests/kmtest/testlist.c b/modules/rostests/kmtests/kmtest/testlist.c index 60ab4bb4534..34e387c43f4 100644 --- a/modules/rostests/kmtests/kmtest/testlist.c +++ b/modules/rostests/kmtests/kmtest/testlist.c @@ -23,6 +23,7 @@ KMT_TESTFUNC Test_IoDeviceObject; KMT_TESTFUNC Test_IoReadWrite; KMT_TESTFUNC Test_MmMapLockedPagesSpecifyCache; KMT_TESTFUNC Test_NtCreateSection; +KMT_TESTFUNC Test_NtSystemDebugControl; KMT_TESTFUNC Test_PoIrp; KMT_TESTFUNC Test_RtlAvlTree; KMT_TESTFUNC Test_RtlCaptureContext; @@ -58,6 +59,7 @@ const KMT_TEST TestList[] = { "IoReadWrite", Test_IoReadWrite }, { "MmMapLockedPagesSpecifyCache", Test_MmMapLockedPagesSpecifyCache }, { "NtCreateSection", Test_NtCreateSection }, + { "NtSystemDebugControl", Test_NtSystemDebugControl }, { "PoIrp", Test_PoIrp }, { "RtlAvlTree", Test_RtlAvlTree }, { "RtlException", Test_RtlException }, diff --git a/modules/rostests/kmtests/kmtest_drv/testlist.c b/modules/rostests/kmtests/kmtest_drv/testlist.c index 9ef992257ee..b863bcf7b04 100644 --- a/modules/rostests/kmtests/kmtest_drv/testlist.c +++ b/modules/rostests/kmtests/kmtest_drv/testlist.c @@ -35,6 +35,7 @@ KMT_TESTFUNC Test_IoInterrupt; KMT_TESTFUNC Test_IoIrp; KMT_TESTFUNC Test_IoMdl; KMT_TESTFUNC Test_IoVolume; +KMT_TESTFUNC Test_KdSystemDebugControl; KMT_TESTFUNC Test_KeApc; KMT_TESTFUNC Test_KeDeviceQueue; KMT_TESTFUNC Test_KeDpc; @@ -118,6 +119,7 @@ const KMT_TEST TestList[] = { "IoIrp", Test_IoIrp }, { "IoMdl", Test_IoMdl }, { "IoVolume", Test_IoVolume }, + { "KdSystemDebugControl", Test_KdSystemDebugControl }, { "KeApc", Test_KeApc }, { "KeDeviceQueue", Test_KeDeviceQueue }, { "KeDpc", Test_KeDpc }, diff --git a/modules/rostests/kmtests/ntos_kd/KdSystemDebugControl.c b/modules/rostests/kmtests/ntos_kd/KdSystemDebugControl.c new file mode 100644 index 00000000000..a4da12f2224 --- /dev/null +++ b/modules/rostests/kmtests/ntos_kd/KdSystemDebugControl.c @@ -0,0 +1,151 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Kernel-Mode Test Suite for KdSystemDebugControl (kernel-mode) + * COPYRIGHT: Copyright 2024 Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> + */ + +#include <kmt_test.h> +#include <ndk/kdfuncs.h> + +#define ok_eq_print_test(testid, value, expected, spec) \ + ok((value) == (expected), "In test %lu: " #value " = " spec ", expected " spec "\n", testid, value, expected) + +#define ok_eq_hex_test(testid, value, expected) \ + ok_eq_print_test(testid, value, expected, "0x%08lx") + +#define ok_neq_print_test(testid, value, expected, spec) \ + ok((value) != (expected), "In test %lu: " #value " = " spec ", expected != " spec "\n", testid, value, expected) + +#define ok_neq_hex_test(testid, value, expected) \ + ok_neq_print_test(testid, value, expected, "0x%08lx") + + +BOOLEAN +(NTAPI *pKdRefreshDebuggerNotPresent)(VOID); + +NTSTATUS +(NTAPI *pKdSystemDebugControl)( + _In_ SYSDBG_COMMAND Command, + _In_ PVOID InputBuffer, + _In_ ULONG InputBufferLength, + _Out_ PVOID OutputBuffer, + _In_ ULONG OutputBufferLength, + _Inout_ PULONG ReturnLength, + _In_ KPROCESSOR_MODE PreviousMode); + + +static +NTSTATUS +TestSystemDebugControl( + _In_ SYSDBG_COMMAND Command) +{ + return pKdSystemDebugControl(Command, + NULL, // _In_ PVOID InputBuffer, + 0, // _In_ ULONG InputBufferLength, + NULL, // _Out_ PVOID OutputBuffer, + 0, // _In_ ULONG OutputBufferLength, + NULL, + KernelMode); +} + +START_TEST(KdSystemDebugControl) +{ + NTSTATUS Status; + ULONG Command; + RTL_OSVERSIONINFOEXW verInfo; + UNICODE_STRING fnName; + BOOLEAN IsNT52SP1OrHigher; + BOOLEAN IsVistaOrHigher; + BOOLEAN IsDebuggerActive; + + /* Test for OS version: KdSystemDebugControl() + * exists only on NT 5.2 SP1 and higher */ + verInfo.dwOSVersionInfoSize = sizeof(verInfo); + Status = RtlGetVersion((PRTL_OSVERSIONINFOW)&verInfo); + if (skip(NT_SUCCESS(Status), "RtlGetVersion() returned 0x%08lx\n", Status)) + return; + + // IsWindowsVersionOrGreater(5, 2, 1); + IsNT52SP1OrHigher = + (verInfo.dwMajorVersion > 5) || + (verInfo.dwMajorVersion == 5 && verInfo.dwMinorVersion > 2) || + (verInfo.dwMajorVersion == 5 && verInfo.dwMinorVersion == 2 && verInfo.wServicePackMajor >= 1); + + if (skip(IsNT52SP1OrHigher, "KdSystemDebugControl() only exists on NT 5.2 SP1 and higher\n")) + return; + + // IsWindowsVersionOrGreater(6, 0, 0); + IsVistaOrHigher = (verInfo.dwMajorVersion >= 6); + + + /* Load the Kd routines at runtime */ + + /* Note: KdRefreshDebuggerNotPresent() is NT 5.2+ */ + RtlInitUnicodeString(&fnName, L"KdRefreshDebuggerNotPresent"); + pKdRefreshDebuggerNotPresent = MmGetSystemRoutineAddress(&fnName); + ok(!!pKdRefreshDebuggerNotPresent, + "KdRefreshDebuggerNotPresent() unavailable but OS is NT 5.2 SP1 or higher?\n"); + + RtlInitUnicodeString(&fnName, L"KdSystemDebugControl"); + pKdSystemDebugControl = MmGetSystemRoutineAddress(&fnName); + if (skip(!!pKdSystemDebugControl, "KdSystemDebugControl() unavailable but OS is NT 5.2 SP1 or higher?\n")) + return; + + + /* Check whether the kernel debugger is present or not */ + IsDebuggerActive = (pKdRefreshDebuggerNotPresent + ? !pKdRefreshDebuggerNotPresent() + : (/*KD_DEBUGGER_ENABLED &&*/ !KD_DEBUGGER_NOT_PRESENT)); + + trace("Debugger is %s\n", IsDebuggerActive ? "active" : "inactive"); + + /* Unsupported commands */ + for (Command = 0; Command <= 6; ++Command) + { + Status = TestSystemDebugControl((SYSDBG_COMMAND)Command); + if (!IsVistaOrHigher || IsDebuggerActive) + ok_eq_hex_test(Command, Status, STATUS_INVALID_INFO_CLASS); + else + ok_eq_hex_test(Command, Status, STATUS_DEBUGGER_INACTIVE); + } + + /* + * Supported commands: + * + * SysDbgQueryVersion = 7, + * SysDbgReadVirtual = 8, + * SysDbgWriteVirtual = 9, + * SysDbgReadPhysical = 10, + * SysDbgWritePhysical = 11, + * SysDbgReadControlSpace = 12, + * SysDbgWriteControlSpace = 13, + * SysDbgReadIoSpace = 14, + * SysDbgWriteIoSpace = 15, + * SysDbgReadMsr = 16, + * SysDbgWriteMsr = 17, + * SysDbgReadBusData = 18, + * SysDbgWriteBusData = 19, + * SysDbgCheckLowMemory = 20 + */ + for (Command = 7; Command <= 20; ++Command) + { + Status = TestSystemDebugControl((SYSDBG_COMMAND)Command); + if (!IsVistaOrHigher || IsDebuggerActive) + ok_neq_hex_test(Command, Status, STATUS_INVALID_INFO_CLASS); // Status must be != STATUS_INVALID_INFO_CLASS + else + ok_eq_hex_test(Command, Status, STATUS_DEBUGGER_INACTIVE); + } + + /* Unsupported commands */ + for (Command = 21; Command <= 40; ++Command) + { + Status = TestSystemDebugControl((SYSDBG_COMMAND)Command); + if (!IsVistaOrHigher || IsDebuggerActive) + ok_eq_hex_test(Command, Status, STATUS_INVALID_INFO_CLASS); + else + ok_eq_hex_test(Command, Status, STATUS_DEBUGGER_INACTIVE); + } +} + +/* EOF */ diff --git a/modules/rostests/kmtests/ntos_kd/NtSystemDebugControl.c b/modules/rostests/kmtests/ntos_kd/NtSystemDebugControl.c new file mode 100644 index 00000000000..021fc6b0fcf --- /dev/null +++ b/modules/rostests/kmtests/ntos_kd/NtSystemDebugControl.c @@ -0,0 +1,293 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Kernel-Mode Test Suite for NtSystemDebugControl (user-mode) + * COPYRIGHT: Copyright 2024 Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> + */ + +#include <kmt_test.h> +#include <ndk/exfuncs.h> +#include <ndk/kdfuncs.h> +#include <ndk/setypes.h> + +#define ok_eq_print_test(testid, value, expected, spec) \ + ok((value) == (expected), "In test %lu: " #value " = " spec ", expected " spec "\n", testid, value, expected) + +#define ok_eq_hex_test(testid, value, expected) \ + ok_eq_print_test(testid, value, expected, "0x%08lx") + +#define ok_neq_print_test(testid, value, expected, spec) \ + ok((value) != (expected), "In test %lu: " #value " = " spec ", expected != " spec "\n", testid, value, expected) + +#define ok_neq_hex_test(testid, value, expected) \ + ok_neq_print_test(testid, value, expected, "0x%08lx") + +ULONG +GetNtDdiVersion(VOID) +{ + RTL_OSVERSIONINFOEXW verInfo; + NTSTATUS Status; + ULONG Version; + + verInfo.dwOSVersionInfoSize = sizeof(verInfo); + Status = RtlGetVersion((PRTL_OSVERSIONINFOW)&verInfo); + if (!NT_SUCCESS(Status)) + { + trace("RtlGetVersion() returned 0x%08lx\n", Status); + return 0; + } + + Version = ((((verInfo.dwMajorVersion & 0xFF) << 8) | + (verInfo.dwMinorVersion & 0xFF)) << 16) | + (((verInfo.wServicePackMajor & 0xFF) << 8) | + (verInfo.wServicePackMinor & 0xFF)); + + return Version; +} + +static +NTSTATUS +TestSystemDebugControl( + _In_ SYSDBG_COMMAND Command) +{ + return NtSystemDebugControl(Command, + NULL, // _In_ PVOID InputBuffer, + 0, // _In_ ULONG InputBufferLength, + NULL, // _Out_ PVOID OutputBuffer, + 0, // _In_ ULONG OutputBufferLength, + NULL); +} + +START_TEST(NtSystemDebugControl) +{ + NTSTATUS Status; + ULONG Command; + ULONG Version; + SYSTEM_KERNEL_DEBUGGER_INFORMATION DebuggerInfo = {0}; + BOOLEAN IsNT52SP1OrHigher; + BOOLEAN IsVistaOrHigher; + BOOLEAN IsDebuggerActive; + BOOLEAN PrivilegeSet[2] = {FALSE}; + BOOLEAN WasDebuggerEnabled; + + /* Test for OS version: KdSystemDebugControl() + * exists only on NT 5.2 SP1 and higher */ + Version = GetNtDdiVersion(); + if (skip(Version != 0, "GetNtDdiVersion() returned 0\n")) + return; + + // IsWindowsVersionOrGreater(5, 2, 1); + IsNT52SP1OrHigher = (Version >= NTDDI_WS03SP1); + + // IsWindowsVersionOrGreater(6, 0, 0); + IsVistaOrHigher = (Version >= NTDDI_WIN6); + + + /* Check whether the kernel debugger is present or not */ + Status = NtQuerySystemInformation(SystemKernelDebuggerInformation, + &DebuggerInfo, + sizeof(DebuggerInfo), + NULL); + + IsDebuggerActive = NT_SUCCESS(Status) && !DebuggerInfo.KernelDebuggerNotPresent; + // DebuggerInfo.KernelDebuggerEnabled; // SharedUserData->KdDebuggerEnabled; + + trace("Debugger is %s\n", IsDebuggerActive ? "active" : "inactive"); + + /* + * Explicitly disable the debug privilege so that we can test + * that NtSystemDebugControl() fails when the privilege is absent. + * Note that SysDbgGetTriageDump (29) is used for testing here, + * because it doesn't require a debugger to be active in order + * to proceed further (privilege check and actual functionality). + */ + Status = RtlAdjustPrivilege(SE_DEBUG_PRIVILEGE, FALSE, FALSE, &PrivilegeSet[0]); + ok_eq_hex(Status, STATUS_SUCCESS); + Status = TestSystemDebugControl(SysDbgGetTriageDump /* 29 */); + ok_eq_hex(Status, STATUS_ACCESS_DENIED); + + /* Now, enable the debug privilege for the rest of the tests */ + Status = RtlAdjustPrivilege(SE_DEBUG_PRIVILEGE, TRUE, FALSE, &PrivilegeSet[1]); + ok_eq_hex(Status, STATUS_SUCCESS); + + /* Supported commands */ + for (Command = 0; Command <= 5; ++Command) + { + Status = TestSystemDebugControl((SYSDBG_COMMAND)Command); + if (!IsVistaOrHigher || IsDebuggerActive) + ok_neq_hex_test(Command, Status, STATUS_INVALID_INFO_CLASS); + else + ok_eq_hex_test(Command, Status, STATUS_DEBUGGER_INACTIVE); + } + + /* Test SysDbgBreakPoint (6) only when the debugger is inactive + * or disabled; otherwise this call would trigger a breakpoint */ + if (!skip((IsVistaOrHigher && !IsDebuggerActive) || !SharedUserData->KdDebuggerEnabled, + "NtSystemDebugControl(SysDbgBreakPoint) skipped because the debugger is active\n")) + { + Status = TestSystemDebugControl(SysDbgBreakPoint /* 6 */); + if (!SharedUserData->KdDebuggerEnabled /*&& (!IsVistaOrHigher || IsDebuggerActive)*/) + { + ok_eq_hex_test(Command, Status, STATUS_UNSUCCESSFUL); + } + else + { + // ASSERT(IsVistaOrHigher && !IsDebuggerActive); + ok_eq_hex_test(Command, Status, STATUS_DEBUGGER_INACTIVE); + } + } + + /* + * Commands handled by kernel-mode KdSystemDebugControl(), + * and unsupported in user-mode: + * + * SysDbgQueryVersion = 7, + * SysDbgReadVirtual = 8, + * SysDbgWriteVirtual = 9, + * SysDbgReadPhysical = 10, + * SysDbgWritePhysical = 11, + * SysDbgReadControlSpace = 12, + * SysDbgWriteControlSpace = 13, + * SysDbgReadIoSpace = 14, + * SysDbgWriteIoSpace = 15, + * SysDbgReadMsr = 16, + * SysDbgWriteMsr = 17, + * SysDbgReadBusData = 18, + * SysDbgWriteBusData = 19, + * SysDbgCheckLowMemory = 20 + */ + // TODO: Handle this differently if !IsNT52SP1OrHigher ? + DBG_UNREFERENCED_PARAMETER(IsNT52SP1OrHigher); + for (Command = 7; Command <= 20; ++Command) + { + Status = TestSystemDebugControl((SYSDBG_COMMAND)Command); + if (!IsVistaOrHigher || IsDebuggerActive) + ok_eq_hex_test(Command, Status, STATUS_NOT_IMPLEMENTED); + else + ok_eq_hex_test(Command, Status, STATUS_DEBUGGER_INACTIVE); + } + + + /* + * Separately test commands SysDbgEnableKernelDebugger (21) + * and SysDbgDisableKernelDebugger (22), as they influence + * the internal state of the debugger. The order of testing + * matters, depending on whether the debugger was originally + * enabled or disabled. + */ + + /* Save whether the debugger is currently enabled; + * the next tests are going to change its state */ + WasDebuggerEnabled = SharedUserData->KdDebuggerEnabled; + + /* Try to disable or enable the debugger, depending on its original state */ + if (WasDebuggerEnabled) + Command = SysDbgDisableKernelDebugger; // 22 + else + Command = SysDbgEnableKernelDebugger; // 21 + Status = TestSystemDebugControl((SYSDBG_COMMAND)Command); + if (!IsVistaOrHigher || IsDebuggerActive) + { + /* + * KdEnableDebugger() (with lock enabled) wants a KdDisableDebugger() + * first (i.e. that the debugger was previously explicitly disabled) + * in order to return success; otherwise it'll return STATUS_INVALID_PARAMETER. + */ + if (Command == SysDbgEnableKernelDebugger) + { + ok(Status == STATUS_SUCCESS || Status == STATUS_INVALID_PARAMETER, + "In test %lu: Status = 0x%08lx, expected 0x%08lx or 0x%08lx\n", + Command, Status, STATUS_SUCCESS, STATUS_INVALID_PARAMETER); + } + else + { + ok_eq_hex_test(Command, Status, STATUS_SUCCESS); + } + } + else + { + ok_eq_hex_test(Command, Status, STATUS_DEBUGGER_INACTIVE); + } + + /* Re-enable or disable the debugger, depending on its original state */ + if (WasDebuggerEnabled) + Command = SysDbgEnableKernelDebugger; // 21 + else + Command = SysDbgDisableKernelDebugger; // 22 + Status = TestSystemDebugControl((SYSDBG_COMMAND)Command); + if (!IsVistaOrHigher || IsDebuggerActive) + ok_eq_hex_test(Command, Status, STATUS_SUCCESS); + else + ok_eq_hex_test(Command, Status, STATUS_DEBUGGER_INACTIVE); + + + /* Supported commands */ + for (Command = 23; Command <= 31; ++Command) + { + Status = TestSystemDebugControl((SYSDBG_COMMAND)Command); + if (!IsVistaOrHigher || IsDebuggerActive) + ok_neq_hex_test(Command, Status, STATUS_INVALID_INFO_CLASS); + else + ok_eq_hex_test(Command, Status, STATUS_DEBUGGER_INACTIVE); + } + + /* These are Vista+ and depend on the OS version */ + for (Command = 32; Command <= 36; ++Command) + { + Status = TestSystemDebugControl((SYSDBG_COMMAND)Command); + if (!IsVistaOrHigher || IsDebuggerActive) + { + if (Version >= NTDDI_WIN6) // IsVistaOrHigher + ok_neq_hex_test(Command, Status, STATUS_INVALID_INFO_CLASS); + else + ok_eq_hex_test(Command, Status, STATUS_INVALID_INFO_CLASS); + } + else + { + ok_eq_hex_test(Command, Status, STATUS_DEBUGGER_INACTIVE); + } + } + + Command = 37; // SysDbgGetLiveKernelDump + Status = TestSystemDebugControl((SYSDBG_COMMAND)Command); + if (!IsVistaOrHigher || IsDebuggerActive) + { + if (Version >= NTDDI_WINBLUE) + ok_neq_hex_test(Command, Status, STATUS_INVALID_INFO_CLASS); + else + ok_eq_hex_test(Command, Status, STATUS_INVALID_INFO_CLASS); + } + else + { + ok_eq_hex_test(Command, Status, STATUS_DEBUGGER_INACTIVE); + } + + Command = 38; // SysDbgKdPullRemoteFile + Status = TestSystemDebugControl((SYSDBG_COMMAND)Command); + if (!IsVistaOrHigher || IsDebuggerActive) + { + if (Version >= NTDDI_WIN10_VB) + ok_neq_hex_test(Command, Status, STATUS_INVALID_INFO_CLASS); + else + ok_eq_hex_test(Command, Status, STATUS_INVALID_INFO_CLASS); + } + else + { + ok_eq_hex_test(Command, Status, STATUS_DEBUGGER_INACTIVE); + } + + /* Unsupported commands */ + for (Command = 39; Command <= 40; ++Command) + { + Status = TestSystemDebugControl((SYSDBG_COMMAND)Command); + if (!IsVistaOrHigher || IsDebuggerActive) + ok_eq_hex_test(Command, Status, STATUS_INVALID_INFO_CLASS); + else + ok_eq_hex_test(Command, Status, STATUS_DEBUGGER_INACTIVE); + } + + /* Finally restore the original debug privilege state */ + RtlAdjustPrivilege(SE_DEBUG_PRIVILEGE, PrivilegeSet[0], FALSE, &PrivilegeSet[0]); +} + +/* EOF */

1 0

[reactos] 01/03: [KMTESTS] Remove "EnablePrivilege*" helpers + Fix typo
by Hermès Bélusca-Maïto 28 Jan '25

28 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6ede6ac246a510ee9fc2a… commit 6ede6ac246a510ee9fc2ab04453187f6f4a08b66 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Sep 6 16:14:41 2024 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jan 28 15:37:10 2025 +0100 [KMTESTS] Remove "EnablePrivilege*" helpers + Fix typo Their functionality is already ensured by RtlAdjustPrivilege(). --- modules/rostests/kmtests/include/kmt_test.h | 2 +- modules/rostests/kmtests/kmtest/fltsupport.c | 82 +++------------------------- modules/rostests/kmtests/kmtest/kmtest.h | 2 +- 3 files changed, 11 insertions(+), 75 deletions(-) diff --git a/modules/rostests/kmtests/include/kmt_test.h b/modules/rostests/kmtests/include/kmt_test.h index 2f0315a48b5..1e265c9a05a 100644 --- a/modules/rostests/kmtests/include/kmt_test.h +++ b/modules/rostests/kmtests/include/kmt_test.h @@ -186,7 +186,7 @@ DWORD KmtSendBufferToDriver(IN DWORD ControlCode, IN OUT PVOID Buffer OPTIONAL, DWORD KmtFltCreateService(_In_z_ PCWSTR ServiceName, _In_z_ PCWSTR DisplayName, _Out_ SC_HANDLE *ServiceHandle); DWORD KmtFltDeleteService(_In_opt_z_ PCWSTR ServiceName, _Inout_ SC_HANDLE *ServiceHandle); DWORD KmtFltAddAltitude(_In_z_ LPWSTR Altitude); -DWORD KmtFltLoadDriver(_In_ BOOLEAN EnableDriverLoadPrivlege, _In_ BOOLEAN RestartIfRunning, _In_ BOOLEAN ConnectComms, _Out_ HANDLE *hPort); +DWORD KmtFltLoadDriver(_In_ BOOLEAN EnableDriverLoadPrivilege, _In_ BOOLEAN RestartIfRunning, _In_ BOOLEAN ConnectComms, _Out_ HANDLE *hPort); DWORD KmtFltUnloadDriver(_In_ HANDLE *hPort, _In_ BOOLEAN DisonnectComms); DWORD KmtFltConnectComms(_Out_ HANDLE *hPort); DWORD KmtFltDisconnectComms(_In_ HANDLE hPort); diff --git a/modules/rostests/kmtests/kmtest/fltsupport.c b/modules/rostests/kmtests/kmtest/fltsupport.c index ae0cb05abb4..19868018d47 100644 --- a/modules/rostests/kmtests/kmtest/fltsupport.c +++ b/modules/rostests/kmtests/kmtest/fltsupport.c @@ -11,6 +11,7 @@ #include "kmtest.h" #include <kmt_public.h> +#include <ndk/setypes.h> #include <assert.h> #include <debug.h> @@ -25,10 +26,6 @@ KmtpCreateService( IN DWORD ServiceType, OUT SC_HANDLE *ServiceHandle); -DWORD EnablePrivilegeInCurrentProcess( - _In_z_ LPWSTR lpPrivName, - _In_ BOOL bEnable); - // move to a shared location typedef struct _KMTFLT_MESSAGE_HEADER { @@ -110,7 +107,7 @@ KmtFltDeleteService( */ DWORD KmtFltLoadDriver( - _In_ BOOLEAN EnableDriverLoadPrivlege, + _In_ BOOLEAN EnableDriverLoadPrivilege, _In_ BOOLEAN RestartIfRunning, _In_ BOOLEAN ConnectComms, _Out_ HANDLE *hPort @@ -118,13 +115,16 @@ KmtFltLoadDriver( { DWORD Error; - if (EnableDriverLoadPrivlege) + if (EnableDriverLoadPrivilege) { - Error = EnablePrivilegeInCurrentProcess(SE_LOAD_DRIVER_NAME , TRUE); + BOOLEAN WasEnabled; + Error = RtlNtStatusToDosError(RtlAdjustPrivilege( + SE_LOAD_DRIVER_PRIVILEGE, + TRUE, + FALSE, // Enable in current process. + &WasEnabled)); if (Error) - { return Error; - } } Error = KmtFltLoad(TestServiceName); @@ -141,14 +141,10 @@ KmtFltLoadDriver( } if (Error) - { return Error; - } if (ConnectComms) - { Error = KmtFltConnectComms(hPort); - } return Error; } @@ -524,63 +520,3 @@ Quit: return Error; } - -/* -* Private functions, not meant for use in kmtests -*/ - -DWORD EnablePrivilege( - _In_ HANDLE hToken, - _In_z_ LPWSTR lpPrivName, - _In_ BOOL bEnable) -{ - TOKEN_PRIVILEGES TokenPrivileges; - LUID luid; - BOOL bSuccess; - DWORD dwError = ERROR_SUCCESS; - - /* Get the luid for this privilege */ - if (!LookupPrivilegeValueW(NULL, lpPrivName, &luid)) - return GetLastError(); - - /* Setup the struct with the priv info */ - TokenPrivileges.PrivilegeCount = 1; - TokenPrivileges.Privileges[0].Luid = luid; - TokenPrivileges.Privileges[0].Attributes = bEnable ? SE_PRIVILEGE_ENABLED : 0; - - /* Enable the privilege info in the token */ - bSuccess = AdjustTokenPrivileges(hToken, - FALSE, - &TokenPrivileges, - sizeof(TOKEN_PRIVILEGES), - NULL, - NULL); - if (bSuccess == FALSE) dwError = GetLastError(); - - /* return status */ - return dwError; -} - -DWORD EnablePrivilegeInCurrentProcess( - _In_z_ LPWSTR lpPrivName, - _In_ BOOL bEnable) -{ - HANDLE hToken; - BOOL bSuccess; - DWORD dwError = ERROR_SUCCESS; - - /* Get a handle to our token */ - bSuccess = OpenProcessToken(GetCurrentProcess(), - TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, - &hToken); - if (bSuccess == FALSE) return GetLastError(); - - /* Enable the privilege in the agent token */ - dwError = EnablePrivilege(hToken, lpPrivName, bEnable); - - /* We're done with this now */ - CloseHandle(hToken); - - /* return status */ - return dwError; -} diff --git a/modules/rostests/kmtests/kmtest/kmtest.h b/modules/rostests/kmtests/kmtest/kmtest.h index a32d41c0546..2a6c9ef2216 100644 --- a/modules/rostests/kmtests/kmtest/kmtest.h +++ b/modules/rostests/kmtests/kmtest/kmtest.h @@ -126,6 +126,6 @@ KmtFltDeleteService( DWORD KmtFltCloseService( _Inout_ SC_HANDLE *ServiceHandle); -#endif /* KMT_FILTER_DRIVER */ +#endif /* KMT_FLT_USER_MODE */ #endif /* !defined _KMTESTS_H_ */

1 0

[reactos] 03/03: [MOUNTMGR_APITEST] Add custom DesiredAccess to GetMountMgrHandle()
by Hermès Bélusca-Maïto 28 Jan '25

28 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cf2cbe6ff6c11d4c9527a… commit cf2cbe6ff6c11d4c9527a212b3d2953ca7e5c988 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jan 26 23:08:52 2025 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jan 28 15:29:41 2025 +0100 [MOUNTMGR_APITEST] Add custom DesiredAccess to GetMountMgrHandle() This will allow any future tests, employing IOCTL_MOUNTMGR_* that require read or write accesses, to also use this helper. --- modules/rostests/apitests/mountmgr/QueryDosVolumePaths.c | 2 +- modules/rostests/apitests/mountmgr/QueryPoints.c | 2 +- modules/rostests/apitests/mountmgr/precomp.h | 3 ++- modules/rostests/apitests/mountmgr/utils.c | 5 +++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/modules/rostests/apitests/mountmgr/QueryDosVolumePaths.c b/modules/rostests/apitests/mountmgr/QueryDosVolumePaths.c index 138e45bd56e..e7103b121e7 100644 --- a/modules/rostests/apitests/mountmgr/QueryDosVolumePaths.c +++ b/modules/rostests/apitests/mountmgr/QueryDosVolumePaths.c @@ -571,7 +571,7 @@ START_TEST(QueryDosVolumePaths) HANDLE hFindVolume; WCHAR szVolumeName[MAX_PATH]; - MountMgrHandle = GetMountMgrHandle(); + MountMgrHandle = GetMountMgrHandle(FILE_READ_ATTRIBUTES); if (!MountMgrHandle) { win_skip("MountMgr unavailable: %lu\n", GetLastError()); diff --git a/modules/rostests/apitests/mountmgr/QueryPoints.c b/modules/rostests/apitests/mountmgr/QueryPoints.c index ad6b433878d..a34e27f8ca4 100644 --- a/modules/rostests/apitests/mountmgr/QueryPoints.c +++ b/modules/rostests/apitests/mountmgr/QueryPoints.c @@ -36,7 +36,7 @@ START_TEST(QueryPoints) MOUNTMGR_MOUNT_POINTS MountPoints; PMOUNTMGR_MOUNT_POINTS AllocatedPoints; - MountMgrHandle = GetMountMgrHandle(); + MountMgrHandle = GetMountMgrHandle(FILE_READ_ATTRIBUTES); if (!MountMgrHandle) { win_skip("MountMgr unavailable: %lu\n", GetLastError()); diff --git a/modules/rostests/apitests/mountmgr/precomp.h b/modules/rostests/apitests/mountmgr/precomp.h index 8031f379b24..8414c0d9ce1 100644 --- a/modules/rostests/apitests/mountmgr/precomp.h +++ b/modules/rostests/apitests/mountmgr/precomp.h @@ -23,7 +23,8 @@ LPCSTR wine_dbgstr_us(const UNICODE_STRING *us); HANDLE -GetMountMgrHandle(VOID); +GetMountMgrHandle( + _In_ ACCESS_MASK DesiredAccess); VOID DumpBuffer( diff --git a/modules/rostests/apitests/mountmgr/utils.c b/modules/rostests/apitests/mountmgr/utils.c index 7fa0794d2aa..10f4b527f16 100644 --- a/modules/rostests/apitests/mountmgr/utils.c +++ b/modules/rostests/apitests/mountmgr/utils.c @@ -19,7 +19,8 @@ LPCSTR wine_dbgstr_us(const UNICODE_STRING *us) * The handle should be closed with NtClose() once it is no longer in use. **/ HANDLE -GetMountMgrHandle(VOID) +GetMountMgrHandle( + _In_ ACCESS_MASK DesiredAccess) { NTSTATUS Status; UNICODE_STRING MountMgrDevice; @@ -34,7 +35,7 @@ GetMountMgrHandle(VOID) NULL, NULL); Status = NtOpenFile(&MountMgrHandle, - FILE_READ_ATTRIBUTES | SYNCHRONIZE, + DesiredAccess | SYNCHRONIZE, &ObjectAttributes, &IoStatusBlock, FILE_SHARE_READ | FILE_SHARE_WRITE,

1 0

[reactos] 02/03: [MOUNTMGR] MountMgrMountedDeviceArrival(): Fix pool buffer double-free.
by Hermès Bélusca-Maïto 28 Jan '25

28 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8d91d4c8e1907ca50c348… commit 8d91d4c8e1907ca50c3489e8f4868cf5827f1d5c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Jan 28 14:45:15 2025 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jan 28 15:29:40 2025 +0100 [MOUNTMGR] MountMgrMountedDeviceArrival(): Fix pool buffer double-free. `DeviceInformation->DeviceName.Buffer` was already freed via the previous `FreePool(TargetDeviceName.Buffer);` call, since `DeviceInformation->DeviceName` was set to `TargetDeviceName` above in the code. This resulted in a pool double-free, triggering a corruption of the pool, and a BSoD. What had to be freed instead, is `DeviceInformation->SymbolicName.Buffer` that is allocated at the beginning of the function. --- drivers/storage/mountmgr/mountmgr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/storage/mountmgr/mountmgr.c b/drivers/storage/mountmgr/mountmgr.c index 4e1552791bc..6603df3f53b 100644 --- a/drivers/storage/mountmgr/mountmgr.c +++ b/drivers/storage/mountmgr/mountmgr.c @@ -995,7 +995,7 @@ MountMgrMountedDeviceArrival(IN PDEVICE_EXTENSION DeviceExtension, FreePool(UniqueId); FreePool(TargetDeviceName.Buffer); - FreePool(DeviceInformation->DeviceName.Buffer); + FreePool(DeviceInformation->SymbolicName.Buffer); FreePool(DeviceInformation); KeReleaseSemaphore(&(DeviceExtension->DeviceLock), IO_NO_INCREMENT, 1, FALSE);

1 0

[reactos] 01/03: [NTOS:IO] Fix a typo in comment
by Hermès Bélusca-Maïto 28 Jan '25

28 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5962c445112f9e5ae843f… commit 5962c445112f9e5ae843ffea663f19de4dbbe5f6 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jan 26 18:46:07 2025 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jan 28 15:29:39 2025 +0100 [NTOS:IO] Fix a typo in comment --- ntoskrnl/io/iomgr/iofunc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/io/iomgr/iofunc.c b/ntoskrnl/io/iomgr/iofunc.c index 3c0cf9b69e2..64b692ea2aa 100644 --- a/ntoskrnl/io/iomgr/iofunc.c +++ b/ntoskrnl/io/iomgr/iofunc.c @@ -295,7 +295,7 @@ IopDeviceFsIoControl(IN HANDLE DeviceHandle, return STATUS_INVALID_PARAMETER; } - /* Check if we from user mode */ + /* Check if we came from user mode */ if (PreviousMode != KernelMode) { /* Get the access mask */

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs