Ros-diffs June 2021

ros-diffs@reactos.org

19 participants
228 discussions

[reactos] 05/13: [WIN32K:NTUSER] Do not pass NULL keyboard layout to IntToUnicodeEx

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=813d9cd2ccac9f2539c8f… commit 813d9cd2ccac9f2539c8fbdec29a0d08c9b7f922 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Jun 18 12:43:53 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Tue Jun 29 11:49:20 2021 +0200 [WIN32K:NTUSER] Do not pass NULL keyboard layout to IntToUnicodeEx There's an ASSERT on that --- win32ss/user/ntuser/keyboard.c | 37 ++++++++++++++++++++++++++++--------- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/win32ss/user/ntuser/keyboard.c b/win32ss/user/ntuser/keyboard.c index 20673f95c7b..b4ff7805b86 100644 --- a/win32ss/user/ntuser/keyboard.c +++ b/win32ss/user/ntuser/keyboard.c @@ -1105,7 +1105,7 @@ UserProcessKeyboardInput( if (wVk & KBDEXT) KbdInput.dwFlags |= KEYEVENTF_EXTENDEDKEY; // - // Based on wine input:test_Input_blackbox this is okay. It seems the + // Based on wine input:test_Input_blackbox this is okay. It seems the // bit did not get set and more research is needed. Now the right // shift works. // @@ -1341,6 +1341,7 @@ NtUserToUnicodeEx( PWCHAR pwszBuff = NULL; INT i, iRet = 0; PKL pKl = NULL; + NTSTATUS Status; TRACE("Enter NtUserSetKeyboardState\n"); @@ -1390,17 +1391,35 @@ NtUserToUnicodeEx( pKl = pti->KeyboardLayout; } - iRet = IntToUnicodeEx(wVirtKey, - wScanCode, - afKeyState, - pwszBuff, - cchBuff, - wFlags, - pKl ? pKl->spkf->pKbdTbl : NULL); + if (pKl) + { + iRet = IntToUnicodeEx(wVirtKey, + wScanCode, + afKeyState, + pwszBuff, + cchBuff, + wFlags, + pKl->spkf->pKbdTbl); + + if (iRet) + { + Status = MmCopyToCaller(pwszBuffUnsafe, pwszBuff, cchBuff * sizeof(WCHAR)); + } + } + else + { + ERR("No keyboard layout ?!\n"); + Status = STATUS_INVALID_HANDLE; + } - MmCopyToCaller(pwszBuffUnsafe, pwszBuff, cchBuff * sizeof(WCHAR)); ExFreePoolWithTag(pwszBuff, TAG_STRING); + if (!NT_SUCCESS(Status)) + { + iRet = 0; + SetLastNtError(Status); + } + UserLeave(); TRACE("Leave NtUserSetKeyboardState, ret=%i\n", iRet); return iRet;

3 years, 5 months

