Ros-diffs November 2018

ros-diffs@reactos.org

29 participants
250 discussions

08/13: [NTOSKRNL] Properly align allocation on SMP in ExAllocateCacheAwareRundownProtection()

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c5db202bdc228cfc47b81… commit c5db202bdc228cfc47b811766c8e5e105f3c7da5 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Nov 17 15:45:29 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Nov 17 16:44:36 2018 +0100 [NTOSKRNL] Properly align allocation on SMP in ExAllocateCacheAwareRundownProtection() --- ntoskrnl/ex/rundown.c | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/ntoskrnl/ex/rundown.c b/ntoskrnl/ex/rundown.c index da96b08af9..cde0bf7aea 100644 --- a/ntoskrnl/ex/rundown.c +++ b/ntoskrnl/ex/rundown.c @@ -473,9 +473,9 @@ NTAPI ExAllocateCacheAwareRundownProtection(IN POOL_TYPE PoolType, IN ULONG Tag) { - PVOID PoolToFree; PEX_RUNDOWN_REF RunRef; - ULONG RunRefSize, Count, Offset; + PVOID PoolToFree, RunRefs; + ULONG RunRefSize, Count, Offset, Align; PEX_RUNDOWN_REF_CACHE_AWARE RunRefCacheAware; PAGED_CODE(); @@ -495,7 +495,8 @@ ExAllocateCacheAwareRundownProtection(IN POOL_TYPE PoolType, } else { - RunRefSize = KeGetRecommendedSharedDataAlignment(); + Align = KeGetRecommendedSharedDataAlignment(); + RunRefSize = Align; ASSERT((RunRefSize & (RunRefSize - 1)) == 0); } @@ -512,13 +513,27 @@ ExAllocateCacheAwareRundownProtection(IN POOL_TYPE PoolType, } /* On SMP, check for alignment */ - if (RunRefCacheAware->Number > 1) + if (RunRefCacheAware->Number > 1 && (ULONG_PTR)PoolToFree & (Align - 1)) { - /* FIXME: properly align run refs */ - UNIMPLEMENTED; + /* Not properly aligned, do it again! */ + ExFreePoolWithTag(PoolToFree, Tag); + + /* Allocate a bigger buffer to be able to align properly */ + PoolToFree = ExAllocatePoolWithTag(PoolType, RunRefSize * (RunRefCacheAware->Number + 1), Tag); + if (PoolToFree == NULL) + { + ExFreePoolWithTag(RunRefCacheAware, Tag); + return NULL; + } + + RunRefs = (PVOID)ALIGN_UP_BY(PoolToFree, Align); + } + else + { + RunRefs = PoolToFree; } - RunRefCacheAware->RunRefs = PoolToFree; + RunRefCacheAware->RunRefs = RunRefs; RunRefCacheAware->PoolToFree = PoolToFree; /* And initialize runref */ @@ -528,7 +543,7 @@ ExAllocateCacheAwareRundownProtection(IN POOL_TYPE PoolType, { Offset = RunRefCacheAware->RunRefSize * Count; RunRef = (PEX_RUNDOWN_REF)((ULONG_PTR)RunRefCacheAware->RunRefs + Offset); - RunRef->Count = 0; + _ExInitializeRundownProtection(RunRef); } } @@ -605,7 +620,7 @@ ExInitializeRundownProtectionCacheAware(IN PEX_RUNDOWN_REF_CACHE_AWARE RunRefCac { Offset = RunRefCacheAware->RunRefSize * Count; RunRef = (PEX_RUNDOWN_REF)((ULONG_PTR)RunRefCacheAware->RunRefs + Offset); - RunRef->Count = 0; + _ExInitializeRundownProtection(RunRef); } } }

5 years, 11 months

