Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/02: [SYSDM] Implement the selection of a property page by command line
by Eric Kohl 09 Feb '20

09 Feb '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=81389f291900d4d7f6107… commit 81389f291900d4d7f6107cee6a7a63924366d438 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Feb 9 13:07:13 2020 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Feb 9 13:07:13 2020 +0100 [SYSDM] Implement the selection of a property page by command line --- dll/cpl/sysdm/precomp.h | 5 ++--- dll/cpl/sysdm/sysdm.c | 24 +++++++++++++++++------- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/dll/cpl/sysdm/precomp.h b/dll/cpl/sysdm/precomp.h index 5eb66604bb5..0e6fbde768a 100644 --- a/dll/cpl/sysdm/precomp.h +++ b/dll/cpl/sysdm/precomp.h @@ -18,19 +18,18 @@ #include <shellapi.h> #include <shlobj.h> #include <setupapi.h> +#include <cpl.h> #include "resource.h" #define NUM_APPLETS (1) -typedef LONG (CALLBACK *APPLET_INITPROC)(VOID); - typedef struct _APPLET { int idIcon; int idName; int idDescription; - APPLET_INITPROC AppletProc; + APPLET_PROC AppletProc; } APPLET, *PAPPLET; extern HINSTANCE hApplet; diff --git a/dll/cpl/sysdm/sysdm.c b/dll/cpl/sysdm/sysdm.c index 8061b1c663b..817c0015db7 100644 --- a/dll/cpl/sysdm/sysdm.c +++ b/dll/cpl/sysdm/sysdm.c @@ -9,12 +9,10 @@ #include "precomp.h" -#include <cpl.h> #include <regstr.h> -LONG CALLBACK SystemApplet(VOID); +static LONG APIENTRY SystemApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam); HINSTANCE hApplet = 0; -HWND hCPLWindow; /* Applets */ APPLET Applets[NUM_APPLETS] = @@ -140,22 +138,28 @@ PropSheetProc(HWND hwndDlg, UINT uMsg, LPARAM lParam) /* First Applet */ LONG CALLBACK -SystemApplet(VOID) +SystemApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) { HPROPSHEETPAGE hpsp[MAX_SYSTEM_PAGES]; PROPSHEETHEADER psh; HMODULE hNetIdDll; HPSXA hpsxa = NULL; + INT nPage = 0; LONG Ret; static INITCOMMONCONTROLSEX icc = {sizeof(INITCOMMONCONTROLSEX), ICC_LINK_CLASS}; if (!InitCommonControlsEx(&icc)) return 0; + if (uMsg == CPL_STARTWPARMSW && lParam != 0) + { + nPage = _wtoi((PWSTR)lParam); + } + ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); psh.dwSize = sizeof(PROPSHEETHEADER); psh.dwFlags = PSH_PROPTITLE | PSH_USEICONID | PSH_USECALLBACK; - psh.hwndParent = hCPLWindow; + psh.hwndParent = hwnd; psh.hInstance = hApplet; psh.pszIcon = MAKEINTRESOURCEW(IDI_USERPROF); psh.pszCaption = MAKEINTRESOURCE(IDS_CPLSYSTEMNAME); @@ -176,6 +180,9 @@ SystemApplet(VOID) SHAddFromPropSheetExtArray(hpsxa, PropSheetAddPage, (LPARAM)&psh); } + if (nPage != 0 && nPage <= psh.nPages) + psh.nStartPage = nPage; + Ret = (LONG)(PropertySheet(&psh) != -1); if (hpsxa != NULL) @@ -219,9 +226,12 @@ CPlApplet(HWND hwndCPl, break; case CPL_DBLCLK: - hCPLWindow = hwndCPl; - Applets[i].AppletProc(); + Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); break; + + case CPL_STARTWPARMSW: + return Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); + } return FALSE;

1 0

[reactos] 01/01: [CRT] Only write to the output buffer when necessary in _strlwr. CORE-16667
by Thomas Faber 09 Feb '20

09 Feb '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d528e634778337edf1c61… commit d528e634778337edf1c615aeaa3fef47b7510d2b Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Feb 9 10:20:48 2020 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Feb 9 10:23:01 2020 +0100 [CRT] Only write to the output buffer when necessary in _strlwr. CORE-16667 Like e884290d292, this is also a hack and is missing locale awareness. --- sdk/lib/crt/string/strlwr.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sdk/lib/crt/string/strlwr.c b/sdk/lib/crt/string/strlwr.c index 5966a5bf3aa..53d06dc9d96 100644 --- a/sdk/lib/crt/string/strlwr.c +++ b/sdk/lib/crt/string/strlwr.c @@ -7,9 +7,13 @@ char * CDECL _strlwr(char *x) { char *y=x; + char ch, lower; while (*y) { - *y=tolower(*y); + ch = *y; + lower = tolower(ch); + if (ch != lower) + *y = lower; y++; } return x;

