Ros-diffs January 2023

ros-diffs@reactos.org

18 participants
79 discussions

[reactos] 02/02: [NTDLL_APITEST] Add test for a section where PointerToRawData = 0 while SizeOfRawData != 0. CORE-18797

by Roy Tam

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9293b975ef6695b031b8c… commit 9293b975ef6695b031b8ccce36b9c5508218772d Author: Roy Tam <roytam(a)gmail.com> AuthorDate: Fri Jan 20 17:02:37 2023 +0800 Commit: Roy Tam <roytam(a)gmail.com> CommitDate: Fri Jan 20 17:02:37 2023 +0800 [NTDLL_APITEST] Add test for a section where PointerToRawData = 0 while SizeOfRawData != 0. CORE-18797 --- .../rostests/apitests/ntdll/NtMapViewOfSection.c | 24 ++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/modules/rostests/apitests/ntdll/NtMapViewOfSection.c b/modules/rostests/apitests/ntdll/NtMapViewOfSection.c index 8723696c924..4a6e187a08b 100644 --- a/modules/rostests/apitests/ntdll/NtMapViewOfSection.c +++ b/modules/rostests/apitests/ntdll/NtMapViewOfSection.c @@ -1498,7 +1498,8 @@ static struct _RAW_SIZE_IMAGE_FILE IMAGE_SECTION_HEADER data_header; IMAGE_SECTION_HEADER zdata_header; IMAGE_SECTION_HEADER rsrc_header; - BYTE pad[488]; + IMAGE_SECTION_HEADER bss_header; + BYTE pad[448]; BYTE text_data[0x1200]; BYTE data_data[0x1200]; BYTE rsrc_data[0x400]; @@ -1522,7 +1523,7 @@ static struct _RAW_SIZE_IMAGE_FILE /* IMAGE_FILE_HEADER */ { IMAGE_FILE_MACHINE_I386, /* Machine */ - 4, /* NumberOfSections */ + 5, /* NumberOfSections */ 0x47EFDF09, /* TimeDateStamp */ 0, /* PointerToSymbolTable */ 0, /* NumberOfSymbols */ @@ -1646,6 +1647,21 @@ static struct _RAW_SIZE_IMAGE_FILE IMAGE_SCN_MEM_READ | IMAGE_SCN_CNT_INITIALIZED_DATA, /* Characteristics */ }, + /* IMAGE_SECTION_HEADER */ + { + /* PointerToRawData = 0 while SizeOfRawData != 0, CORE-18797 */ + ".bss", /* Name */ + { 0x400 }, /* Misc.VirtualSize */ + 0x5000, /* VirtualAddress */ + 0x600, /* SizeOfRawData */ + 0, /* PointerToRawData */ + 0, /* PointerToRelocations */ + 0, /* PointerToLinenumbers */ + 0, /* NumberOfRelocations */ + 0, /* NumberOfLinenumbers */ + IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_READ | + IMAGE_SCN_CNT_UNINITIALIZED_DATA, /* Characteristics */ + }, /* fill */ { 0 }, /* text */ @@ -1802,6 +1818,10 @@ Test_RawSize(ULONG TestNumber) ok_hex(ImageFile->zdata_header.SizeOfRawData, RawSizeImageFile.zdata_header.SizeOfRawData); ok_hex(ImageFile->zdata_header.PointerToRawData, 0); + /* PointerToRawData = 0 resets SizeOfRawData to 0, CORE-18797 */ + ok_hex(ImageFile->bss_header.SizeOfRawData, 0); + ok_hex(ImageFile->bss_header.PointerToRawData, 0); + #define TEST_BYTE(n, v) \ StartSeh() \ ok(Bytes[n] == v, "[%lu] Bytes[%u] = 0x%x, expected 0x%x\n", \

1 year, 11 months

[reactos] 01/02: [NTOS:MM] Ignore sections either PointerToRawData or SizeOfRawData is zero