[reactos] 04/13: [KMTESTS] Fix tests for uniprocessor checked build

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8d665f895900f2658c623… commit 8d665f895900f2658c62317f7727da7075f62cdc Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Wed May 26 17:06:11 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Tue Jun 29 11:49:20 2021 +0200 [KMTESTS] Fix tests for uniprocessor checked build --- modules/rostests/kmtests/ntos_ke/KeSpinLock.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/modules/rostests/kmtests/ntos_ke/KeSpinLock.c b/modules/rostests/kmtests/ntos_ke/KeSpinLock.c index d761d8e9a25..9b16648573f 100644 --- a/modules/rostests/kmtests/ntos_ke/KeSpinLock.c +++ b/modules/rostests/kmtests/ntos_ke/KeSpinLock.c @@ -167,12 +167,16 @@ BOOLEAN TryNoRaise(PKSPIN_LOCK SpinLock, PCHECK_DATA CheckData) { { \ PKTHREAD Thread = KeGetCurrentThread(); \ (VOID)Thread; \ - if (KmtIsMultiProcessorBuild) \ + if (KmtIsMultiProcessorBuild || KmtIsCheckedBuild) \ { \ ok_eq_bool(Ret, (Value) == 0); \ if (SpinLock) \ - ok_eq_ulongptr(*(SpinLock), \ - (Value) ? (ULONG_PTR)Thread | 1 : 0); \ + { \ + if (KmtIsCheckedBuild) \ + ok_eq_ulongptr(*(SpinLock), (Value) ? (ULONG_PTR)Thread | 1 : 0); \ + else \ + ok_eq_ulongptr(*(SpinLock), (Value) ? 1 : 0); \ + } \ } \ else \ { \ @@ -192,7 +196,7 @@ BOOLEAN TryNoRaise(PKSPIN_LOCK SpinLock, PCHECK_DATA CheckData) { #define CheckSpinLockQueueHandle(SpinLock, CheckData, Value) do \ { \ - if (KmtIsMultiProcessorBuild) \ + if (KmtIsMultiProcessorBuild || KmtIsCheckedBuild) \ { \ ok_eq_bool(Ret, (Value) == 0); \ if (SpinLock) \

3 years, 5 months

[reactos] 03/13: [NTOS:KE] Implement KeAcquireInStackQueuedSpinLockForDpc & KeReleaseInStackQueuedSpinLockForDpc

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e312a40ae29a3aa9ba86a… commit e312a40ae29a3aa9ba86a3e1122348ff112c1499 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Wed May 26 17:05:15 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Tue Jun 29 11:49:20 2021 +0200 [NTOS:KE] Implement KeAcquireInStackQueuedSpinLockForDpc & KeReleaseInStackQueuedSpinLockForDpc --- ntoskrnl/ke/spinlock.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/ntoskrnl/ke/spinlock.c b/ntoskrnl/ke/spinlock.c index c6e44a21c0c..6648f75e5a9 100644 --- a/ntoskrnl/ke/spinlock.c +++ b/ntoskrnl/ke/spinlock.c @@ -413,25 +413,32 @@ KeReleaseSpinLockForDpc(IN PKSPIN_LOCK SpinLock, } /* - * @unimplemented + * @implemented */ VOID FASTCALL KeAcquireInStackQueuedSpinLockForDpc(IN PKSPIN_LOCK SpinLock, IN PKLOCK_QUEUE_HANDLE LockHandle) { - UNIMPLEMENTED; - return; + LockHandle->OldIrql = KeGetCurrentIrql(); + if (LockHandle->OldIrql >= DISPATCH_LEVEL) + KeAcquireInStackQueuedSpinLockAtDpcLevel(SpinLock, LockHandle); + else + KeAcquireInStackQueuedSpinLock(SpinLock, LockHandle); } /* - * @unimplemented + * @implemented */ VOID FASTCALL KeReleaseInStackQueuedSpinLockForDpc(IN PKLOCK_QUEUE_HANDLE LockHandle) { - UNIMPLEMENTED; + if (LockHandle->OldIrql >= DISPATCH_LEVEL) + KeReleaseInStackQueuedSpinLockFromDpcLevel(LockHandle); + else + KeReleaseInStackQueuedSpinLock(LockHandle); + } /*

3 years, 5 months

[reactos] 02/13: [HAL] Hack KeTryToAcquireQueuedSpinlock & KeTryToAcquireQueuedSpinLockRaiseToSynch into a somewhat working implementation

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=56d0bc31ce6ac76ac3c3f… commit 56d0bc31ce6ac76ac3c3fca4820c3e6d441c5a52 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Wed May 26 17:03:55 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Tue Jun 29 11:49:20 2021 +0200 [HAL] Hack KeTryToAcquireQueuedSpinlock & KeTryToAcquireQueuedSpinLockRaiseToSynch into a somewhat working implementation --- hal/halx86/generic/spinlock.c | 37 +++++++++++-------------------------- 1 file changed, 11 insertions(+), 26 deletions(-) diff --git a/hal/halx86/generic/spinlock.c b/hal/halx86/generic/spinlock.c index 2a2082ca131..4ffce2e665e 100644 --- a/hal/halx86/generic/spinlock.c +++ b/hal/halx86/generic/spinlock.c @@ -172,6 +172,7 @@ KeReleaseInStackQueuedSpinLock(IN PKLOCK_QUEUE_HANDLE LockHandle) KeLowerIrql(LockHandle->OldIrql); } +#ifndef _MINIHAL_ /* * @implemented */ @@ -180,20 +181,12 @@ FASTCALL KeTryToAcquireQueuedSpinLockRaiseToSynch(IN KSPIN_LOCK_QUEUE_NUMBER LockNumber, IN PKIRQL OldIrql) { -#ifdef CONFIG_SMP - ERROR_DBGBREAK("FIXME: Unused\n"); // FIXME: Unused - return FALSE; -#endif + PKSPIN_LOCK Lock = KeGetCurrentPrcb()->LockQueue[LockNumber].Lock; - /* Simply raise to synch */ + /* KM tests demonstrate that this raises IRQL even if locking fails */ KeRaiseIrql(SYNCH_LEVEL, OldIrql); - - /* Add an explicit memory barrier to prevent the compiler from reordering - memory accesses across the borders of spinlocks */ - KeMemoryBarrierWithoutFence(); - - /* Always return true on UP Machines */ - return TRUE; + /* HACK */ + return KeTryToAcquireSpinLockAtDpcLevel(Lock); } /* @@ -204,23 +197,15 @@ FASTCALL KeTryToAcquireQueuedSpinLock(IN KSPIN_LOCK_QUEUE_NUMBER LockNumber, OUT PKIRQL OldIrql) { -#ifdef CONFIG_SMP - ERROR_DBGBREAK("FIXME: Unused\n"); // FIXME: Unused - return FALSE; -#endif + PKSPIN_LOCK Lock = KeGetCurrentPrcb()->LockQueue[LockNumber].Lock; - /* Simply raise to dispatch */ + /* KM tests demonstrate that this raises IRQL even if locking fails */ KeRaiseIrql(DISPATCH_LEVEL, OldIrql); - - /* Add an explicit memory barrier to prevent the compiler from reordering - memory accesses across the borders of spinlocks */ - KeMemoryBarrierWithoutFence(); - - /* Always return true on UP Machines */ - return TRUE; + /* HACK */ + return KeTryToAcquireSpinLockAtDpcLevel(Lock); } - -#endif +#endif /* !defined(_MINIHAL_) */ +#endif /* defined(_M_IX86) */ VOID NTAPI

3 years, 5 months

[reactos] 01/13: [NTOS:MM] Fix another instance of reentrant spinlock acquisition

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=91587a432bc95c4e3a993… commit 91587a432bc95c4e3a99369f7b61eb159590f72f Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Thu May 20 11:48:02 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Tue Jun 29 11:49:20 2021 +0200 [NTOS:MM] Fix another instance of reentrant spinlock acquisition --- ntoskrnl/cache/newcc.h | 13 +++++++++++++ ntoskrnl/cache/section/data.c | 2 +- ntoskrnl/cache/section/swapout.c | 6 +++--- ntoskrnl/mm/freelist.c | 5 ++--- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/ntoskrnl/cache/newcc.h b/ntoskrnl/cache/newcc.h index d71779f42ff..e903c66977e 100644 --- a/ntoskrnl/cache/newcc.h +++ b/ntoskrnl/cache/newcc.h @@ -160,3 +160,16 @@ CcpPinMappedData(IN PNOCC_CACHE_MAP Map, IN ULONG Length, IN ULONG Flags, IN OUT PVOID *Bcb); + +ULONG +MmGetReferenceCountPageWithoutLock(PFN_NUMBER Page) +{ + ULONG Ret; + KIRQL OldIrql = MiAcquirePfnLock(); + + Ret = MmGetReferenceCountPage(Page); + + MiReleasePfnLock(OldIrql); + + return Ret; +} diff --git a/ntoskrnl/cache/section/data.c b/ntoskrnl/cache/section/data.c index fa83080eddb..3b4aafac89f 100644 --- a/ntoskrnl/cache/section/data.c +++ b/ntoskrnl/cache/section/data.c @@ -643,7 +643,7 @@ MiFreeSegmentPage(PMM_SECTION_SEGMENT Segment, OldPage, FileOffset->QuadPart, Segment, - MmGetReferenceCountPage(OldPage), + MmGetReferenceCountPageWithoutLock(OldPage), Entry, IS_DIRTY_SSE(Entry) ? "true" : "false"); diff --git a/ntoskrnl/cache/section/swapout.c b/ntoskrnl/cache/section/swapout.c index 4c6f100f5d8..e2bf8972cbe 100644 --- a/ntoskrnl/cache/section/swapout.c +++ b/ntoskrnl/cache/section/swapout.c @@ -172,11 +172,11 @@ MmFinalizeSectionPageOut(PMM_SECTION_SEGMENT Segment, SWAPENTRY Swap = MmGetSavedSwapEntryPage(Page); /* Bail early if the reference count isn't where we need it */ - if (MmGetReferenceCountPage(Page) != 1) + if (MmGetReferenceCountPageWithoutLock(Page) != 1) { DPRINT1("Cannot page out locked page %x with ref count %lu\n", Page, - MmGetReferenceCountPage(Page)); + MmGetReferenceCountPageWithoutLock(Page)); return STATUS_UNSUCCESSFUL; } @@ -357,7 +357,7 @@ MmpPageOutPhysicalAddress(PFN_NUMBER Page) NTSTATUS Status = STATUS_SUCCESS; MM_REQUIRED_RESOURCES Resources = { 0 }; - DPRINTC("Page out %x (ref ct %x)\n", Page, MmGetReferenceCountPage(Page)); + DPRINTC("Page out %x (ref ct %x)\n", Page, MmGetReferenceCountPageWithoutLock(Page)); ExAcquireFastMutex(&MiGlobalPageOperation); if ((Segment = MmGetSectionAssociation(Page, &FileOffset))) diff --git a/ntoskrnl/mm/freelist.c b/ntoskrnl/mm/freelist.c index fdd5d4b64da..e3b2f30f9fa 100644 --- a/ntoskrnl/mm/freelist.c +++ b/ntoskrnl/mm/freelist.c @@ -537,20 +537,19 @@ ULONG NTAPI MmGetReferenceCountPage(PFN_NUMBER Pfn) { - KIRQL oldIrql; ULONG RCount; PMMPFN Pfn1; + MI_ASSERT_PFN_LOCK_HELD(); + DPRINT("MmGetReferenceCountPage(PhysicalAddress %x)\n", Pfn << PAGE_SHIFT); - oldIrql = MiAcquirePfnLock(); Pfn1 = MiGetPfnEntry(Pfn); ASSERT(Pfn1); ASSERT_IS_ROS_PFN(Pfn1); RCount = Pfn1->u3.e2.ReferenceCount; - MiReleasePfnLock(oldIrql); return(RCount); }

3 years, 5 months

[reactos] 04/04: [CONUTILS:PAGER][MORE] Implement text line caching + fix some bugs.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=31322f5df910f79804c62… commit 31322f5df910f79804c62d7b216415449cd5b4fb Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Jun 28 20:08:38 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Jun 28 21:26:32 2021 +0200 [CONUTILS:PAGER][MORE] Implement text line caching + fix some bugs. - Implement caching of individual (newline-separated) text lines; this behaviour can be enabled with a flag (enabled by MORE): CON_PAGER_CACHE_INCOMPLETE_LINE. This feature is necessary when reading a text file, whose text lines may span across two or more successive temporary read buffers, and is required for correctly determining whether the lines being read are blank and may be squeezed. - When squeezing blank lines, the blank-line check must be done for each line segment corresponding to the screen line (and following) that need to be displayed. This matches the behaviour of MS MORE.COM. - Fix the IsBlankLine() check to not consider FORM-FEEDs as being blank characters: This is necessary for correctly handling FORM-FEED expansion. Also note that MS MORE.COM only checks for spaces and TABs, so we are slightly overdoing these checks (considering other types of whitespace). - Get rid of ConCallPagerLine() and the intermediate CON_PAGER_DONT_OUTPUT state flag that were used repeatedly for each and every small line chunks. Instead, call directly the user-specified 'PagerLine' callback when we are about to start treating the next line segment to be displayed (see comment above). - Fix the exit return condition of ConPagerWorker(): it should return TRUE whenever we displayed all the required lines, and FALSE otherwise. Otherwise, the previous (buggy) condition on the data being read from the text file, may lead to the prompt not showing when a screenful of text has been displayed, if it happened that the current text buffer becomes empty at the same time (even if, overall, the text file hasn't been fully displayed). - In MorePagerLine(), when we encounter for the first time a blank line that will be squeezed with other successive ones, display a single blank line. But for that, just display one space and a newline: this single space is especially needed in order to force line wrapping when the ENABLE_VIRTUAL_TERMINAL_PROCESSING or DISABLE_NEWLINE_AUTO_RETURN console modes are enabled. Otherwise the cursor remains at the previous line (without wrapping), and just outputting one newline will not make it move past 2 lines as one would naively expect. --- base/applications/cmdutils/more/more.c | 67 ++++-- sdk/lib/conutils/pager.c | 387 ++++++++++++++++++++++++++------- sdk/lib/conutils/pager.h | 18 +- 3 files changed, 363 insertions(+), 109 deletions(-) diff --git a/base/applications/cmdutils/more/more.c b/base/applications/cmdutils/more/more.c index 5b868f0b5dc..afe20b9e803 100644 --- a/base/applications/cmdutils/more/more.c +++ b/base/applications/cmdutils/more/more.c @@ -80,6 +80,19 @@ static BOOL IsBlankLine(IN PCWCH line, IN DWORD cch) WORD wType; for (ich = 0; ich < cch; ++ich) { + /* + * Explicitly exclude FORM-FEED from the check, + * so that the pager can handle it. + */ + if (line[ich] == L'\f') + return FALSE; + + /* + * Otherwise do the extended blanks check. + * Note that MS MORE.COM only checks for spaces (\x20) and TABs (\x09). + * See http://archives.miloush.net/michkap/archive/2007/06/11/3230072.html + * for more information. + */ wType = 0; GetStringTypeW(CT_CTYPE1, &line[ich], 1, &wType); if (!(wType & (C1_BLANK | C1_SPACE))) @@ -95,15 +108,12 @@ MorePagerLine( IN PCWCH line, IN DWORD cch) { - DWORD ich; - if (s_dwFlags & FLAG_PLUSn) /* Skip lines */ { if (Pager->lineno < s_nNextLineNo) { - Pager->dwFlags |= CON_PAGER_DONT_OUTPUT; s_bPrevLineIsBlank = FALSE; - return TRUE; /* Don't output */ + return TRUE; /* Handled */ } s_dwFlags &= ~FLAG_PLUSn; } @@ -113,19 +123,26 @@ MorePagerLine( if (IsBlankLine(line, cch)) { if (s_bPrevLineIsBlank) - { - Pager->dwFlags |= CON_PAGER_DONT_OUTPUT; - return TRUE; /* Don't output */ - } + return TRUE; /* Handled */ - for (ich = 0; ich < cch; ++ich) - { - if (line[ich] == L'\n') - { - s_bPrevLineIsBlank = TRUE; - break; - } - } + /* + * Display a single blank line, independently of the actual size + * of the current line, by displaying just one space: this is + * especially needed in order to force line wrapping when the + * ENABLE_VIRTUAL_TERMINAL_PROCESSING or DISABLE_NEWLINE_AUTO_RETURN + * console modes are enabled. + * Then, reposition the cursor to the next line, first column. + */ + if (Pager->PageColumns > 0) + ConStreamWrite(Pager->Screen->Stream, TEXT(" "), 1); + ConStreamWrite(Pager->Screen->Stream, TEXT("\n"), 1); + Pager->iLine++; + Pager->iColumn = 0; + + s_bPrevLineIsBlank = TRUE; + s_nNextLineNo = 0; + + return TRUE; /* Handled */ } else { @@ -134,7 +151,8 @@ MorePagerLine( } s_nNextLineNo = 0; - return FALSE; /* Do output */ + /* Not handled, let the pager do the default action */ + return FALSE; } static BOOL @@ -998,7 +1016,7 @@ int wmain(int argc, WCHAR* argv[]) } Pager.PagerLine = MorePagerLine; - Pager.dwFlags |= CON_PAGER_EXPAND_TABS; + Pager.dwFlags |= CON_PAGER_EXPAND_TABS | CON_PAGER_CACHE_INCOMPLETE_LINE; if (s_dwFlags & FLAG_P) Pager.dwFlags |= CON_PAGER_EXPAND_FF; Pager.nTabWidth = s_nTabWidth; @@ -1023,7 +1041,7 @@ int wmain(int argc, WCHAR* argv[]) Encoding = ENCODING_ANSI; // ENCODING_UTF8; /* Start paging */ - bContinue = ConPutsPaging(&Pager, PagePrompt, TRUE, L""); + bContinue = ConWritePaging(&Pager, PagePrompt, TRUE, NULL, 0); if (!bContinue) goto Quit; @@ -1050,6 +1068,11 @@ int wmain(int argc, WCHAR* argv[]) break; } while (bRet && dwReadBytes > 0); + + /* Flush any cached pager buffers */ + if (bContinue) + bContinue = ConWritePaging(&Pager, PagePrompt, FALSE, NULL, 0); + goto Quit; } @@ -1100,7 +1123,7 @@ int wmain(int argc, WCHAR* argv[]) dwSumReadBytes = dwSumReadChars = 0; /* Start paging */ - bContinue = ConPutsPaging(&Pager, PagePrompt, TRUE, L""); + bContinue = ConWritePaging(&Pager, PagePrompt, TRUE, NULL, 0); if (!bContinue) { /* We stop displaying this file */ @@ -1152,6 +1175,10 @@ int wmain(int argc, WCHAR* argv[]) } while (bRet && dwReadBytes > 0); + /* Flush any cached pager buffers */ + if (bContinue) + bContinue = ConWritePaging(&Pager, PagePrompt, FALSE, NULL, 0); + CloseHandle(hFile); /* Check whether we should stop displaying this file */ diff --git a/sdk/lib/conutils/pager.c b/sdk/lib/conutils/pager.c index 4005e455410..56b0f3e95e3 100644 --- a/sdk/lib/conutils/pager.c +++ b/sdk/lib/conutils/pager.c @@ -57,45 +57,187 @@ GetWidthOfCharCJK( return ret; } -static VOID -ConCallPagerLine( +/** + * @brief Retrieves a new text line, or continue fetching the current one. + * + * @remark Manages setting Pager's CurrentLine, ichCurr, iEndLine, and the + * line cache (CachedLine, cchCachedLine). Other functions must not + * modify these values. + **/ +static BOOL +GetNextLine( IN OUT PCON_PAGER Pager, - IN PCTCH line, - IN DWORD cch) + IN PCTCH TextBuff, + IN SIZE_T cch) { - Pager->dwFlags &= ~CON_PAGER_DONT_OUTPUT; /* Clear the flag */ + SIZE_T ich = Pager->ich; + SIZE_T ichStart; + SIZE_T cchLine; + BOOL bCacheLine; + + Pager->ichCurr = 0; + Pager->iEndLine = 0; + + /* + * If we already had an existing line, then we can safely start a new one + * and getting rid of any current cached line. Otherwise, we don't have + * a current line and we may be caching a new one, in which case, continue + * caching it until it becomes complete. + */ + // INVESTIGATE: Do that only if (ichStart >= iEndLine) ?? + if (Pager->CurrentLine) + { + // ASSERT(Pager->CurrentLine == Pager->CachedLine); + if (Pager->CachedLine) + { + HeapFree(GetProcessHeap(), 0, (PVOID)Pager->CachedLine); + Pager->CachedLine = NULL; + Pager->cchCachedLine = 0; + } + + Pager->CurrentLine = NULL; + } + + /* Nothing else to read if we are past the end of the buffer */ + if (ich >= cch) + { + /* If we have a pending cached line, terminate it now */ + if (Pager->CachedLine) + goto TerminateLine; + + /* Otherwise, bail out */ + return FALSE; + } - if (!Pager->PagerLine || !Pager->PagerLine(Pager, line, cch)) - CON_STREAM_WRITE(Pager->Screen->Stream, line, cch); + /* Start a new line, or continue an existing one */ + ichStart = ich; + + /* Find where this line ends, looking for a NEWLINE character. + * (NOTE: We cannot use strchr because the buffer is not NULL-terminated) */ + for (; ich < cch; ++ich) + { + if (TextBuff[ich] == TEXT('\n')) + { + ++ich; + break; + } + } + Pager->ich = ich; + + cchLine = (ich - ichStart); + + // + // FIXME: Impose a maximum string limit when the line is cached, in order + // not to potentially grow memory indefinitely. When the limit is reached, + // terminate the line. + // + + /* + * If we have stopped because we have exhausted the text buffer + * and we have not found an end-of-line character, this may mean + * that the text line spans across different text buffers. If we + * have been told so, cache this line: we will complete it during + * the next call(s) and only then, display it. + * Otherwise, consider the line to be terminated now. + */ + bCacheLine = ((Pager->dwFlags & CON_PAGER_CACHE_INCOMPLETE_LINE) && + (ich >= cch) && (TextBuff[ich - 1] != TEXT('\n'))); + + /* Allocate, or re-allocate, the cached line buffer */ + if (bCacheLine && !Pager->CachedLine) + { + /* We start caching, allocate the cached line buffer */ + Pager->CachedLine = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + cchLine * sizeof(TCHAR)); + Pager->cchCachedLine = 0; + + if (!Pager->CachedLine) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + } + else if (Pager->CachedLine) + { + /* We continue caching, re-allocate the cached line buffer */ + PVOID ptr = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + (PVOID)Pager->CachedLine, + (Pager->cchCachedLine + cchLine) * sizeof(TCHAR)); + if (!ptr) + { + HeapFree(GetProcessHeap(), 0, (PVOID)Pager->CachedLine); + Pager->CachedLine = NULL; + Pager->cchCachedLine = 0; + + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + Pager->CachedLine = ptr; + } + if (Pager->CachedLine) + { + /* Copy/append the text to the cached line buffer */ + RtlCopyMemory((PVOID)&Pager->CachedLine[Pager->cchCachedLine], + &TextBuff[ichStart], + cchLine * sizeof(TCHAR)); + Pager->cchCachedLine += cchLine; + } + if (bCacheLine) + { + /* The line is currently incomplete, don't proceed further for now */ + return FALSE; + } + +TerminateLine: + /* The line should be complete now. If we have an existing cached line, + * it has been completed by appending the remaining text to it. */ + + /* We are starting a new line */ + Pager->ichCurr = 0; + if (Pager->CachedLine) + { + Pager->iEndLine = Pager->cchCachedLine; + Pager->CurrentLine = Pager->CachedLine; + } + else + { + Pager->iEndLine = cchLine; + Pager->CurrentLine = &TextBuff[ichStart]; + } + + /* Increase only when we have got a NEWLINE */ + if ((Pager->iEndLine > 0) && (Pager->CurrentLine[Pager->iEndLine - 1] == TEXT('\n'))) + Pager->lineno++; + + return TRUE; } +/** + * @brief Does the main paging work: fetching text lines and displaying them. + **/ static BOOL -ConPagerWorker(IN PCON_PAGER Pager) +ConPagerWorker( + IN PCON_PAGER Pager, + IN PCTCH TextBuff, + IN DWORD cch) { const DWORD PageColumns = Pager->PageColumns; const DWORD ScrollRows = Pager->ScrollRows; - const PCTCH Line = Pager->TextBuff; - const DWORD cch = Pager->cch; BOOL bFinitePaging = ((PageColumns > 0) && (Pager->PageRows > 0)); LONG nTabWidth = Pager->nTabWidth; - DWORD ich = Pager->ich; + PCTCH Line; + SIZE_T ich; + SIZE_T ichStart; + SIZE_T iEndLine; DWORD iColumn = Pager->iColumn; - DWORD iLine = Pager->iLine; - DWORD ichStart = ich; - UINT nCodePage; - BOOL IsCJK; + UINT nCodePage = GetConsoleOutputCP(); + BOOL IsCJK = IsCJKCodePage(nCodePage); UINT nWidthOfChar = 1; BOOL IsDoubleWidthCharTrailing = FALSE; - if (ich >= cch) - return FALSE; - - nCodePage = GetConsoleOutputCP(); - IsCJK = IsCJKCodePage(nCodePage); - /* Normalize the tab width: if negative or too large, * cap it to the number of columns. */ if (PageColumns > 0) // if (bFinitePaging) @@ -113,38 +255,88 @@ ConPagerWorker(IN PCON_PAGER Pager) nTabWidth = 8; } - if (Pager->dwFlags & CON_PAGER_EXPAND_TABS) + + /* Continue displaying the previous line, if any, or start a new one */ + Line = Pager->CurrentLine; + ichStart = Pager->ichCurr; + iEndLine = Pager->iEndLine; + +ProcessLine: + + /* Stop now if we have displayed more page lines than requested */ + if (bFinitePaging && (Pager->iLine >= ScrollRows)) + goto End; + + if (!Line || (ichStart >= iEndLine)) + { + /* Start a new line */ + if (!GetNextLine(Pager, TextBuff, cch)) + goto End; + + Line = Pager->CurrentLine; + ichStart = Pager->ichCurr; + iEndLine = Pager->iEndLine; + } + else + { + /* Continue displaying the current line */ + } + + // ASSERT(Line && ((ichStart < iEndLine) || (ichStart == iEndLine && iEndLine == 0))); + + /* Determine whether this line segment (from the current position till the end) should be displayed */ + Pager->iColumn = iColumn; + if (Pager->PagerLine && Pager->PagerLine(Pager, &Line[ichStart], iEndLine - ichStart)) + { + iColumn = Pager->iColumn; + + /* Done with this line; start a new one */ + Pager->nSpacePending = 0; // And reset any pending space. + ichStart = iEndLine; + goto ProcessLine; + } + // else: Continue displaying the line. + + + /* Print out any pending TAB expansion */ + if (Pager->nSpacePending > 0) { ExpandTab: while (Pager->nSpacePending > 0) { - /* Stop now if we have displayed more screen lines than requested */ - if (bFinitePaging && (iLine >= ScrollRows)) - break; - - ConCallPagerLine(Pager, L" ", 1); + /* Print filling spaces */ + CON_STREAM_WRITE(Pager->Screen->Stream, TEXT(" "), 1); --(Pager->nSpacePending); ++iColumn; + + /* Check whether we are going across the column */ if ((PageColumns > 0) && (iColumn % PageColumns == 0)) { - if (!(Pager->dwFlags & CON_PAGER_DONT_OUTPUT)) - ++iLine; + // Pager->nSpacePending = 0; // <-- This is the mode of most text editors... + + /* Reposition the cursor to the next line, first column */ + if (!bFinitePaging || (PageColumns < Pager->Screen->csbi.dwSize.X)) + CON_STREAM_WRITE(Pager->Screen->Stream, TEXT("\n"), 1); + + Pager->iLine++; + + /* Restart at the character */ + // ASSERT(ichStart == ich); + goto ProcessLine; } } } -ProcessLine: - /* Stop now if we have displayed more screen lines than requested */ - if (bFinitePaging && (iLine >= ScrollRows)) - goto End; - /* Loop over each character in the buffer */ - for (; ich < cch; ++ich) + /* Find, within this line segment (starting from its + * beginning), until where we can print to the page. */ + for (ich = ichStart; ich < iEndLine; ++ich) { /* NEWLINE character */ if (Line[ich] == TEXT('\n')) { /* We should stop now */ + // ASSERT(ich == iEndLine - 1); break; } @@ -194,33 +386,34 @@ ProcessLine: } } - /* Output the pending text */ - Pager->dwFlags &= ~CON_PAGER_DONT_OUTPUT; + /* Output the pending line segment */ if (ich - ichStart > 0) - ConCallPagerLine(Pager, &Line[ichStart], ich - ichStart); + CON_STREAM_WRITE(Pager->Screen->Stream, &Line[ichStart], ich - ichStart); - /* Have we finished the buffer? */ - if (ich >= cch) - goto End; + /* Have we finished the line segment? */ + if (ich >= iEndLine) + { + /* Restart at the character */ + ichStart = ich; + goto ProcessLine; + } /* Handle special characters */ /* NEWLINE character */ if (Line[ich] == TEXT('\n')) { - /* Output the newline */ - if (!(Pager->dwFlags & CON_PAGER_DONT_OUTPUT)) - { - // ConCallPagerLine(Pager, L"\n", 1); - CON_STREAM_WRITE(Pager->Screen->Stream, TEXT("\n"), 1); - ++iLine; - } + // ASSERT(ich == iEndLine - 1); + + /* Reposition the cursor to the next line, first column */ + CON_STREAM_WRITE(Pager->Screen->Stream, TEXT("\n"), 1); + + Pager->iLine++; iColumn = 0; /* Done with this line; start a new one */ Pager->nSpacePending = 0; // And reset any pending space. - Pager->lineno++; - ichStart = ++ich; + ichStart = iEndLine; goto ProcessLine; } @@ -245,28 +438,38 @@ ProcessLine: if (Line[ich] == TEXT('\f') && (Pager->dwFlags & CON_PAGER_EXPAND_FF)) { - // FIXME: Should we handle CON_PAGER_DONT_OUTPUT ? if (bFinitePaging) { - /* Clear until the end of the screen */ - while (iLine < ScrollRows) + /* Clear until the end of the page */ + while (Pager->iLine < ScrollRows) { - ConCallPagerLine(Pager, L"\n", 1); - // CON_STREAM_WRITE(Pager->Screen->Stream, TEXT("\n"), 1); - // if (!(Pager->dwFlags & CON_PAGER_DONT_OUTPUT)) - ++iLine; + /* Call the user paging function in order to know + * whether we need to output the blank lines. */ + Pager->iColumn = iColumn; + if (Pager->PagerLine && Pager->PagerLine(Pager, TEXT("\n"), 1)) + { + /* Only one blank line displayed, that counts in the line count */ + Pager->iLine++; + break; + } + else + { + CON_STREAM_WRITE(Pager->Screen->Stream, TEXT("\n"), 1); + Pager->iLine++; + } } } else { - /* Just output a FORM-FEED character */ - ConCallPagerLine(Pager, L"\f", 1); - // CON_STREAM_WRITE(Pager->Screen->Stream, L"\f", 1); + /* Just output a FORM-FEED and a NEWLINE */ + CON_STREAM_WRITE(Pager->Screen->Stream, TEXT("\f\n"), 2); + Pager->iLine++; } iColumn = 0; Pager->nSpacePending = 0; // And reset any pending space. + /* Skip and restart past the character */ ichStart = ++ich; goto ProcessLine; } @@ -276,19 +479,18 @@ ProcessLine: if (IsDoubleWidthCharTrailing) { IsDoubleWidthCharTrailing = FALSE; // Reset the flag. - - if (!(Pager->dwFlags & CON_PAGER_DONT_OUTPUT)) - CON_STREAM_WRITE(Pager->Screen->Stream, TEXT(" "), 1); - // ++iLine; - + CON_STREAM_WRITE(Pager->Screen->Stream, TEXT(" "), 1); /* Fall back below */ } /* Are we wrapping the line? */ if ((PageColumns > 0) && (iColumn % PageColumns == 0)) { - if (!(Pager->dwFlags & CON_PAGER_DONT_OUTPUT)) - ++iLine; + /* Reposition the cursor to the next line, first column */ + if (!bFinitePaging || (PageColumns < Pager->Screen->csbi.dwSize.X)) + CON_STREAM_WRITE(Pager->Screen->Stream, TEXT("\n"), 1); + + Pager->iLine++; } /* Restart at the character */ @@ -297,14 +499,25 @@ ProcessLine: End: - if (iLine >= ScrollRows) - iLine = 0; /* Reset the count of lines being printed */ + /* + * We are exiting, either because we displayed all the required lines + * (iLine >= ScrollRows), or, because we don't have more data to display. + */ - Pager->ich = ich; + Pager->ichCurr = ichStart; Pager->iColumn = iColumn; - Pager->iLine = iLine; + // INVESTIGATE: Can we get rid of CurrentLine here? // if (ichStart >= iEndLine) ... - return (ich < cch); + /* Return TRUE if we displayed all the required lines; FALSE otherwise */ + if (bFinitePaging && (Pager->iLine >= ScrollRows)) + { + Pager->iLine = 0; /* Reset the count of lines being printed */ + return TRUE; + } + else + { + return FALSE; + } } @@ -374,25 +587,34 @@ ConWritePaging( /* File output, or single line: all lines are displayed at once; reset to a default value */ Pager->ScrollRows = 0; } - } - if (StartPaging) - { + /* Reset the internal data buffer */ + Pager->CachedLine = NULL; + Pager->cchCachedLine = 0; + /* Reset the paging state */ + Pager->CurrentLine = NULL; + Pager->ichCurr = 0; + Pager->iEndLine = 0; Pager->nSpacePending = 0; Pager->iColumn = 0; Pager->iLine = 0; - Pager->lineno = 1; + Pager->lineno = 0; } - Pager->TextBuff = szStr; - Pager->cch = len; + /* Reset the reading index in the user-provided source buffer */ Pager->ich = 0; - if (len == 0 || szStr == NULL) - return TRUE; + /* Run the pager even when the user-provided source buffer is + * empty, in case we need to flush any remaining cached line. */ + if (!Pager->CachedLine) + { + /* No cached line, bail out now */ + if (len == 0 || szStr == NULL) + return TRUE; + } - while (ConPagerWorker(Pager)) + while (ConPagerWorker(Pager, szStr, len)) { /* Prompt the user only when we display to a console and the screen * is not too small: at least one line for the actual paged text and @@ -403,7 +625,8 @@ ConWritePaging( Pager->ScrollRows = Pager->PageRows - 1; /* Prompt the user; give him some values for statistics */ - if (!PagePrompt(Pager, Pager->ich, Pager->cch)) + // FIXME: Doesn't reflect what's currently being displayed. + if (!PagePrompt(Pager, Pager->ich, len)) return FALSE; } diff --git a/sdk/lib/conutils/pager.h b/sdk/lib/conutils/pager.h index 8d38f07881f..1ddc5606970 100644 --- a/sdk/lib/conutils/pager.h +++ b/sdk/lib/conutils/pager.h @@ -37,9 +37,10 @@ typedef BOOL IN DWORD cch); /* Flags for CON_PAGER */ -#define CON_PAGER_DONT_OUTPUT (1 << 0) -#define CON_PAGER_EXPAND_TABS (1 << 1) -#define CON_PAGER_EXPAND_FF (1 << 2) +#define CON_PAGER_EXPAND_TABS (1 << 0) +#define CON_PAGER_EXPAND_FF (1 << 1) +// Whether or not the pager will cache the line if it's incomplete (not NEWLINE-terminated). +#define CON_PAGER_CACHE_INCOMPLETE_LINE (1 << 2) typedef struct _CON_PAGER { @@ -55,12 +56,15 @@ typedef struct _CON_PAGER DWORD ScrollRows; /* Data buffer */ - PCTCH TextBuff; /* The text buffer */ - DWORD cch; /* The total number of characters */ + PCTCH CachedLine; /* Cached line, HeapAlloc'ated */ + SIZE_T cchCachedLine; /* Its length (number of characters) */ + SIZE_T ich; /* The current index of character in TextBuff (a user-provided source buffer) */ /* Paging state */ - DWORD ich; /* The current index of character */ - DWORD nSpacePending; /* Pending spaces for TAB expansion */ + PCTCH CurrentLine; /* Pointer to the current line (either within a user-provided source buffer, or to CachedLine) */ + SIZE_T ichCurr; /* The current index of character in CurrentLine */ + SIZE_T iEndLine; /* End (length) of CurrentLine */ + DWORD nSpacePending; /* Pending spaces for TAB expansion */ DWORD iColumn; /* The current index of column */ DWORD iLine; /* The physical output line count of screen */ DWORD lineno; /* The logical line number */

3 years, 5 months

[reactos] 03/04: [CONUTILS:PAGER] Extract the character-specific handling out of the character-loop.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aff90f530cbbbabbc6c1e… commit aff90f530cbbbabbc6c1e54a04b38e4bfb631c2b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Jun 28 00:49:48 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Jun 28 21:26:32 2021 +0200 [CONUTILS:PAGER] Extract the character-specific handling out of the character-loop. This also allows to factor out the ConCallPagerLine() call for outputting the pending text. --- sdk/lib/conutils/pager.c | 224 ++++++++++++++++++++++++++++------------------- 1 file changed, 132 insertions(+), 92 deletions(-) diff --git a/sdk/lib/conutils/pager.c b/sdk/lib/conutils/pager.c index db7e17eb883..4005e455410 100644 --- a/sdk/lib/conutils/pager.c +++ b/sdk/lib/conutils/pager.c @@ -74,7 +74,7 @@ ConPagerWorker(IN PCON_PAGER Pager) { const DWORD PageColumns = Pager->PageColumns; const DWORD ScrollRows = Pager->ScrollRows; - const PCTCH TextBuff = Pager->TextBuff; + const PCTCH Line = Pager->TextBuff; const DWORD cch = Pager->cch; BOOL bFinitePaging = ((PageColumns > 0) && (Pager->PageRows > 0)); @@ -83,9 +83,8 @@ ConPagerWorker(IN PCON_PAGER Pager) DWORD ich = Pager->ich; DWORD iColumn = Pager->iColumn; DWORD iLine = Pager->iLine; - DWORD lineno = Pager->lineno; - DWORD ichStart = ich; + UINT nCodePage; BOOL IsCJK; UINT nWidthOfChar = 1; @@ -134,135 +133,176 @@ ExpandTab: } } +ProcessLine: + /* Stop now if we have displayed more screen lines than requested */ + if (bFinitePaging && (iLine >= ScrollRows)) + goto End; + /* Loop over each character in the buffer */ for (; ich < cch; ++ich) { - /* Stop now if we have displayed more screen lines than requested */ - if (bFinitePaging && (iLine >= ScrollRows)) - break; - - Pager->lineno = lineno; - /* NEWLINE character */ - if (TextBuff[ich] == TEXT('\n')) + if (Line[ich] == TEXT('\n')) { - /* Output the pending text, including the newline */ - ConCallPagerLine(Pager, &TextBuff[ichStart], ich - ichStart + 1); - ichStart = ich + 1; - if (!(Pager->dwFlags & CON_PAGER_DONT_OUTPUT)) - ++iLine; - iColumn = 0; - - /* Done with this line; start a new one */ - ++lineno; - continue; + /* We should stop now */ + break; } /* TAB character */ - if (TextBuff[ich] == TEXT('\t') && + if (Line[ich] == TEXT('\t') && (Pager->dwFlags & CON_PAGER_EXPAND_TABS)) { - /* Output the pending text */ - ConCallPagerLine(Pager, &TextBuff[ichStart], ich - ichStart); - - /* Perform tab expansion, unless the tab width is zero */ - if (nTabWidth == 0) - { - ichStart = ich + 1; - continue; - } - ichStart = ++ich; - Pager->nSpacePending += nTabWidth - (iColumn % nTabWidth); - goto ExpandTab; + /* We should stop now */ + break; } /* FORM-FEED character */ - if (TextBuff[ich] == TEXT('\f') && + if (Line[ich] == TEXT('\f') && (Pager->dwFlags & CON_PAGER_EXPAND_FF)) { - /* Output the pending text, skipping the form-feed */ - ConCallPagerLine(Pager, &TextBuff[ichStart], ich - ichStart); - ichStart = ich + 1; - // FIXME: Should we handle CON_PAGER_DONT_OUTPUT ? - - if (bFinitePaging) - { - /* Clear until the end of the screen */ - while (iLine < ScrollRows) - { - ConCallPagerLine(Pager, L"\n", 1); - // CON_STREAM_WRITE(Pager->Screen->Stream, TEXT("\n"), 1); - // if (!(Pager->dwFlags & CON_PAGER_DONT_OUTPUT)) - ++iLine; - } - } - else - { - /* Just output a FORM-FEED character */ - ConCallPagerLine(Pager, L"\f", 1); - // CON_STREAM_WRITE(Pager->Screen->Stream, L"\f", 1); - } - - iColumn = 0; - continue; + /* We should stop now */ + break; } /* Other character - Handle double-width for CJK */ if (IsCJK) - { - nWidthOfChar = GetWidthOfCharCJK(nCodePage, TextBuff[ich]); - if (PageColumns > 0) - { - IsDoubleWidthCharTrailing = (nWidthOfChar == 2) && - ((iColumn + 1) % PageColumns == 0); - } - } + nWidthOfChar = GetWidthOfCharCJK(nCodePage, Line[ich]); /* Care about CJK character presentation only when outputting * to a device where the number of columns is known. */ - if (PageColumns > 0) + if ((PageColumns > 0) && IsCJK) { - if ((iColumn + nWidthOfChar) % PageColumns == 0) - { - /* Output the pending text, including the last double-width character */ - ConCallPagerLine(Pager, &TextBuff[ichStart], ich - ichStart + 1); - ichStart = ich + 1; - if (!(Pager->dwFlags & CON_PAGER_DONT_OUTPUT)) - ++iLine; - iColumn += nWidthOfChar; - continue; - } - + IsDoubleWidthCharTrailing = (nWidthOfChar == 2) && + ((iColumn + 1) % PageColumns == 0); if (IsDoubleWidthCharTrailing) { - /* Output the pending text, excluding the last double-width character */ - ConCallPagerLine(Pager, &TextBuff[ichStart], ich - ichStart); - ichStart = ich; - if (!(Pager->dwFlags & CON_PAGER_DONT_OUTPUT)) - CON_STREAM_WRITE(Pager->Screen->Stream, TEXT(" "), 1); - --ich; - if (!(Pager->dwFlags & CON_PAGER_DONT_OUTPUT)) - ++iLine; - ++iColumn; - continue; + /* Reserve this character for the next line */ + ++iColumn; // Count a blank instead. + /* We should stop now */ + break; } } iColumn += nWidthOfChar; + + /* Check whether we are going across the column */ + if ((PageColumns > 0) && (iColumn % PageColumns == 0)) + { + ++ich; + break; + } } - /* Output the remaining text */ + /* Output the pending text */ + Pager->dwFlags &= ~CON_PAGER_DONT_OUTPUT; if (ich - ichStart > 0) - ConCallPagerLine(Pager, &TextBuff[ichStart], ich - ichStart); + ConCallPagerLine(Pager, &Line[ichStart], ich - ichStart); + + /* Have we finished the buffer? */ + if (ich >= cch) + goto End; + + /* Handle special characters */ + + /* NEWLINE character */ + if (Line[ich] == TEXT('\n')) + { + /* Output the newline */ + if (!(Pager->dwFlags & CON_PAGER_DONT_OUTPUT)) + { + // ConCallPagerLine(Pager, L"\n", 1); + CON_STREAM_WRITE(Pager->Screen->Stream, TEXT("\n"), 1); + ++iLine; + } + iColumn = 0; + + /* Done with this line; start a new one */ + Pager->nSpacePending = 0; // And reset any pending space. + Pager->lineno++; + ichStart = ++ich; + goto ProcessLine; + } + + /* TAB character */ + if (Line[ich] == TEXT('\t') && + (Pager->dwFlags & CON_PAGER_EXPAND_TABS)) + { + /* Perform TAB expansion, unless the tab width is zero */ + if (nTabWidth == 0) + { + ichStart = ++ich; + goto ProcessLine; + } + + ichStart = ++ich; + /* Reset the number of spaces needed to develop this TAB character */ + Pager->nSpacePending = nTabWidth - (iColumn % nTabWidth); + goto ExpandTab; + } + + /* FORM-FEED character */ + if (Line[ich] == TEXT('\f') && + (Pager->dwFlags & CON_PAGER_EXPAND_FF)) + { + // FIXME: Should we handle CON_PAGER_DONT_OUTPUT ? + if (bFinitePaging) + { + /* Clear until the end of the screen */ + while (iLine < ScrollRows) + { + ConCallPagerLine(Pager, L"\n", 1); + // CON_STREAM_WRITE(Pager->Screen->Stream, TEXT("\n"), 1); + // if (!(Pager->dwFlags & CON_PAGER_DONT_OUTPUT)) + ++iLine; + } + } + else + { + /* Just output a FORM-FEED character */ + ConCallPagerLine(Pager, L"\f", 1); + // CON_STREAM_WRITE(Pager->Screen->Stream, L"\f", 1); + } + + iColumn = 0; + Pager->nSpacePending = 0; // And reset any pending space. + + ichStart = ++ich; + goto ProcessLine; + } + + /* If we output a double-width character that goes across the column, + * fill with blank and display the character on the next line. */ + if (IsDoubleWidthCharTrailing) + { + IsDoubleWidthCharTrailing = FALSE; // Reset the flag. + + if (!(Pager->dwFlags & CON_PAGER_DONT_OUTPUT)) + CON_STREAM_WRITE(Pager->Screen->Stream, TEXT(" "), 1); + // ++iLine; + + /* Fall back below */ + } + + /* Are we wrapping the line? */ + if ((PageColumns > 0) && (iColumn % PageColumns == 0)) + { + if (!(Pager->dwFlags & CON_PAGER_DONT_OUTPUT)) + ++iLine; + } + + /* Restart at the character */ + ichStart = ich; + goto ProcessLine; + +End: if (iLine >= ScrollRows) iLine = 0; /* Reset the count of lines being printed */ Pager->ich = ich; Pager->iColumn = iColumn; Pager->iLine = iLine; - Pager->lineno = lineno; return (ich < cch); }

3 years, 5 months

[reactos] 02/04: [CONUTILS:PAGER][MORE] Fix the default paging region.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ff445ca184abf213083a4… commit ff445ca184abf213083a45b2ae49ffa662d8c028 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jun 27 15:58:25 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Jun 28 21:26:31 2021 +0200 [CONUTILS:PAGER][MORE] Fix the default paging region. - The column extent should cover the whole width of the console screenbuffer. On the contrary, the line extent covers only the number of lines that cover the current displayed console window. - Since the console can be resized while the pager is prompting, we need to actually recalculate in the prompt routine the default number of lines for a screen. - Reset s_nNextLineNo when paging a new file. --- base/applications/cmdutils/more/more.c | 17 +++++++++++++++++ sdk/lib/conutils/pager.c | 8 ++++---- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/base/applications/cmdutils/more/more.c b/base/applications/cmdutils/more/more.c index f9179138ee1..5b868f0b5dc 100644 --- a/base/applications/cmdutils/more/more.c +++ b/base/applications/cmdutils/more/more.c @@ -172,6 +172,14 @@ PagePrompt(PCON_PAGER Pager, DWORD Done, DWORD Total) if (!*StrLines) K32LoadStringW(NULL, IDS_CONTINUE_LINES, StrLines, ARRAYSIZE(StrLines)); + /* + * Check whether the pager is prompting, but we have actually finished + * to display a given file, or no data is present in STDIN anymore. + * In this case, skip the prompt altogether. The only exception is when + * we are displaying other files. + */ + // TODO: Implement! + Restart: nLines = 0; @@ -323,6 +331,11 @@ Restart: dwMode |= ENABLE_PROCESSED_INPUT; SetConsoleMode(hInput, dwMode); + /* Refresh the screen information, as the console may have been + * redimensioned. Update also the default number of lines to scroll. */ + ConGetScreenInfo(Pager->Screen, &csbi); + Pager->ScrollRows = csbi.srWindow.Bottom - csbi.srWindow.Top; + /* * Erase the full line where the cursor is, and move * the cursor back to the beginning of the line. @@ -357,6 +370,7 @@ Restart: { s_dwFlags |= FLAG_PLUSn; s_nNextLineNo = Pager->lineno + nLines; + /* Use the default Pager->ScrollRows value */ return TRUE; } default: @@ -412,6 +426,7 @@ Restart: /* Clear the screen */ ConClearScreen(Pager->Screen); } + /* Use the default Pager->ScrollRows value */ return TRUE; } @@ -444,6 +459,7 @@ Restart: else { /* Extended features are unavailable: display one page */ + /* Use the default Pager->ScrollRows value */ return TRUE; } } @@ -1075,6 +1091,7 @@ int wmain(int argc, WCHAR* argv[]) SetFilePointer(hFile, SkipBytes, NULL, FILE_BEGIN); /* Reset state for paging */ + s_nNextLineNo = 0; s_bPrevLineIsBlank = FALSE; s_fPrompt = PROMPT_PERCENT; s_bDoNextFile = FALSE; diff --git a/sdk/lib/conutils/pager.c b/sdk/lib/conutils/pager.c index ced3bd4e0cb..db7e17eb883 100644 --- a/sdk/lib/conutils/pager.c +++ b/sdk/lib/conutils/pager.c @@ -312,7 +312,7 @@ ConWritePaging( if (bIsConsole) { /* Calculate the console screen extent */ - Pager->PageColumns = csbi.srWindow.Right - csbi.srWindow.Left + 1; + Pager->PageColumns = csbi.dwSize.X; Pager->PageRows = csbi.srWindow.Bottom - csbi.srWindow.Top + 1; } else @@ -324,14 +324,14 @@ ConWritePaging( if (StartPaging) { - if (bIsConsole) + if (bIsConsole && (Pager->PageRows >= 2)) { /* Reset to display one page by default */ Pager->ScrollRows = Pager->PageRows - 1; } else { - /* File output: all lines are displayed at once; reset to a default value */ + /* File output, or single line: all lines are displayed at once; reset to a default value */ Pager->ScrollRows = 0; } } @@ -371,7 +371,7 @@ ConWritePaging( * in case the user has redimensioned it during the prompt. */ if (bIsConsole && ConGetScreenInfo(Pager->Screen, &csbi)) { - Pager->PageColumns = csbi.srWindow.Right - csbi.srWindow.Left + 1; + Pager->PageColumns = csbi.dwSize.X; Pager->PageRows = csbi.srWindow.Bottom - csbi.srWindow.Top + 1; } }

3 years, 5 months

[reactos] 01/04: [CONUTILS:PAGER][MORE] Code style/formatting.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f74a3f6e29608a43869b2… commit f74a3f6e29608a43869b299321285636d4df816f Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jun 27 02:23:12 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Jun 28 21:26:30 2021 +0200 [CONUTILS:PAGER][MORE] Code style/formatting. - Shorten the names of the flags: CON_PAGER_FLAG_*** --> CON_PAGER_***. - Reorder few members in the CON_PAGER pager structure where they make sense. - ScreenColumns, ScreenRows --> PageColumns, PageRows: keeping the open possibility for having a pager controlling a region of different size than the screen. - Add doxygen documentation for ConWritePaging(). --- base/applications/cmdutils/more/more.c | 11 ++-- sdk/lib/conutils/pager.c | 92 +++++++++++++++++++++------------- sdk/lib/conutils/pager.h | 21 ++++---- 3 files changed, 76 insertions(+), 48 deletions(-) diff --git a/base/applications/cmdutils/more/more.c b/base/applications/cmdutils/more/more.c index 16c07d2417a..f9179138ee1 100644 --- a/base/applications/cmdutils/more/more.c +++ b/base/applications/cmdutils/more/more.c @@ -88,7 +88,8 @@ static BOOL IsBlankLine(IN PCWCH line, IN DWORD cch) return TRUE; } -static BOOL __stdcall +static BOOL +__stdcall MorePagerLine( IN OUT PCON_PAGER Pager, IN PCWCH line, @@ -100,7 +101,7 @@ MorePagerLine( { if (Pager->lineno < s_nNextLineNo) { - Pager->dwFlags |= CON_PAGER_FLAG_DONT_OUTPUT; + Pager->dwFlags |= CON_PAGER_DONT_OUTPUT; s_bPrevLineIsBlank = FALSE; return TRUE; /* Don't output */ } @@ -113,7 +114,7 @@ MorePagerLine( { if (s_bPrevLineIsBlank) { - Pager->dwFlags |= CON_PAGER_FLAG_DONT_OUTPUT; + Pager->dwFlags |= CON_PAGER_DONT_OUTPUT; return TRUE; /* Don't output */ } @@ -981,9 +982,9 @@ int wmain(int argc, WCHAR* argv[]) } Pager.PagerLine = MorePagerLine; - Pager.dwFlags |= CON_PAGER_FLAG_EXPAND_TABS; + Pager.dwFlags |= CON_PAGER_EXPAND_TABS; if (s_dwFlags & FLAG_P) - Pager.dwFlags |= CON_PAGER_FLAG_EXPAND_FF; + Pager.dwFlags |= CON_PAGER_EXPAND_FF; Pager.nTabWidth = s_nTabWidth; /* Special case where we run 'MORE' without any argument: we use STDIN */ diff --git a/sdk/lib/conutils/pager.c b/sdk/lib/conutils/pager.c index 24d0849f546..ced3bd4e0cb 100644 --- a/sdk/lib/conutils/pager.c +++ b/sdk/lib/conutils/pager.c @@ -63,7 +63,7 @@ ConCallPagerLine( IN PCTCH line, IN DWORD cch) { - Pager->dwFlags &= ~CON_PAGER_FLAG_DONT_OUTPUT; /* Clear the flag */ + Pager->dwFlags &= ~CON_PAGER_DONT_OUTPUT; /* Clear the flag */ if (!Pager->PagerLine || !Pager->PagerLine(Pager, line, cch)) CON_STREAM_WRITE(Pager->Screen->Stream, line, cch); @@ -72,12 +72,12 @@ ConCallPagerLine( static BOOL ConPagerWorker(IN PCON_PAGER Pager) { - const DWORD ScreenColumns = Pager->ScreenColumns; + const DWORD PageColumns = Pager->PageColumns; const DWORD ScrollRows = Pager->ScrollRows; const PCTCH TextBuff = Pager->TextBuff; const DWORD cch = Pager->cch; - BOOL bFinitePaging = ((ScreenColumns > 0) && (Pager->ScreenRows > 0)); + BOOL bFinitePaging = ((PageColumns > 0) && (Pager->PageRows > 0)); LONG nTabWidth = Pager->nTabWidth; DWORD ich = Pager->ich; @@ -99,12 +99,12 @@ ConPagerWorker(IN PCON_PAGER Pager) /* Normalize the tab width: if negative or too large, * cap it to the number of columns. */ - if (ScreenColumns > 0) // if (bFinitePaging) + if (PageColumns > 0) // if (bFinitePaging) { if (nTabWidth < 0) - nTabWidth = ScreenColumns - 1; + nTabWidth = PageColumns - 1; else - nTabWidth = min(nTabWidth, ScreenColumns - 1); + nTabWidth = min(nTabWidth, PageColumns - 1); } else { @@ -114,7 +114,7 @@ ConPagerWorker(IN PCON_PAGER Pager) nTabWidth = 8; } - if (Pager->dwFlags & CON_PAGER_FLAG_EXPAND_TABS) + if (Pager->dwFlags & CON_PAGER_EXPAND_TABS) { ExpandTab: while (Pager->nSpacePending > 0) @@ -126,9 +126,9 @@ ExpandTab: ConCallPagerLine(Pager, L" ", 1); --(Pager->nSpacePending); ++iColumn; - if ((ScreenColumns > 0) && (iColumn % ScreenColumns == 0)) + if ((PageColumns > 0) && (iColumn % PageColumns == 0)) { - if (!(Pager->dwFlags & CON_PAGER_FLAG_DONT_OUTPUT)) + if (!(Pager->dwFlags & CON_PAGER_DONT_OUTPUT)) ++iLine; } } @@ -149,7 +149,7 @@ ExpandTab: /* Output the pending text, including the newline */ ConCallPagerLine(Pager, &TextBuff[ichStart], ich - ichStart + 1); ichStart = ich + 1; - if (!(Pager->dwFlags & CON_PAGER_FLAG_DONT_OUTPUT)) + if (!(Pager->dwFlags & CON_PAGER_DONT_OUTPUT)) ++iLine; iColumn = 0; @@ -160,7 +160,7 @@ ExpandTab: /* TAB character */ if (TextBuff[ich] == TEXT('\t') && - (Pager->dwFlags & CON_PAGER_FLAG_EXPAND_TABS)) + (Pager->dwFlags & CON_PAGER_EXPAND_TABS)) { /* Output the pending text */ ConCallPagerLine(Pager, &TextBuff[ichStart], ich - ichStart); @@ -178,12 +178,12 @@ ExpandTab: /* FORM-FEED character */ if (TextBuff[ich] == TEXT('\f') && - (Pager->dwFlags & CON_PAGER_FLAG_EXPAND_FF)) + (Pager->dwFlags & CON_PAGER_EXPAND_FF)) { /* Output the pending text, skipping the form-feed */ ConCallPagerLine(Pager, &TextBuff[ichStart], ich - ichStart); ichStart = ich + 1; - // FIXME: Should we handle CON_PAGER_FLAG_DONT_OUTPUT ? + // FIXME: Should we handle CON_PAGER_DONT_OUTPUT ? if (bFinitePaging) { @@ -192,7 +192,7 @@ ExpandTab: { ConCallPagerLine(Pager, L"\n", 1); // CON_STREAM_WRITE(Pager->Screen->Stream, TEXT("\n"), 1); - // if (!(Pager->dwFlags & CON_PAGER_FLAG_DONT_OUTPUT)) + // if (!(Pager->dwFlags & CON_PAGER_DONT_OUTPUT)) ++iLine; } } @@ -212,23 +212,23 @@ ExpandTab: if (IsCJK) { nWidthOfChar = GetWidthOfCharCJK(nCodePage, TextBuff[ich]); - if (ScreenColumns > 0) + if (PageColumns > 0) { IsDoubleWidthCharTrailing = (nWidthOfChar == 2) && - ((iColumn + 1) % ScreenColumns == 0); + ((iColumn + 1) % PageColumns == 0); } } /* Care about CJK character presentation only when outputting * to a device where the number of columns is known. */ - if (ScreenColumns > 0) + if (PageColumns > 0) { - if ((iColumn + nWidthOfChar) % ScreenColumns == 0) + if ((iColumn + nWidthOfChar) % PageColumns == 0) { /* Output the pending text, including the last double-width character */ ConCallPagerLine(Pager, &TextBuff[ichStart], ich - ichStart + 1); ichStart = ich + 1; - if (!(Pager->dwFlags & CON_PAGER_FLAG_DONT_OUTPUT)) + if (!(Pager->dwFlags & CON_PAGER_DONT_OUTPUT)) ++iLine; iColumn += nWidthOfChar; continue; @@ -239,10 +239,10 @@ ExpandTab: /* Output the pending text, excluding the last double-width character */ ConCallPagerLine(Pager, &TextBuff[ichStart], ich - ichStart); ichStart = ich; - if (!(Pager->dwFlags & CON_PAGER_FLAG_DONT_OUTPUT)) + if (!(Pager->dwFlags & CON_PAGER_DONT_OUTPUT)) CON_STREAM_WRITE(Pager->Screen->Stream, TEXT(" "), 1); --ich; - if (!(Pager->dwFlags & CON_PAGER_FLAG_DONT_OUTPUT)) + if (!(Pager->dwFlags & CON_PAGER_DONT_OUTPUT)) ++iLine; ++iColumn; continue; @@ -267,7 +267,31 @@ ExpandTab: return (ich < cch); } -/* Returns TRUE when all the text is displayed, and FALSE if display is stopped */ + +/** + * @name ConWritePaging + * Pages the contents of a user-specified character buffer on the screen. + * + * @param[in] Pager + * Pager object that describes where the paged output is issued. + * + * @param[in] PagePrompt + * A user-specific callback, called when a page has been displayed. + * + * @param[in] StartPaging + * Set to TRUE for initializing the paging operation; FALSE during paging. + * + * @param[in] szStr + * Pointer to the character buffer whose contents are to be paged. + * + * @param[in] len + * Length of the character buffer pointed by @p szStr, specified + * in number of characters. + * + * @return + * TRUE when all the contents of the character buffer has been displayed; + * FALSE if the paging operation has been stopped (controlled via @p PagePrompt). + **/ BOOL ConWritePaging( IN PCON_PAGER Pager, @@ -288,14 +312,14 @@ ConWritePaging( if (bIsConsole) { /* Calculate the console screen extent */ - Pager->ScreenColumns = csbi.srWindow.Right - csbi.srWindow.Left + 1; - Pager->ScreenRows = csbi.srWindow.Bottom - csbi.srWindow.Top + 1; + Pager->PageColumns = csbi.srWindow.Right - csbi.srWindow.Left + 1; + Pager->PageRows = csbi.srWindow.Bottom - csbi.srWindow.Top + 1; } else { /* We assume it's a file handle */ - Pager->ScreenColumns = 0; - Pager->ScreenRows = 0; + Pager->PageColumns = 0; + Pager->PageRows = 0; } if (StartPaging) @@ -303,7 +327,7 @@ ConWritePaging( if (bIsConsole) { /* Reset to display one page by default */ - Pager->ScrollRows = Pager->ScreenRows - 1; + Pager->ScrollRows = Pager->PageRows - 1; } else { @@ -314,11 +338,11 @@ ConWritePaging( if (StartPaging) { - /* Reset the output line count, the column index and the line number */ - Pager->iLine = 0; + /* Reset the paging state */ + Pager->nSpacePending = 0; Pager->iColumn = 0; + Pager->iLine = 0; Pager->lineno = 1; - Pager->nSpacePending = 0; } Pager->TextBuff = szStr; @@ -333,10 +357,10 @@ ConWritePaging( /* Prompt the user only when we display to a console and the screen * is not too small: at least one line for the actual paged text and * one line for the prompt. */ - if (bIsConsole && (Pager->ScreenRows >= 2)) + if (bIsConsole && (Pager->PageRows >= 2)) { /* Reset to display one page by default */ - Pager->ScrollRows = Pager->ScreenRows - 1; + Pager->ScrollRows = Pager->PageRows - 1; /* Prompt the user; give him some values for statistics */ if (!PagePrompt(Pager, Pager->ich, Pager->cch)) @@ -347,8 +371,8 @@ ConWritePaging( * in case the user has redimensioned it during the prompt. */ if (bIsConsole && ConGetScreenInfo(Pager->Screen, &csbi)) { - Pager->ScreenColumns = csbi.srWindow.Right - csbi.srWindow.Left + 1; - Pager->ScreenRows = csbi.srWindow.Bottom - csbi.srWindow.Top + 1; + Pager->PageColumns = csbi.srWindow.Right - csbi.srWindow.Left + 1; + Pager->PageRows = csbi.srWindow.Bottom - csbi.srWindow.Top + 1; } } diff --git a/sdk/lib/conutils/pager.h b/sdk/lib/conutils/pager.h index 61bbad6416c..8d38f07881f 100644 --- a/sdk/lib/conutils/pager.h +++ b/sdk/lib/conutils/pager.h @@ -29,25 +29,28 @@ extern "C" { // #include <wincon.h> struct _CON_PAGER; -typedef BOOL (__stdcall *CON_PAGER_LINE_FN)( + +typedef BOOL +(__stdcall *CON_PAGER_LINE_FN)( IN OUT struct _CON_PAGER *Pager, IN PCTCH line, IN DWORD cch); /* Flags for CON_PAGER */ -#define CON_PAGER_FLAG_DONT_OUTPUT (1 << 0) -#define CON_PAGER_FLAG_EXPAND_TABS (1 << 1) -#define CON_PAGER_FLAG_EXPAND_FF (1 << 2) +#define CON_PAGER_DONT_OUTPUT (1 << 0) +#define CON_PAGER_EXPAND_TABS (1 << 1) +#define CON_PAGER_EXPAND_FF (1 << 2) typedef struct _CON_PAGER { /* Console screen properties */ PCON_SCREEN Screen; - DWORD ScreenColumns; - DWORD ScreenRows; + DWORD PageColumns; + DWORD PageRows; /* Paging parameters */ CON_PAGER_LINE_FN PagerLine; /* The line function */ + DWORD dwFlags; /* The CON_PAGER_... flags */ LONG nTabWidth; DWORD ScrollRows; @@ -57,11 +60,10 @@ typedef struct _CON_PAGER /* Paging state */ DWORD ich; /* The current index of character */ + DWORD nSpacePending; /* Pending spaces for TAB expansion */ DWORD iColumn; /* The current index of column */ DWORD iLine; /* The physical output line count of screen */ DWORD lineno; /* The logical line number */ - DWORD dwFlags; /* The CON_PAGER_FLAG_... flags */ - DWORD nSpacePending; } CON_PAGER, *PCON_PAGER; #define INIT_CON_PAGER(pScreen) {(pScreen), 0} @@ -73,7 +75,8 @@ do { \ } while (0) -typedef BOOL (__stdcall *PAGE_PROMPT)( +typedef BOOL +(__stdcall *PAGE_PROMPT)( IN PCON_PAGER Pager, IN DWORD Done, IN DWORD Total);

3 years, 5 months

[reactos] 01/01: [CMAKE] Use BUILD_MP CMake option correctly

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1c7f3476a0c7febaa573e… commit 1c7f3476a0c7febaa573e2e35ecbbc5efb354e01 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Mon Jun 28 17:54:09 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Mon Jun 28 17:54:09 2021 +0300 [CMAKE] Use BUILD_MP CMake option correctly --- ntoskrnl/CMakeLists.txt | 2 +- sdk/cmake/config.cmake | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/CMakeLists.txt b/ntoskrnl/CMakeLists.txt index 31970629c76..6849bcf0099 100644 --- a/ntoskrnl/CMakeLists.txt +++ b/ntoskrnl/CMakeLists.txt @@ -64,7 +64,7 @@ add_pch(ntoskrnl ${REACTOS_SOURCE_DIR}/ntoskrnl/include/ntoskrnl.h "${PCH_SKIP_S add_dependencies(ntoskrnl psdk asm) add_cd_file(TARGET ntoskrnl DESTINATION reactos/system32 NO_CAB FOR all) -if(BUILD_MP OR (ARCH STREQUAL "amd64")) +if(BUILD_MP) add_subdirectory(ntkrnlmp) endif() diff --git a/sdk/cmake/config.cmake b/sdk/cmake/config.cmake index 84e032f045a..63e5d71f0dd 100644 --- a/sdk/cmake/config.cmake +++ b/sdk/cmake/config.cmake @@ -97,8 +97,7 @@ else() set(_WINKD_ FALSE CACHE BOOL "Whether to compile with the KD protocol.") endif() -cmake_dependent_option(BUILD_MP "Whether to build the multiprocessor versions of NTOSKRNL and HAL." ON - "ARCH STREQUAL i386" OFF) +option(BUILD_MP "Whether to build the multiprocessor versions of NTOSKRNL and HAL." ON) cmake_dependent_option(ISAPNP_ENABLE "Whether to enable the ISA PnP support." ON "ARCH STREQUAL i386 AND NOT SARCH STREQUAL xbox" OFF)

3 years, 6 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 June 2021