1 0

[reactos] 01/01: [NDK][RTL] Implement RtlGetUnloadEventTrace. CORE-16671
by Oleg Dubinskiy 09 Feb '20

09 Feb '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6f232770d3999177188e1… commit 6f232770d3999177188e1c7faed4c66c596f26b4 Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Fri Jan 31 14:01:46 2020 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Feb 9 08:37:58 2020 +0100 [NDK][RTL] Implement RtlGetUnloadEventTrace. CORE-16671 --- dll/ntdll/def/ntdll.spec | 2 +- sdk/include/ndk/rtltypes.h | 2 ++ sdk/lib/rtl/trace.c | 10 ++++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dll/ntdll/def/ntdll.spec b/dll/ntdll/def/ntdll.spec index da5e3614322..00e2ee107ad 100644 --- a/dll/ntdll/def/ntdll.spec +++ b/dll/ntdll/def/ntdll.spec @@ -679,7 +679,7 @@ @ stdcall RtlGetSecurityDescriptorRMControl(ptr ptr) @ stdcall RtlGetSetBootStatusData(ptr long long ptr long long) @ stdcall RtlGetThreadErrorMode() -@ stdcall -stub RtlGetUnloadEventTrace() +@ stdcall RtlGetUnloadEventTrace() @ stdcall RtlGetUserInfoHeap(ptr long ptr ptr ptr) @ stdcall RtlGetVersion(ptr) @ stdcall RtlHashUnicodeString(ptr long long ptr) diff --git a/sdk/include/ndk/rtltypes.h b/sdk/include/ndk/rtltypes.h index 02d65a29719..ee3206768e6 100644 --- a/sdk/include/ndk/rtltypes.h +++ b/sdk/include/ndk/rtltypes.h @@ -1224,6 +1224,8 @@ typedef struct _RTL_FLS_DATA // // Unload Event Trace Structure for RtlGetUnloadEventTrace // +#define RTL_UNLOAD_EVENT_TRACE_NUMBER 64 + typedef struct _RTL_UNLOAD_EVENT_TRACE { PVOID BaseAddress; diff --git a/sdk/lib/rtl/trace.c b/sdk/lib/rtl/trace.c index 3979a502855..f0bf4578a01 100644 --- a/sdk/lib/rtl/trace.c +++ b/sdk/lib/rtl/trace.c @@ -10,8 +10,18 @@ #define NDEBUG #include <debug.h> +static RTL_UNLOAD_EVENT_TRACE RtlpUnloadEventTrace[RTL_UNLOAD_EVENT_TRACE_NUMBER]; + /* FUNCTIONS ******************************************************************/ +PRTL_UNLOAD_EVENT_TRACE +NTAPI +RtlGetUnloadEventTrace(VOID) +{ + /* Just return a pointer to an array, according to MSDN */ + return RtlpUnloadEventTrace; +} + BOOLEAN NTAPI RtlTraceDatabaseAdd(IN PRTL_TRACE_DATABASE Database,

1 0

[reactos] 01/01: [HAL] Use a spin lock for the DMA adapter list. CORE-16611
by Thomas Faber 09 Feb '20

