Ros-diffs July 2021

ros-diffs@reactos.org

18 participants
142 discussions

[reactos] 01/02: [CRT] Define NULL in crtdefs.h

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=486a4d93ed7e4e89385c6… commit 486a4d93ed7e4e89385c60297f281ace34611712 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Jul 27 15:08:26 2021 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Jul 27 22:08:58 2021 +0200 [CRT] Define NULL in crtdefs.h --- sdk/include/crt/crtdbg.h | 8 -------- sdk/include/crt/crtdefs.h | 8 ++++++++ sdk/include/crt/locale.h | 8 -------- sdk/include/crt/stddef.h | 9 --------- sdk/include/crt/stdio.h | 8 -------- sdk/include/crt/stdlib.h | 12 ------------ sdk/include/crt/string.h | 8 -------- sdk/include/crt/tchar.h | 8 -------- sdk/include/crt/time.h | 8 -------- sdk/include/crt/wchar.h | 8 -------- 10 files changed, 8 insertions(+), 77 deletions(-) diff --git a/sdk/include/crt/crtdbg.h b/sdk/include/crt/crtdbg.h index 9117025b6e2..9b72b56a60c 100644 --- a/sdk/include/crt/crtdbg.h +++ b/sdk/include/crt/crtdbg.h @@ -10,14 +10,6 @@ #pragma pack(push,_CRT_PACKING) -#ifndef NULL -#ifdef __cplusplus -#define NULL 0 -#else -#define NULL ((void *)0) -#endif -#endif - #ifdef __cplusplus extern "C" { #endif diff --git a/sdk/include/crt/crtdefs.h b/sdk/include/crt/crtdefs.h index 8ea3f85bdf5..d4ad5fd2178 100644 --- a/sdk/include/crt/crtdefs.h +++ b/sdk/include/crt/crtdefs.h @@ -9,6 +9,14 @@ #ifndef _INC_CRTDEFS #define _INC_CRTDEFS +#ifndef NULL +#ifdef __cplusplus +#define NULL 0 +#else +#define NULL ((void *)0) +#endif +#endif + #ifdef _USE_32BIT_TIME_T #ifdef _WIN64 #error You cannot use 32-bit time_t (_USE_32BIT_TIME_T) with _WIN64 diff --git a/sdk/include/crt/locale.h b/sdk/include/crt/locale.h index f5cdc8a50fa..fff1376ce01 100644 --- a/sdk/include/crt/locale.h +++ b/sdk/include/crt/locale.h @@ -14,14 +14,6 @@ extern "C" { #endif -#ifndef NULL -#ifdef __cplusplus -#define NULL 0 -#else -#define NULL ((void *)0) -#endif -#endif - #define LC_ALL 0 #define LC_COLLATE 1 #define LC_CTYPE 2 diff --git a/sdk/include/crt/stddef.h b/sdk/include/crt/stddef.h index b5210fb9e92..1ff523e3a06 100644 --- a/sdk/include/crt/stddef.h +++ b/sdk/include/crt/stddef.h @@ -365,15 +365,6 @@ typedef __WCHAR_TYPE__ wchar_t; #endif /* __sys_stdtypes_h */ -/* A null pointer constant. */ -#ifndef NULL -#ifdef __cplusplus -#define NULL 0 -#else -#define NULL ((void*)0) -#endif -#endif - #ifndef offsetof /* Offset of member MEMBER in a struct of type TYPE. */ diff --git a/sdk/include/crt/stdio.h b/sdk/include/crt/stdio.h index bff3578088d..9ac92d50672 100644 --- a/sdk/include/crt/stdio.h +++ b/sdk/include/crt/stdio.h @@ -66,14 +66,6 @@ extern "C" { #define _SYS_OPEN 20 #define TMP_MAX 32767 -#ifndef NULL -#ifdef __cplusplus -#define NULL 0 -#else -#define NULL ((void *)0) -#endif -#endif - #ifndef _OFF_T_DEFINED #define _OFF_T_DEFINED #ifndef _OFF_T_ diff --git a/sdk/include/crt/stdlib.h b/sdk/include/crt/stdlib.h index 298b7ffad54..3985a547536 100644 --- a/sdk/include/crt/stdlib.h +++ b/sdk/include/crt/stdlib.h @@ -15,18 +15,6 @@ extern "C" { #endif -#ifndef NULL -#ifdef __cplusplus -#ifndef _WIN64 -#define NULL 0 -#else -#define NULL 0LL -#endif /* W64 */ -#else -#define NULL ((void *)0) -#endif -#endif - #ifndef MB_LEN_MAX #define MB_LEN_MAX 5 #endif diff --git a/sdk/include/crt/string.h b/sdk/include/crt/string.h index caeb23fcdc9..23cf26a9ce1 100644 --- a/sdk/include/crt/string.h +++ b/sdk/include/crt/string.h @@ -17,14 +17,6 @@ extern "C" { #define _NLSCMPERROR 2147483647 #endif -#ifndef NULL -#ifdef __cplusplus -#define NULL 0 -#else -#define NULL ((void *)0) -#endif -#endif - #ifndef _CRT_MEMORY_DEFINED #define _CRT_MEMORY_DEFINED diff --git a/sdk/include/crt/tchar.h b/sdk/include/crt/tchar.h index d246b00e4c4..5143e5961a8 100644 --- a/sdk/include/crt/tchar.h +++ b/sdk/include/crt/tchar.h @@ -1513,14 +1513,6 @@ extern "C" { #define _istlegal(_c) (1) -#ifndef NULL -#ifdef __cplusplus -#define NULL 0 -#else -#define NULL ((void *)0) -#endif -#endif - #define _strdec(_cpc1,_cpc2) ((_cpc1)>=(_cpc2) ? NULL : (_cpc2)-1) #define _strinc(_pc) ((_pc)+1) #define _strnextc(_cpc) ((unsigned int) *(const unsigned char *)(_cpc)) diff --git a/sdk/include/crt/time.h b/sdk/include/crt/time.h index d712a396372..680c7fd2a1a 100644 --- a/sdk/include/crt/time.h +++ b/sdk/include/crt/time.h @@ -63,14 +63,6 @@ extern "C" { #endif #endif -#ifndef NULL -#ifdef __cplusplus -#define NULL 0 -#else -#define NULL ((void *)0) -#endif -#endif - #ifndef _TM_DEFINED #define _TM_DEFINED struct tm { diff --git a/sdk/include/crt/wchar.h b/sdk/include/crt/wchar.h index f708917ace3..6c0f148b343 100644 --- a/sdk/include/crt/wchar.h +++ b/sdk/include/crt/wchar.h @@ -128,14 +128,6 @@ extern "C" { #define _WFINDDATA_T_DEFINED #endif /* !_WFINDDATA_T_DEFINED */ -#ifndef NULL -#ifdef __cplusplus -#define NULL 0 -#else -#define NULL ((void *)0) -#endif -#endif - #ifndef _CRT_CTYPEDATA_DEFINED # define _CRT_CTYPEDATA_DEFINED # ifndef _CTYPE_DISABLE_MACROS