07/13: [NTOSKRNL] Implement ExfAcquireRundownProtectionCacheAwareEx(), ExfReleaseRundownProtectionCacheAwareEx()

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=36fadc2dca62cc38dc499… commit 36fadc2dca62cc38dc499278e8a3637ec4f4462b Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Nov 17 15:36:08 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Nov 17 16:44:35 2018 +0100 [NTOSKRNL] Implement ExfAcquireRundownProtectionCacheAwareEx(), ExfReleaseRundownProtectionCacheAwareEx() --- ntoskrnl/ex/rundown.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/ntoskrnl/ex/rundown.c b/ntoskrnl/ex/rundown.c index 3b24f5e8be..da96b08af9 100644 --- a/ntoskrnl/ex/rundown.c +++ b/ntoskrnl/ex/rundown.c @@ -5,6 +5,7 @@ * PURPOSE: Rundown and Cache-Aware Rundown Protection * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) * Thomas Weidenmueller + * Pierre Schweitzer */ /* INCLUDES *****************************************************************/ @@ -391,17 +392,17 @@ ExfAcquireRundownProtectionCacheAware(IN PEX_RUNDOWN_REF_CACHE_AWARE RunRefCache } /* - * @unimplemented NT5.2 + * @implemented NT5.2 */ BOOLEAN FASTCALL ExfAcquireRundownProtectionCacheAwareEx(IN PEX_RUNDOWN_REF_CACHE_AWARE RunRefCacheAware, IN ULONG Count) { - DBG_UNREFERENCED_PARAMETER(RunRefCacheAware); - DBG_UNREFERENCED_PARAMETER(Count); - UNIMPLEMENTED; - return FALSE; + PEX_RUNDOWN_REF RunRef; + + RunRef = ExGetRunRefForCurrentProcessor(RunRefCacheAware); + return ExfAcquireRundownProtectionEx(RunRef, Count); } /* @@ -418,16 +419,17 @@ ExfReleaseRundownProtectionCacheAware(IN PEX_RUNDOWN_REF_CACHE_AWARE RunRefCache } /* - * @unimplemented NT5.2 + * @implemented NT5.2 */ VOID FASTCALL ExfReleaseRundownProtectionCacheAwareEx(IN PEX_RUNDOWN_REF_CACHE_AWARE RunRefCacheAware, IN ULONG Count) { - DBG_UNREFERENCED_PARAMETER(RunRefCacheAware); - DBG_UNREFERENCED_PARAMETER(Count); - UNIMPLEMENTED; + PEX_RUNDOWN_REF RunRef; + + RunRef = ExGetRunRefForCurrentProcessor(RunRefCacheAware); + return ExfReleaseRundownProtectionEx(RunRef, Count); } /*

5 years, 11 months

06/13: [NTOSKRNL] Simplify implementation of ExfAcquireRundownProtectionCacheAware(), ExfReleaseRundownProtectionCacheAware()

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=afb2214154886d3717bbb… commit afb2214154886d3717bbb0c9b7623603262c6e5a Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Nov 17 15:33:52 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Nov 17 16:44:35 2018 +0100 [NTOSKRNL] Simplify implementation of ExfAcquireRundownProtectionCacheAware(), ExfReleaseRundownProtectionCacheAware() --- ntoskrnl/ex/rundown.c | 44 ++++---------------------------------------- 1 file changed, 4 insertions(+), 40 deletions(-) diff --git a/ntoskrnl/ex/rundown.c b/ntoskrnl/ex/rundown.c index 94a2696286..3b24f5e8be 100644 --- a/ntoskrnl/ex/rundown.c +++ b/ntoskrnl/ex/rundown.c @@ -384,29 +384,10 @@ BOOLEAN FASTCALL ExfAcquireRundownProtectionCacheAware(IN PEX_RUNDOWN_REF_CACHE_AWARE RunRefCacheAware) { - ULONG Value; - BOOLEAN Acquired; PEX_RUNDOWN_REF RunRef; - RunRef = (PEX_RUNDOWN_REF)((ULONG_PTR)RunRefCacheAware->RunRefs + - RunRefCacheAware->RunRefSize * - (KeGetCurrentProcessorNumber() % RunRefCacheAware->Number)); - - /* Get current value */ - Value = RunRef->Count & !EX_RUNDOWN_ACTIVE; - /* Try to acquire the quick way if already active */ - if (ExpChangeRundown(RunRef, - ((RunRef->Count & !EX_RUNDOWN_ACTIVE) + EX_RUNDOWN_COUNT_INC), - Value) == Value) - { - Acquired = 1; - } - else - { - Acquired = ExfAcquireRundownProtection(RunRef); - } - - return Acquired; + RunRef = ExGetRunRefForCurrentProcessor(RunRefCacheAware); + return _ExAcquireRundownProtection(RunRef); } /* @@ -430,27 +411,10 @@ VOID FASTCALL ExfReleaseRundownProtectionCacheAware(IN PEX_RUNDOWN_REF_CACHE_AWARE RunRefCacheAware) { - ULONG Value; PEX_RUNDOWN_REF RunRef; - RunRef = (PEX_RUNDOWN_REF)((ULONG_PTR)RunRefCacheAware->RunRefs + - RunRefCacheAware->RunRefSize * - (KeGetCurrentProcessorNumber() % RunRefCacheAware->Number)); - - /* Get current value */ - Value = RunRef->Count & !EX_RUNDOWN_ACTIVE; - /* Try to release the quick way if multiple actived */ - if (ExpChangeRundown(RunRef, - ((RunRef->Count & !EX_RUNDOWN_ACTIVE) - EX_RUNDOWN_COUNT_INC), - Value) == Value) - { - /* Sanity check */ - ASSERT((Value >= EX_RUNDOWN_COUNT_INC) || (KeNumberProcessors > 1)); - } - else - { - ExfReleaseRundownProtection(RunRef); - } + RunRef = ExGetRunRefForCurrentProcessor(RunRefCacheAware); + return _ExReleaseRundownProtection(RunRef); } /*

5 years, 11 months

05/13: [NTOSKRNL] Implement ExGetRunRefForCurrentProcessor() to get runref for a proc

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=010b9b5469377fbddf2d6… commit 010b9b5469377fbddf2d632de9a3945d7e522643 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Nov 17 15:32:10 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Nov 17 16:44:35 2018 +0100 [NTOSKRNL] Implement ExGetRunRefForCurrentProcessor() to get runref for a proc --- ntoskrnl/include/internal/ex.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ntoskrnl/include/internal/ex.h b/ntoskrnl/include/internal/ex.h index a8e715aadd..e09eb9ba05 100644 --- a/ntoskrnl/include/internal/ex.h +++ b/ntoskrnl/include/internal/ex.h @@ -545,6 +545,15 @@ ExGetCountFastReference(IN EX_FAST_REF FastRef) return (ULONG)FastRef.RefCnt; } +FORCEINLINE +PEX_RUNDOWN_REF +ExGetRunRefForCurrentProcessor(IN PEX_RUNDOWN_REF_CACHE_AWARE RunRefCacheAware) +{ + return (PEX_RUNDOWN_REF)((ULONG_PTR)RunRefCacheAware->RunRefs + + RunRefCacheAware->RunRefSize * + (KeGetCurrentProcessorNumber() % RunRefCacheAware->Number)); +} + FORCEINLINE VOID ExInitializeFastReference(OUT PEX_FAST_REF FastRef,

5 years, 11 months

04/13: [NTOSKRNL] Implement ExfAcquireRundownProtectionCacheAware(), ExfReleaseRundownProtectionCacheAware()

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7e36e76d5dd6510016855… commit 7e36e76d5dd651001685570ff21229d770caea32 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Nov 17 15:25:26 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Nov 17 16:44:35 2018 +0100 [NTOSKRNL] Implement ExfAcquireRundownProtectionCacheAware(), ExfReleaseRundownProtectionCacheAware() --- ntoskrnl/ex/rundown.c | 53 ++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 46 insertions(+), 7 deletions(-) diff --git a/ntoskrnl/ex/rundown.c b/ntoskrnl/ex/rundown.c index ee1dbadb2b..94a2696286 100644 --- a/ntoskrnl/ex/rundown.c +++ b/ntoskrnl/ex/rundown.c @@ -378,15 +378,35 @@ ExfWaitForRundownProtectionRelease(IN PEX_RUNDOWN_REF RunRef) /* FIXME: STUBS **************************************************************/ /* - * @unimplemented NT5.2 + * @implemented NT5.2 */ BOOLEAN FASTCALL ExfAcquireRundownProtectionCacheAware(IN PEX_RUNDOWN_REF_CACHE_AWARE RunRefCacheAware) { - DBG_UNREFERENCED_PARAMETER(RunRefCacheAware); - UNIMPLEMENTED; - return FALSE; + ULONG Value; + BOOLEAN Acquired; + PEX_RUNDOWN_REF RunRef; + + RunRef = (PEX_RUNDOWN_REF)((ULONG_PTR)RunRefCacheAware->RunRefs + + RunRefCacheAware->RunRefSize * + (KeGetCurrentProcessorNumber() % RunRefCacheAware->Number)); + + /* Get current value */ + Value = RunRef->Count & !EX_RUNDOWN_ACTIVE; + /* Try to acquire the quick way if already active */ + if (ExpChangeRundown(RunRef, + ((RunRef->Count & !EX_RUNDOWN_ACTIVE) + EX_RUNDOWN_COUNT_INC), + Value) == Value) + { + Acquired = 1; + } + else + { + Acquired = ExfAcquireRundownProtection(RunRef); + } + + return Acquired; } /* @@ -404,14 +424,33 @@ ExfAcquireRundownProtectionCacheAwareEx(IN PEX_RUNDOWN_REF_CACHE_AWARE RunRefCac } /* - * @unimplemented NT5.2 + * @implemented NT5.2 */ VOID FASTCALL ExfReleaseRundownProtectionCacheAware(IN PEX_RUNDOWN_REF_CACHE_AWARE RunRefCacheAware) { - DBG_UNREFERENCED_PARAMETER(RunRefCacheAware); - UNIMPLEMENTED; + ULONG Value; + PEX_RUNDOWN_REF RunRef; + + RunRef = (PEX_RUNDOWN_REF)((ULONG_PTR)RunRefCacheAware->RunRefs + + RunRefCacheAware->RunRefSize * + (KeGetCurrentProcessorNumber() % RunRefCacheAware->Number)); + + /* Get current value */ + Value = RunRef->Count & !EX_RUNDOWN_ACTIVE; + /* Try to release the quick way if multiple actived */ + if (ExpChangeRundown(RunRef, + ((RunRef->Count & !EX_RUNDOWN_ACTIVE) - EX_RUNDOWN_COUNT_INC), + Value) == Value) + { + /* Sanity check */ + ASSERT((Value >= EX_RUNDOWN_COUNT_INC) || (KeNumberProcessors > 1)); + } + else + { + ExfReleaseRundownProtection(RunRef); + } } /*

5 years, 11 months

03/13: [NTOSKRNL] Implement ExSizeOfRundownProtectionCacheAware()

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=47d309b262b302cb86fe7… commit 47d309b262b302cb86fe72d689a616bbbde3a7d4 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Nov 17 15:03:43 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Nov 17 16:44:35 2018 +0100 [NTOSKRNL] Implement ExSizeOfRundownProtectionCacheAware() --- ntoskrnl/ex/rundown.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/ex/rundown.c b/ntoskrnl/ex/rundown.c index 5b354857e3..ee1dbadb2b 100644 --- a/ntoskrnl/ex/rundown.c +++ b/ntoskrnl/ex/rundown.c @@ -606,13 +606,28 @@ ExInitializeRundownProtectionCacheAware(IN PEX_RUNDOWN_REF_CACHE_AWARE RunRefCac } /* - * @unimplemented NT5.2 + * @implemented NT5.2 */ SIZE_T NTAPI ExSizeOfRundownProtectionCacheAware(VOID) { - UNIMPLEMENTED; - return 0; + SIZE_T Size; + + PAGED_CODE(); + + /* Compute the needed size for runrefs */ + if (KeNumberProcessors <= 1) + { + Size = sizeof(EX_RUNDOWN_REF); + } + else + { + /* We +1, to have enough room for alignment */ + Size = (KeNumberProcessors + 1) * KeGetRecommendedSharedDataAlignment(); + } + + /* Return total size (master structure and runrefs) */ + return Size + sizeof(EX_RUNDOWN_REF_CACHE_AWARE); }