09 Feb '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6c93669012c654efc4635… commit 6c93669012c654efc46354670251a5475ac0f41f Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Fri Jan 31 23:03:57 2020 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Feb 9 08:32:56 2020 +0100 [HAL] Use a spin lock for the DMA adapter list. CORE-16611 This is necessary because HalPutDmaAdapter can be called at DISPATCH_LEVEL. --- hal/halx86/generic/dma.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/hal/halx86/generic/dma.c b/hal/halx86/generic/dma.c index 7bcfc33e037..39c2efe42a6 100644 --- a/hal/halx86/generic/dma.c +++ b/hal/halx86/generic/dma.c @@ -85,6 +85,7 @@ #ifndef _MINIHAL_ static KEVENT HalpDmaLock; +static KSPIN_LOCK HalpDmaAdapterListLock; static LIST_ENTRY HalpDmaAdapterList; static PADAPTER_OBJECT HalpEisaAdapter[8]; #endif @@ -165,6 +166,7 @@ HalpInitDma(VOID) * first map buffers. */ InitializeListHead(&HalpDmaAdapterList); + KeInitializeSpinLock(&HalpDmaAdapterListLock); KeInitializeEvent(&HalpDmaLock, NotificationEvent, TRUE); HalpMasterAdapter = HalpDmaAllocateMasterAdapter(); @@ -621,6 +623,7 @@ HalGetAdapter(IN PDEVICE_DESCRIPTION DeviceDescription, BOOLEAN EisaAdapter; ULONG MapRegisters; ULONG MaximumLength; + KIRQL OldIrql; /* Validate parameters in device description */ if (DeviceDescription->Version > DEVICE_DESCRIPTION_VERSION2) return NULL; @@ -688,8 +691,7 @@ HalGetAdapter(IN PDEVICE_DESCRIPTION DeviceDescription, } /* - * Acquire the DMA lock that is used to protect adapter lists and - * EISA adapter array. + * Acquire the DMA lock that is used to protect the EISA adapter array. */ KeWaitForSingleObject(&HalpDmaLock, Executive, KernelMode, FALSE, NULL); @@ -745,14 +747,20 @@ HalGetAdapter(IN PDEVICE_DESCRIPTION DeviceDescription, } } - if (!EisaAdapter) InsertTailList(&HalpDmaAdapterList, &AdapterObject->AdapterList); - /* - * Release the DMA lock. HalpDmaAdapterList and HalpEisaAdapter will - * no longer be touched, so we don't need it. + * Release the DMA lock. HalpEisaAdapter will no longer be touched, + * so we don't need it. */ KeSetEvent(&HalpDmaLock, 0, 0); + if (!EisaAdapter) + { + /* If it's not one of the static adapters, add it to the list */ + KeAcquireSpinLock(&HalpDmaAdapterListLock, &OldIrql); + InsertTailList(&HalpDmaAdapterList, &AdapterObject->AdapterList); + KeReleaseSpinLock(&HalpDmaAdapterListLock, OldIrql); + } + /* * Setup the values in the adapter object that are common for all * types of buses. @@ -818,11 +826,12 @@ VOID NTAPI HalPutDmaAdapter(IN PADAPTER_OBJECT AdapterObject) { + KIRQL OldIrql; if (AdapterObject->ChannelNumber == 0xFF) { - KeWaitForSingleObject(&HalpDmaLock, Executive, KernelMode, FALSE, NULL); + KeAcquireSpinLock(&HalpDmaAdapterListLock, &OldIrql); RemoveEntryList(&AdapterObject->AdapterList); - KeSetEvent(&HalpDmaLock, 0, 0); + KeReleaseSpinLock(&HalpDmaAdapterListLock, OldIrql); } ObDereferenceObject(AdapterObject);

1 0

[reactos] 01/01: [CPL][APPWIZ] Add InitCommonControls calls (#2316)
by Katayama Hirofumi MZ 09 Feb '20

09 Feb '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0e8bf61f819116d5eda10… commit 0e8bf61f819116d5eda10db2fe852907ca518e9f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Feb 9 14:42:26 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Feb 9 14:42:26 2020 +0900 [CPL][APPWIZ] Add InitCommonControls calls (#2316) CORE-16669 --- dll/cpl/appwiz/createlink.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dll/cpl/appwiz/createlink.c b/dll/cpl/appwiz/createlink.c index 46cf6f9b84c..e51403658f5 100644 --- a/dll/cpl/appwiz/createlink.c +++ b/dll/cpl/appwiz/createlink.c @@ -11,6 +11,7 @@ */ #include "appwiz.h" +#include <commctrl.h> #include <shellapi.h> #include <strsafe.h> @@ -495,7 +496,7 @@ PropSheetProc(HWND hwndDlg, UINT uMsg, LPARAM lParam) } LONG CALLBACK -ShowCreateShortcutWizard(HWND hwndCPl, LPWSTR szPath) +ShowCreateShortcutWizard(HWND hwndCPl, LPCWSTR szPath) { PROPSHEETHEADERW psh; HPROPSHEETPAGE ahpsp[2]; @@ -601,7 +602,8 @@ LONG CALLBACK NewLinkHereW(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) { - return ShowCreateShortcutWizard(hwndCPl, (LPWSTR) lParam1); + InitCommonControls(); + return ShowCreateShortcutWizard(hwndCPl, (LPWSTR)lParam1); } LONG @@ -612,6 +614,7 @@ NewLinkHereA(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) if (MultiByteToWideChar(CP_ACP, 0, (LPSTR)lParam1, -1, szFile, _countof(szFile))) { + InitCommonControls(); return ShowCreateShortcutWizard(hwndCPl, szFile); } return -1;