3 years, 5 months

[reactos] 02/02: [NTOS:MM] Annotate some functions with regards to MmPfnLock

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ce65553eaa0506962064f… commit ce65553eaa0506962064f8f2224b149ad45d6bdb Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Jul 23 17:14:47 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Tue Jul 27 15:36:55 2021 +0200 [NTOS:MM] Annotate some functions with regards to MmPfnLock Also fix MI_ASSERT_PFN_LOCK_HELD macro. Now in debug builds, SpinLocks are always non-zero when held. --- ntoskrnl/include/internal/mm.h | 29 ++++++++++++++++++++++++++--- ntoskrnl/mm/section.c | 6 ++++++ 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/include/internal/mm.h b/ntoskrnl/include/internal/mm.h index e8ace692bd2..bb27544a949 100644 --- a/ntoskrnl/include/internal/mm.h +++ b/ntoskrnl/include/internal/mm.h @@ -46,6 +46,8 @@ extern SIZE_T MmtotalCommitLimitMaximum; extern PVOID MiDebugMapping; // internal extern PMMPTE MmDebugPte; // internal +extern KSPIN_LOCK MmPfnLock; + struct _KTRAP_FRAME; struct _EPROCESS; struct _MM_RMAP_ENTRY; @@ -940,7 +942,11 @@ MmGetSectionAssociation(PFN_NUMBER Page, PLARGE_INTEGER Offset); /* freelist.c **********************************************************/ - +_IRQL_raises_(DISPATCH_LEVEL) +_IRQL_requires_max_(DISPATCH_LEVEL) +_Requires_lock_not_held_(MmPfnLock) +_Acquires_lock_(MmPfnLock) +_IRQL_saves_ FORCEINLINE KIRQL MiAcquirePfnLock(VOID) @@ -948,14 +954,20 @@ MiAcquirePfnLock(VOID) return KeAcquireQueuedSpinLock(LockQueuePfnLock); } +_Requires_lock_held_(MmPfnLock) +_Releases_lock_(MmPfnLock) +_IRQL_requires_(DISPATCH_LEVEL) FORCEINLINE VOID MiReleasePfnLock( - _In_ KIRQL OldIrql) + _In_ _IRQL_restores_ KIRQL OldIrql) { KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); } +_IRQL_requires_min_(DISPATCH_LEVEL) +_Requires_lock_not_held_(MmPfnLock) +_Acquires_lock_(MmPfnLock) FORCEINLINE VOID MiAcquirePfnLockAtDpcLevel(VOID) @@ -967,6 +979,9 @@ MiAcquirePfnLockAtDpcLevel(VOID) KeAcquireQueuedSpinLockAtDpcLevel(LockQueue); } +_Requires_lock_held_(MmPfnLock) +_Releases_lock_(MmPfnLock) +_IRQL_requires_min_(DISPATCH_LEVEL) FORCEINLINE VOID MiReleasePfnLockFromDpcLevel(VOID) @@ -978,7 +993,7 @@ MiReleasePfnLockFromDpcLevel(VOID) ASSERT(KeGetCurrentIrql() >= DISPATCH_LEVEL); } -#define MI_ASSERT_PFN_LOCK_HELD() ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL) +#define MI_ASSERT_PFN_LOCK_HELD() NT_ASSERT((KeGetCurrentIrql() >= DISPATCH_LEVEL) && (MmPfnLock != 0)) FORCEINLINE PMMPFN @@ -1476,10 +1491,18 @@ MmUnsharePageEntrySectionSegment(PMEMORY_AREA MemoryArea, BOOLEAN PageOut, ULONG_PTR *InEntry); +_When_(OldIrql == MM_NOIRQL, _IRQL_requires_max_(DISPATCH_LEVEL)) +_When_(OldIrql == MM_NOIRQL, _Requires_lock_not_held_(MmPfnLock)) +_When_(OldIrql != MM_NOIRQL, _Requires_lock_held_(MmPfnLock)) +_When_(OldIrql != MM_NOIRQL, _Releases_lock_(MmPfnLock)) +_When_(OldIrql != MM_NOIRQL, _IRQL_restores_(OldIrql)) +_When_(OldIrql != MM_NOIRQL, _IRQL_requires_(DISPATCH_LEVEL)) VOID NTAPI MmDereferenceSegmentWithLock(PMM_SECTION_SEGMENT Segment, KIRQL OldIrql); +_IRQL_requires_max_(DISPATCH_LEVEL) +_Requires_lock_not_held_(MmPfnLock) FORCEINLINE VOID MmDereferenceSegment(PMM_SECTION_SEGMENT Segment) diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index c59f45077fd..c4b89125f06 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -987,6 +987,12 @@ FreeSegmentPage(PMM_SECTION_SEGMENT Segment, PLARGE_INTEGER Offset) MmReleasePageMemoryConsumer(MC_USER, Page); } +_When_(OldIrql == MM_NOIRQL, _IRQL_requires_max_(DISPATCH_LEVEL)) +_When_(OldIrql == MM_NOIRQL, _Requires_lock_not_held_(MmPfnLock)) +_When_(OldIrql != MM_NOIRQL, _Requires_lock_held_(MmPfnLock)) +_When_(OldIrql != MM_NOIRQL, _Releases_lock_(MmPfnLock)) +_When_(OldIrql != MM_NOIRQL, _IRQL_restores_(OldIrql)) +_When_(OldIrql != MM_NOIRQL, _IRQL_requires_(DISPATCH_LEVEL)) VOID NTAPI MmDereferenceSegmentWithLock(PMM_SECTION_SEGMENT Segment, KIRQL OldIrql)