by Roy Tam

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0d4a8d0ea6fba6da0c13f… commit 0d4a8d0ea6fba6da0c13f597f614ebd6f20086fd Author: Roy Tam <roytam(a)gmail.com> AuthorDate: Fri Jan 20 17:02:12 2023 +0800 Commit: Roy Tam <roytam(a)gmail.com> CommitDate: Fri Jan 20 17:02:12 2023 +0800 [NTOS:MM] Ignore sections either PointerToRawData or SizeOfRawData is zero VC1 Linker fills BSS.SizeOfRawData with data in IMAGE_OPTIONAL_HEADER.SizeOfUninitializedData but keeps PointerToRawData to zero. CORE-18797 --- ntoskrnl/mm/section.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index 61930738642..2fba8e89908 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -814,7 +814,7 @@ l_ReadHeaderFromFile: DIE(("Memory gap between section %u and the previous\n", i)); /* ignore explicit BSS sections */ - if(pishSectionHeaders[i].SizeOfRawData != 0) + if(pishSectionHeaders[i].PointerToRawData != 0 && pishSectionHeaders[i].SizeOfRawData != 0) { /* validate the alignment */ #if 0

1 year, 11 months

[reactos] 01/01: [SHELL32] Add 3 accelerators for IDM_DRAGFILE MENU de-DE.rc (#5001)

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e89675768be212fca2e59… commit e89675768be212fca2e59be68a4276cd308abd82 Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Wed Jan 18 22:40:05 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 18 22:40:05 2023 +0100 [SHELL32] Add 3 accelerators for IDM_DRAGFILE MENU de-DE.rc (#5001) They got lost when the menu was translated to german during 0.4.9-dev'ing. --- dll/win32/shell32/lang/de-DE.rc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index 7c00c22c6ae..cef3e293e0d 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -80,9 +80,9 @@ IDM_DRAGFILE MENU BEGIN POPUP "" BEGIN - MENUITEM "Hierher kopieren", IDM_COPYHERE - MENUITEM "Hierher verschieben", IDM_MOVEHERE - MENUITEM "Verknüpfung hier erstellen", IDM_LINKHERE + MENUITEM "Hierher &kopieren", IDM_COPYHERE + MENUITEM "Hierher &verschieben", IDM_MOVEHERE + MENUITEM "Verknüpfung hier &erstellen", IDM_LINKHERE MENUITEM SEPARATOR MENUITEM "Abbrechen", 0 END

1 year, 11 months

[reactos] 01/01: [NTGDI] Check if face->charmap is not zero before accessing its encoding (#4390)

by Julio Carchi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a999c4374607861cdc557… commit a999c4374607861cdc5576e8a9255958e15273f6 Author: Julio Carchi <julcar(a)informaticos.com> AuthorDate: Wed Jan 18 13:24:40 2023 -0500 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 18 21:24:40 2023 +0300 [NTGDI] Check if face->charmap is not zero before accessing its encoding (#4390) This allows DevExpress Ribbon Notepad sample to start. Also add a fat DPRINT1 suggested by Timo Kreuzer, because there is a lot wrong in the code. CORE-18091 CORE-18558 --- win32ss/gdi/ntgdi/freetype.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index ca1285a4ae7..fcf6f2dfcc7 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -4490,6 +4490,12 @@ ftGetFontUnicodeRanges(PFONTGDI Font, PGLYPHSET glyphset) DWORD num_ranges = 0; FT_Face face = Font->SharedFace->Face; + if (face->charmap == NULL) + { + DPRINT1("FIXME: No charmap selected! This is a BUG!\n"); + return 0; + } + if (face->charmap->encoding == FT_ENCODING_UNICODE) { FT_UInt glyph_code = 0;

1 year, 11 months

[reactos] 01/01: [NTOS:MM] Use image prefix in MmLoadSystemImage

by Wu Haotian

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=346477fb3c98246b03ec3… commit 346477fb3c98246b03ec3fcb60b50b562aa7ab85 Author: Wu Haotian <RigoLigo03(a)gmail.com> AuthorDate: Mon Jan 9 22:55:29 2023 +0800 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Wed Jan 18 02:35:19 2023 +0300 [NTOS:MM] Use image prefix in MmLoadSystemImage MmLoadSystemImage has a PUNICODE_STRING NamePrefix parameter which is currently unused in ReactOS. When the kernel loads the crash dump storage stack drivers, the drivers will be loaded with MmLoadSystemImage with a "dump_" or "hiber_" (for hibernation, which uses crash dump stack too) prefix. This change adds in the prefix support, and is supposed to push crash dump support forward. CORE-376 --- ntoskrnl/mm/ARM3/sysldr.c | 53 +++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 49 insertions(+), 4 deletions(-) diff --git a/ntoskrnl/mm/ARM3/sysldr.c b/ntoskrnl/mm/ARM3/sysldr.c index 35b538259f3..3ea6662cc28 100644 --- a/ntoskrnl/mm/ARM3/sysldr.c +++ b/ntoskrnl/mm/ARM3/sysldr.c @@ -2900,7 +2900,7 @@ MmLoadSystemImage(IN PUNICODE_STRING FileName, ULONG EntrySize, DriverSize; PLOAD_IMPORTS LoadedImports = MM_SYSLDR_NO_IMPORTS; PCHAR MissingApiName, Buffer; - PWCHAR MissingDriverName; + PWCHAR MissingDriverName, PrefixedBuffer = NULL; HANDLE SectionHandle; ACCESS_MASK DesiredAccess; PSECTION Section = NULL; @@ -2964,7 +2964,52 @@ MmLoadSystemImage(IN PUNICODE_STRING FileName, PrefixName = *FileName; /* Check if we have a prefix */ - if (NamePrefix) DPRINT1("Prefixed images are not yet supported!\n"); + if (NamePrefix) + { + /* Check if "directory + prefix" is too long for the string */ + Status = RtlUShortAdd(BaseDirectory.Length, + NamePrefix->Length, + &PrefixName.MaximumLength); + if (!NT_SUCCESS(Status)) + { + Status = STATUS_INVALID_PARAMETER; + goto Quickie; + } + + /* Check if "directory + prefix + basename" is too long for the string */ + Status = RtlUShortAdd(PrefixName.MaximumLength, + BaseName.Length, + &PrefixName.MaximumLength); + if (!NT_SUCCESS(Status)) + { + Status = STATUS_INVALID_PARAMETER; + goto Quickie; + } + + /* Allocate the buffer exclusively used for prefixed name */ + PrefixedBuffer = ExAllocatePoolWithTag(PagedPool, + PrefixName.MaximumLength, + TAG_LDR_WSTR); + if (!PrefixedBuffer) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Quickie; + } + + /* Clear out the prefixed name string */ + PrefixName.Buffer = PrefixedBuffer; + PrefixName.Length = 0; + + /* Concatenate the strings */ + RtlAppendUnicodeStringToString(&PrefixName, &BaseDirectory); + RtlAppendUnicodeStringToString(&PrefixName, NamePrefix); + RtlAppendUnicodeStringToString(&PrefixName, &BaseName); + + /* Now the base name of the image becomes the prefixed version */ + BaseName.Buffer = &(PrefixName.Buffer[BaseDirectory.Length / sizeof(WCHAR)]); + BaseName.Length += NamePrefix->Length; + BaseName.MaximumLength = (PrefixName.MaximumLength - BaseDirectory.Length); + } /* Check if we already have a name, use it instead */ if (LoadedName) BaseName = *LoadedName; @@ -3406,8 +3451,8 @@ Quickie: /* If we have a file handle, close it */ if (FileHandle) ZwClose(FileHandle); - /* Check if we had a prefix (not supported yet - PrefixName == *FileName now) */ - /* if (NamePrefix) ExFreePool(PrefixName.Buffer); */ + /* If we have allocated a prefixed name buffer, free it */ + if (PrefixedBuffer) ExFreePoolWithTag(PrefixedBuffer, TAG_LDR_WSTR); /* Free the name buffer and return status */ ExFreePoolWithTag(Buffer, TAG_LDR_WSTR);

1 year, 11 months

[reactos] 01/01: [NTOS:IO] Handle missing device instance in IopInitializeBuiltinDriver. CORE-18793

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=543d3902599e98401dae7… commit 543d3902599e98401dae73ca690f89b93b6d8d7d Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Jan 14 16:36:57 2023 -0500 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Jan 14 17:52:17 2023 -0500 [NTOS:IO] Handle missing device instance in IopInitializeBuiltinDriver. CORE-18793 --- ntoskrnl/io/iomgr/driver.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/io/iomgr/driver.c b/ntoskrnl/io/iomgr/driver.c index 61ac27ed25b..498b09ea40f 100644 --- a/ntoskrnl/io/iomgr/driver.c +++ b/ntoskrnl/io/iomgr/driver.c @@ -967,9 +967,16 @@ IopInitializeBuiltinDriver(IN PLDR_DATA_TABLE_ENTRY BootLdrEntry) instancePath.Buffer[instancePath.Length / sizeof(WCHAR)] = UNICODE_NULL; PDEVICE_OBJECT pdo = IopGetDeviceObjectFromDeviceInstance(&instancePath); - PiQueueDeviceAction(pdo, PiActionAddBootDevices, NULL, NULL); - ObDereferenceObject(pdo); - deviceAdded = TRUE; + if (pdo != NULL) + { + PiQueueDeviceAction(pdo, PiActionAddBootDevices, NULL, NULL); + ObDereferenceObject(pdo); + deviceAdded = TRUE; + } + else + { + DPRINT1("No device node found matching instance path '%wZ'\n", &instancePath); + } } ExFreePool(kvInfo);

1 year, 11 months

[reactos] 01/01: [HIVESYS] Move ndis to the "NDIS Wrapper" group. CORE-18790

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6c06760547d093268d9d9… commit 6c06760547d093268d9d9d778b1d91f24b63269e Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Jan 14 15:24:51 2023 -0500 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Jan 14 15:33:30 2023 -0500 [HIVESYS] Move ndis to the "NDIS Wrapper" group. CORE-18790 Miniport drivers import from NDIS, but NDIS does not support being loaded as a dependent driver (it does not have DllInitialize). Instead, NDIS needs to load before all possible miniport drivers, even boot-start ones. We achieve this by placing it in its own service order group, which loads before the NDIS group. All our miniport drivers are demand-start, so would automatically start later. The ndisprot driver from the ticket is likely the first boot-start miniport we've encountered. Since DriverEntry did not run, AdapterListHead was NULL, resulting in the crash. --- boot/bootdata/hivesys.inf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index 45c3d6e6446..b22c8a7abba 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -1694,9 +1694,9 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Mup","ImagePath",0x00020000,"system32\dr HKLM,"SYSTEM\CurrentControlSet\Services\Mup","Start",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\Mup","Type",0x00010001,0x00000002 -; NDIS driver - the only boot-start network driver +; NDIS driver - needs to load before any drivers in the NDIS group HKLM,"SYSTEM\CurrentControlSet\Services\Ndis","ErrorControl",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\Ndis","Group",0x00000000,"NDIS" +HKLM,"SYSTEM\CurrentControlSet\Services\Ndis","Group",0x00000000,"NDIS Wrapper" HKLM,"SYSTEM\CurrentControlSet\Services\Ndis","ImagePath",0x00020000,"system32\drivers\ndis.sys" HKLM,"SYSTEM\CurrentControlSet\Services\Ndis","Start",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\Ndis","Type",0x00010001,0x00000001

1 year, 11 months

[reactos] 01/01: [WIN32SS:NTUSER] restore snapped window to normal size by dragging window caption

by Denis Malikov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=669b2f4465f0f5e3dac17… commit 669b2f4465f0f5e3dac177e46865058fae0b1179 Author: Denis Malikov <filedem(a)gmail.com> AuthorDate: Sat Nov 20 16:58:24 2021 +0700 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Sun Jan 8 22:49:59 2023 +0300 [WIN32SS:NTUSER] restore snapped window to normal size by dragging window caption CORE-15638 --- win32ss/user/ntuser/nonclient.c | 39 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/win32ss/user/ntuser/nonclient.c b/win32ss/user/ntuser/nonclient.c index 0561086024b..aad6fe72d77 100644 --- a/win32ss/user/ntuser/nonclient.c +++ b/win32ss/user/ntuser/nonclient.c @@ -263,7 +263,7 @@ DefWndDoSizeMove(PWND pwnd, WORD wParam) ExStyle = pwnd->ExStyle; iconic = (Style & WS_MINIMIZE) != 0; - if ((Style & WS_MAXIMIZE) || !IntIsWindowVisible(pwnd)) return; + if (((Style & WS_MAXIMIZE) && syscommand != SC_MOVE) || !IntIsWindowVisible(pwnd)) return; thickframe = UserHasThickFrameStyle(Style, ExStyle) && !iconic; @@ -511,7 +511,40 @@ DefWndDoSizeMove(PWND pwnd, WORD wParam) RECT newRect = unmodRect; if (!iconic && !DragFullWindows) UserDrawMovingFrame( hdc, &sizingRect, thickframe ); - if (hittest == HTCAPTION) RECTL_vOffsetRect( &newRect, dx, dy ); + if (hittest == HTCAPTION) + { + /* Restore window size if it is snapped */ + if (!RECTL_bIsEmptyRect(&pwnd->InternalPos.NormalRect) && + !IntEqualRect(&pwnd->InternalPos.NormalRect, &pwnd->rcWindow)) + { + UserSetCursorPos(max(0, pwnd->InternalPos.NormalRect.left) + pt.x, pwnd->InternalPos.NormalRect.top + pt.y, 0, 0, FALSE); + + /* Save normal size - it required when window unsnapped from one side and snapped to another holding mouse down */ + origRect = pwnd->InternalPos.NormalRect; + + /* Restore from maximized state */ + if (Style & WS_MAXIMIZE) + { + co_IntSendMessage(UserHMGetHandle(pwnd), WM_SYSCOMMAND, SC_RESTORE, 0); + } + /* Restore snapped to left/right place */ + else + { + co_WinPosSetWindowPos(pwnd, + NULL, + pwnd->InternalPos.NormalRect.left, + pwnd->InternalPos.NormalRect.top, + pwnd->InternalPos.NormalRect.right - pwnd->InternalPos.NormalRect.left, + pwnd->InternalPos.NormalRect.bottom - pwnd->InternalPos.NormalRect.top, + 0); + } + RECTL_vSetEmptyRect(&pwnd->InternalPos.NormalRect); + continue; + } + + /* regular window moving */ + RECTL_vOffsetRect(&newRect, dx, dy); + } if (ON_LEFT_BORDER(hittest)) newRect.left += dx; else if (ON_RIGHT_BORDER(hittest)) newRect.right += dx; if (ON_TOP_BORDER(hittest)) newRect.top += dy; @@ -1648,7 +1681,7 @@ NC_HandleNCLButtonDblClk(PWND pWnd, WPARAM wParam, LPARAM lParam) UserSystemParametersInfo(SPI_GETWORKAREA, 0, &mouseRect, 0); co_WinPosSetWindowPos(pWnd, - 0, + NULL, sizingRect.left, mouseRect.top, sizingRect.right - sizingRect.left,

1 year, 11 months

[reactos] 01/01: [THEMES][DOC] "Open Sans" -> "Trebuchet MS" (#4983)

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8d5011fb6ba2c86fa8b1d… commit 8d5011fb6ba2c86fa8b1d508a35ec150bced2b64 Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Sun Jan 8 16:07:30 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Jan 8 16:07:30 2023 +0100 [THEMES][DOC] "Open Sans" -> "Trebuchet MS" (#4983) [THEMES] Eliminates the last references to "Open Sans" font. This is an addendum to 0.4.13-dev-765-g 04a361d091095a96bb3af376e46daf4c5fe81c63 "Open Sans" has been replaced by "Trebuchet MS" back then. [DOC] Mention trebuc*.ttf as being based on 'Open Sans Fonts' --- media/doc/3rd Party Files.txt | 2 +- .../textfiles/ExtraLargeNormal.INI | 68 +++++++++++----------- .../lautus.msstyles/textfiles/ExtraLargeNormal.INI | 68 +++++++++++----------- 3 files changed, 69 insertions(+), 69 deletions(-) diff --git a/media/doc/3rd Party Files.txt b/media/doc/3rd Party Files.txt index 86e25d83cde..d135337ab31 100644 --- a/media/doc/3rd Party Files.txt +++ b/media/doc/3rd Party Files.txt @@ -178,7 +178,7 @@ License: media/fonts/doc/DejaVu/LICENSE.txt URL: http://dejavu.sourceforge.net Title: Open Sans Fonts -Path: media/fonts +Path: media/fonts/trebuc*.ttf Used Version: 1.10 License: Apache-2.0 (https://spdx.org/licenses/Apache-2.0.html) URL: http://www.google.com/fonts/specimen/Open+Sans diff --git a/media/themes/Blackshade/blackshade.msstyles/textfiles/ExtraLargeNormal.INI b/media/themes/Blackshade/blackshade.msstyles/textfiles/ExtraLargeNormal.INI index ae865bb0166..411e2c58a91 100644 --- a/media/themes/Blackshade/blackshade.msstyles/textfiles/ExtraLargeNormal.INI +++ b/media/themes/Blackshade/blackshade.msstyles/textfiles/ExtraLargeNormal.INI @@ -13,7 +13,7 @@ Btnface = 239 238 243 BtnHighlight = 255 255 255 BtnShadow = 162 162 162 CaptionBarHeight = 24 -CaptionFont = Open Sans, 8, Bold +CaptionFont = Trebuchet MS, 8, Bold CaptionText = 255 255 255 CssName = cpwebvw.css DkShadow3d = 162 162 162 @@ -24,23 +24,23 @@ GrayText = 172 168 153 Highlight = 75 75 75 HighlightText = 255 255 255 HotTracking = 0 0 128 -IconTitleFont = Open Sans, 8 +IconTitleFont = Trebuchet MS, 8 InactiveCaption = 65 65 65 InactiveCaptionText = 180 180 180 Light3d = 241 239 226 Menu = 255 255 255 MenuBar = 239 238 243 -MenuFont = Open Sans, 8 +MenuFont = Trebuchet MS, 8 MenuHilight = 100 100 100 MenuText = 75 75 75 MinColorDepth = 15 -MsgBoxFont = Open Sans, 8 +MsgBoxFont = Trebuchet MS, 8 ScrollbarHeight = 15 ScrollbarWidth = 15 -SmallCaptionFont = Open Sans, 8, Bold +SmallCaptionFont = Trebuchet MS, 8, Bold SMCaptionBarHeight = 19 SMCaptionBarWidth = 21 -StatusFont = Open Sans, 8 +StatusFont = Trebuchet MS, 8 Window = 255 255 255 XmlName = default.xml @@ -101,7 +101,7 @@ SizingType = Stretch TextColor = 112 112 112 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Open Sans, 8 +FONT = Trebuchet MS, 8 TEXTSHADOWOFFSET = 1,1 TEXTSHADOWTYPE = Single TEXTSHADOWCOLOR = 221 221 221 @@ -206,7 +206,7 @@ GradientRatio2 = 255 BgType = ImageFile ContentMargins = 8, 8, 7, 7 FillColorHint = 94 135 217 -Font = Open Sans, 8, Bold +Font = Trebuchet MS, 8, Bold ImageFile = Normal\ExplorerBarHeaderBackground.bmp SizingMargins = 17, 1, 0, 0 SizingType = Stretch @@ -252,7 +252,7 @@ BgType = ImageFile BorderColor = 255 255 255 ContentMargins = 8, 8, 7, 7 FillColor = 214 223 247 -Font = Open Sans, 8 +Font = Trebuchet MS, 8 ImageFile = Normal\NormalGroupBackground.bmp SizingMargins = 3, 3, 3, 3 SizingType = Stretch @@ -286,7 +286,7 @@ Transparent = true BgType = ImageFile ContentMargins = 8, 8, 7, 7 FillColorHint = 240 243 251 -Font = Open Sans, 8, Bold +Font = Trebuchet MS, 8, Bold ImageFile = Normal\NormalGroupHead.bmp SizingMargins = 3, 15, 3, 1 SizingType = Stretch @@ -297,7 +297,7 @@ Transparent = true BgType = ImageFile ContentMargins = 8, 8, 7, 7 FillColorHint = 239 243 255 -Font = Open Sans, 8 +Font = Trebuchet MS, 8 ImageFile = Normal\SpecialGroupBackground.bmp SizingMargins = 3, 3, 3, 3 SizingType = Stretch @@ -331,7 +331,7 @@ Transparent = true BgType = ImageFile ContentMargins = 8, 8, 7, 7 FillColor = 2 72 178 -Font = Open Sans, 8, Bold +Font = Trebuchet MS, 8, Bold ImageFile = Normal\SpecialGroupHead.bmp SizingMargins = 3, 6, 5, 16 SizingType = Stretch @@ -416,7 +416,7 @@ SizingType = Stretch [Rebar] Bgtype = imagefile FillColorHint = 241 243 239 -Font = Open Sans, 8 +Font = Trebuchet MS, 8 ImageFile = Normal\ToolbarBackground.bmp Sizingmargins = 1, 1, 1, 2 Sizingtype = stretch @@ -683,7 +683,7 @@ TRANSPARENTCOLOR = 255 0 255 BgType = ImageFile ContentMargins = 11, 2, 0, 5 DefaultPaneSize = 0, 0, 178, 30 -Font = Open Sans, 8, Bold +Font = Trebuchet MS, 8, Bold HotTracking = 48 112 208 Imagecount = 1 ImageFile = Normal\StartPanelMoreProgBackGround.BMP @@ -749,7 +749,7 @@ TRANSPARENTCOLOR = 255 0 255 BgType = None DefaultPaneSize = 0, 0, 357, 28 FillColorHint = 31 113 216 -Font = Open Sans, 8, Bold +Font = Trebuchet MS, 8, Bold Imagecount = 1 ImageFile = Normal\StartUserPanel.bmp ImageLayout = Horizontal @@ -825,7 +825,7 @@ MinDpi2 = 164 StockImageFile = Normal\TabBackground.bmp TrueSizeScalingType = Dpi TrueSizeStretchMark = 50 -FONT = Open Sans, 8 +FONT = Trebuchet MS, 8 TEXTCOLOR = 112 112 112 [Tab.Pane] @@ -849,7 +849,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Open Sans, 8 +FONT = Trebuchet MS, 8 TEXTCOLOR = 112 112 112 TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -867,7 +867,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Open Sans, 8 +FONT = Trebuchet MS, 8 TEXTCOLOR = 112 112 112 TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -885,7 +885,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Open Sans, 8 +FONT = Trebuchet MS, 8 TEXTCOLOR = 112 112 112 TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -903,7 +903,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Open Sans, 8 +FONT = Trebuchet MS, 8 TEXTCOLOR = 112 112 112 TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -921,7 +921,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Open Sans, 8 +FONT = Trebuchet MS, 8 TEXTCOLOR = 112 112 112 TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -939,7 +939,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Open Sans, 8 +FONT = Trebuchet MS, 8 TEXTCOLOR = 112 112 112 TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -961,7 +961,7 @@ TEXTSHADOWTYPE = Single TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 TEXTCOLOR = 112 112 112 -FONT = Open Sans, 8 +FONT = Trebuchet MS, 8 [Tab.TopTabItemRightEdge] AccentColorHint = 255 200 60 @@ -975,7 +975,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Open Sans, 8 +FONT = Trebuchet MS, 8 TEXTCOLOR = 112 112 112 TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -1011,7 +1011,7 @@ Transparent = True TransparentColor = 255 0 255 [TaskBand.GroupCount] -Font = Open Sans, 8, Bold +Font = Trebuchet MS, 8, Bold TextColor = 255 255 255 [TaskBar.BackgroundBottom] @@ -1663,7 +1663,7 @@ OffsetType = TopLeft [ExplorerBar::Rebar] Bgtype = imagefile FillColorHint = 243 247 253 -Font = Open Sans, 8 +Font = Trebuchet MS, 8 ImageFile = Normal\ExplorerBarToolbarBackground.bmp Sizingmargins = 0, 0, 34, 0 Sizingtype = stretch @@ -1869,7 +1869,7 @@ AccentColorHint = 48 127 229 BgType = ImageFile ContentMargins = 0, 0, 0, 0 FillColorHint = 255 255 255 -Font = Open Sans, 8 +Font = Trebuchet MS, 8 ImageFile = Normal\StartGroupBackground.bmp SizingMargins = 24, 3, 3, 4 SizingType = Stretch @@ -1975,7 +1975,7 @@ SizingMargins = 1, 1, 0, 0 [TaskBand::Toolbar] BgType = None -Font = Open Sans, 8 +Font = Trebuchet MS, 8 TextColor = 255 255 255 TEXTSHADOWCOLOR = 0 0 0 TEXTSHADOWOFFSET = 1,1 @@ -2035,7 +2035,7 @@ AccentColorHint = 255 199 60 BgType = ImageFile ContentMargins = 6, 11, 6, 6 FillColorHint = 33 87 213 -Font = Open Sans, 8 +Font = Trebuchet MS, 8 ImageFile = Normal\TaskBandBackground.bmp SizingMargins = 6, 6, 6, 6 SizingType = Stretch @@ -2056,7 +2056,7 @@ Transparent = True [TaskBandVert::Toolbar] BgType = None -Font = Open Sans, 8 +Font = Trebuchet MS, 8 TextColor = 255 255 255 [TaskBandVert::Toolbar.Button] @@ -2083,7 +2083,7 @@ Transparent = True [TaskBar::Rebar] BgType = None -Font = Open Sans, 8 +Font = Trebuchet MS, 8 TextColor = 123 182 232 [TaskBar::Rebar.Band] @@ -2142,7 +2142,7 @@ TransparentColor = 255 0 255 [TaskBar::Toolbar] BgType = None -Font = Open Sans, 8 +Font = Trebuchet MS, 8 TextColor = 255 255 255 [TaskBar::Toolbar.Button] @@ -2169,7 +2169,7 @@ Transparent = True [TaskBarVert::Toolbar] BgType = None -Font = Open Sans, 8 +Font = Trebuchet MS, 8 TextColor = 255 255 255 [TaskBarVert::Toolbar(Checked)] @@ -2204,7 +2204,7 @@ SizingType = Stretch Transparent = True [TrayNotify::Clock] -Font = Open Sans, 8 +Font = Trebuchet MS, 8 TextColor = 255 255 255 [TrayNotify::Toolbar] diff --git a/media/themes/Lautus/lautus.msstyles/textfiles/ExtraLargeNormal.INI b/media/themes/Lautus/lautus.msstyles/textfiles/ExtraLargeNormal.INI index ae865bb0166..411e2c58a91 100644 --- a/media/themes/Lautus/lautus.msstyles/textfiles/ExtraLargeNormal.INI +++ b/media/themes/Lautus/lautus.msstyles/textfiles/ExtraLargeNormal.INI @@ -13,7 +13,7 @@ Btnface = 239 238 243 BtnHighlight = 255 255 255 BtnShadow = 162 162 162 CaptionBarHeight = 24 -CaptionFont = Open Sans, 8, Bold +CaptionFont = Trebuchet MS, 8, Bold CaptionText = 255 255 255 CssName = cpwebvw.css DkShadow3d = 162 162 162 @@ -24,23 +24,23 @@ GrayText = 172 168 153 Highlight = 75 75 75 HighlightText = 255 255 255 HotTracking = 0 0 128 -IconTitleFont = Open Sans, 8 +IconTitleFont = Trebuchet MS, 8 InactiveCaption = 65 65 65 InactiveCaptionText = 180 180 180 Light3d = 241 239 226 Menu = 255 255 255 MenuBar = 239 238 243 -MenuFont = Open Sans, 8 +MenuFont = Trebuchet MS, 8 MenuHilight = 100 100 100 MenuText = 75 75 75 MinColorDepth = 15 -MsgBoxFont = Open Sans, 8 +MsgBoxFont = Trebuchet MS, 8 ScrollbarHeight = 15 ScrollbarWidth = 15 -SmallCaptionFont = Open Sans, 8, Bold +SmallCaptionFont = Trebuchet MS, 8, Bold SMCaptionBarHeight = 19 SMCaptionBarWidth = 21 -StatusFont = Open Sans, 8 +StatusFont = Trebuchet MS, 8 Window = 255 255 255 XmlName = default.xml @@ -101,7 +101,7 @@ SizingType = Stretch TextColor = 112 112 112 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Open Sans, 8 +FONT = Trebuchet MS, 8 TEXTSHADOWOFFSET = 1,1 TEXTSHADOWTYPE = Single TEXTSHADOWCOLOR = 221 221 221 @@ -206,7 +206,7 @@ GradientRatio2 = 255 BgType = ImageFile ContentMargins = 8, 8, 7, 7 FillColorHint = 94 135 217 -Font = Open Sans, 8, Bold +Font = Trebuchet MS, 8, Bold ImageFile = Normal\ExplorerBarHeaderBackground.bmp SizingMargins = 17, 1, 0, 0 SizingType = Stretch @@ -252,7 +252,7 @@ BgType = ImageFile BorderColor = 255 255 255 ContentMargins = 8, 8, 7, 7 FillColor = 214 223 247 -Font = Open Sans, 8 +Font = Trebuchet MS, 8 ImageFile = Normal\NormalGroupBackground.bmp SizingMargins = 3, 3, 3, 3 SizingType = Stretch @@ -286,7 +286,7 @@ Transparent = true BgType = ImageFile ContentMargins = 8, 8, 7, 7 FillColorHint = 240 243 251 -Font = Open Sans, 8, Bold +Font = Trebuchet MS, 8, Bold ImageFile = Normal\NormalGroupHead.bmp SizingMargins = 3, 15, 3, 1 SizingType = Stretch @@ -297,7 +297,7 @@ Transparent = true BgType = ImageFile ContentMargins = 8, 8, 7, 7 FillColorHint = 239 243 255 -Font = Open Sans, 8 +Font = Trebuchet MS, 8 ImageFile = Normal\SpecialGroupBackground.bmp SizingMargins = 3, 3, 3, 3 SizingType = Stretch @@ -331,7 +331,7 @@ Transparent = true BgType = ImageFile ContentMargins = 8, 8, 7, 7 FillColor = 2 72 178 -Font = Open Sans, 8, Bold +Font = Trebuchet MS, 8, Bold ImageFile = Normal\SpecialGroupHead.bmp SizingMargins = 3, 6, 5, 16 SizingType = Stretch @@ -416,7 +416,7 @@ SizingType = Stretch [Rebar] Bgtype = imagefile FillColorHint = 241 243 239 -Font = Open Sans, 8 +Font = Trebuchet MS, 8 ImageFile = Normal\ToolbarBackground.bmp Sizingmargins = 1, 1, 1, 2 Sizingtype = stretch @@ -683,7 +683,7 @@ TRANSPARENTCOLOR = 255 0 255 BgType = ImageFile ContentMargins = 11, 2, 0, 5 DefaultPaneSize = 0, 0, 178, 30 -Font = Open Sans, 8, Bold +Font = Trebuchet MS, 8, Bold HotTracking = 48 112 208 Imagecount = 1 ImageFile = Normal\StartPanelMoreProgBackGround.BMP @@ -749,7 +749,7 @@ TRANSPARENTCOLOR = 255 0 255 BgType = None DefaultPaneSize = 0, 0, 357, 28 FillColorHint = 31 113 216 -Font = Open Sans, 8, Bold +Font = Trebuchet MS, 8, Bold Imagecount = 1 ImageFile = Normal\StartUserPanel.bmp ImageLayout = Horizontal @@ -825,7 +825,7 @@ MinDpi2 = 164 StockImageFile = Normal\TabBackground.bmp TrueSizeScalingType = Dpi TrueSizeStretchMark = 50 -FONT = Open Sans, 8 +FONT = Trebuchet MS, 8 TEXTCOLOR = 112 112 112 [Tab.Pane] @@ -849,7 +849,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Open Sans, 8 +FONT = Trebuchet MS, 8 TEXTCOLOR = 112 112 112 TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -867,7 +867,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Open Sans, 8 +FONT = Trebuchet MS, 8 TEXTCOLOR = 112 112 112 TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -885,7 +885,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Open Sans, 8 +FONT = Trebuchet MS, 8 TEXTCOLOR = 112 112 112 TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -903,7 +903,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Open Sans, 8 +FONT = Trebuchet MS, 8 TEXTCOLOR = 112 112 112 TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -921,7 +921,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Open Sans, 8 +FONT = Trebuchet MS, 8 TEXTCOLOR = 112 112 112 TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -939,7 +939,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Open Sans, 8 +FONT = Trebuchet MS, 8 TEXTCOLOR = 112 112 112 TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -961,7 +961,7 @@ TEXTSHADOWTYPE = Single TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 TEXTCOLOR = 112 112 112 -FONT = Open Sans, 8 +FONT = Trebuchet MS, 8 [Tab.TopTabItemRightEdge] AccentColorHint = 255 200 60 @@ -975,7 +975,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Open Sans, 8 +FONT = Trebuchet MS, 8 TEXTCOLOR = 112 112 112 TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -1011,7 +1011,7 @@ Transparent = True TransparentColor = 255 0 255 [TaskBand.GroupCount] -Font = Open Sans, 8, Bold +Font = Trebuchet MS, 8, Bold TextColor = 255 255 255 [TaskBar.BackgroundBottom] @@ -1663,7 +1663,7 @@ OffsetType = TopLeft [ExplorerBar::Rebar] Bgtype = imagefile FillColorHint = 243 247 253 -Font = Open Sans, 8 +Font = Trebuchet MS, 8 ImageFile = Normal\ExplorerBarToolbarBackground.bmp Sizingmargins = 0, 0, 34, 0 Sizingtype = stretch @@ -1869,7 +1869,7 @@ AccentColorHint = 48 127 229 BgType = ImageFile ContentMargins = 0, 0, 0, 0 FillColorHint = 255 255 255 -Font = Open Sans, 8 +Font = Trebuchet MS, 8 ImageFile = Normal\StartGroupBackground.bmp SizingMargins = 24, 3, 3, 4 SizingType = Stretch @@ -1975,7 +1975,7 @@ SizingMargins = 1, 1, 0, 0 [TaskBand::Toolbar] BgType = None -Font = Open Sans, 8 +Font = Trebuchet MS, 8 TextColor = 255 255 255 TEXTSHADOWCOLOR = 0 0 0 TEXTSHADOWOFFSET = 1,1 @@ -2035,7 +2035,7 @@ AccentColorHint = 255 199 60 BgType = ImageFile ContentMargins = 6, 11, 6, 6 FillColorHint = 33 87 213 -Font = Open Sans, 8 +Font = Trebuchet MS, 8 ImageFile = Normal\TaskBandBackground.bmp SizingMargins = 6, 6, 6, 6 SizingType = Stretch @@ -2056,7 +2056,7 @@ Transparent = True [TaskBandVert::Toolbar] BgType = None -Font = Open Sans, 8 +Font = Trebuchet MS, 8 TextColor = 255 255 255 [TaskBandVert::Toolbar.Button] @@ -2083,7 +2083,7 @@ Transparent = True [TaskBar::Rebar] BgType = None -Font = Open Sans, 8 +Font = Trebuchet MS, 8 TextColor = 123 182 232 [TaskBar::Rebar.Band] @@ -2142,7 +2142,7 @@ TransparentColor = 255 0 255 [TaskBar::Toolbar] BgType = None -Font = Open Sans, 8 +Font = Trebuchet MS, 8 TextColor = 255 255 255 [TaskBar::Toolbar.Button] @@ -2169,7 +2169,7 @@ Transparent = True [TaskBarVert::Toolbar] BgType = None -Font = Open Sans, 8 +Font = Trebuchet MS, 8 TextColor = 255 255 255 [TaskBarVert::Toolbar(Checked)] @@ -2204,7 +2204,7 @@ SizingType = Stretch Transparent = True [TrayNotify::Clock] -Font = Open Sans, 8 +Font = Trebuchet MS, 8 TextColor = 255 255 255 [TrayNotify::Toolbar]

1 year, 11 months

[reactos] 03/03: [NTOS:KD] Revisit KdSendPacket() and KdReceivePacket() for DBGKD_DEBUG_IO. (#4914)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=84e32e4e90109b3bce75d… commit 84e32e4e90109b3bce75ddb3eee2d3dfc42ab4be Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Nov 27 19:58:56 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Jan 6 18:57:32 2023 +0100 [NTOS:KD] Revisit KdSendPacket() and KdReceivePacket() for DBGKD_DEBUG_IO. (#4914) - Use SAL2 annotations. - KdSendPacket(): Validate DEBUG_IO API call. - KdReceivePacket(): Take the LengthOfStringRead into account; use KdbpReadCommand() to read the input, so that correct line edition is available (backspace, etc.) --- ntoskrnl/kd/kdio.c | 163 ++++++++++++++++++++-------------------------------- ntoskrnl/kdbg/kdb.h | 5 ++ 2 files changed, 68 insertions(+), 100 deletions(-) diff --git a/ntoskrnl/kd/kdio.c b/ntoskrnl/kd/kdio.c index 3f39e20c173..45733e0b3ca 100644 --- a/ntoskrnl/kd/kdio.c +++ b/ntoskrnl/kd/kdio.c @@ -37,7 +37,7 @@ CPPORT SerialPortInfo = {0, DEFAULT_DEBUG_BAUD_RATE, 0}; static CHAR KdpScreenLineBuffer[KdpScreenLineLengthDefault + 1] = ""; static ULONG KdpScreenLineBufferPos = 0, KdpScreenLineLength = 0; -const ULONG KdpDmesgBufferSize = 128 * 1024; // 512*1024; // 5*1024*1024; +const ULONG KdpDmesgBufferSize = 128 * 1024; // 512*1024; PCHAR KdpDmesgBuffer = NULL; volatile ULONG KdpDmesgCurrentPosition = 0; volatile ULONG KdpDmesgFreeBytes = 0; @@ -576,18 +576,34 @@ extern STRING KdbPromptString; VOID NTAPI KdSendPacket( - IN ULONG PacketType, - IN PSTRING MessageHeader, - IN PSTRING MessageData, - IN OUT PKD_CONTEXT Context) + _In_ ULONG PacketType, + _In_ PSTRING MessageHeader, + _In_opt_ PSTRING MessageData, + _Inout_ PKD_CONTEXT Context) { if (PacketType == PACKET_TYPE_KD_DEBUG_IO) { - PSTRING Output = MessageData; + ULONG ApiNumber = ((PDBGKD_DEBUG_IO)MessageHeader->Buffer)->ApiNumber; PLIST_ENTRY CurrentEntry; PKD_DISPATCH_TABLE CurrentTable; - if (!KdpDebugMode.Value) return; + /* Validate API call */ + if (MessageHeader->Length != sizeof(DBGKD_DEBUG_IO)) + return; + if ((ApiNumber != DbgKdPrintStringApi) && + (ApiNumber != DbgKdGetStringApi)) + { + return; + } + if (!MessageData) + return; + + /* NOTE: MessageData->Length should be equal to + * DebugIo.u.PrintString.LengthOfString, or to + * DebugIo.u.GetString.LengthOfPromptString */ + + if (!KdpDebugMode.Value) + return; /* Call the registered handlers */ CurrentEntry = KdProviders.Flink; @@ -599,7 +615,7 @@ KdSendPacket( KdProvidersList); /* Call it */ - CurrentTable->KdpPrintRoutine(Output->Buffer, Output->Length); + CurrentTable->KdpPrintRoutine(MessageData->Buffer, MessageData->Length); /* Next Table */ CurrentEntry = CurrentEntry->Flink; @@ -672,20 +688,17 @@ KdSendPacket( KDSTATUS NTAPI KdReceivePacket( - IN ULONG PacketType, - OUT PSTRING MessageHeader, - OUT PSTRING MessageData, - OUT PULONG DataLength, - IN OUT PKD_CONTEXT Context) + _In_ ULONG PacketType, + _Out_ PSTRING MessageHeader, + _Out_ PSTRING MessageData, + _Out_ PULONG DataLength, + _Inout_ PKD_CONTEXT Context) { #ifdef KDBG - KIRQL OldIrql; - STRING StringChar; - CHAR Response; - USHORT i; - ULONG DummyScanCode; - CHAR MessageBuffer[100]; + STRING NewLine = RTL_CONSTANT_STRING("\n"); STRING ResponseString; + PDBGKD_DEBUG_IO DebugIo; + CHAR MessageBuffer[512]; #endif if (PacketType == PACKET_TYPE_KD_STATE_MANIPULATE) @@ -724,99 +737,49 @@ KdReceivePacket( return KdPacketTimedOut; #ifdef KDBG - ResponseString.Buffer = MessageBuffer; - ResponseString.Length = 0; - ResponseString.MaximumLength = min(sizeof(MessageBuffer), MessageData->MaximumLength); - StringChar.Buffer = &Response; - StringChar.Length = StringChar.MaximumLength = sizeof(Response); - - /* Display the string and print a new line for log neatness */ - *StringChar.Buffer = '\n'; - KdpPrintString(&StringChar); + DebugIo = (PDBGKD_DEBUG_IO)MessageHeader->Buffer; - /* Print the kdb prompt */ - KdpPrintString(&KdbPromptString); + /* Validate API call */ + if (MessageHeader->MaximumLength != sizeof(DBGKD_DEBUG_IO)) + return KdPacketNeedsResend; + if (DebugIo->ApiNumber != DbgKdGetStringApi) + return KdPacketNeedsResend; - // TODO: Use an improved KdbpReadCommand() function for our purposes. + /* NOTE: We cannot use directly MessageData->Buffer here as it points + * to the temporary KdpMessageBuffer scratch buffer that is being + * shared with all the possible I/O KD operations that may happen. */ + ResponseString.Buffer = MessageBuffer; + ResponseString.Length = 0; + ResponseString.MaximumLength = min(sizeof(MessageBuffer), + MessageData->MaximumLength); + ResponseString.MaximumLength = min(ResponseString.MaximumLength, + DebugIo->u.GetString.LengthOfStringRead); - /* Acquire the printing spinlock without waiting at raised IRQL */ - OldIrql = KdbpAcquireLock(&KdpSerialSpinLock); + /* The prompt string has been printed by KdSendPacket; go to + * new line and print the kdb prompt -- for SYSREG2 support. */ + KdpPrintString(&NewLine); + KdpPrintString(&KdbPromptString); // Alternatively, use "Input> " if (!(KdbDebugState & KD_DEBUG_KDSERIAL)) KbdDisableMouse(); - /* Loop the whole string */ - for (i = 0; i < ResponseString.MaximumLength; i++) - { - /* Check if this is serial debugging mode */ - if (KdbDebugState & KD_DEBUG_KDSERIAL) - { - /* Get the character from serial */ - do - { - Response = KdbpTryGetCharSerial(MAXULONG); - } while (Response == -1); - } - else - { - /* Get the response from the keyboard */ - do - { - Response = KdbpTryGetCharKeyboard(&DummyScanCode, MAXULONG); - } while (Response == -1); - } - - /* Check for return */ - if (Response == '\r') - { - /* - * We might need to discard the next '\n'. - * Wait a bit to make sure we receive it. - */ - KeStallExecutionProcessor(100000); - - /* Check the mode */ - if (KdbDebugState & KD_DEBUG_KDSERIAL) - { - /* Read and discard the next character, if any */ - KdbpTryGetCharSerial(5); - } - else - { - /* Read and discard the next character, if any */ - KdbpTryGetCharKeyboard(&DummyScanCode, 5); - } - - /* - * Null terminate the output string -- documentation states that - * DbgPrompt does not null terminate, but it does - */ - *(PCHAR)(ResponseString.Buffer + i) = 0; - break; - } - - /* Write it back and print it to the log */ - *(PCHAR)(ResponseString.Buffer + i) = Response; - KdbpReleaseLock(&KdpSerialSpinLock, OldIrql); - KdpPrintString(&StringChar); - OldIrql = KdbpAcquireLock(&KdpSerialSpinLock); - } - - /* Release the spinlock */ - KdbpReleaseLock(&KdpSerialSpinLock, OldIrql); - - /* Print a new line */ - *StringChar.Buffer = '\n'; - KdpPrintString(&StringChar); - - /* Return the length */ - RtlCopyMemory(MessageData->Buffer, ResponseString.Buffer, i); - *DataLength = i; + /* Read a line of user input and retrieve the length. + * The output string is NULL-terminated -- documentation states + * that DbgPrompt() does not NULL-terminate, but it does. */ + *DataLength = KdbpReadCommand(ResponseString.Buffer, + ResponseString.MaximumLength); if (!(KdbDebugState & KD_DEBUG_KDSERIAL)) KbdEnableMouse(); + /* Return the length */ + *DataLength = min(*DataLength, DebugIo->u.GetString.LengthOfStringRead); + MessageData->Length = DebugIo->u.GetString.LengthOfStringRead = *DataLength; + + /* Only now we can copy back the data into MessageData->Buffer */ + RtlCopyMemory(MessageData->Buffer, ResponseString.Buffer, *DataLength); #endif + return KdPacketReceived; } diff --git a/ntoskrnl/kdbg/kdb.h b/ntoskrnl/kdbg/kdb.h index d78e2696cdd..8d1e9af2a47 100644 --- a/ntoskrnl/kdbg/kdb.h +++ b/ntoskrnl/kdbg/kdb.h @@ -98,6 +98,11 @@ KdbpCliMainLoop( VOID KdbpCliInterpretInitFile(VOID); +SIZE_T +KdbpReadCommand( + _Out_ PCHAR Buffer, + _In_ SIZE_T Size); + VOID KdbpPager( _In_ PCHAR Buffer,

1 year, 11 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2023