1 0

[reactos] 01/01: [CONSRV] Additions for the GUI frontend.
by Hermès Bélusca-Maïto 08 Feb '20

08 Feb '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=53061a4b695b377ac7ae1… commit 53061a4b695b377ac7ae10367121f55a158bb348 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 9 00:28:20 2020 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 9 00:39:16 2020 +0100 [CONSRV] Additions for the GUI frontend. - Fix the text-copy code to handle fullwidth characters. - Move the caret painting code to its own function. --- win32ss/user/winsrv/consrv/frontends/gui/text.c | 142 ++++++++++++++---------- 1 file changed, 83 insertions(+), 59 deletions(-) diff --git a/win32ss/user/winsrv/consrv/frontends/gui/text.c b/win32ss/user/winsrv/consrv/frontends/gui/text.c index 1751dfeb865..0397be7d82e 100644 --- a/win32ss/user/winsrv/consrv/frontends/gui/text.c +++ b/win32ss/user/winsrv/consrv/frontends/gui/text.c @@ -120,8 +120,13 @@ CopyBlock(PTEXTMODE_SCREEN_BUFFER Buffer, /* * Sometimes, applications can put NULL chars into the screen-buffer * (this behaviour is allowed). Detect this and replace by a space. + * For full-width characters: copy only the character specified + * in the leading-byte cell, skipping the trailing-byte cell. */ - *dstPos++ = (ptr[xPos].Char.UnicodeChar ? ptr[xPos].Char.UnicodeChar : L' '); + if (!(ptr[xPos].Attributes & COMMON_LVB_TRAILING_BYTE)) + { + *dstPos++ = (ptr[xPos].Char.UnicodeChar ? ptr[xPos].Char.UnicodeChar : L' '); + } } /* Add newline characters if we are not in inline-text copy mode */ @@ -212,8 +217,13 @@ CopyLines(PTEXTMODE_SCREEN_BUFFER Buffer, /* * Sometimes, applications can put NULL chars into the screen-buffer * (this behaviour is allowed). Detect this and replace by a space. + * For full-width characters: copy only the character specified + * in the leading-byte cell, skipping the trailing-byte cell. */ - *dstPos++ = (ptr[xPos].Char.UnicodeChar ? ptr[xPos].Char.UnicodeChar : L' '); + if (!(ptr[xPos].Attributes & COMMON_LVB_TRAILING_BYTE)) + { + *dstPos++ = (ptr[xPos].Char.UnicodeChar ? ptr[xPos].Char.UnicodeChar : L' '); + } } } @@ -351,6 +361,75 @@ GuiPasteToTextModeBuffer(PTEXTMODE_SCREEN_BUFFER Buffer, GlobalUnlock(hData); } +static VOID +GuiPaintCaret( + PTEXTMODE_SCREEN_BUFFER Buffer, + PGUI_CONSOLE_DATA GuiData, + ULONG TopLine, + ULONG BottomLine, + ULONG LeftColumn, + ULONG RightColumn) +{ + PCONSRV_CONSOLE Console = Buffer->Header.Console; + + ULONG CursorX, CursorY, CursorHeight; + HBRUSH CursorBrush, OldBrush; + WORD Attribute; + + if (Buffer->CursorInfo.bVisible && + Buffer->CursorBlinkOn && + !Buffer->ForceCursorOff) + { + CursorX = Buffer->CursorPosition.X; + CursorY = Buffer->CursorPosition.Y; + if (LeftColumn <= CursorX && CursorX <= RightColumn && + TopLine <= CursorY && CursorY <= BottomLine) + { + CursorHeight = ConioEffectiveCursorSize(Console, GuiData->CharHeight); + + Attribute = ConioCoordToPointer(Buffer, Buffer->CursorPosition.X, Buffer->CursorPosition.Y)->Attributes; + if (Attribute == DEFAULT_SCREEN_ATTRIB) + Attribute = Buffer->ScreenDefaultAttrib; + + CursorBrush = CreateSolidBrush(PaletteRGBFromAttrib(Console, TextAttribFromAttrib(Attribute))); + OldBrush = SelectObject(GuiData->hMemDC, CursorBrush); + + if (Attribute & COMMON_LVB_LEADING_BYTE) + { + /* The caret is on the leading byte */ + PatBlt(GuiData->hMemDC, + CursorX * GuiData->CharWidth, + CursorY * GuiData->CharHeight + (GuiData->CharHeight - CursorHeight), + GuiData->CharWidth * 2, + CursorHeight, + PATCOPY); + } + else if (Attribute & COMMON_LVB_TRAILING_BYTE) + { + /* The caret is on the trailing byte */ + PatBlt(GuiData->hMemDC, + (CursorX - 1) * GuiData->CharWidth, + CursorY * GuiData->CharHeight + (GuiData->CharHeight - CursorHeight), + GuiData->CharWidth * 2, + CursorHeight, + PATCOPY); + } + else + { + PatBlt(GuiData->hMemDC, + CursorX * GuiData->CharWidth, + CursorY * GuiData->CharHeight + (GuiData->CharHeight - CursorHeight), + GuiData->CharWidth, + CursorHeight, + PATCOPY); + } + + SelectObject(GuiData->hMemDC, OldBrush); + DeleteObject(CursorBrush); + } + } +} + VOID GuiPaintTextModeBuffer(PTEXTMODE_SCREEN_BUFFER Buffer, PGUI_CONSOLE_DATA GuiData, @@ -363,8 +442,6 @@ GuiPaintTextModeBuffer(PTEXTMODE_SCREEN_BUFFER Buffer, PCHAR_INFO From; PWCHAR To; WORD LastAttribute, Attribute; - ULONG CursorX, CursorY, CursorHeight; - HBRUSH CursorBrush, OldBrush; HFONT OldFont, NewFont; BOOLEAN IsUnderline; @@ -492,61 +569,8 @@ GuiPaintTextModeBuffer(PTEXTMODE_SCREEN_BUFFER Buffer, /* Restore the old font */ SelectObject(GuiData->hMemDC, OldFont); - /* - * Draw the caret - */ - if (Buffer->CursorInfo.bVisible && - Buffer->CursorBlinkOn && - !Buffer->ForceCursorOff) - { - CursorX = Buffer->CursorPosition.X; - CursorY = Buffer->CursorPosition.Y; - if (LeftColumn <= CursorX && CursorX <= RightColumn && - TopLine <= CursorY && CursorY <= BottomLine) - { - CursorHeight = ConioEffectiveCursorSize(Console, GuiData->CharHeight); - - Attribute = ConioCoordToPointer(Buffer, Buffer->CursorPosition.X, Buffer->CursorPosition.Y)->Attributes; - if (Attribute == DEFAULT_SCREEN_ATTRIB) - Attribute = Buffer->ScreenDefaultAttrib; - - CursorBrush = CreateSolidBrush(PaletteRGBFromAttrib(Console, TextAttribFromAttrib(Attribute))); - OldBrush = SelectObject(GuiData->hMemDC, CursorBrush); - - if (Attribute & COMMON_LVB_LEADING_BYTE) - { - /* The caret is on the leading byte */ - PatBlt(GuiData->hMemDC, - CursorX * GuiData->CharWidth, - CursorY * GuiData->CharHeight + (GuiData->CharHeight - CursorHeight), - GuiData->CharWidth * 2, - CursorHeight, - PATCOPY); - } - else if (Attribute & COMMON_LVB_TRAILING_BYTE) - { - /* The caret is on the trailing byte */ - PatBlt(GuiData->hMemDC, - (CursorX - 1) * GuiData->CharWidth, - CursorY * GuiData->CharHeight + (GuiData->CharHeight - CursorHeight), - GuiData->CharWidth * 2, - CursorHeight, - PATCOPY); - } - else - { - PatBlt(GuiData->hMemDC, - CursorX * GuiData->CharWidth, - CursorY * GuiData->CharHeight + (GuiData->CharHeight - CursorHeight), - GuiData->CharWidth, - CursorHeight, - PATCOPY); - } - - SelectObject(GuiData->hMemDC, OldBrush); - DeleteObject(CursorBrush); - } - } + /* Draw the caret */ + GuiPaintCaret(Buffer, GuiData, TopLine, BottomLine, LeftColumn, RightColumn); LeaveCriticalSection(&Console->Lock); }