5 years, 11 months

02/13: [NTOSKRNL] Implement ExInitializeRundownProtectionCacheAware()

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ce94d37dbe8670bb7f2a8… commit ce94d37dbe8670bb7f2a8c344f89429b53739b91 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Nov 17 15:01:05 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Nov 17 16:44:35 2018 +0100 [NTOSKRNL] Implement ExInitializeRundownProtectionCacheAware() --- ntoskrnl/ex/rundown.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 46 insertions(+), 5 deletions(-) diff --git a/ntoskrnl/ex/rundown.c b/ntoskrnl/ex/rundown.c index a6561df1cb..5b354857e3 100644 --- a/ntoskrnl/ex/rundown.c +++ b/ntoskrnl/ex/rundown.c @@ -552,16 +552,57 @@ ExFreeCacheAwareRundownProtection(IN PEX_RUNDOWN_REF_CACHE_AWARE RunRefCacheAwar } /* - * @unimplemented NT5.2 + * @implemented NT5.2 */ VOID NTAPI ExInitializeRundownProtectionCacheAware(IN PEX_RUNDOWN_REF_CACHE_AWARE RunRefCacheAware, - IN SIZE_T Count) + IN SIZE_T Size) { - DBG_UNREFERENCED_PARAMETER(RunRefCacheAware); - DBG_UNREFERENCED_PARAMETER(Count); - UNIMPLEMENTED; + PVOID Pool; + PEX_RUNDOWN_REF RunRef; + ULONG Count, RunRefSize, Offset; + + PAGED_CODE(); + + /* Get the user allocate pool for runrefs */ + Pool = (PVOID)((ULONG_PTR)RunRefCacheAware + sizeof(EX_RUNDOWN_REF_CACHE_AWARE)); + + /* By default a runref is structure-sized */ + RunRefSize = sizeof(EX_RUNDOWN_REF); + + /* + * If we just have enough room for a single runref, deduce were on a single + * processor machine + */ + if (Size == sizeof(EX_RUNDOWN_REF_CACHE_AWARE) + sizeof(EX_RUNDOWN_REF)) + { + Count = 1; + } + else + { + /* FIXME: Properly align on SMP */ + UNIMPLEMENTED; + } + + /* Initialize the structure */ + RunRefCacheAware->RunRefs = Pool; + RunRefCacheAware->RunRefSize = RunRefSize; + RunRefCacheAware->Number = Count; + + /* There is no allocated pool! */ + RunRefCacheAware->PoolToFree = (PVOID)0xBADCA11u; + + /* Initialize runref */ + if (RunRefCacheAware->Number != 0) + { + for (Count = 0; Count < RunRefCacheAware->Number; ++Count) + { + Offset = RunRefCacheAware->RunRefSize * Count; + RunRef = (PEX_RUNDOWN_REF)((ULONG_PTR)RunRefCacheAware->RunRefs + Offset); + RunRef->Count = 0; + } + } } /*

5 years, 11 months

01/13: [NTOSKRNL] Implement ExAllocateCacheAwareRundownProtection() and ExFreeCacheAwareRundownProtection()

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bc77f83888ca4f83f5e0d… commit bc77f83888ca4f83f5e0d122b50b2896be36fcd8 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Nov 17 14:48:24 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Nov 17 16:44:34 2018 +0100 [NTOSKRNL] Implement ExAllocateCacheAwareRundownProtection() and ExFreeCacheAwareRundownProtection() --- ntoskrnl/ex/rundown.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 74 insertions(+), 8 deletions(-) diff --git a/ntoskrnl/ex/rundown.c b/ntoskrnl/ex/rundown.c index fb0b82b5e8..a6561df1cb 100644 --- a/ntoskrnl/ex/rundown.c +++ b/ntoskrnl/ex/rundown.c @@ -461,28 +461,94 @@ ExfReInitializeRundownProtectionCacheAware(IN PEX_RUNDOWN_REF_CACHE_AWARE RunRef } /* - * @unimplemented NT5.2 + * @implemented NT5.2 */ PEX_RUNDOWN_REF_CACHE_AWARE NTAPI ExAllocateCacheAwareRundownProtection(IN POOL_TYPE PoolType, IN ULONG Tag) { - DBG_UNREFERENCED_PARAMETER(PoolType); - DBG_UNREFERENCED_PARAMETER(Tag); - UNIMPLEMENTED; - return NULL; + PVOID PoolToFree; + PEX_RUNDOWN_REF RunRef; + ULONG RunRefSize, Count, Offset; + PEX_RUNDOWN_REF_CACHE_AWARE RunRefCacheAware; + + PAGED_CODE(); + + /* Allocate the master structure */ + RunRefCacheAware = ExAllocatePoolWithTag(PoolType, sizeof(EX_RUNDOWN_REF_CACHE_AWARE), Tag); + if (RunRefCacheAware == NULL) + { + return NULL; + } + + /* Compute the size of each runref */ + RunRefCacheAware->Number = KeNumberProcessors; + if (KeNumberProcessors <= 1) + { + RunRefSize = sizeof(EX_RUNDOWN_REF); + } + else + { + RunRefSize = KeGetRecommendedSharedDataAlignment(); + ASSERT((RunRefSize & (RunRefSize - 1)) == 0); + } + + /* It must at least hold a EX_RUNDOWN_REF structure */ + ASSERT(sizeof(EX_RUNDOWN_REF) <= RunRefSize); + RunRefCacheAware->RunRefSize = RunRefSize; + + /* Allocate our runref pool */ + PoolToFree = ExAllocatePoolWithTag(PoolType, RunRefSize * RunRefCacheAware->Number, Tag); + if (PoolToFree == NULL) + { + ExFreePoolWithTag(RunRefCacheAware, Tag); + return NULL; + } + + /* On SMP, check for alignment */ + if (RunRefCacheAware->Number > 1) + { + /* FIXME: properly align run refs */ + UNIMPLEMENTED; + } + + RunRefCacheAware->RunRefs = PoolToFree; + RunRefCacheAware->PoolToFree = PoolToFree; + + /* And initialize runref */ + if (RunRefCacheAware->Number != 0) + { + for (Count = 0; Count < RunRefCacheAware->Number; ++Count) + { + Offset = RunRefCacheAware->RunRefSize * Count; + RunRef = (PEX_RUNDOWN_REF)((ULONG_PTR)RunRefCacheAware->RunRefs + Offset); + RunRef->Count = 0; + } + } + + return RunRefCacheAware; } /* - * @unimplemented NT5.2 + * @implemented NT5.2 */ VOID NTAPI ExFreeCacheAwareRundownProtection(IN PEX_RUNDOWN_REF_CACHE_AWARE RunRefCacheAware) { - DBG_UNREFERENCED_PARAMETER(RunRefCacheAware); - UNIMPLEMENTED; + PAGED_CODE(); + + /* + * This is to be called for RunRefCacheAware that were allocated with + * ExAllocateCacheAwareRundownProtection and not for user-allocated + * ones + */ + ASSERT(RunRefCacheAware->PoolToFree != (PVOID)0xBADCA11); + + /* We don't know the tag that as used for allocation */ + ExFreePoolWithTag(RunRefCacheAware->PoolToFree, 0); + ExFreePoolWithTag(RunRefCacheAware, 0); } /*

5 years, 11 months

01/01: [CHKDSK] Implement translation files for Romanian & Italian (#961)

by Bișoc George

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cfff74daed2aab0705f1d… commit cfff74daed2aab0705f1d5c8fb7d3c40c9f8f38e Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Sat Nov 17 15:16:36 2018 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Nov 17 15:16:36 2018 +0100 [CHKDSK] Implement translation files for Romanian & Italian (#961) --- base/system/chkdsk/chkdsk.rc | 6 ++++++ base/system/chkdsk/lang/it-IT.rc | 38 ++++++++++++++++++++++++++++++++++++++ base/system/chkdsk/lang/ro-RO.rc | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 82 insertions(+) diff --git a/base/system/chkdsk/chkdsk.rc b/base/system/chkdsk/chkdsk.rc index c3154e36d4..00a5373b53 100644 --- a/base/system/chkdsk/chkdsk.rc +++ b/base/system/chkdsk/chkdsk.rc @@ -16,9 +16,15 @@ #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_IT_IT + #include "lang/it-IT.rc" +#endif #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif +#ifdef LANGUAGE_RO_RO + #include "lang/ro-RO.rc" +#endif #ifdef LANGUAGE_RU_RU #include "lang/ru-RU.rc" #endif diff --git a/base/system/chkdsk/lang/it-IT.rc b/base/system/chkdsk/lang/it-IT.rc new file mode 100644 index 0000000000..e49a092592 --- /dev/null +++ b/base/system/chkdsk/lang/it-IT.rc @@ -0,0 +1,38 @@ +/* + * PROJECT: Check Disk utility + * LICENSE: See COPYING in the top level directory + * PURPOSE: Italian resource file + * COPYRIGHT: Copyright 2018 Bișoc George (fraizeraust99 at gmail dot com) + */ + +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_USAGE "\n\ +Uso: %s [drive:] [-F] [-V] [-R] [-C] \n\n\ +[drive:] Specifica un disco per il controllo.\n\ +-F Risolvi gli errori del disco.\n\ +-V Visualizza il percorso del file di ogni file del disco.\n\ +-R Trova i settori danneggiati e recupera le informazioni leggibili.\n\ +-C Controlla il drive solamente se è sporco.\n\ +\n" + + IDS_PERCENT_COMPL "%d percentuale completato.\r" + IDS_FILE_SYSTEM "Il tipo del file di sistema è %s.\n" + IDS_ABOUT "\n\ +Chkdskx v1.0.1 di Mark Russinovich\n\ +Systems Internals - http://www.sysinternals.com\n\ +Adattazione ReactOS nel 1999 di Emanuele Aliberti\n\n" +END + +STRINGTABLE +BEGIN + IDS_VOLUME_IN_USE "Il volume è in uso e non può essere bloccato\n" + IDS_CHKDSK_FAIL "Chkdsk non era in grado di finire con successo.\n\n" + IDS_NO_ENTRY_POINT "Impossibile trovare i punti d'ingresso FMIFS.\n\n" + IDS_BAD_ARGUMENT "Argomento sconosciuto: %s\n" + IDS_NO_CURRENT_DIR "Impossibile ottenre la cartella corrente. Codice errore: " + IDS_NO_QUERY_VOL "Impossibile interrogare il volume. Codice errore: " + IDS_VOLUME_IN_USE_PROC "Impossibile l'esecuzione del Chkdsk perché il volume è in uso da un altro processo.\n\n" +END diff --git a/base/system/chkdsk/lang/ro-RO.rc b/base/system/chkdsk/lang/ro-RO.rc new file mode 100644 index 0000000000..6f3cb9cfba --- /dev/null +++ b/base/system/chkdsk/lang/ro-RO.rc @@ -0,0 +1,38 @@ +/* + * PROJECT: Check Disk utility + * LICENSE: See COPYING in the top level directory + * PURPOSE: Romanian resource file + * COPYRIGHT: Copyright 2018 Bișoc George (fraizeraust99 at gmail dot com) + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_USAGE "\n\ +Uz: %s [drive:] [-F] [-V] [-R] [-C] \n\n\ +[drive:] Specifică unitatea de stocare pentru control.\n\ +-F Rezolvă erorile discului.\n\ +-V Vizualizează calea tuturor fișierelor de pe disc.\n\ +-R Găsește sectoarele defecte și recuperează informațiile care pot fi citite.\n\ +-C Controlează unitatea de stocare doar dacă este necesar.\n\ +\n" + + IDS_PERCENT_COMPL "%d completat.\r" + IDS_FILE_SYSTEM "Tipul sistemului de fișier este %s.\n" + IDS_ABOUT "\n\ +Chkdskx v1.0.1 de către Mark Russinovich\n\ +Systems Internals - http://www.sysinternals.com\n\ +Adaptarea pentru ReactOS din 1999 de către Emanuele Aliberti\n\n" +END + +STRINGTABLE +BEGIN + IDS_VOLUME_IN_USE "Volumul este în uz și nu poate fi blocat\n" + IDS_CHKDSK_FAIL "Operația programului Chkdsk a eșuat.\n\n" + IDS_NO_ENTRY_POINT "Nu s-au putut găsi punctele de intrare FMIFS.\n\n" + IDS_BAD_ARGUMENT "Argument necunoscut: %s\n" + IDS_NO_CURRENT_DIR "Nu s-a putut găsi directorul respectiv. Cod de eroare: " + IDS_NO_QUERY_VOL "Nu s-a putut interoga volumul. Cod de eroare: " + IDS_VOLUME_IN_USE_PROC "Execuția Chkdsk a eșuat pentru că volumul este folosit de către un alt proces.\n\n" +END

5 years, 11 months

01/01: [MODULES] Add a convenient option to transfer files into a new installation (#877)

by Bernhard Feichtinger

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=76daaf9fafadec0fbf98c… commit 76daaf9fafadec0fbf98c068080cdd15320f4ffb Author: Bernhard Feichtinger <43303168+BieHDC(a)users.noreply.github.com> AuthorDate: Fri Nov 16 23:26:58 2018 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Nov 16 23:26:58 2018 +0100 [MODULES] Add a convenient option to transfer files into a new installation (#877) Purpose: When doing a PXE BootCD installation, you may be left without networking, usb and a cd drive. This adds an easy way to include a few or more files to the installation which are then present on the disk after the installation and which does not require any change to ReactOS source code/build script files (and no manual editing of boot/bootdata/packages/reactos.dff.in). Proposed changes: Adds a new modules/3rdparty folder which lets the files end up in C:\ReactOS\3rdParty ready for use. --- .gitignore | 1 + boot/bootdata/packages/reactos.dff.in | 1 + modules/CMakeLists.txt | 10 ++++++++++ sdk/cmake/CMakeMacros.cmake | 2 ++ 4 files changed, 14 insertions(+) diff --git a/.gitignore b/.gitignore index 9bed1e86be..717e06c033 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ modules/optional modules/bootcd_extras modules/livecd_extras modules/hybridcd_extras +modules/3rdparty .cproject .project .settings diff --git a/boot/bootdata/packages/reactos.dff.in b/boot/bootdata/packages/reactos.dff.in index 9424840238..0b550795d5 100644 --- a/boot/bootdata/packages/reactos.dff.in +++ b/boot/bootdata/packages/reactos.dff.in @@ -81,6 +81,7 @@ Signature = "$Windows NT$" 60 = winsxs\x86_reactos.newapi_6595b64144ccf1df_1.0.0.0_none_deadbeef 61 = winsxs\x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.0.14393.0_none_deadbeef 62 = Resources\Themes\Modern +63 = 3rdParty .InfEnd diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt index 78123b6aed..4c68bfb1e5 100644 --- a/modules/CMakeLists.txt +++ b/modules/CMakeLists.txt @@ -17,6 +17,8 @@ endif() ## Extra files for Boot/Live/Hybrid CD. You need to put them under [boot|live|hybrid]cd_extras ## in the same layout as you want them to be in the CD. +## If you change the content of any of the following folders later on, +## run "cmake ." before compiling. if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/bootcd_extras/) file(GLOB_RECURSE EXTRA_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/bootcd_extras/ ${CMAKE_CURRENT_SOURCE_DIR}/bootcd_extras/*) foreach(item ${EXTRA_FILES}) @@ -35,3 +37,11 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/hybridcd_extras/) add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/hybridcd_extras/${item} DESTINATION extras NO_CAB NAME_ON_CD ${item} FOR hybridcd) endforeach(item) endif() + +## Extra files which you need existing on the hard drive after the installation. +if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/) + file(GLOB_RECURSE EXTRA_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/ ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/*) + foreach(item ${EXTRA_FILES}) + add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/${item} DESTINATION reactos/3rdParty NAME_ON_CD ${item} FOR bootcd) + endforeach(item) +endif() diff --git a/sdk/cmake/CMakeMacros.cmake b/sdk/cmake/CMakeMacros.cmake index f7eba51794..f5d2a0befa 100644 --- a/sdk/cmake/CMakeMacros.cmake +++ b/sdk/cmake/CMakeMacros.cmake @@ -294,6 +294,8 @@ macro(dir_to_num dir var) set(${var} 61) elseif(${dir} STREQUAL reactos/Resources/Themes/Modern) set(${var} 62) + elseif(${dir} STREQUAL reactos/3rdParty) + set(${var} 63) else() message(FATAL_ERROR "Wrong destination: ${dir}") endif()

5 years, 11 months

← Newer
1
...
11
12
13
14
15
16
17
...
25
Older →

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 November 2018