3 years, 5 months

[reactos] 01/02: [NTOS:MM] Always release PFN lock in MmDereferenceSegmentWithLock

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6150dc994ab68a0b6a3e3… commit 6150dc994ab68a0b6a3e389e1687ce666ba84435 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Jul 23 16:38:56 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Tue Jul 27 15:36:55 2021 +0200 [NTOS:MM] Always release PFN lock in MmDereferenceSegmentWithLock All callers release it after calling it. CORE-17698 --- ntoskrnl/mm/section.c | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index 25d8db8561c..c59f45077fd 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -991,27 +991,21 @@ VOID NTAPI MmDereferenceSegmentWithLock(PMM_SECTION_SEGMENT Segment, KIRQL OldIrql) { - BOOLEAN HaveLock = FALSE; - /* Lock the PFN lock because we mess around with SectionObjectPointers */ if (OldIrql == MM_NOIRQL) { - HaveLock = TRUE; OldIrql = MiAcquirePfnLock(); } if (InterlockedDecrement64(Segment->ReferenceCount) > 0) { /* Nothing to do yet */ - if (HaveLock) - MiReleasePfnLock(OldIrql); + MiReleasePfnLock(OldIrql); return; } *Segment->Flags |= MM_SEGMENT_INDELETE; - - if (HaveLock) - MiReleasePfnLock(OldIrql); + MiReleasePfnLock(OldIrql); /* Flush the segment */ if (*Segment->Flags & MM_DATAFILE_SEGMENT) @@ -1019,13 +1013,11 @@ MmDereferenceSegmentWithLock(PMM_SECTION_SEGMENT Segment, KIRQL OldIrql) /* Free the page table. This will flush any remaining dirty data */ MmFreePageTablesSectionSegment(Segment, FreeSegmentPage); - if (HaveLock) - OldIrql = MiAcquirePfnLock(); + OldIrql = MiAcquirePfnLock(); /* Delete the pointer on the file */ ASSERT(Segment->FileObject->SectionObjectPointer->DataSectionObject == Segment); Segment->FileObject->SectionObjectPointer->DataSectionObject = NULL; - if (HaveLock) - MiReleasePfnLock(OldIrql); + MiReleasePfnLock(OldIrql); ObDereferenceObject(Segment->FileObject); ExFreePoolWithTag(Segment, TAG_MM_SECTION_SEGMENT); @@ -1038,13 +1030,11 @@ MmDereferenceSegmentWithLock(PMM_SECTION_SEGMENT Segment, KIRQL OldIrql) ULONG NrSegments; ULONG i; - if (HaveLock) - OldIrql = MiAcquirePfnLock(); + OldIrql = MiAcquirePfnLock(); /* Delete the pointer on the file */ ASSERT(ImageSectionObject->FileObject->SectionObjectPointer->ImageSectionObject == ImageSectionObject); ImageSectionObject->FileObject->SectionObjectPointer->ImageSectionObject = NULL; - if (HaveLock) - MiReleasePfnLock(OldIrql); + MiReleasePfnLock(OldIrql); ObDereferenceObject(ImageSectionObject->FileObject); @@ -2128,8 +2118,8 @@ MmpDeleteSection(PVOID ObjectBody) /* We just dereference the first segment */ ASSERT(ImageSectionObject->RefCount > 0); + /* MmDereferenceSegmentWithLock releases PFN lock */ MmDereferenceSegmentWithLock(ImageSectionObject->Segments, OldIrql); - MiReleasePfnLock(OldIrql); } else { @@ -2145,8 +2135,8 @@ MmpDeleteSection(PVOID ObjectBody) KIRQL OldIrql = MiAcquirePfnLock(); Segment->SectionCount--; + /* MmDereferenceSegmentWithLock releases PFN lock */ MmDereferenceSegmentWithLock(Segment, OldIrql); - MiReleasePfnLock(OldIrql); } } @@ -4264,9 +4254,9 @@ MmFlushImageSection (IN PSECTION_OBJECT_POINTERS SectionObjectPointer, /* * Someone actually created a section while we were not looking. * Drop our ref and deny. + * MmDereferenceSegmentWithLock releases Pfn lock */ MmDereferenceSegmentWithLock(&ImageSectionObject->Segments[0], OldIrql); - MiReleasePfnLock(OldIrql); return FALSE; } @@ -4276,7 +4266,6 @@ MmFlushImageSection (IN PSECTION_OBJECT_POINTERS SectionObjectPointer, /* Dereference the first segment, this will free everything & release the lock */ MmDereferenceSegmentWithLock(&ImageSectionObject->Segments[0], OldIrql); - MiReleasePfnLock(OldIrql); return TRUE; } case MmFlushForWrite:

3 years, 5 months

[reactos] 02/02: [VIDEOPRT] Fix updating of new registry path values

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ecf3416f492c4b664586d… commit ecf3416f492c4b664586de89bc36f831437fe23f Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Jul 22 16:13:38 2021 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Jul 27 14:44:14 2021 +0200 [VIDEOPRT] Fix updating of new registry path values CORE-17688 When a new driver is installed for the same device (like VBoxVideo), it uses the same hardware enum registry key and thus reuses the same DisplayId and the same display registry key. Therefore we need to update the setting in that key, even when the key already exists. This seems to work good and not cause any issues, but testing indicated that on Windows some values are only updated, when the driver has changed. If neccessary, this can be achieved by updating and querying the ActiveService value in the device enum key (e.g. HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Enum\PCI\VEN_80EE&DEV_BEEF&SUSYS_00000000&REV_00\3&267a616a&0&10\Control: ActiveService). If that doesn't match the current device name (from DriverExtension->RegistryPath) the values [...] --- win32ss/drivers/videoprt/registry.c | 62 ++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/win32ss/drivers/videoprt/registry.c b/win32ss/drivers/videoprt/registry.c index 8d43b32edab..5a0f96c719f 100644 --- a/win32ss/drivers/videoprt/registry.c +++ b/win32ss/drivers/videoprt/registry.c @@ -498,42 +498,42 @@ IntCreateNewRegistryPath( ERR_(VIDEOPRT, "Failed create key '%wZ'\n", &DeviceExtension->NewRegistryPath); return Status; } + } - /* Open the new key */ - InitializeObjectAttributes(&ObjectAttributes, - &DeviceExtension->NewRegistryPath, - OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = ZwOpenKey(&NewKey, KEY_READ, &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - ERR_(VIDEOPRT, "Failed to open settings key. Status 0x%lx\n", Status); - return Status; - } - - /* Open the device profile key */ - InitializeObjectAttributes(&ObjectAttributes, - &DeviceExtension->RegistryPath, - OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = ZwOpenKey(&SettingsKey, KEY_READ, &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - ERR_(VIDEOPRT, "Failed to open settings key. Status 0x%lx\n", Status); - ObCloseHandle(NewKey, KernelMode); - return Status; - } - - /* Copy the registry data from the legacy key */ - Status = IntCopyRegistryKey(SettingsKey, NewKey); + /* Open the new key */ + InitializeObjectAttributes(&ObjectAttributes, + &DeviceExtension->NewRegistryPath, + OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = ZwOpenKey(&NewKey, KEY_READ, &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + ERR_(VIDEOPRT, "Failed to open settings key. Status 0x%lx\n", Status); + return Status; + } - /* Close the key handles */ - ObCloseHandle(SettingsKey, KernelMode); + /* Open the device profile key */ + InitializeObjectAttributes(&ObjectAttributes, + &DeviceExtension->RegistryPath, + OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = ZwOpenKey(&SettingsKey, KEY_READ, &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + ERR_(VIDEOPRT, "Failed to open settings key. Status 0x%lx\n", Status); ObCloseHandle(NewKey, KernelMode); + return Status; } + /* Copy the registry data from the legacy key */ + Status = IntCopyRegistryKey(SettingsKey, NewKey); + + /* Close the key handles */ + ObCloseHandle(SettingsKey, KernelMode); + ObCloseHandle(NewKey, KernelMode); + return Status; }

3 years, 5 months