1 0

[reactos] 02/02: [CONSRV] Simplify parts of code in the line-input module.
by Hermès Bélusca-Maïto 08 Feb '20

08 Feb '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0d500b642b435e6175ab4… commit 0d500b642b435e6175ab4a3d1727c2fac68da5de Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 9 00:32:53 2020 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 9 00:38:32 2020 +0100 [CONSRV] Simplify parts of code in the line-input module. --- win32ss/user/winsrv/consrv/lineinput.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/win32ss/user/winsrv/consrv/lineinput.c b/win32ss/user/winsrv/consrv/lineinput.c index 20d66c68e12..2aab09254ef 100644 --- a/win32ss/user/winsrv/consrv/lineinput.c +++ b/win32ss/user/winsrv/consrv/lineinput.c @@ -106,11 +106,14 @@ LineInputEdit(PCONSRV_CONSOLE Console, if (GetConsoleInputBufferMode(Console) & ENABLE_ECHO_INPUT) { - for (i = Pos; i < NewSize; i++) + if (Pos < NewSize) { - TermWriteStream(Console, ActiveBuffer, &Console->LineBuffer[i], 1, TRUE); + TermWriteStream(Console, ActiveBuffer, + &Console->LineBuffer[Pos], + NewSize - Pos, + TRUE); } - for (; i < Console->LineSize; i++) + for (i = NewSize; i < Console->LineSize; ++i) { TermWriteStream(Console, ActiveBuffer, L" ", 1, TRUE); } @@ -431,12 +434,10 @@ LineInputKeyDown(PCONSRV_CONSOLE Console, LineInputSetPos(Console, Console->LineSize); Console->LineBuffer[Console->LineSize++] = L'\r'; - if (GetConsoleInputBufferMode(Console) & ENABLE_ECHO_INPUT) + if ((GetType(Console->ActiveBuffer) == TEXTMODE_BUFFER) && + (GetConsoleInputBufferMode(Console) & ENABLE_ECHO_INPUT)) { - if (GetType(Console->ActiveBuffer) == TEXTMODE_BUFFER) - { - TermWriteStream(Console, (PTEXTMODE_SCREEN_BUFFER)(Console->ActiveBuffer), L"\r", 1, TRUE); - } + TermWriteStream(Console, (PTEXTMODE_SCREEN_BUFFER)(Console->ActiveBuffer), L"\r", 1, TRUE); } /* @@ -448,12 +449,10 @@ LineInputKeyDown(PCONSRV_CONSOLE Console, Console->LineSize < Console->LineMaxSize) { Console->LineBuffer[Console->LineSize++] = L'\n'; - if (GetConsoleInputBufferMode(Console) & ENABLE_ECHO_INPUT) + if ((GetType(Console->ActiveBuffer) == TEXTMODE_BUFFER) && + (GetConsoleInputBufferMode(Console) & ENABLE_ECHO_INPUT)) { - if (GetType(Console->ActiveBuffer) == TEXTMODE_BUFFER) - { - TermWriteStream(Console, (PTEXTMODE_SCREEN_BUFFER)(Console->ActiveBuffer), L"\n", 1, TRUE); - } + TermWriteStream(Console, (PTEXTMODE_SCREEN_BUFFER)(Console->ActiveBuffer), L"\n", 1, TRUE); } } Console->LineComplete = TRUE;

