Ros-diffs November 2024

ros-diffs@reactos.org

22 participants
103 discussions

[reactos] 01/01: [NTOS:MM] Implement MmAllocate/FreeMappingAddress (#7260)

by Oleg Dubinskiy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=83d74e74338874a107894… commit 83d74e74338874a107894bb0ba5159ee6a0608c8 Author: Oleg Dubinskiy <oleg.dubinskij30(a)gmail.com> AuthorDate: Sat Nov 2 15:10:51 2024 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Nov 2 15:10:51 2024 +0100 [NTOS:MM] Implement MmAllocate/FreeMappingAddress (#7260) Implement MmAllocateMappingAddress and MmFreeMappingAddress routines. Based on mm-implement-mappingaddress.patch by Thomas Faber with some changes from me. Required by Microsoft NTFS driver (from Windows Server 2003 SP2 only, the one from Windows XP SP3 does not need them) and by NDIS & TDI drivers (both from Windows XP SP3 and Windows Server 2003 SP2). Also they are called when using Dr. Web Security Space 8 filter drivers together with MS FltMgr & TDI. Fortunately, this part (these two routines) are enough to get the drivers working in both cases, and others (partially incomplete) routines are not badly required, so they can be finished and committed later. CORE-10147, CORE-14635, CORE-17409, CORE-19318 --- ntoskrnl/mm/ARM3/miarm.h | 8 +++ ntoskrnl/mm/ARM3/pool.c | 132 ++++++++++++++++++++++++++++++++++++++++++---- sdk/include/xdk/mmfuncs.h | 4 +- 3 files changed, 131 insertions(+), 13 deletions(-) diff --git a/ntoskrnl/mm/ARM3/miarm.h b/ntoskrnl/mm/ARM3/miarm.h index 3f32bced9a3..7515b4c506b 100644 --- a/ntoskrnl/mm/ARM3/miarm.h +++ b/ntoskrnl/mm/ARM3/miarm.h @@ -154,6 +154,14 @@ C_ASSERT(SYSTEM_PD_SIZE == PAGE_SIZE); #error Define these please! #endif +// +// Some internal SYSTEM_PTE_MISUSE bugcheck subcodes +// +#define PTE_MAPPING_NONE 0x100 +#define PTE_MAPPING_NOT_OWNED 0x101 +#define PTE_MAPPING_EMPTY 0x102 +#define PTE_MAPPING_RESERVED 0x103 + // // Mask for image section page protection // diff --git a/ntoskrnl/mm/ARM3/pool.c b/ntoskrnl/mm/ARM3/pool.c index 8ab8ae293a4..badc8a3e4d7 100644 --- a/ntoskrnl/mm/ARM3/pool.c +++ b/ntoskrnl/mm/ARM3/pool.c @@ -1552,27 +1552,137 @@ MmReturnPoolQuota( /* PUBLIC FUNCTIONS ***********************************************************/ -/* - * @unimplemented +/** + * @brief + * Reserves the specified amount of memory in system virtual address space. + * + * @param[in] NumberOfBytes + * Size, in bytes, of memory to reserve. + * + * @param[in] PoolTag + * Pool Tag identifying the buffer. Usually consists from 4 characters in reversed order. + * + * @return + * A pointer to the 1st memory block of the reserved buffer in case of success, NULL otherwise. + * + * @remarks Must be called at IRQL <= APC_LEVEL */ +_Must_inspect_result_ +_IRQL_requires_max_(APC_LEVEL) +_Ret_maybenull_ PVOID NTAPI -MmAllocateMappingAddress(IN SIZE_T NumberOfBytes, - IN ULONG PoolTag) +MmAllocateMappingAddress( + _In_ SIZE_T NumberOfBytes, + _In_ ULONG PoolTag) { - UNIMPLEMENTED; - return NULL; + PFN_NUMBER SizeInPages; + PMMPTE PointerPte; + MMPTE TempPte; + + /* How many PTEs does the caller want? */ + SizeInPages = BYTES_TO_PAGES(NumberOfBytes); + if (SizeInPages == 0) + { + KeBugCheckEx(SYSTEM_PTE_MISUSE, + PTE_MAPPING_NONE, /* Requested 0 mappings */ + SizeInPages, + PoolTag, + (ULONG_PTR)_ReturnAddress()); + } + + /* We need two extra PTEs to store size and pool tag in */ + SizeInPages += 2; + + /* Reserve our PTEs */ + PointerPte = MiReserveSystemPtes(SizeInPages, SystemPteSpace); + if (!PointerPte) + { + /* Failed to reserve PTEs */ + DPRINT1("Failed to reserve system PTEs\n"); + return NULL; + } + + ASSERT(SizeInPages <= MM_EMPTY_PTE_LIST); + TempPte.u.Long = 0; + TempPte.u.List.NextEntry = SizeInPages; + MI_WRITE_INVALID_PTE(&PointerPte[0], TempPte); + TempPte.u.Long = PoolTag; + TempPte.u.Hard.Valid = 0; + MI_WRITE_INVALID_PTE(&PointerPte[1], TempPte); + return MiPteToAddress(PointerPte + 2); } -/* - * @unimplemented +/** + * @brief + * Frees previously reserved amount of memory in system virtual address space. + * + * @param[in] BaseAddress + * A pointer to the 1st memory block of the reserved buffer. + * + * @param[in] PoolTag + * Pool Tag identifying the buffer. Usually consists from 4 characters in reversed order. + * + * @return + * Nothing. + * + * @see MmAllocateMappingAddress + * + * @remarks Must be called at IRQL <= APC_LEVEL */ +_IRQL_requires_max_(APC_LEVEL) VOID NTAPI -MmFreeMappingAddress(IN PVOID BaseAddress, - IN ULONG PoolTag) +MmFreeMappingAddress( + _In_ __drv_freesMem(Mem) _Post_invalid_ PVOID BaseAddress, + _In_ ULONG PoolTag) { - UNIMPLEMENTED; + PMMPTE PointerPte; + MMPTE TempPte; + PFN_NUMBER SizeInPages; + PFN_NUMBER i; + + /* Get the first PTE we reserved */ + PointerPte = MiAddressToPte(BaseAddress) - 2; + + /* Verify that the pool tag matches */ + TempPte.u.Long = PoolTag; + TempPte.u.Hard.Valid = 0; + if (PointerPte[1].u.Long != TempPte.u.Long) + { + KeBugCheckEx(SYSTEM_PTE_MISUSE, + PTE_MAPPING_NOT_OWNED, /* Trying to free an address it does not own */ + (ULONG_PTR)BaseAddress, + PoolTag, + PointerPte[1].u.Long); + } + + /* We must have a size */ + SizeInPages = PointerPte[0].u.List.NextEntry; + if (SizeInPages < 3) + { + KeBugCheckEx(SYSTEM_PTE_MISUSE, + PTE_MAPPING_EMPTY, /* Mapping apparently empty */ + (ULONG_PTR)BaseAddress, + PoolTag, + (ULONG_PTR)_ReturnAddress()); + } + + /* Enumerate all PTEs and make sure they are empty */ + for (i = 2; i < SizeInPages; i++) + { + if (PointerPte[i].u.Long != 0) + { + KeBugCheckEx(SYSTEM_PTE_MISUSE, + PTE_MAPPING_RESERVED, /* Mapping address still reserved */ + (ULONG_PTR)PointerPte, + PoolTag, + SizeInPages - 2); + } + } + + /* Release the PTEs */ + MiReleaseSystemPtes(PointerPte, SizeInPages, SystemPteSpace); } /* EOF */ diff --git a/sdk/include/xdk/mmfuncs.h b/sdk/include/xdk/mmfuncs.h index 478763fbc6e..da9734c046b 100644 --- a/sdk/include/xdk/mmfuncs.h +++ b/sdk/include/xdk/mmfuncs.h @@ -633,7 +633,7 @@ MmAdvanceMdl( _Must_inspect_result_ _IRQL_requires_max_(APC_LEVEL) -_When_ (return != NULL, _Out_writes_bytes_opt_ (NumberOfBytes)) +_Ret_maybenull_ NTKERNELAPI PVOID NTAPI @@ -646,7 +646,7 @@ NTKERNELAPI VOID NTAPI MmFreeMappingAddress( - _In_ PVOID BaseAddress, + _In_ __drv_freesMem(Mem) _Post_invalid_ PVOID BaseAddress, _In_ ULONG PoolTag); _IRQL_requires_max_ (APC_LEVEL)

1 month, 3 weeks

[reactos] 06/06: [VCRUNTIME] Stop including crtdefs.h

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=abbc78401095be4d94dfa… commit abbc78401095be4d94dfa0050b4d307e83b1b7b4 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun May 12 17:09:32 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Nov 2 12:52:59 2024 +0200 [VCRUNTIME] Stop including crtdefs.h --- sdk/include/vcruntime/emmintrin.h | 2 +- sdk/include/vcruntime/excpt.h | 2 +- sdk/include/vcruntime/intrin.h | 2 +- sdk/include/vcruntime/limits.h | 2 +- sdk/include/vcruntime/mmintrin.h | 4 ++-- sdk/include/vcruntime/rtcapi.h | 2 +- sdk/include/vcruntime/setjmp.h | 2 +- sdk/include/vcruntime/stdarg.h | 2 +- sdk/include/vcruntime/stdint.h | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sdk/include/vcruntime/emmintrin.h b/sdk/include/vcruntime/emmintrin.h index 21e6ece0c6a..2fbb5bd0c9f 100644 --- a/sdk/include/vcruntime/emmintrin.h +++ b/sdk/include/vcruntime/emmintrin.h @@ -11,7 +11,7 @@ #ifndef _INCLUDED_EMM #define _INCLUDED_EMM -#include <crtdefs.h> +#include <vcruntime.h> #include <xmmintrin.h> #if defined(_MSC_VER) && !defined(__clang__) diff --git a/sdk/include/vcruntime/excpt.h b/sdk/include/vcruntime/excpt.h index 62841cbda23..798b19180f1 100644 --- a/sdk/include/vcruntime/excpt.h +++ b/sdk/include/vcruntime/excpt.h @@ -6,7 +6,7 @@ #ifndef _INC_EXCPT #define _INC_EXCPT -#include <crtdefs.h> +#include <vcruntime.h> #pragma pack(push,_CRT_PACKING) diff --git a/sdk/include/vcruntime/intrin.h b/sdk/include/vcruntime/intrin.h index 3a03d02fe3e..513c2667786 100644 --- a/sdk/include/vcruntime/intrin.h +++ b/sdk/include/vcruntime/intrin.h @@ -4,7 +4,7 @@ #ifndef RC_INVOKED -#include <crtdefs.h> +#include <vcruntime.h> #include <setjmp.h> #include <stddef.h> diff --git a/sdk/include/vcruntime/limits.h b/sdk/include/vcruntime/limits.h index 9fad49b873d..f571e1d208e 100644 --- a/sdk/include/vcruntime/limits.h +++ b/sdk/include/vcruntime/limits.h @@ -4,7 +4,7 @@ * No warranty is given; refer to the file DISCLAIMER within this package. */ #pragma once -#include <crtdefs.h> +#include <vcruntime.h> #ifndef _INC_LIMITS #define _INC_LIMITS diff --git a/sdk/include/vcruntime/mmintrin.h b/sdk/include/vcruntime/mmintrin.h index 61a1427e6dc..28124c91fda 100644 --- a/sdk/include/vcruntime/mmintrin.h +++ b/sdk/include/vcruntime/mmintrin.h @@ -22,7 +22,7 @@ #ifndef _MMINTRIN_H_INCLUDED #define _MMINTRIN_H_INCLUDED -#include <crtdefs.h> +#include <vcruntime.h> #ifdef __cplusplus extern "C" { @@ -42,7 +42,7 @@ extern "C" { float m64_f32[2]; __int8 m64_i8[8]; __int16 m64_i16[4]; - __int32 m64_i32[2]; + __int32 m64_i32[2]; __int64 m64_i64; unsigned __int8 m64_u8[8]; unsigned __int16 m64_u16[4]; diff --git a/sdk/include/vcruntime/rtcapi.h b/sdk/include/vcruntime/rtcapi.h index 0aeb8afa431..adf058abeab 100644 --- a/sdk/include/vcruntime/rtcapi.h +++ b/sdk/include/vcruntime/rtcapi.h @@ -6,7 +6,7 @@ #ifndef _INC_RTCAPI #define _INC_RTCAPI -#include <crtdefs.h> +#include <vcruntime.h> #pragma pack(push,_CRT_PACKING) diff --git a/sdk/include/vcruntime/setjmp.h b/sdk/include/vcruntime/setjmp.h index 80e90f75b9b..e7d80129a8b 100644 --- a/sdk/include/vcruntime/setjmp.h +++ b/sdk/include/vcruntime/setjmp.h @@ -6,7 +6,7 @@ #ifndef _INC_SETJMP #define _INC_SETJMP -#include <crtdefs.h> +#include <vcruntime.h> #pragma pack(push,_CRT_PACKING) diff --git a/sdk/include/vcruntime/stdarg.h b/sdk/include/vcruntime/stdarg.h index 54e54779c2d..f56ca0ce33a 100644 --- a/sdk/include/vcruntime/stdarg.h +++ b/sdk/include/vcruntime/stdarg.h @@ -33,7 +33,7 @@ Boston, MA 02110-1301, USA. */ #ifndef _INC_STDARG #define _INC_STDARG -#include <crtdefs.h> +#include <vcruntime.h> #include <vadefs.h> #ifndef _WIN32 diff --git a/sdk/include/vcruntime/stdint.h b/sdk/include/vcruntime/stdint.h index 4c99ed04414..3246acf00bf 100644 --- a/sdk/include/vcruntime/stdint.h +++ b/sdk/include/vcruntime/stdint.h @@ -25,7 +25,7 @@ #ifndef _STDINT_H #define _STDINT_H -#include <crtdefs.h> +#include <vcruntime.h> #define __need_wint_t #define __need_wchar_t

1 month, 3 weeks

[reactos] 05/06: [VCRUNTIME] Add some missing definitions to vcruntime*.h

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2955b1f0e95ec66e5f7f7… commit 2955b1f0e95ec66e5f7f7156bb437e980667566c Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun May 12 13:32:45 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Nov 2 12:52:59 2024 +0200 [VCRUNTIME] Add some missing definitions to vcruntime*.h --- sdk/include/vcruntime/vcruntime.h | 88 ++++++++++++++++++++++++ sdk/include/vcruntime/vcruntime_startup.h | 15 +++++ sdk/include/vcruntime/vcruntime_string.h | 107 ++++++++++++++++++++++++++++++ 3 files changed, 210 insertions(+) diff --git a/sdk/include/vcruntime/vcruntime.h b/sdk/include/vcruntime/vcruntime.h index aef28c5d0b7..3344cec75ee 100644 --- a/sdk/include/vcruntime/vcruntime.h +++ b/sdk/include/vcruntime/vcruntime.h @@ -11,6 +11,32 @@ #define _CRT_WIDE_(_String) L ## _String #define _CRT_WIDE(_String) _CRT_WIDE_(_String) +#define _CRT_CONCATENATE_(a, b) a ## b +#define _CRT_CONCATENATE(a, b) _CRT_CONCATENATE_(a, b) + +#define _CRT_UNPARENTHESIZE_(...) __VA_ARGS__ +#define _CRT_UNPARENTHESIZE(...) _CRT_UNPARENTHESIZE_ __VA_ARGS__ + +#ifndef _MSC_VER +#define __pragma(x) _Pragma(_CRT_STRINGIZE(x)) +#endif + +#ifdef __cplusplus + #define _CRT_BEGIN_C_HEADER \ + __pragma(pack(push, _CRT_PACKING_IDENTIFIER, _CRT_PACKING)) \ + extern "C" { + #define _CRT_END_C_HEADER \ + } \ + __pragma(pack(pop, _CRT_PACKING_IDENTIFIER)) +#else + #define _CRT_BEGIN_C_HEADER \ + __pragma(pack(push, _CRT_PACKING_IDENTIFIER, _CRT_PACKING)) + #define _CRT_END_C_HEADER \ + __pragma(pack(pop, _CRT_PACKING_IDENTIFIER)) +#endif + +_CRT_BEGIN_C_HEADER + #ifndef _CRTIMP #ifdef CRTDLL /* Defined for ntdll, crtdll, msvcrt, etc */ #define _CRTIMP @@ -21,6 +47,16 @@ #endif /* CRTDLL || _DLL */ #endif /* !_CRTIMP */ +#ifndef _VCRTIMP + #ifndef _VCRT_DEFINED_CRTIMP + #define _VCRTIMP _CRTIMP + #elif defined(_VCRT_BUILD) && defined(CRTDLL) && !defined(_VCRT_SAT_1) + #define _VCRTIMP __declspec(dllexport) + #else + #define _VCRTIMP + #endif +#endif + #ifndef __CRTDECL #define __CRTDECL __cdecl #endif @@ -118,3 +154,55 @@ #define _CRT_ALIGN(x) __attribute__ ((aligned(x))) #endif #endif + +#if defined (__midl) || defined(__WIDL__) + #define _VCRT_ALIGN(x) +#elif defined(_MSC_VER) + #define _CRT_ALIGN(x) __declspec(align(x)) +#else + #define _VCRT_ALIGN(x) __attribute__ ((aligned(x))) +#endif + +#if defined __cplusplus + typedef bool __vcrt_bool; +#elif defined __midl + typedef char __vcrt_bool; +#else + typedef _Bool __vcrt_bool; +#endif + +#ifndef _HAS_NODISCARD + #ifndef __has_cpp_attribute + #define _HAS_NODISCARD 0 + #elif __has_cpp_attribute(nodiscard) >= 201603L + #define _HAS_NODISCARD 1 + #else + #define _HAS_NODISCARD 0 + #endif +#endif // _HAS_NODISCARD + +#if _HAS_NODISCARD + #define _NODISCARD [[nodiscard]] +#else + #define _NODISCARD +#endif // _HAS_NODISCARD + +#if defined _M_X64 || defined _M_ARM || defined _M_ARM64 + #define _UNALIGNED __unaligned +#else + #define _UNALIGNED +#endif + +#ifdef __cplusplus + // Safer than the C definition, as it ensures that the argument is not a pointer + extern "C++" template<typename _T, size_t _Size> + char (*__crt_countof_helper(_UNALIGNED _T(&_Array)[_Size]))[_Size]; + #define __crt_countof(_Array) sizeof(*__crt_countof_helper(_Array)) +#else + #define __crt_countof(_Array) (sizeof(_Array) / sizeof(_Array[0])) +#endif + +void __cdecl __security_init_cookie(void); +extern uintptr_t __security_cookie; + +_CRT_END_C_HEADER diff --git a/sdk/include/vcruntime/vcruntime_startup.h b/sdk/include/vcruntime/vcruntime_startup.h index 646ca4e82d4..f84012e542e 100644 --- a/sdk/include/vcruntime/vcruntime_startup.h +++ b/sdk/include/vcruntime/vcruntime_startup.h @@ -7,3 +7,18 @@ typedef enum _crt_argv_mode _crt_argv_unexpanded_arguments, _crt_argv_expanded_arguments, } _crt_argv_mode; + +typedef enum _crt_exit_cleanup_mode +{ + _crt_exit_full_cleanup, + _crt_exit_quick_cleanup, + _crt_exit_no_cleanup +} _crt_exit_cleanup_mode; + +typedef enum _crt_exit_return_mode +{ + _crt_exit_terminate_process, + _crt_exit_return_to_caller +} _crt_exit_return_mode; + +__vcrt_bool __cdecl __vcrt_uninitialize(_In_ __vcrt_bool _Terminating); diff --git a/sdk/include/vcruntime/vcruntime_string.h b/sdk/include/vcruntime/vcruntime_string.h index 3dfac8d4bd1..ce5c2bbfc4c 100644 --- a/sdk/include/vcruntime/vcruntime_string.h +++ b/sdk/include/vcruntime/vcruntime_string.h @@ -2,3 +2,110 @@ #pragma once #include <vcruntime.h> + +_CRT_BEGIN_C_HEADER + +void* +__cdecl +memset( + _Out_writes_bytes_all_(_Size) void *_Dst, + _In_ int _Val, + _In_ size_t _Size); + +_CRT_INSECURE_DEPRECATE_MEMORY(memcpy_s) +_Post_equal_to_(_Dst) +_At_buffer_((unsigned char*)_Dst, _Iter_, _Size, + _Post_satisfies_(((unsigned char*)_Dst)[_Iter_] == ((unsigned char*)_Src)[_Iter_])) +void* +__cdecl +memcpy( + _Out_writes_bytes_all_(_Size) void *_Dst, + _In_reads_bytes_(_Size) void const *_Src, + _In_ size_t _Size); + +_CRT_INSECURE_DEPRECATE_MEMORY(memmove_s) +_VCRTIMP +void* +__cdecl +memmove( + _Out_writes_bytes_all_opt_(_Size) void *_Dst, + _In_reads_bytes_opt_(_Size) void const *_Src, + _In_ size_t _Size); + +_NODISCARD +_Check_return_ +_VCRTIMP +char _CONST_RETURN* +__cdecl +strchr( + _In_z_ const char *_Str, + _In_ int _Val); + +_NODISCARD +_Check_return_ +_When_(return != NULL, _Ret_range_(_Str, _Str + _String_length_(_Str) - 1)) +_VCRTIMP +wchar_t _CONST_RETURN* +__cdecl +wcschr( + _In_z_ const wchar_t *_Str, + _In_ wchar_t _Ch); + +_NODISCARD +_Check_return_ +_VCRTIMP +char _CONST_RETURN* +__cdecl strrchr( + _In_z_ const char *_Str, + _In_ int _Ch); + +_NODISCARD +_Check_return_ +_Ret_maybenull_ +_VCRTIMP +char _CONST_RETURN* +__cdecl +strstr( + _In_z_ const char *_Str, + _In_z_ const char *_SubStr); + +_NODISCARD +_Check_return_ +int +__cdecl +memcmp( + _In_reads_bytes_(_Size) const void *_Buf1, + _In_reads_bytes_(_Size) const void *_Buf2, + _In_ size_t _Size); + +_NODISCARD +_Check_return_ +_Ret_maybenull_ +_When_(return != NULL, _Ret_range_(_Str, _Str + _String_length_(_Str) - 1)) +_VCRTIMP +wchar_t _CONST_RETURN* +__cdecl +wcsstr( + _In_z_ const wchar_t *_Str, + _In_z_ const wchar_t *_SubStr); + +_NODISCARD +_Check_return_ +_VCRTIMP +void _CONST_RETURN* +__cdecl +memchr( + _In_reads_bytes_opt_(_MaxCount) const void *_Buf, + _In_ int _Val, + _In_ size_t _MaxCount); + +_NODISCARD +_Check_return_ +_VCRTIMP +wchar_t _CONST_RETURN* +__cdecl +wcsrchr( + _In_z_ const wchar_t *_Str, + _In_ wchar_t _Ch); + +_CRT_END_C_HEADER

1 month, 3 weeks

[reactos] 04/06: [VCRUNTIME] Move some definitions from crtdefs.h to vadefs.h

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=90e95d15a2851f577e98d… commit 90e95d15a2851f577e98d5d42522587f16b25f09 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat May 11 10:20:48 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Nov 2 12:52:59 2024 +0200 [VCRUNTIME] Move some definitions from crtdefs.h to vadefs.h --- sdk/include/vcruntime/crtdefs.h | 33 --------------------------------- sdk/include/vcruntime/vadefs.h | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/sdk/include/vcruntime/crtdefs.h b/sdk/include/vcruntime/crtdefs.h index da025e5d0b6..5068c265b34 100644 --- a/sdk/include/vcruntime/crtdefs.h +++ b/sdk/include/vcruntime/crtdefs.h @@ -211,45 +211,12 @@ extern "C" { #endif -#ifndef _UINTPTR_T_DEFINED -#define _UINTPTR_T_DEFINED -#ifndef __uintptr_t_defined -#define __uintptr_t_defined -#undef uintptr_t -#ifdef _WIN64 -#if defined(__GNUC__) && defined(__STRICT_ANSI__) - typedef unsigned int uintptr_t __attribute__ ((mode (DI))); -#else - __MINGW_EXTENSION typedef unsigned __int64 uintptr_t; -#endif -#else - typedef unsigned int uintptr_t; -#endif -#endif -#endif - #ifndef _WCTYPE_T_DEFINED #define _WCTYPE_T_DEFINED typedef unsigned short wint_t; typedef unsigned short wctype_t; #endif -#ifdef __GNUC__ -#ifndef __GNUC_VA_LIST -#define __GNUC_VA_LIST - typedef __builtin_va_list __gnuc_va_list; -#endif -#endif - -#ifndef _VA_LIST_DEFINED -#define _VA_LIST_DEFINED -#if defined(__GNUC__) - typedef __gnuc_va_list va_list; -#elif defined(_MSC_VER) - typedef _Writable_bytes_(_Inexpressible_("length varies")) char * va_list; -#endif -#endif - #ifndef _ERRCODE_DEFINED #define _ERRCODE_DEFINED typedef int errcode; diff --git a/sdk/include/vcruntime/vadefs.h b/sdk/include/vcruntime/vadefs.h index f01e67e496b..57761f6858a 100644 --- a/sdk/include/vcruntime/vadefs.h +++ b/sdk/include/vcruntime/vadefs.h @@ -18,6 +18,39 @@ extern "C" { #endif +#ifdef __GNUC__ +#ifndef __GNUC_VA_LIST +#define __GNUC_VA_LIST + typedef __builtin_va_list __gnuc_va_list; +#endif +#endif + +#ifndef _VA_LIST_DEFINED +#define _VA_LIST_DEFINED +#if defined(__GNUC__) + typedef __gnuc_va_list va_list; +#elif defined(_MSC_VER) + typedef _Writable_bytes_(_Inexpressible_("length varies")) char * va_list; +#endif +#endif + +#ifndef _UINTPTR_T_DEFINED +#define _UINTPTR_T_DEFINED +#ifndef __uintptr_t_defined +#define __uintptr_t_defined +#undef uintptr_t +#ifdef _WIN64 +#if defined(__GNUC__) && defined(__STRICT_ANSI__) + typedef unsigned int uintptr_t __attribute__ ((mode (DI))); +#else + typedef unsigned __int64 uintptr_t; +#endif +#else + typedef unsigned int uintptr_t; +#endif +#endif +#endif + #ifdef __cplusplus #define _ADDRESSOF(v) (&reinterpret_cast<const char &>(v)) #else

1 month, 3 weeks

[reactos] 03/06: [VCRUNTIME] Move some definitions from crtdefs.h to vcruntime.h

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1d01b8c6f0d20be8acee7… commit 1d01b8c6f0d20be8acee7f5aa9b5a0b3d5bba1f1 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat May 11 10:03:43 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Nov 2 12:52:59 2024 +0200 [VCRUNTIME] Move some definitions from crtdefs.h to vcruntime.h This reflects what native headers do. TODO: Move _CRT_ALIGN to corecrt.h --- sdk/include/vcruntime/crtdefs.h | 119 -------------------------------------- sdk/include/vcruntime/vcruntime.h | 114 ++++++++++++++++++++++++++++++++++++ 2 files changed, 114 insertions(+), 119 deletions(-) diff --git a/sdk/include/vcruntime/crtdefs.h b/sdk/include/vcruntime/crtdefs.h index 0b93ca1e9f1..da025e5d0b6 100644 --- a/sdk/include/vcruntime/crtdefs.h +++ b/sdk/include/vcruntime/crtdefs.h @@ -28,8 +28,6 @@ #endif #endif -#undef _CRT_PACKING -#define _CRT_PACKING 8 #pragma pack(push,_CRT_PACKING) /* Disable non-ANSI C definitions if compiling with __STDC__ */ @@ -50,20 +48,11 @@ /** Properties ***************************************************************/ -#ifndef _CRT_STRINGIZE -#define __CRT_STRINGIZE(_Value) #_Value -#define _CRT_STRINGIZE(_Value) __CRT_STRINGIZE(_Value) -#endif #ifndef _CRT_DEFER_MACRO #define _CRT_DEFER_MACRO(M,...) M(__VA_ARGS__) #endif -#ifndef _CRT_WIDE -#define __CRT_WIDE(_String) L ## _String -#define _CRT_WIDE(_String) __CRT_WIDE(_String) -#endif - #ifndef _W64 #if !defined(_midl) && defined(_X86_) && _MSC_VER >= 1300 #define _W64 __w64 @@ -72,16 +61,6 @@ #endif #endif -#ifndef _CRTIMP - #ifdef CRTDLL /* Defined for ntdll, crtdll, msvcrt, etc */ - #define _CRTIMP - #elif defined(_DLL) - #define _CRTIMP __declspec(dllimport) - #else /* !CRTDLL && !_DLL */ - #define _CRTIMP - #endif /* CRTDLL || _DLL */ -#endif /* !_CRTIMP */ - //#define _CRT_ALTERNATIVE_INLINES #ifndef _CRTIMP_ALT @@ -150,37 +129,14 @@ #endif #endif -#ifndef _CRT_ALIGN -#if defined (__midl) || defined(__WIDL__) -#define _CRT_ALIGN(x) -#elif defined(_MSC_VER) -#define _CRT_ALIGN(x) __declspec(align(x)) -#else -#define _CRT_ALIGN(x) __attribute__ ((aligned(x))) -#endif -#endif - #ifndef _CRTNOALIAS #define _CRTNOALIAS #endif -#ifndef __CRTDECL -#define __CRTDECL __cdecl -#endif - #ifndef _CRT_UNUSED #define _CRT_UNUSED(x) (void)x #endif -#ifndef _CONST_RETURN -#ifdef __cplusplus -#define _CONST_RETURN const -#define _CRT_CONST_CORRECT_OVERLOADS -#else -#define _CONST_RETURN -#endif -#endif - #define __crt_typefix(ctype) #ifndef _STATIC_ASSERT @@ -195,27 +151,10 @@ /** Deprecated ***************************************************************/ -#ifdef __GNUC__ -#define _CRT_DEPRECATE_TEXT(_Text) __attribute__ ((deprecated)) -#elif defined(_MSC_VER) -#define _CRT_DEPRECATE_TEXT(_Text) __declspec(deprecated(_Text)) -#else -#define _CRT_DEPRECATE_TEXT(_Text) -#endif - #ifndef __STDC_WANT_SECURE_LIB__ #define __STDC_WANT_SECURE_LIB__ 1 #endif -#ifndef _CRT_INSECURE_DEPRECATE -# ifdef _CRT_SECURE_NO_DEPRECATE -# define _CRT_INSECURE_DEPRECATE(_Replacement) -# else -# define _CRT_INSECURE_DEPRECATE(_Replacement) \ - _CRT_DEPRECATE_TEXT("This may be unsafe, Try " #_Replacement " instead!") -# endif -#endif - #ifndef _CRT_INSECURE_DEPRECATE_CORE # ifdef _CRT_SECURE_NO_DEPRECATE_CORE # define _CRT_INSECURE_DEPRECATE_CORE(_Replacement) @@ -234,10 +173,6 @@ # endif #endif -#ifndef _CRT_INSECURE_DEPRECATE_MEMORY -#define _CRT_INSECURE_DEPRECATE_MEMORY(_Replacement) -#endif - #ifndef _CRT_INSECURE_DEPRECATE_GLOBALS #define _CRT_INSECURE_DEPRECATE_GLOBALS(_Replacement) #endif @@ -276,37 +211,6 @@ extern "C" { #endif -#ifndef _SIZE_T_DEFINED -#define _SIZE_T_DEFINED -#undef size_t -#ifdef _WIN64 -#if defined(__GNUC__) && defined(__STRICT_ANSI__) - typedef unsigned int size_t __attribute__ ((mode (DI))); -#else - __MINGW_EXTENSION typedef unsigned __int64 size_t; -#endif -#else - typedef unsigned int size_t; -#endif -#endif - -#ifndef _INTPTR_T_DEFINED -#define _INTPTR_T_DEFINED -#ifndef __intptr_t_defined -#define __intptr_t_defined -#undef intptr_t -#ifdef _WIN64 -#if defined(__GNUC__) && defined(__STRICT_ANSI__) - typedef int intptr_t __attribute__ ((mode (DI))); -#else - __MINGW_EXTENSION typedef __int64 intptr_t; -#endif -#else - typedef int intptr_t; -#endif -#endif -#endif - #ifndef _UINTPTR_T_DEFINED #define _UINTPTR_T_DEFINED #ifndef __uintptr_t_defined @@ -324,29 +228,6 @@ extern "C" { #endif #endif -#ifndef _PTRDIFF_T_DEFINED -#define _PTRDIFF_T_DEFINED -#ifndef _PTRDIFF_T_ -#undef ptrdiff_t -#ifdef _WIN64 -#if defined(__GNUC__) && defined(__STRICT_ANSI__) - typedef int ptrdiff_t __attribute__ ((mode (DI))); -#else - __MINGW_EXTENSION typedef __int64 ptrdiff_t; -#endif -#else - typedef int ptrdiff_t; -#endif -#endif -#endif - -#ifndef _WCHAR_T_DEFINED -#define _WCHAR_T_DEFINED -#if defined(_MSC_VER) || !defined(__cplusplus) - typedef unsigned short wchar_t; -#endif -#endif - #ifndef _WCTYPE_T_DEFINED #define _WCTYPE_T_DEFINED typedef unsigned short wint_t; diff --git a/sdk/include/vcruntime/vcruntime.h b/sdk/include/vcruntime/vcruntime.h index aa8e3f59b65..aef28c5d0b7 100644 --- a/sdk/include/vcruntime/vcruntime.h +++ b/sdk/include/vcruntime/vcruntime.h @@ -4,3 +4,117 @@ #include <_mingw.h> #include <sal.h> #include <vadefs.h> + +#define _CRT_STRINGIZE_(_Value) #_Value +#define _CRT_STRINGIZE(_Value) _CRT_STRINGIZE_(_Value) + +#define _CRT_WIDE_(_String) L ## _String +#define _CRT_WIDE(_String) _CRT_WIDE_(_String) + +#ifndef _CRTIMP + #ifdef CRTDLL /* Defined for ntdll, crtdll, msvcrt, etc */ + #define _CRTIMP + #elif defined(_DLL) + #define _CRTIMP __declspec(dllimport) + #else /* !CRTDLL && !_DLL */ + #define _CRTIMP + #endif /* CRTDLL || _DLL */ +#endif /* !_CRTIMP */ + +#ifndef __CRTDECL +#define __CRTDECL __cdecl +#endif + +#ifndef _CONST_RETURN +#ifdef __cplusplus +#define _CONST_RETURN const +#define _CRT_CONST_CORRECT_OVERLOADS +#else +#define _CONST_RETURN +#endif +#endif + +#ifdef __GNUC__ +#define _CRT_DEPRECATE_TEXT(_Text) __attribute__ ((deprecated)) +#elif defined(_MSC_VER) +#define _CRT_DEPRECATE_TEXT(_Text) __declspec(deprecated(_Text)) +#else +#define _CRT_DEPRECATE_TEXT(_Text) +#endif + +#ifndef _CRT_INSECURE_DEPRECATE +# ifdef _CRT_SECURE_NO_DEPRECATE +# define _CRT_INSECURE_DEPRECATE(_Replacement) +# else +# define _CRT_INSECURE_DEPRECATE(_Replacement) \ + _CRT_DEPRECATE_TEXT("This may be unsafe, Try " #_Replacement " instead!") +# endif +#endif + +#ifndef _CRT_INSECURE_DEPRECATE_MEMORY +#define _CRT_INSECURE_DEPRECATE_MEMORY(_Replacement) +#endif + +#ifndef _SIZE_T_DEFINED +#define _SIZE_T_DEFINED +#undef size_t +#ifdef _WIN64 +#if defined(__GNUC__) && defined(__STRICT_ANSI__) + typedef unsigned int size_t __attribute__ ((mode (DI))); +#else + typedef unsigned __int64 size_t; +#endif +#else + typedef unsigned int size_t; +#endif +#endif + +#ifndef _INTPTR_T_DEFINED +#define _INTPTR_T_DEFINED +#ifndef __intptr_t_defined +#define __intptr_t_defined +#undef intptr_t +#ifdef _WIN64 +#if defined(__GNUC__) && defined(__STRICT_ANSI__) + typedef int intptr_t __attribute__ ((mode (DI))); +#else + typedef __int64 intptr_t; +#endif +#else + typedef int intptr_t; +#endif +#endif +#endif + +#ifndef _PTRDIFF_T_DEFINED +#define _PTRDIFF_T_DEFINED +#ifndef _PTRDIFF_T_ +#undef ptrdiff_t +#ifdef _WIN64 +#if defined(__GNUC__) && defined(__STRICT_ANSI__) + typedef int ptrdiff_t __attribute__ ((mode (DI))); +#else + __MINGW_EXTENSION typedef __int64 ptrdiff_t; +#endif +#else + typedef int ptrdiff_t; +#endif +#endif +#endif + +#ifndef _WCHAR_T_DEFINED +#define _WCHAR_T_DEFINED +#if defined(_MSC_VER) || !defined(__cplusplus) + typedef unsigned short wchar_t; +#endif +#endif + +#ifndef _CRT_ALIGN + #if defined (__midl) || defined(__WIDL__) + #define _CRT_ALIGN(x) + #elif defined(_MSC_VER) + #define _CRT_ALIGN(x) __declspec(align(x)) + #else + #define _CRT_ALIGN(x) __attribute__ ((aligned(x))) + #endif +#endif

1 month, 3 weeks

[reactos] 02/06: [VCRUNTIME] Add vcruntime.h and related (mostly empty)

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ff2c7c872062822e69aa0… commit ff2c7c872062822e69aa0a9e645fe25e61509c6c Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat May 11 09:25:04 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Nov 2 12:52:59 2024 +0200 [VCRUNTIME] Add vcruntime.h and related (mostly empty) This is for compatibility with some 3rd-party code. --- sdk/include/vcruntime/crtdefs.h | 2 +- sdk/include/vcruntime/vadefs.h | 2 -- sdk/include/vcruntime/vcruntime.h | 6 ++++++ sdk/include/vcruntime/vcruntime_new_debug.h | 2 ++ sdk/include/vcruntime/vcruntime_startup.h | 9 +++++++++ sdk/include/vcruntime/vcruntime_string.h | 4 ++++ 6 files changed, 22 insertions(+), 3 deletions(-) diff --git a/sdk/include/vcruntime/crtdefs.h b/sdk/include/vcruntime/crtdefs.h index be29b637cae..0b93ca1e9f1 100644 --- a/sdk/include/vcruntime/crtdefs.h +++ b/sdk/include/vcruntime/crtdefs.h @@ -3,7 +3,7 @@ * This file is part of the w64 mingw-runtime package. * No warranty is given; refer to the file DISCLAIMER within this package. */ -#include <_mingw.h> +#include <vcruntime.h> #include <specstrings.h> #ifndef _INC_CRTDEFS diff --git a/sdk/include/vcruntime/vadefs.h b/sdk/include/vcruntime/vadefs.h index 5506bb7db24..f01e67e496b 100644 --- a/sdk/include/vcruntime/vadefs.h +++ b/sdk/include/vcruntime/vadefs.h @@ -10,8 +10,6 @@ #error Only Win32 target is supported! #endif -#include <crtdefs.h> - #undef _CRT_PACKING #define _CRT_PACKING 8 #pragma pack(push,_CRT_PACKING) diff --git a/sdk/include/vcruntime/vcruntime.h b/sdk/include/vcruntime/vcruntime.h new file mode 100644 index 00000000000..aa8e3f59b65 --- /dev/null +++ b/sdk/include/vcruntime/vcruntime.h @@ -0,0 +1,6 @@ + +#pragma once + +#include <_mingw.h> +#include <sal.h> +#include <vadefs.h> diff --git a/sdk/include/vcruntime/vcruntime_new_debug.h b/sdk/include/vcruntime/vcruntime_new_debug.h new file mode 100644 index 00000000000..99ddf32dbf3 --- /dev/null +++ b/sdk/include/vcruntime/vcruntime_new_debug.h @@ -0,0 +1,2 @@ + +#pragma once diff --git a/sdk/include/vcruntime/vcruntime_startup.h b/sdk/include/vcruntime/vcruntime_startup.h new file mode 100644 index 00000000000..646ca4e82d4 --- /dev/null +++ b/sdk/include/vcruntime/vcruntime_startup.h @@ -0,0 +1,9 @@ + +#pragma once + +typedef enum _crt_argv_mode +{ + _crt_argv_no_arguments, + _crt_argv_unexpanded_arguments, + _crt_argv_expanded_arguments, +} _crt_argv_mode; diff --git a/sdk/include/vcruntime/vcruntime_string.h b/sdk/include/vcruntime/vcruntime_string.h new file mode 100644 index 00000000000..3dfac8d4bd1 --- /dev/null +++ b/sdk/include/vcruntime/vcruntime_string.h @@ -0,0 +1,4 @@ + +#pragma once + +#include <vcruntime.h>

1 month, 3 weeks

[reactos] 01/06: [VCRUNTIME] Move compiler runtime headers into their own folder

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=84344399b57b55f1a5832… commit 84344399b57b55f1a58321f42d9515fd3e29ea91 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat May 11 08:11:36 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Nov 2 12:52:59 2024 +0200 [VCRUNTIME] Move compiler runtime headers into their own folder These headers come with the MS compiler. Some of them are standard, like emmintrin.h, others are MS specific like crtdefs.h This separation will allow using MS CRT headers. Eventually it can allow compiling with the compilers' runtime headers. --- CMakeLists.txt | 1 + sdk/include/{crt => vcruntime}/_mingw.h | 0 sdk/include/{crt => vcruntime}/_mingw_mac.h | 0 sdk/include/{crt => vcruntime}/_mingw_unicode.h | 0 sdk/include/{crt => vcruntime}/armintr.h | 0 sdk/include/{crt => vcruntime}/comdef.h | 0 sdk/include/{crt => vcruntime}/comdefsp.h | 0 sdk/include/{crt => vcruntime}/comip.h | 0 sdk/include/{crt => vcruntime}/comutil.h | 0 sdk/include/{crt => vcruntime}/crtdefs.h | 0 sdk/include/{crt => vcruntime}/eh.h | 0 sdk/include/{crt => vcruntime}/emmintrin.h | 0 sdk/include/{crt => vcruntime}/excpt.h | 0 sdk/include/{psdk => vcruntime}/gcc_sal.h | 0 sdk/include/{crt => vcruntime}/intrin.h | 0 sdk/include/{crt => vcruntime}/limits.h | 0 sdk/include/{crt => vcruntime}/mingw32/gcc_float.h | 0 sdk/include/{crt => vcruntime}/mingw32/intrin.h | 0 sdk/include/{crt => vcruntime}/mingw32/intrin_arm.h | 0 sdk/include/{crt => vcruntime}/mingw32/intrin_ppc.h | 0 sdk/include/{crt => vcruntime}/mingw32/intrin_x86.h | 0 sdk/include/{crt => vcruntime}/mingw32/intrin_x86_64.h | 0 sdk/include/{crt => vcruntime}/mmintrin.h | 0 sdk/include/{psdk => vcruntime}/ms_sal.h | 0 sdk/include/{crt => vcruntime}/msc/intrin.h | 0 sdk/include/{crt => vcruntime}/msc/msc_float.h | 0 sdk/include/{crt => vcruntime}/pgobootrun.h | 0 sdk/include/{crt => vcruntime}/rtcapi.h | 0 sdk/include/{psdk => vcruntime}/sal.h | 0 sdk/include/{crt => vcruntime}/setjmp.h | 0 sdk/include/{crt => vcruntime}/setjmpex.h | 0 sdk/include/{crt => vcruntime}/stdarg.h | 0 sdk/include/{crt => vcruntime}/stdbool.h | 0 sdk/include/{crt => vcruntime}/stdint.h | 0 sdk/include/{crt => vcruntime}/vadefs.h | 0 sdk/include/{crt => vcruntime}/varargs.h | 0 sdk/include/{crt => vcruntime}/xmmintrin.h | 0 sdk/include/{crt => vcruntime}/ymath.h | 0 sdk/include/wdf/kmdf/1.17/wdf.h | 2 +- 39 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1bb54f893eb..063ea4d060d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -319,6 +319,7 @@ Enable this if the module uses typeid or dynamic_cast. You will probably need to ${REACTOS_BINARY_DIR}/sdk/include/reactos ${REACTOS_BINARY_DIR}/sdk/include/reactos/mc sdk/include/crt + sdk/include/vcruntime sdk/include/ddk sdk/include/ndk sdk/include/reactos diff --git a/sdk/include/crt/_mingw.h b/sdk/include/vcruntime/_mingw.h similarity index 100% rename from sdk/include/crt/_mingw.h rename to sdk/include/vcruntime/_mingw.h diff --git a/sdk/include/crt/_mingw_mac.h b/sdk/include/vcruntime/_mingw_mac.h similarity index 100% rename from sdk/include/crt/_mingw_mac.h rename to sdk/include/vcruntime/_mingw_mac.h diff --git a/sdk/include/crt/_mingw_unicode.h b/sdk/include/vcruntime/_mingw_unicode.h similarity index 100% rename from sdk/include/crt/_mingw_unicode.h rename to sdk/include/vcruntime/_mingw_unicode.h diff --git a/sdk/include/crt/armintr.h b/sdk/include/vcruntime/armintr.h similarity index 100% rename from sdk/include/crt/armintr.h rename to sdk/include/vcruntime/armintr.h diff --git a/sdk/include/crt/comdef.h b/sdk/include/vcruntime/comdef.h similarity index 100% rename from sdk/include/crt/comdef.h rename to sdk/include/vcruntime/comdef.h diff --git a/sdk/include/crt/comdefsp.h b/sdk/include/vcruntime/comdefsp.h similarity index 100% rename from sdk/include/crt/comdefsp.h rename to sdk/include/vcruntime/comdefsp.h diff --git a/sdk/include/crt/comip.h b/sdk/include/vcruntime/comip.h similarity index 100% rename from sdk/include/crt/comip.h rename to sdk/include/vcruntime/comip.h diff --git a/sdk/include/crt/comutil.h b/sdk/include/vcruntime/comutil.h similarity index 100% rename from sdk/include/crt/comutil.h rename to sdk/include/vcruntime/comutil.h diff --git a/sdk/include/crt/crtdefs.h b/sdk/include/vcruntime/crtdefs.h similarity index 100% rename from sdk/include/crt/crtdefs.h rename to sdk/include/vcruntime/crtdefs.h diff --git a/sdk/include/crt/eh.h b/sdk/include/vcruntime/eh.h similarity index 100% rename from sdk/include/crt/eh.h rename to sdk/include/vcruntime/eh.h diff --git a/sdk/include/crt/emmintrin.h b/sdk/include/vcruntime/emmintrin.h similarity index 100% rename from sdk/include/crt/emmintrin.h rename to sdk/include/vcruntime/emmintrin.h diff --git a/sdk/include/crt/excpt.h b/sdk/include/vcruntime/excpt.h similarity index 100% rename from sdk/include/crt/excpt.h rename to sdk/include/vcruntime/excpt.h diff --git a/sdk/include/psdk/gcc_sal.h b/sdk/include/vcruntime/gcc_sal.h similarity index 100% rename from sdk/include/psdk/gcc_sal.h rename to sdk/include/vcruntime/gcc_sal.h diff --git a/sdk/include/crt/intrin.h b/sdk/include/vcruntime/intrin.h similarity index 100% rename from sdk/include/crt/intrin.h rename to sdk/include/vcruntime/intrin.h diff --git a/sdk/include/crt/limits.h b/sdk/include/vcruntime/limits.h similarity index 100% rename from sdk/include/crt/limits.h rename to sdk/include/vcruntime/limits.h diff --git a/sdk/include/crt/mingw32/gcc_float.h b/sdk/include/vcruntime/mingw32/gcc_float.h similarity index 100% rename from sdk/include/crt/mingw32/gcc_float.h rename to sdk/include/vcruntime/mingw32/gcc_float.h diff --git a/sdk/include/crt/mingw32/intrin.h b/sdk/include/vcruntime/mingw32/intrin.h similarity index 100% rename from sdk/include/crt/mingw32/intrin.h rename to sdk/include/vcruntime/mingw32/intrin.h diff --git a/sdk/include/crt/mingw32/intrin_arm.h b/sdk/include/vcruntime/mingw32/intrin_arm.h similarity index 100% rename from sdk/include/crt/mingw32/intrin_arm.h rename to sdk/include/vcruntime/mingw32/intrin_arm.h diff --git a/sdk/include/crt/mingw32/intrin_ppc.h b/sdk/include/vcruntime/mingw32/intrin_ppc.h similarity index 100% rename from sdk/include/crt/mingw32/intrin_ppc.h rename to sdk/include/vcruntime/mingw32/intrin_ppc.h diff --git a/sdk/include/crt/mingw32/intrin_x86.h b/sdk/include/vcruntime/mingw32/intrin_x86.h similarity index 100% rename from sdk/include/crt/mingw32/intrin_x86.h rename to sdk/include/vcruntime/mingw32/intrin_x86.h diff --git a/sdk/include/crt/mingw32/intrin_x86_64.h b/sdk/include/vcruntime/mingw32/intrin_x86_64.h similarity index 100% rename from sdk/include/crt/mingw32/intrin_x86_64.h rename to sdk/include/vcruntime/mingw32/intrin_x86_64.h diff --git a/sdk/include/crt/mmintrin.h b/sdk/include/vcruntime/mmintrin.h similarity index 100% rename from sdk/include/crt/mmintrin.h rename to sdk/include/vcruntime/mmintrin.h diff --git a/sdk/include/psdk/ms_sal.h b/sdk/include/vcruntime/ms_sal.h similarity index 100% rename from sdk/include/psdk/ms_sal.h rename to sdk/include/vcruntime/ms_sal.h diff --git a/sdk/include/crt/msc/intrin.h b/sdk/include/vcruntime/msc/intrin.h similarity index 100% rename from sdk/include/crt/msc/intrin.h rename to sdk/include/vcruntime/msc/intrin.h diff --git a/sdk/include/crt/msc/msc_float.h b/sdk/include/vcruntime/msc/msc_float.h similarity index 100% rename from sdk/include/crt/msc/msc_float.h rename to sdk/include/vcruntime/msc/msc_float.h diff --git a/sdk/include/crt/pgobootrun.h b/sdk/include/vcruntime/pgobootrun.h similarity index 100% rename from sdk/include/crt/pgobootrun.h rename to sdk/include/vcruntime/pgobootrun.h diff --git a/sdk/include/crt/rtcapi.h b/sdk/include/vcruntime/rtcapi.h similarity index 100% rename from sdk/include/crt/rtcapi.h rename to sdk/include/vcruntime/rtcapi.h diff --git a/sdk/include/psdk/sal.h b/sdk/include/vcruntime/sal.h similarity index 100% rename from sdk/include/psdk/sal.h rename to sdk/include/vcruntime/sal.h diff --git a/sdk/include/crt/setjmp.h b/sdk/include/vcruntime/setjmp.h similarity index 100% rename from sdk/include/crt/setjmp.h rename to sdk/include/vcruntime/setjmp.h diff --git a/sdk/include/crt/setjmpex.h b/sdk/include/vcruntime/setjmpex.h similarity index 100% rename from sdk/include/crt/setjmpex.h rename to sdk/include/vcruntime/setjmpex.h diff --git a/sdk/include/crt/stdarg.h b/sdk/include/vcruntime/stdarg.h similarity index 100% rename from sdk/include/crt/stdarg.h rename to sdk/include/vcruntime/stdarg.h diff --git a/sdk/include/crt/stdbool.h b/sdk/include/vcruntime/stdbool.h similarity index 100% rename from sdk/include/crt/stdbool.h rename to sdk/include/vcruntime/stdbool.h diff --git a/sdk/include/crt/stdint.h b/sdk/include/vcruntime/stdint.h similarity index 100% rename from sdk/include/crt/stdint.h rename to sdk/include/vcruntime/stdint.h diff --git a/sdk/include/crt/vadefs.h b/sdk/include/vcruntime/vadefs.h similarity index 100% rename from sdk/include/crt/vadefs.h rename to sdk/include/vcruntime/vadefs.h diff --git a/sdk/include/crt/varargs.h b/sdk/include/vcruntime/varargs.h similarity index 100% rename from sdk/include/crt/varargs.h rename to sdk/include/vcruntime/varargs.h diff --git a/sdk/include/crt/xmmintrin.h b/sdk/include/vcruntime/xmmintrin.h similarity index 100% rename from sdk/include/crt/xmmintrin.h rename to sdk/include/vcruntime/xmmintrin.h diff --git a/sdk/include/crt/ymath.h b/sdk/include/vcruntime/ymath.h similarity index 100% rename from sdk/include/crt/ymath.h rename to sdk/include/vcruntime/ymath.h diff --git a/sdk/include/wdf/kmdf/1.17/wdf.h b/sdk/include/wdf/kmdf/1.17/wdf.h index 2ea904466a5..733d0d3fcce 100644 --- a/sdk/include/wdf/kmdf/1.17/wdf.h +++ b/sdk/include/wdf/kmdf/1.17/wdf.h @@ -40,7 +40,7 @@ Revision History: #endif // reactos start -#include <psdk/sal.h> +#include <sal.h> #include <section_attribs.h> #define STDCALL __stdcall // reactos end

1 month, 3 weeks

[reactos] 01/01: [SPEC2DEF] Implement support for negated architecture

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7b2bb7ecc8622c68ce02d… commit 7b2bb7ecc8622c68ce02d7ec7fa3d3d19514d8d7 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Jun 3 10:26:02 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Nov 2 02:36:45 2024 +0200 [SPEC2DEF] Implement support for negated architecture This is used by wine spec files. --- sdk/tools/spec2def/spec2def.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/sdk/tools/spec2def/spec2def.c b/sdk/tools/spec2def/spec2def.c index 36612eb4bfc..cd80dffafcc 100644 --- a/sdk/tools/spec2def/spec2def.c +++ b/sdk/tools/spec2def/spec2def.c @@ -1072,9 +1072,24 @@ ParseFile(char* pcStart, FILE *fileDest, unsigned *cExports) /* Look if we are included */ do { + int negated = 0, match = 0; + pc++; + + /* Check for negated case */ + if (*pc == '!') + { + negated = 1; + pc++; + } + if (CompareToken(pc, pszArchString) || CompareToken(pc, pszArchString2)) + { + match = 1; + } + + if (match != negated) { included = 1; }

1 month, 3 weeks

[reactos] 01/01: [SETUPAPI] SETUP_CreateDevicesList must return ERROR_INVALID_DATA when the Enumerator is invalid

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d55ca68f7d77e14c9053d… commit d55ca68f7d77e14c9053d2047a0fa3ff3323f9a6 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Fri Nov 1 22:17:02 2024 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Fri Nov 1 22:17:02 2024 +0100 [SETUPAPI] SETUP_CreateDevicesList must return ERROR_INVALID_DATA when the Enumerator is invalid This fixes the devclass apitest. --- dll/win32/setupapi/devclass.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/setupapi/devclass.c b/dll/win32/setupapi/devclass.c index 7f94eebdb94..b8f78401598 100644 --- a/dll/win32/setupapi/devclass.c +++ b/dll/win32/setupapi/devclass.c @@ -2,7 +2,7 @@ * SetupAPI device class-related functions * * Copyright 2000 Andreas Mohr for CodeWeavers - * 2005-2006 Herv� Poussineau (hpoussin(a)reactos.org) + * 2005-2006 Hervé Poussineau (hpoussin(a)reactos.org) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -159,7 +159,7 @@ SETUP_CreateDevicesList( TRACE("CM_Get_Device_ID_List_ExW() failed with status 0x%x\n", cr); if (Buffer) HeapFree(GetProcessHeap(), 0, Buffer); - return GetErrorCodeFromCrCode(cr); + return (cr == CR_REGISTRY_ERROR) ? ERROR_INVALID_DATA : GetErrorCodeFromCrCode(cr); } } while (cr != CR_SUCCESS);

1 month, 3 weeks

[reactos] 01/01: [UMPNPMGR] PNP_GetGlobalState returns CM_GLOBAL_STATE_SHUTTING_DOWN on service shutdown

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=91bc5b5e9488fd674639b… commit 91bc5b5e9488fd674639b7102fb6b973a2b5f299 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Fri Nov 1 14:43:37 2024 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Fri Nov 1 14:43:37 2024 +0100 [UMPNPMGR] PNP_GetGlobalState returns CM_GLOBAL_STATE_SHUTTING_DOWN on service shutdown --- base/services/umpnpmgr/precomp.h | 1 + base/services/umpnpmgr/rpcserver.c | 3 +++ base/services/umpnpmgr/umpnpmgr.c | 4 ++++ 3 files changed, 8 insertions(+) diff --git a/base/services/umpnpmgr/precomp.h b/base/services/umpnpmgr/precomp.h index a9dabcc25c8..21c3622d929 100644 --- a/base/services/umpnpmgr/precomp.h +++ b/base/services/umpnpmgr/precomp.h @@ -88,6 +88,7 @@ RpcServerThread( extern HKEY hEnumKey; extern HKEY hClassKey; extern BOOL g_IsUISuppressed; +extern BOOL g_ShuttingDown; BOOL GetSuppressNewUIValue(VOID); diff --git a/base/services/umpnpmgr/rpcserver.c b/base/services/umpnpmgr/rpcserver.c index db6a474a0f6..ff7a15ac0fb 100644 --- a/base/services/umpnpmgr/rpcserver.c +++ b/base/services/umpnpmgr/rpcserver.c @@ -687,6 +687,9 @@ PNP_GetGlobalState( *pulState = CM_GLOBAL_STATE_CAN_DO_UI | CM_GLOBAL_STATE_SERVICES_AVAILABLE; + if (g_ShuttingDown) + *pulState |= CM_GLOBAL_STATE_SHUTTING_DOWN; + return CR_SUCCESS; } diff --git a/base/services/umpnpmgr/umpnpmgr.c b/base/services/umpnpmgr/umpnpmgr.c index 14b7c1a9e6f..60194bd458d 100644 --- a/base/services/umpnpmgr/umpnpmgr.c +++ b/base/services/umpnpmgr/umpnpmgr.c @@ -44,6 +44,7 @@ static SERVICE_STATUS ServiceStatus; HKEY hEnumKey = NULL; HKEY hClassKey = NULL; BOOL g_IsUISuppressed = FALSE; +BOOL g_ShuttingDown = FALSE; /* FUNCTIONS *****************************************************************/ @@ -52,6 +53,9 @@ UpdateServiceStatus( _In_ DWORD dwState, _In_ DWORD dwCheckPoint) { + if ((dwState == SERVICE_STOPPED) || (dwState == SERVICE_STOP_PENDING)) + g_ShuttingDown = TRUE; + ServiceStatus.dwServiceType = SERVICE_WIN32_OWN_PROCESS; ServiceStatus.dwCurrentState = dwState; ServiceStatus.dwWin32ExitCode = 0;

1 month, 3 weeks

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2024