[reactos] 01/02: [WIN32K] Fix uninitialized variable

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=204626f793ad0f27064a0… commit 204626f793ad0f27064a0e7a1422a9795875384c Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Jul 19 08:55:09 2021 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Jul 27 14:44:14 2021 +0200 [WIN32K] Fix uninitialized variable --- win32ss/user/ntuser/keyboard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32ss/user/ntuser/keyboard.c b/win32ss/user/ntuser/keyboard.c index b4ff7805b86..61a30b6a0e9 100644 --- a/win32ss/user/ntuser/keyboard.c +++ b/win32ss/user/ntuser/keyboard.c @@ -1341,7 +1341,7 @@ NtUserToUnicodeEx( PWCHAR pwszBuff = NULL; INT i, iRet = 0; PKL pKl = NULL; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; TRACE("Enter NtUserSetKeyboardState\n");

3 years, 5 months

[reactos] 01/01: [CRT/arm] Update file headers to new format and change license to MIT

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f1e2c6cbd0577a20f5938… commit f1e2c6cbd0577a20f5938af67cb5f49b4dde380a Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Jul 24 11:41:06 2021 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Jul 27 14:42:55 2021 +0200 [CRT/arm] Update file headers to new format and change license to MIT * Add Raman Masanin to copyrights * Add some comments * Return long long from __rt_sdiv (no functional difference, just for clarity) --- sdk/lib/crt/math/arm/__rt_div.c | 126 --------------------------------- sdk/lib/crt/math/arm/__rt_div_worker.h | 24 ++++--- sdk/lib/crt/math/arm/__rt_sdiv.c | 18 ++--- sdk/lib/crt/math/arm/__rt_sdiv64.s | 15 ++-- sdk/lib/crt/math/arm/__rt_udiv.c | 15 ++-- sdk/lib/crt/math/arm/__rt_udiv64.s | 15 ++-- 6 files changed, 55 insertions(+), 158 deletions(-) diff --git a/sdk/lib/crt/math/arm/__rt_div.c b/sdk/lib/crt/math/arm/__rt_div.c deleted file mode 100644 index c59a701fecf..00000000000 --- a/sdk/lib/crt/math/arm/__rt_div.c +++ /dev/null @@ -1,126 +0,0 @@ -/* - * COPYRIGHT: BSD - See COPYING.ARM in the top level directory - * PROJECT: ReactOS CRT library - * FILE: lib/sdk/crt/math/arm/__rt_div.c - * PURPOSE: Implementation of __rt_udiv - * PROGRAMMER: Timo Kreuzer - * REFERENCE: http://research.microsoft.com/en-us/um/redmond/projects/invisible/src/crt/m… - * http://research.microsoft.com/en-us/um/redmond/projects/invisible/src/crt/m… - */ - -typedef struct _ARM_UDIVRESULT -{ - unsigned int quotient; /* to be returned in R0 */ - unsigned int modulus; /* to be returned in R1 */ -} ARM_UDIVRESULT; - -__forceinline -void -__brkdiv0(void) -{ - __emit(0xDEF9); -} - -__forceinline -void -__rt_udiv_internal( - ARM_UDIVRESULT *result, - unsigned int divisor, - unsigned int dividend) -{ - unsigned int shift; - unsigned int mask; - unsigned int quotient; - - if (divisor == 0) - { - /* Raise divide by zero error */ - __brkdiv0(); - } - - if (divisor > dividend) - { - result->quotient = 0; - result->modulus = divisor; - return; - } - - /* Get the difference in count of leading zeros between dividend and divisor */ - shift = _CountLeadingZeros(divisor); - shift -= _CountLeadingZeros(dividend); - - /* Shift the divisor to the left, so that it's highest bit is the same - as the highest bit of the dividend */ - divisor <<= shift; - - mask = 1 << shift; - - quotient = 0; - do - { - if (dividend >= divisor) - { - quotient |= mask; - dividend -= divisor; - } - divisor >>= 1; - mask >>= 1; - } - while (mask); - - result->quotient = quotient; - result->modulus = dividend; - return; -} - -ARM_UDIVRESULT -__rt_udiv( - unsigned int divisor, - unsigned int dividend) -{ - ARM_UDIVRESULT result; - - __rt_udiv_internal(&result, divisor, dividend); - return result; -} - -typedef struct _ARM_SDIVRESULT -{ - int quotient; /* to be returned in R0 */ - int modulus; /* to be returned in R1 */ -} ARM_SDIVRESULT; - -ARM_SDIVRESULT -__rt_sdiv( - int divisor, - int dividend) -{ - ARM_SDIVRESULT result; - int divisor_sign, dividend_sign; - - dividend_sign = divisor & 0x80000000; - if (dividend_sign) - { - dividend = -dividend; - } - - divisor_sign = divisor & 0x80000000; - if (divisor_sign) - { - divisor = -divisor; - } - - __rt_udiv_internal((ARM_UDIVRESULT*)&result, divisor, dividend); - - if (dividend_sign ^ divisor_sign) - { - result.quotient = -result.quotient; - } - - if (dividend_sign) - { - result.modulus = -result.modulus; - } - - return result; -} diff --git a/sdk/lib/crt/math/arm/__rt_div_worker.h b/sdk/lib/crt/math/arm/__rt_div_worker.h index 035b3abd045..2b658415a3f 100644 --- a/sdk/lib/crt/math/arm/__rt_div_worker.h +++ b/sdk/lib/crt/math/arm/__rt_div_worker.h @@ -1,12 +1,20 @@ /* - * COPYRIGHT: BSD - See COPYING.ARM in the top level directory - * PROJECT: ReactOS CRT library - * FILE: lib/sdk/crt/math/arm/__rt_div_worker.h - * PURPOSE: Implementation of __rt_udiv - * PROGRAMMER: Timo Kreuzer - * REFERENCE: http://research.microsoft.com/pubs/70645/tr-2008-141.pdf - * http://research.microsoft.com/en-us/um/redmond/projects/invisible/src/crt/m… - * http://research.microsoft.com/en-us/um/redmond/projects/invisible/src/crt/m… + * PROJECT: ReactOS CRT library + * LICENSE: MIT (https://spdx.org/licenses/MIT) + * PURPOSE: Implementation of __rt_div_worker + * COPYRIGHT: Copyright 2015 Timo Kreuzer <timo.kreuzer(a)reactos.org> + * Copyright 2021 Raman Masanin <36927roma(a)gmail.com> + */ + +/* + * See also: + * http://research.microsoft.com/pubs/70645/tr-2008-141.pdf + * https://web.archive.org/web/20100110044008/http://research.microsoft.com/en… + * https://github.com/bawoodruff/BeagleBoard/blob/2731e3174af6daefe4a287a6be82… + * https://github.com/bawoodruff/BeagleBoard/blob/2731e3174af6daefe4a287a6be82… + * https://github.com/bawoodruff/BeagleBoard/blob/2731e3174af6daefe4a287a6be82… + * https://github.com/qemu/edk2/blob/e3c7db50cac9125607df49d5873991df6df11eae/… + * https://github.com/jmonesti/qemu-4.1.1/blob/55fb6a81039a62174c2763759324c43… */ #ifdef _USE_64_BITS_ diff --git a/sdk/lib/crt/math/arm/__rt_sdiv.c b/sdk/lib/crt/math/arm/__rt_sdiv.c index 302cec422a4..96e0eafe334 100644 --- a/sdk/lib/crt/math/arm/__rt_sdiv.c +++ b/sdk/lib/crt/math/arm/__rt_sdiv.c @@ -1,11 +1,9 @@ /* - * COPYRIGHT: BSD - See COPYING.ARM in the top level directory - * PROJECT: ReactOS CRT library - * FILE: lib/sdk/crt/math/arm/__rt_sdiv.c - * PURPOSE: Implementation of __rt_sdiv - * PROGRAMMER: Timo Kreuzer - * REFERENCE: http://research.microsoft.com/en-us/um/redmond/projects/invisible/src/crt/m… - * http://research.microsoft.com/en-us/um/redmond/projects/invisible/src/crt/m… + * PROJECT: ReactOS CRT library + * LICENSE: MIT (https://spdx.org/licenses/MIT) + * PURPOSE: Implementation of __rt_sdiv + * COPYRIGHT: Copyright 2015 Timo Kreuzer <timo.kreuzer(a)reactos.org> + * Copyright 2021 Raman Masanin <36927roma(a)gmail.com> */ #define __rt_div_worker __rt_sdiv_worker @@ -13,7 +11,10 @@ #include "__rt_div_worker.h" -unsigned long long +/* + * Returns quotient in R0, remainder in R1 + */ +long long __rt_sdiv( int divisor, int dividend) @@ -24,4 +25,3 @@ __rt_sdiv( return result.raw_data; } - diff --git a/sdk/lib/crt/math/arm/__rt_sdiv64.s b/sdk/lib/crt/math/arm/__rt_sdiv64.s index d3515a79729..57f21edcaef 100644 --- a/sdk/lib/crt/math/arm/__rt_sdiv64.s +++ b/sdk/lib/crt/math/arm/__rt_sdiv64.s @@ -1,8 +1,9 @@ /* - * COPYRIGHT: BSD - See COPYING.ARM in the top level directory - * PROJECT: ReactOS CRT library - * PURPOSE: Implementation of __rt_sdiv64 - * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + * PROJECT: ReactOS CRT library + * LICENSE: MIT (https://spdx.org/licenses/MIT) + * PURPOSE: Implementation of __rt_sdiv64 + * COPYRIGHT: Copyright 2015 Timo Kreuzer <timo.kreuzer(a)reactos.org> + * Copyright 2021 Raman Masanin <36927roma(a)gmail.com> */ /* INCLUDES ******************************************************************/ @@ -15,6 +16,12 @@ TEXTAREA + /* + IN: r1:r0 = divisor + IN: r3:r2 = dividend + OUT: r1:r0 = quotient + OUT: r3:r2 = remainder + */ NESTED_ENTRY __rt_sdiv64 /* Allocate stack space and store parameters there */ diff --git a/sdk/lib/crt/math/arm/__rt_udiv.c b/sdk/lib/crt/math/arm/__rt_udiv.c index 2f47697d8ff..9863ce4d83d 100644 --- a/sdk/lib/crt/math/arm/__rt_udiv.c +++ b/sdk/lib/crt/math/arm/__rt_udiv.c @@ -1,16 +1,18 @@ /* - * COPYRIGHT: BSD - See COPYING.ARM in the top level directory - * PROJECT: ReactOS CRT library - * PURPOSE: Implementation of __rt_udiv - * PROGRAMMER: Timo Kreuzer - * REFERENCE: http://research.microsoft.com/en-us/um/redmond/projects/invisible/src/crt/m… - * http://research.microsoft.com/en-us/um/redmond/projects/invisible/src/crt/m… + * PROJECT: ReactOS CRT library + * LICENSE: MIT (https://spdx.org/licenses/MIT) + * PURPOSE: Implementation of __rt_udiv + * COPYRIGHT: Copyright 2015 Timo Kreuzer <timo.kreuzer(a)reactos.org> + * Copyright 2021 Raman Masanin <36927roma(a)gmail.com> */ #define __rt_div_worker __rt_udiv_worker #include "__rt_div_worker.h" + /* + * Returns quotient in R0, remainder in R1 + */ unsigned long long __rt_udiv( unsigned int divisor, @@ -22,4 +24,3 @@ __rt_udiv( return result.raw_data; } - diff --git a/sdk/lib/crt/math/arm/__rt_udiv64.s b/sdk/lib/crt/math/arm/__rt_udiv64.s index d08a02fc463..182ff33595a 100644 --- a/sdk/lib/crt/math/arm/__rt_udiv64.s +++ b/sdk/lib/crt/math/arm/__rt_udiv64.s @@ -1,8 +1,9 @@ /* - * COPYRIGHT: BSD - See COPYING.ARM in the top level directory - * PROJECT: ReactOS CRT library - * PURPOSE: Implementation of __rt_udiv64 - * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + * PROJECT: ReactOS CRT library + * LICENSE: MIT (https://spdx.org/licenses/MIT) + * PURPOSE: Implementation of __rt_udiv64 + * COPYRIGHT: Copyright 2015 Timo Kreuzer <timo.kreuzer(a)reactos.org> + * Copyright 2021 Raman Masanin <36927roma(a)gmail.com> */ /* INCLUDES ******************************************************************/ @@ -15,6 +16,12 @@ TEXTAREA + /* + IN: r1:r0 = divisor + IN: r3:r2 = dividend + OUT: r1:r0 = quotient + OUT: r3:r2 = remainder + */ NESTED_ENTRY __rt_udiv64 /* Allocate stack space and store parameters there */

3 years, 5 months

[reactos] 01/01: [CPPRT] arm: Add 2 'MSVCRTEX_eh_vector_*structor_iterator' aliases

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9a42267b06861a0571637… commit 9a42267b06861a057163729ca188438d157f13b8 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Mon May 24 08:56:17 2021 +0200 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Mon Jul 26 09:58:20 2021 +0300 [CPPRT] arm: Add 2 'MSVCRTEX_eh_vector_*structor_iterator' aliases CORE-17606 --- sdk/lib/cpprt/arm/cpprt.s | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sdk/lib/cpprt/arm/cpprt.s b/sdk/lib/cpprt/arm/cpprt.s index a5561993d53..ffb466459ce 100644 --- a/sdk/lib/cpprt/arm/cpprt.s +++ b/sdk/lib/cpprt/arm/cpprt.s @@ -15,9 +15,15 @@ _Target SETS "|$Target|" ; void __cdecl `eh vector constructor iterator'(void *,unsigned int,int,void (__cdecl*)(void *),void (__cdecl*)(void *)) DEFINE_ALIAS ??_L@YAXPAXIHP6AX0@Z1@Z, ?MSVCRTEX_eh_vector_constructor_iterator@@YAXPAXIHP6AX0@Z1@Z + ; void __cdecl `eh vector constructor iterator'(void *,unsigned int,unsigned int,void (__cdecl*)(void *),void (__cdecl*)(void *)) + DEFINE_ALIAS ??_L@YAXPAXIIP6AX0@Z1@Z, ?MSVCRTEX_eh_vector_constructor_iterator@@YAXPAXIHP6AX0@Z1@Z + ; void __cdecl `eh vector destructor iterator'(void *,unsigned int,int,void (__cdecl*)(void *)) DEFINE_ALIAS ??_M@YAXPAXIHP6AX0@Z@Z, ?MSVCRTEX_eh_vector_destructor_iterator@@YAXPAXIHP6AX0@Z@Z + ; void __cdecl `eh vector destructor iterator'(void *,unsigned int,unsigned int,void (__cdecl*)(void *)) + DEFINE_ALIAS ??_M@YAXPAXIIP6AX0@Z@Z, ?MSVCRTEX_eh_vector_destructor_iterator@@YAXPAXIHP6AX0@Z@Z + ; These are the same //DEFINE_ALIAS __CxxFrameHandler3, __CxxFrameHandler

3 years, 5 months

[reactos] 01/01: [NTOS:SE] Remove redundant commented call on token duplication

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e2a8585edc0883408dd10… commit e2a8585edc0883408dd10778228e6c66d44c5876 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sun Jul 25 18:02:32 2021 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Sun Jul 25 18:02:32 2021 +0200 [NTOS:SE] Remove redundant commented call on token duplication When duplicating an access token, the authentication ID is already copied from the existing token to the new one anyway so there's no point on having the commented call still left in the code. --- ntoskrnl/se/token.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ntoskrnl/se/token.c b/ntoskrnl/se/token.c index 507a8d73bad..a7b004ae034 100644 --- a/ntoskrnl/se/token.c +++ b/ntoskrnl/se/token.c @@ -854,8 +854,7 @@ SepDuplicateToken( AccessToken->TokenFlags = Token->TokenFlags & ~TOKEN_SESSION_NOT_REFERENCED; - /* Copy and reference the logon session */ - // RtlCopyLuid(&AccessToken->AuthenticationId, &Token->AuthenticationId); + /* Reference the logon session */ Status = SepRmReferenceLogonSession(&AccessToken->AuthenticationId); if (!NT_SUCCESS(Status)) {

3 years, 5 months

[reactos] 01/01: [DRWTSN32] Fix Clang build. Addendum to bdab437f.

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a1ebce3aac7290b66ebad… commit a1ebce3aac7290b66ebadcd0e006fe288420b907 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sun Jul 25 17:52:33 2021 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sun Jul 25 18:14:23 2021 +0300 [DRWTSN32] Fix Clang build. Addendum to bdab437f. Also use a macro for better code readability. Co-authored-by: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> --- base/applications/drwtsn32/sysinfo.cpp | 49 +++++++++++++++++----------------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/base/applications/drwtsn32/sysinfo.cpp b/base/applications/drwtsn32/sysinfo.cpp index eef86e3d3e8..bc96af0d00f 100644 --- a/base/applications/drwtsn32/sysinfo.cpp +++ b/base/applications/drwtsn32/sysinfo.cpp @@ -15,30 +15,31 @@ static const char* Exception2Str(DWORD code) { switch (code) { - case EXCEPTION_ACCESS_VIOLATION: return "EXCEPTION_ACCESS_VIOLATION"; - case EXCEPTION_DATATYPE_MISALIGNMENT: return "EXCEPTION_DATATYPE_MISALIGNMENT"; - case EXCEPTION_BREAKPOINT: return "EXCEPTION_BREAKPOINT"; - case EXCEPTION_SINGLE_STEP: return "EXCEPTION_SINGLE_STEP"; - case EXCEPTION_ARRAY_BOUNDS_EXCEEDED: return "EXCEPTION_ARRAY_BOUNDS_EXCEEDED"; - case EXCEPTION_FLT_DENORMAL_OPERAND: return "EXCEPTION_FLT_DENORMAL_OPERAND"; - case EXCEPTION_FLT_DIVIDE_BY_ZERO: return "EXCEPTION_FLT_DIVIDE_BY_ZERO"; - case EXCEPTION_FLT_INEXACT_RESULT: return "EXCEPTION_FLT_INEXACT_RESULT"; - case EXCEPTION_FLT_INVALID_OPERATION: return "EXCEPTION_FLT_INVALID_OPERATION"; - case EXCEPTION_FLT_OVERFLOW: return "EXCEPTION_FLT_OVERFLOW"; - case EXCEPTION_FLT_STACK_CHECK: return "EXCEPTION_FLT_STACK_CHECK"; - case EXCEPTION_FLT_UNDERFLOW: return "EXCEPTION_FLT_UNDERFLOW"; - case EXCEPTION_INT_DIVIDE_BY_ZERO: return "EXCEPTION_INT_DIVIDE_BY_ZERO"; - case EXCEPTION_INT_OVERFLOW: return "EXCEPTION_INT_OVERFLOW"; - case EXCEPTION_PRIV_INSTRUCTION: return "EXCEPTION_PRIV_INSTRUCTION"; - case EXCEPTION_IN_PAGE_ERROR: return "EXCEPTION_IN_PAGE_ERROR"; - case EXCEPTION_ILLEGAL_INSTRUCTION: return "EXCEPTION_ILLEGAL_INSTRUCTION"; - case EXCEPTION_NONCONTINUABLE_EXCEPTION: return "EXCEPTION_NONCONTINUABLE_EXCEPTION"; - case EXCEPTION_STACK_OVERFLOW: return "EXCEPTION_STACK_OVERFLOW"; - case EXCEPTION_INVALID_DISPOSITION: return "EXCEPTION_INVALID_DISPOSITION"; - case EXCEPTION_GUARD_PAGE: return "EXCEPTION_GUARD_PAGE"; - case EXCEPTION_INVALID_HANDLE: return "EXCEPTION_INVALID_HANDLE"; - case EXCEPTION_WINE_STUB: return "EXCEPTION_WINE_STUB"; - case STATUS_ASSERTION_FAILURE: return "STATUS_ASSERTION_FAILURE"; +#define EX_TO_STR(name) case (DWORD)(name): return #name + EX_TO_STR(EXCEPTION_ACCESS_VIOLATION); + EX_TO_STR(EXCEPTION_DATATYPE_MISALIGNMENT); + EX_TO_STR(EXCEPTION_BREAKPOINT); + EX_TO_STR(EXCEPTION_SINGLE_STEP); + EX_TO_STR(EXCEPTION_ARRAY_BOUNDS_EXCEEDED); + EX_TO_STR(EXCEPTION_FLT_DENORMAL_OPERAND); + EX_TO_STR(EXCEPTION_FLT_DIVIDE_BY_ZERO); + EX_TO_STR(EXCEPTION_FLT_INEXACT_RESULT); + EX_TO_STR(EXCEPTION_FLT_INVALID_OPERATION); + EX_TO_STR(EXCEPTION_FLT_OVERFLOW); + EX_TO_STR(EXCEPTION_FLT_STACK_CHECK); + EX_TO_STR(EXCEPTION_FLT_UNDERFLOW); + EX_TO_STR(EXCEPTION_INT_DIVIDE_BY_ZERO); + EX_TO_STR(EXCEPTION_INT_OVERFLOW); + EX_TO_STR(EXCEPTION_PRIV_INSTRUCTION); + EX_TO_STR(EXCEPTION_IN_PAGE_ERROR); + EX_TO_STR(EXCEPTION_ILLEGAL_INSTRUCTION); + EX_TO_STR(EXCEPTION_NONCONTINUABLE_EXCEPTION); + EX_TO_STR(EXCEPTION_STACK_OVERFLOW); + EX_TO_STR(EXCEPTION_INVALID_DISPOSITION); + EX_TO_STR(EXCEPTION_GUARD_PAGE); + EX_TO_STR(EXCEPTION_INVALID_HANDLE); + EX_TO_STR(EXCEPTION_WINE_STUB); + EX_TO_STR(STATUS_ASSERTION_FAILURE); } return "--";

3 years, 5 months

[reactos] 01/01: [DRWTSN32] Recognize STATUS_ASSERTION_FAILURE as exception number

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bdab437fa47b1fd692f76… commit bdab437fa47b1fd692f767242004fe86a0830ddc Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sun Jul 25 15:32:08 2021 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sun Jul 25 15:32:08 2021 +0300 [DRWTSN32] Recognize STATUS_ASSERTION_FAILURE as exception number --- base/applications/drwtsn32/sysinfo.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/base/applications/drwtsn32/sysinfo.cpp b/base/applications/drwtsn32/sysinfo.cpp index 63576dccd08..eef86e3d3e8 100644 --- a/base/applications/drwtsn32/sysinfo.cpp +++ b/base/applications/drwtsn32/sysinfo.cpp @@ -38,6 +38,7 @@ static const char* Exception2Str(DWORD code) case EXCEPTION_GUARD_PAGE: return "EXCEPTION_GUARD_PAGE"; case EXCEPTION_INVALID_HANDLE: return "EXCEPTION_INVALID_HANDLE"; case EXCEPTION_WINE_STUB: return "EXCEPTION_WINE_STUB"; + case STATUS_ASSERTION_FAILURE: return "STATUS_ASSERTION_FAILURE"; } return "--";

3 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2021