1 0

[reactos] 01/02: [CONSRV] Disable the old code for scrolling via keyboard shortcuts as it is buggy. To be fixed later...
by Hermès Bélusca-Maïto 08 Feb '20

08 Feb '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fe3d655bc04ed1a77620f… commit fe3d655bc04ed1a77620f66a89ef6326227cdf8a Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 9 00:30:50 2020 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 9 00:38:31 2020 +0100 [CONSRV] Disable the old code for scrolling via keyboard shortcuts as it is buggy. To be fixed later... --- win32ss/user/winsrv/consrv/frontends/input.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/win32ss/user/winsrv/consrv/frontends/input.c b/win32ss/user/winsrv/consrv/frontends/input.c index a492b28da87..25a53a15c78 100644 --- a/win32ss/user/winsrv/consrv/frontends/input.c +++ b/win32ss/user/winsrv/consrv/frontends/input.c @@ -141,6 +141,11 @@ ConioProcessKey(PCONSRV_CONSOLE Console, MSG* msg) return; } +// +// FIXME: Scrolling via keyboard shortcuts must be done differently, +// without touching the internal VirtualY variable. +// +#if 0 if ( (ShiftState & (RIGHT_ALT_PRESSED | LEFT_ALT_PRESSED)) != 0 && (VirtualKeyCode == VK_UP || VirtualKeyCode == VK_DOWN) ) { @@ -172,6 +177,7 @@ ConioProcessKey(PCONSRV_CONSOLE Console, MSG* msg) ConioDrawConsole(Console); return; } +#endif /* Send the key press to the console driver */

1 0

[reactos] 04/04: [CONSRV] Minor code cleanup.
by Hermès Bélusca-Maïto 08 Feb '20

08 Feb '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=421150d5c34c0c88d6c4b… commit 421150d5c34c0c88d6c4b7a6f7ca94f1a9e268bd Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 9 00:27:01 2020 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 9 00:37:44 2020 +0100 [CONSRV] Minor code cleanup. --- win32ss/user/winsrv/consrv/condrv/conoutput.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/win32ss/user/winsrv/consrv/condrv/conoutput.c b/win32ss/user/winsrv/consrv/condrv/conoutput.c index 2f96f280835..3e6f2407607 100644 --- a/win32ss/user/winsrv/consrv/condrv/conoutput.c +++ b/win32ss/user/winsrv/consrv/condrv/conoutput.c @@ -329,8 +329,7 @@ ConDrvSetConsoleCursorPosition(IN PCONSOLE Console, OldCursorX = Buffer->CursorPosition.X; OldCursorY = Buffer->CursorPosition.Y; Buffer->CursorPosition = *Position; - // Buffer->CursorPosition.X = Position->X; - // Buffer->CursorPosition.Y = Position->Y; + if ( ((PCONSOLE_SCREEN_BUFFER)Buffer == Console->ActiveBuffer) && (!TermSetScreenInfo(Console, (PCONSOLE_SCREEN_BUFFER)Buffer, OldCursorX, OldCursorY)) ) {

1 0

[reactos] 03/04: [CONSRV] Fix the definitions of the Console[Input|Output]UnicodeToAnsiChar() and Console[Input|Output]AnsiToUnicodeChar() macros.
by Hermès Bélusca-Maïto 08 Feb '20

08 Feb '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d9cbe7dc64773f88060da… commit d9cbe7dc64773f88060da7ed9dbd2d731fe28ad8 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 9 00:24:21 2020 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 9 00:37:44 2020 +0100 [CONSRV] Fix the definitions of the Console[Input|Output]UnicodeToAnsiChar() and Console[Input|Output]AnsiToUnicodeChar() macros. --- win32ss/user/winsrv/consrv/condrv/text.c | 12 ++++++++---- win32ss/user/winsrv/consrv/coninput.c | 14 ++++++++++---- win32ss/user/winsrv/consrv/frontends/terminal.c | 12 ++++++++---- win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c | 6 ++++-- 4 files changed, 30 insertions(+), 14 deletions(-) diff --git a/win32ss/user/winsrv/consrv/condrv/text.c b/win32ss/user/winsrv/consrv/condrv/text.c index 92a6f4dfcfa..0d20b94ab94 100644 --- a/win32ss/user/winsrv/consrv/condrv/text.c +++ b/win32ss/user/winsrv/consrv/condrv/text.c @@ -25,12 +25,16 @@ * ERROR_INVALID_PARAMETER." */ #define ConsoleOutputUnicodeToAnsiChar(Console, dChar, sWChar) \ - ASSERT((ULONG_PTR)dChar != (ULONG_PTR)sWChar); \ - WideCharToMultiByte((Console)->OutputCodePage, 0, (sWChar), 1, (dChar), 1, NULL, NULL) +do { \ + ASSERT((ULONG_PTR)(dChar) != (ULONG_PTR)(sWChar)); \ + WideCharToMultiByte((Console)->OutputCodePage, 0, (sWChar), 1, (dChar), 1, NULL, NULL); \ +} while (0) #define ConsoleOutputAnsiToUnicodeChar(Console, dWChar, sChar) \ - ASSERT((ULONG_PTR)dWChar != (ULONG_PTR)sChar); \ - MultiByteToWideChar((Console)->OutputCodePage, 0, (sChar), 1, (dWChar), 1) +do { \ + ASSERT((ULONG_PTR)(dWChar) != (ULONG_PTR)(sChar)); \ + MultiByteToWideChar((Console)->OutputCodePage, 0, (sChar), 1, (dWChar), 1); \ +} while (0) /* PRIVATE FUNCTIONS **********************************************************/ diff --git a/win32ss/user/winsrv/consrv/coninput.c b/win32ss/user/winsrv/consrv/coninput.c index 9c441577a07..d8f5b24d9db 100644 --- a/win32ss/user/winsrv/consrv/coninput.c +++ b/win32ss/user/winsrv/consrv/coninput.c @@ -19,9 +19,11 @@ #define ConSrvGetInputBuffer(ProcessData, Handle, Ptr, Access, LockConsole) \ ConSrvGetObject((ProcessData), (Handle), (PCONSOLE_IO_OBJECT*)(Ptr), NULL, \ (Access), (LockConsole), INPUT_BUFFER) + #define ConSrvGetInputBufferAndHandleEntry(ProcessData, Handle, Ptr, Entry, Access, LockConsole) \ ConSrvGetObject((ProcessData), (Handle), (PCONSOLE_IO_OBJECT*)(Ptr), (Entry), \ (Access), (LockConsole), INPUT_BUFFER) + #define ConSrvReleaseInputBuffer(Buff, IsConsoleLocked) \ ConSrvReleaseObject(&(Buff)->Header, (IsConsoleLocked)) @@ -33,12 +35,16 @@ * ERROR_INVALID_PARAMETER." */ #define ConsoleInputUnicodeToAnsiChar(Console, dChar, sWChar) \ - ASSERT((ULONG_PTR)dChar != (ULONG_PTR)sWChar); \ - WideCharToMultiByte((Console)->InputCodePage, 0, (sWChar), 1, (dChar), 1, NULL, NULL) +do { \ + ASSERT((ULONG_PTR)(dChar) != (ULONG_PTR)(sWChar)); \ + WideCharToMultiByte((Console)->InputCodePage, 0, (sWChar), 1, (dChar), 1, NULL, NULL); \ +} while (0) #define ConsoleInputAnsiToUnicodeChar(Console, dWChar, sChar) \ - ASSERT((ULONG_PTR)dWChar != (ULONG_PTR)sChar); \ - MultiByteToWideChar((Console)->InputCodePage, 0, (sChar), 1, (dWChar), 1) +do { \ + ASSERT((ULONG_PTR)(dWChar) != (ULONG_PTR)(sChar)); \ + MultiByteToWideChar((Console)->InputCodePage, 0, (sChar), 1, (dWChar), 1); \ +} while (0) typedef struct _GET_INPUT_INFO diff --git a/win32ss/user/winsrv/consrv/frontends/terminal.c b/win32ss/user/winsrv/consrv/frontends/terminal.c index bae13a880a2..e6f048215a3 100644 --- a/win32ss/user/winsrv/consrv/frontends/terminal.c +++ b/win32ss/user/winsrv/consrv/frontends/terminal.c @@ -34,12 +34,16 @@ * ERROR_INVALID_PARAMETER." */ #define ConsoleInputUnicodeCharToAnsiChar(Console, dChar, sWChar) \ - ASSERT((ULONG_PTR)dChar != (ULONG_PTR)sWChar); \ - WideCharToMultiByte((Console)->InputCodePage, 0, (sWChar), 1, (dChar), 1, NULL, NULL) +do { \ + ASSERT((ULONG_PTR)(dChar) != (ULONG_PTR)(sWChar)); \ + WideCharToMultiByte((Console)->InputCodePage, 0, (sWChar), 1, (dChar), 1, NULL, NULL); \ +} while (0) #define ConsoleInputAnsiCharToUnicodeChar(Console, dWChar, sChar) \ - ASSERT((ULONG_PTR)dWChar != (ULONG_PTR)sChar); \ - MultiByteToWideChar((Console)->InputCodePage, 0, (sChar), 1, (dWChar), 1) +do { \ + ASSERT((ULONG_PTR)(dWChar) != (ULONG_PTR)(sChar)); \ + MultiByteToWideChar((Console)->InputCodePage, 0, (sChar), 1, (dWChar), 1); \ +} while (0) /* PRIVATE FUNCTIONS **********************************************************/ diff --git a/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c b/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c index e4874b10df6..fd58595ff69 100644 --- a/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c +++ b/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c @@ -29,8 +29,10 @@ /* GLOBALS ********************************************************************/ #define ConsoleOutputUnicodeToAnsiChar(Console, dChar, sWChar) \ - ASSERT((ULONG_PTR)dChar != (ULONG_PTR)sWChar); \ - WideCharToMultiByte((Console)->OutputCodePage, 0, (sWChar), 1, (dChar), 1, NULL, NULL) +do { \ + ASSERT((ULONG_PTR)(dChar) != (ULONG_PTR)(sWChar)); \ + WideCharToMultiByte((Console)->OutputCodePage, 0, (sWChar), 1, (dChar), 1, NULL, NULL); \ +} while (0) /* TUI Console Window Class name */ #define TUI_CONSOLE_WINDOW_CLASS L"TuiConsoleWindowClass"

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs