Ros-diffs December 2019

ros-diffs@reactos.org

18 participants
225 discussions

[reactos] 01/04: [BLUE] Code formatting, add SAL2 annotations, and update file source headers.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d684f906320d909786536… commit d684f906320d9097865369ee94dbf1fc6890277b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Dec 14 18:05:45 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Dec 15 03:36:17 2019 +0100 [BLUE] Code formatting, add SAL2 annotations, and update file source headers. --- drivers/setup/blue/blue.c | 1255 ++++++++++++++------------- drivers/setup/blue/blue.h | 72 +- drivers/setup/blue/font.c | 32 +- sdk/include/reactos/drivers/blue/ntddblue.h | 40 +- 4 files changed, 709 insertions(+), 690 deletions(-) diff --git a/drivers/setup/blue/blue.c b/drivers/setup/blue/blue.c index 7aa4f9d5d2e..23335819b5a 100644 --- a/drivers/setup/blue/blue.c +++ b/drivers/setup/blue/blue.c @@ -1,11 +1,10 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: services/dd/blue/blue.c - * PURPOSE: Console (blue screen) device driver - * PROGRAMMER: Eric Kohl - * UPDATE HISTORY: - * ??? Created + * PROJECT: ReactOS Console Text-Mode Device Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Driver Management Functions. + * COPYRIGHT: Copyright 1999 Boudewijn Dekker + * Copyright 1999-2019 Eric Kohl + * Copyright 2006 Filip Navara */ /* INCLUDES ******************************************************************/ @@ -20,69 +19,69 @@ * [[character][attribute]][[character][attribute]].... */ - /* TYPEDEFS ***************************************************************/ typedef struct _DEVICE_EXTENSION { - PUCHAR VideoMemory; /* Pointer to video memory */ - ULONG CursorSize; - INT CursorVisible; + PUCHAR VideoMemory; /* Pointer to video memory */ + ULONG CursorSize; + INT CursorVisible; USHORT CharAttribute; - ULONG Mode; - UCHAR ScanLines; /* Height of a text line */ - USHORT Rows; /* Number of rows */ - USHORT Columns; /* Number of columns */ + ULONG Mode; + UCHAR ScanLines; /* Height of a text line */ + USHORT Rows; /* Number of rows */ + USHORT Columns; /* Number of columns */ } DEVICE_EXTENSION, *PDEVICE_EXTENSION; typedef struct _VGA_REGISTERS { - UCHAR CRT[24]; - UCHAR Attribute[21]; - UCHAR Graphics[9]; - UCHAR Sequencer[5]; - UCHAR Misc; + UCHAR CRT[24]; + UCHAR Attribute[21]; + UCHAR Graphics[9]; + UCHAR Sequencer[5]; + UCHAR Misc; } VGA_REGISTERS, *PVGA_REGISTERS; static const VGA_REGISTERS VidpMode3Regs = { - /* CRT Controller Registers */ - {0x5F, 0x4F, 0x50, 0x82, 0x55, 0x81, 0xBF, 0x1F, 0x00, 0x47, 0x1E, 0x00, + /* CRT Controller Registers */ + {0x5F, 0x4F, 0x50, 0x82, 0x55, 0x81, 0xBF, 0x1F, 0x00, 0x47, 0x1E, 0x00, 0x00, 0x00, 0x05, 0xF0, 0x9C, 0x8E, 0x8F, 0x28, 0x1F, 0x96, 0xB9, 0xA3}, - /* Attribute Controller Registers */ - {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x14, 0x07, 0x38, 0x39, 0x3A, 0x3B, + /* Attribute Controller Registers */ + {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x14, 0x07, 0x38, 0x39, 0x3A, 0x3B, 0x3C, 0x3D, 0x3E, 0x3F, 0x0C, 0x00, 0x0F, 0x08, 0x00}, - /* Graphics Controller Registers */ - {0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x0E, 0x00, 0xFF}, - /* Sequencer Registers */ - {0x03, 0x00, 0x03, 0x00, 0x02}, - /* Misc Output Register */ - 0x67 + /* Graphics Controller Registers */ + {0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x0E, 0x00, 0xFF}, + /* Sequencer Registers */ + {0x03, 0x00, 0x03, 0x00, 0x02}, + /* Misc Output Register */ + 0x67 }; static const UCHAR DefaultPalette[] = { - 0, 0, 0, - 0, 0, 0xC0, - 0, 0xC0, 0, - 0, 0xC0, 0xC0, - 0xC0, 0, 0, - 0xC0, 0, 0xC0, - 0xC0, 0xC0, 0, - 0xC0, 0xC0, 0xC0, - 0x80, 0x80, 0x80, - 0, 0, 0xFF, - 0, 0xFF, 0, - 0, 0xFF, 0xFF, - 0xFF, 0, 0, - 0xFF, 0, 0xFF, - 0xFF, 0xFF, 0, - 0xFF, 0xFF, 0xFF + 0, 0, 0, + 0, 0, 0xC0, + 0, 0xC0, 0, + 0, 0xC0, 0xC0, + 0xC0, 0, 0, + 0xC0, 0, 0xC0, + 0xC0, 0xC0, 0, + 0xC0, 0xC0, 0xC0, + 0x80, 0x80, 0x80, + 0, 0, 0xFF, + 0, 0xFF, 0, + 0, 0xFF, 0xFF, + 0xFF, 0, 0, + 0xFF, 0, 0xFF, + 0xFF, 0xFF, 0, + 0xFF, 0xFF, 0xFF }; /* FUNCTIONS **************************************************************/ -static VOID FASTCALL +static VOID +FASTCALL ScrSetRegisters(const VGA_REGISTERS *Registers) { UINT32 i; @@ -96,7 +95,7 @@ ScrSetRegisters(const VGA_REGISTERS *Registers) /* Write sequencer registers */ for (i = 1; i < sizeof(Registers->Sequencer); i++) -{ + { WRITE_PORT_UCHAR(SEQ, i); WRITE_PORT_UCHAR(SEQDATA, Registers->Sequencer[i]); } @@ -131,72 +130,74 @@ ScrSetRegisters(const VGA_REGISTERS *Registers) WRITE_PORT_UCHAR(ATTRIB, Registers->Attribute[i]); } - /* Set the PEL mask. */ + /* Set the PEL mask */ WRITE_PORT_UCHAR(PELMASK, 0xff); } -static VOID FASTCALL -ScrAcquireOwnership(PDEVICE_EXTENSION DeviceExtension) +static VOID +FASTCALL +ScrAcquireOwnership( + _In_ PDEVICE_EXTENSION DeviceExtension) { - unsigned int offset; + ULONG offset; UCHAR data, value; ULONG Index; ScrSetRegisters(&VidpMode3Regs); - /* Disable screen and enable palette access. */ + /* Disable screen and enable palette access */ READ_PORT_UCHAR(STATUS); WRITE_PORT_UCHAR(ATTRIB, 0x00); for (Index = 0; Index < sizeof(DefaultPalette) / 3; Index++) { - WRITE_PORT_UCHAR(PELINDEX, Index); - WRITE_PORT_UCHAR(PELDATA, DefaultPalette[Index * 3] >> 2); - WRITE_PORT_UCHAR(PELDATA, DefaultPalette[Index * 3 + 1] >> 2); - WRITE_PORT_UCHAR(PELDATA, DefaultPalette[Index * 3 + 2] >> 2); + WRITE_PORT_UCHAR(PELINDEX, Index); + WRITE_PORT_UCHAR(PELDATA, DefaultPalette[Index * 3] >> 2); + WRITE_PORT_UCHAR(PELDATA, DefaultPalette[Index * 3 + 1] >> 2); + WRITE_PORT_UCHAR(PELDATA, DefaultPalette[Index * 3 + 2] >> 2); } - /* Enable screen and disable palette access. */ + /* Enable screen and disable palette access */ READ_PORT_UCHAR(STATUS); WRITE_PORT_UCHAR(ATTRIB, 0x20); - /* get current output position */ - WRITE_PORT_UCHAR (CRTC_COMMAND, CRTC_CURSORPOSLO); - offset = READ_PORT_UCHAR (CRTC_DATA); - WRITE_PORT_UCHAR (CRTC_COMMAND, CRTC_CURSORPOSHI); - offset += (READ_PORT_UCHAR (CRTC_DATA) << 8); - - /* switch blinking characters off */ - READ_PORT_UCHAR (ATTRC_INPST1); - value = READ_PORT_UCHAR (ATTRC_WRITEREG); - WRITE_PORT_UCHAR (ATTRC_WRITEREG, 0x10); - data = READ_PORT_UCHAR (ATTRC_READREG); + /* Get current output position */ + WRITE_PORT_UCHAR(CRTC_COMMAND, CRTC_CURSORPOSLO); + offset = READ_PORT_UCHAR(CRTC_DATA); + WRITE_PORT_UCHAR(CRTC_COMMAND, CRTC_CURSORPOSHI); + offset += (READ_PORT_UCHAR(CRTC_DATA) << 8); + + /* Switch blinking characters off */ + READ_PORT_UCHAR(ATTRC_INPST1); + value = READ_PORT_UCHAR(ATTRC_WRITEREG); + WRITE_PORT_UCHAR(ATTRC_WRITEREG, 0x10); + data = READ_PORT_UCHAR(ATTRC_READREG); data = data & ~0x08; - WRITE_PORT_UCHAR (ATTRC_WRITEREG, data); - WRITE_PORT_UCHAR (ATTRC_WRITEREG, value); - READ_PORT_UCHAR (ATTRC_INPST1); - - /* read screen information from crt controller */ - WRITE_PORT_UCHAR (CRTC_COMMAND, CRTC_COLUMNS); - DeviceExtension->Columns = READ_PORT_UCHAR (CRTC_DATA) + 1; - WRITE_PORT_UCHAR (CRTC_COMMAND, CRTC_ROWS); - DeviceExtension->Rows = READ_PORT_UCHAR (CRTC_DATA); - WRITE_PORT_UCHAR (CRTC_COMMAND, CRTC_OVERFLOW); - data = READ_PORT_UCHAR (CRTC_DATA); + WRITE_PORT_UCHAR(ATTRC_WRITEREG, data); + WRITE_PORT_UCHAR(ATTRC_WRITEREG, value); + READ_PORT_UCHAR(ATTRC_INPST1); + + /* Read screen information from CRT controller */ + WRITE_PORT_UCHAR(CRTC_COMMAND, CRTC_COLUMNS); + DeviceExtension->Columns = READ_PORT_UCHAR(CRTC_DATA) + 1; + WRITE_PORT_UCHAR(CRTC_COMMAND, CRTC_ROWS); + DeviceExtension->Rows = READ_PORT_UCHAR(CRTC_DATA); + WRITE_PORT_UCHAR(CRTC_COMMAND, CRTC_OVERFLOW); + data = READ_PORT_UCHAR(CRTC_DATA); DeviceExtension->Rows |= (((data & 0x02) << 7) | ((data & 0x40) << 3)); DeviceExtension->Rows++; - WRITE_PORT_UCHAR (CRTC_COMMAND, CRTC_SCANLINES); - DeviceExtension->ScanLines = (READ_PORT_UCHAR (CRTC_DATA) & 0x1F) + 1; - - /* show blinking cursor */ - WRITE_PORT_UCHAR (CRTC_COMMAND, CRTC_CURSORSTART); - WRITE_PORT_UCHAR (CRTC_DATA, (DeviceExtension->ScanLines - 1) & 0x1F); - WRITE_PORT_UCHAR (CRTC_COMMAND, CRTC_CURSOREND); - data = READ_PORT_UCHAR (CRTC_DATA) & 0xE0; - WRITE_PORT_UCHAR (CRTC_DATA, - data | ((DeviceExtension->ScanLines - 1) & 0x1F)); - - /* calculate number of text rows */ + WRITE_PORT_UCHAR(CRTC_COMMAND, CRTC_SCANLINES); + DeviceExtension->ScanLines = (READ_PORT_UCHAR(CRTC_DATA) & 0x1F) + 1; + + /* Show blinking cursor */ + WRITE_PORT_UCHAR(CRTC_COMMAND, CRTC_CURSORSTART); + WRITE_PORT_UCHAR(CRTC_DATA, (DeviceExtension->ScanLines - 1) & 0x1F); + WRITE_PORT_UCHAR(CRTC_COMMAND, CRTC_CURSOREND); + data = READ_PORT_UCHAR(CRTC_DATA) & 0xE0; + WRITE_PORT_UCHAR(CRTC_DATA, + data | ((DeviceExtension->ScanLines - 1) & 0x1F)); + + /* Calculate number of text rows */ DeviceExtension->Rows = DeviceExtension->Rows / DeviceExtension->ScanLines; #ifdef BOCHS_30ROWS @@ -206,20 +207,21 @@ ScrAcquireOwnership(PDEVICE_EXTENSION DeviceExtension) /* Upload a default font for the default codepage 437 */ ScrLoadFontTable(437); - DPRINT ("%d Columns %d Rows %d Scanlines\n", - DeviceExtension->Columns, - DeviceExtension->Rows, - DeviceExtension->ScanLines); + DPRINT("%d Columns %d Rows %d Scanlines\n", + DeviceExtension->Columns, + DeviceExtension->Rows, + DeviceExtension->ScanLines); } -NTSTATUS NTAPI -DriverEntry (PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath); - static DRIVER_DISPATCH ScrCreate; -static NTSTATUS NTAPI -ScrCreate(PDEVICE_OBJECT DeviceObject, - PIRP Irp) +static NTSTATUS +NTAPI +ScrCreate( + _In_ PDEVICE_OBJECT DeviceObject, + _In_ PIRP Irp) { +#define FOREGROUND_LIGHTGRAY (FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED) + PDEVICE_EXTENSION DeviceExtension; PHYSICAL_ADDRESS BaseAddress; NTSTATUS Status; @@ -230,14 +232,14 @@ ScrCreate(PDEVICE_OBJECT DeviceObject, { ScrAcquireOwnership(DeviceExtension); - /* get pointer to video memory */ + /* Get a pointer to the video memory */ BaseAddress.QuadPart = VIDMEM_BASE; DeviceExtension->VideoMemory = - (PUCHAR)MmMapIoSpace (BaseAddress, DeviceExtension->Rows * DeviceExtension->Columns * 2, MmNonCached); + (PUCHAR)MmMapIoSpace(BaseAddress, DeviceExtension->Rows * DeviceExtension->Columns * 2, MmNonCached); } else { - /* store dummy values here */ + /* Store dummy values */ DeviceExtension->Columns = 1; DeviceExtension->Rows = 1; DeviceExtension->ScanLines = 1; @@ -246,34 +248,35 @@ ScrCreate(PDEVICE_OBJECT DeviceObject, DeviceExtension->CursorSize = 5; /* FIXME: value correct?? */ DeviceExtension->CursorVisible = TRUE; - /* more initialization */ - DeviceExtension->CharAttribute = 0x17; /* light grey on blue */ + /* More initialization */ + DeviceExtension->CharAttribute = BACKGROUND_BLUE | FOREGROUND_LIGHTGRAY; DeviceExtension->Mode = ENABLE_PROCESSED_OUTPUT | ENABLE_WRAP_AT_EOL_OUTPUT; Status = STATUS_SUCCESS; Irp->IoStatus.Status = Status; - IoCompleteRequest (Irp, IO_NO_INCREMENT); - - return (Status); + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; } static DRIVER_DISPATCH ScrWrite; -static NTSTATUS NTAPI -ScrWrite(PDEVICE_OBJECT DeviceObject, - PIRP Irp) +static NTSTATUS +NTAPI +ScrWrite( + _In_ PDEVICE_OBJECT DeviceObject, + _In_ PIRP Irp) { - PIO_STACK_LOCATION stk = IoGetCurrentIrpStackLocation (Irp); + PIO_STACK_LOCATION stk = IoGetCurrentIrpStackLocation(Irp); PDEVICE_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; NTSTATUS Status; - char *pch = Irp->UserBuffer; + PCHAR pch = Irp->UserBuffer; PUCHAR vidmem; - unsigned int i; - int j, offset; - int cursorx, cursory; - int rows, columns; - int processed = DeviceExtension->Mode & ENABLE_PROCESSED_OUTPUT; + ULONG i; + ULONG j, offset; + USHORT cursorx, cursory; + USHORT rows, columns; + BOOLEAN processed = !!(DeviceExtension->Mode & ENABLE_PROCESSED_OUTPUT); if (InbvCheckDisplayOwnership()) { @@ -281,610 +284,621 @@ ScrWrite(PDEVICE_OBJECT DeviceObject, Status = STATUS_SUCCESS; Irp->IoStatus.Status = Status; - IoCompleteRequest (Irp, IO_NO_INCREMENT); + IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; } vidmem = DeviceExtension->VideoMemory; - rows = DeviceExtension->Rows; + rows = DeviceExtension->Rows; columns = DeviceExtension->Columns; _disable(); - WRITE_PORT_UCHAR (CRTC_COMMAND, CRTC_CURSORPOSHI); - offset = READ_PORT_UCHAR (CRTC_DATA)<<8; - WRITE_PORT_UCHAR (CRTC_COMMAND, CRTC_CURSORPOSLO); - offset += READ_PORT_UCHAR (CRTC_DATA); + WRITE_PORT_UCHAR(CRTC_COMMAND, CRTC_CURSORPOSHI); + offset = READ_PORT_UCHAR(CRTC_DATA)<<8; + WRITE_PORT_UCHAR(CRTC_COMMAND, CRTC_CURSORPOSLO); + offset += READ_PORT_UCHAR(CRTC_DATA); _enable(); - cursory = offset / columns; - cursorx = offset % columns; - if( processed == 0 ) - { - /* raw output mode */ - // FIXME: Does the buffer only contains chars? or chars + attributes? - // FIXME2: Fix buffer overflow. - memcpy( &vidmem[(cursorx * 2) + (cursory * columns * 2)], pch, stk->Parameters.Write.Length ); - offset += (stk->Parameters.Write.Length / 2); - } - else { - for (i = 0; i < stk->Parameters.Write.Length; i++, pch++) - { - switch (*pch) + cursory = (USHORT)(offset / columns); + cursorx = (USHORT)(offset % columns); + if (!processed) + { + /* Raw output mode */ + // FIXME: Does the buffer only contains chars? or chars + attributes? + // FIXME2: Fix buffer overflow. + RtlCopyMemory(&vidmem[(cursorx * 2) + (cursory * columns * 2)], + pch, stk->Parameters.Write.Length); + offset += (stk->Parameters.Write.Length / 2); + } + else + { + /* Cooked output mode */ + for (i = 0; i < stk->Parameters.Write.Length; i++, pch++) { - case '\b': - if (cursorx > 0) - { - cursorx--; - } - else if (cursory > 0) - { - cursorx = columns - 1; - cursory--; - } - vidmem[(cursorx * 2) + (cursory * columns * 2)] = ' '; - vidmem[(cursorx * 2) + (cursory * columns * 2) + 1] = (char) DeviceExtension->CharAttribute; - break; - - case '\n': - cursory++; - cursorx = 0; - break; - - case '\r': - cursorx = 0; - break; - - case '\t': - offset = TAB_WIDTH - (cursorx % TAB_WIDTH); - for (j = 0; j < offset; j++) - { - vidmem[(cursorx * 2) + (cursory * columns * 2)] = ' '; - cursorx++; - - if (cursorx >= columns) + switch (*pch) + { + case '\b': + { + if (cursorx > 0) + { + cursorx--; + } + else if (cursory > 0) { - cursory++; - cursorx = 0; + cursorx = columns - 1; + cursory--; } - } - break; + vidmem[(cursorx * 2) + (cursory * columns * 2)] = ' '; + vidmem[(cursorx * 2) + (cursory * columns * 2) + 1] = (char)DeviceExtension->CharAttribute; + break; + } - default: - vidmem[(cursorx * 2) + (cursory * columns * 2)] = *pch; - vidmem[(cursorx * 2) + (cursory * columns * 2) + 1] = (char) DeviceExtension->CharAttribute; - cursorx++; - if (cursorx >= columns) - { - cursory++; - cursorx = 0; - } - break; - } + case '\n': + cursory++; + cursorx = 0; + break; - /* Scroll up the contents of the screen if we are at the end */ - if (cursory >= rows) - { - unsigned short *LinePtr; - - memcpy (vidmem, - &vidmem[columns * 2], - columns * (rows - 1) * 2); - - LinePtr = (unsigned short *) &vidmem[columns * (rows - 1) * 2]; - - for (j = 0; j < columns; j++) - { - LinePtr[j] = DeviceExtension->CharAttribute << 8; - } - cursory = rows - 1; - for (j = 0; j < columns; j++) - { - vidmem[(j * 2) + (cursory * columns * 2)] = ' '; - vidmem[(j * 2) + (cursory * columns * 2) + 1] = (char)DeviceExtension->CharAttribute; - } + case '\r': + cursorx = 0; + break; + + case '\t': + { + offset = TAB_WIDTH - (cursorx % TAB_WIDTH); + for (j = 0; j < offset; j++) + { + vidmem[(cursorx * 2) + (cursory * columns * 2)] = ' '; + cursorx++; + + if (cursorx >= columns) + { + cursory++; + cursorx = 0; + } + } + break; + } + + default: + { + vidmem[(cursorx * 2) + (cursory * columns * 2)] = *pch; + vidmem[(cursorx * 2) + (cursory * columns * 2) + 1] = (char)DeviceExtension->CharAttribute; + cursorx++; + if (cursorx >= columns) + { + cursory++; + cursorx = 0; + } + break; + } + } + + /* Scroll up the contents of the screen if we are at the end */ + if (cursory >= rows) + { + PUSHORT LinePtr; + + RtlCopyMemory(vidmem, + &vidmem[columns * 2], + columns * (rows - 1) * 2); + + LinePtr = (PUSHORT)&vidmem[columns * (rows - 1) * 2]; + + for (j = 0; j < columns; j++) + { + LinePtr[j] = DeviceExtension->CharAttribute << 8; + } + cursory = rows - 1; + for (j = 0; j < columns; j++) + { + vidmem[(j * 2) + (cursory * columns * 2)] = ' '; + vidmem[(j * 2) + (cursory * columns * 2) + 1] = (char)DeviceExtension->CharAttribute; + } + } } - } - /* Set the cursor position */ - offset = (cursory * columns) + cursorx; + /* Set the cursor position */ + offset = (cursory * columns) + cursorx; } _disable(); - WRITE_PORT_UCHAR (CRTC_COMMAND, CRTC_CURSORPOSLO); - WRITE_PORT_UCHAR (CRTC_DATA, offset); - WRITE_PORT_UCHAR (CRTC_COMMAND, CRTC_CURSORPOSHI); + WRITE_PORT_UCHAR(CRTC_COMMAND, CRTC_CURSORPOSLO); + WRITE_PORT_UCHAR(CRTC_DATA, offset); + WRITE_PORT_UCHAR(CRTC_COMMAND, CRTC_CURSORPOSHI); offset >>= 8; - WRITE_PORT_UCHAR (CRTC_DATA, offset); + WRITE_PORT_UCHAR(CRTC_DATA, offset); _enable(); Status = STATUS_SUCCESS; Irp->IoStatus.Status = Status; - IoCompleteRequest (Irp, IO_NO_INCREMENT); + IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; } static DRIVER_DISPATCH ScrIoControl; -static NTSTATUS NTAPI -ScrIoControl(PDEVICE_OBJECT DeviceObject, - PIRP Irp) +static NTSTATUS +NTAPI +ScrIoControl( + _In_ PDEVICE_OBJECT DeviceObject, + _In_ PIRP Irp) { - PIO_STACK_LOCATION stk = IoGetCurrentIrpStackLocation (Irp); - PDEVICE_EXTENSION DeviceExtension; - NTSTATUS Status; + NTSTATUS Status; + PIO_STACK_LOCATION stk = IoGetCurrentIrpStackLocation(Irp); + PDEVICE_EXTENSION DeviceExtension; - DeviceExtension = DeviceObject->DeviceExtension; - switch (stk->Parameters.DeviceIoControl.IoControlCode) + DeviceExtension = DeviceObject->DeviceExtension; + switch (stk->Parameters.DeviceIoControl.IoControlCode) { - case IOCTL_CONSOLE_GET_SCREEN_BUFFER_INFO: + case IOCTL_CONSOLE_GET_SCREEN_BUFFER_INFO: { - PCONSOLE_SCREEN_BUFFER_INFO pcsbi = (PCONSOLE_SCREEN_BUFFER_INFO)Irp->AssociatedIrp.SystemBuffer; - int rows = DeviceExtension->Rows; - int columns = DeviceExtension->Columns; - unsigned int offset; - - if (!InbvCheckDisplayOwnership()) - { - /* read cursor position from crtc */ - _disable(); - WRITE_PORT_UCHAR (CRTC_COMMAND, CRTC_CURSORPOSLO); - offset = READ_PORT_UCHAR (CRTC_DATA); - WRITE_PORT_UCHAR (CRTC_COMMAND, CRTC_CURSORPOSHI); - offset += (READ_PORT_UCHAR (CRTC_DATA) << 8); - _enable(); - } - else - { - offset = 0; - } - - pcsbi->dwSize.X = columns; - pcsbi->dwSize.Y = rows; - - pcsbi->dwCursorPosition.X = (SHORT)(offset % columns); - pcsbi->dwCursorPosition.Y = (SHORT)(offset / columns); - - pcsbi->wAttributes = DeviceExtension->CharAttribute; - - pcsbi->srWindow.Left = 0; - pcsbi->srWindow.Right = columns - 1; - pcsbi->srWindow.Top = 0; - pcsbi->srWindow.Bottom = rows - 1; - - pcsbi->dwMaximumWindowSize.X = columns; - pcsbi->dwMaximumWindowSize.Y = rows; - - Irp->IoStatus.Information = sizeof (CONSOLE_SCREEN_BUFFER_INFO); - Status = STATUS_SUCCESS; - } - break; + PCONSOLE_SCREEN_BUFFER_INFO pcsbi = (PCONSOLE_SCREEN_BUFFER_INFO)Irp->AssociatedIrp.SystemBuffer; + USHORT rows = DeviceExtension->Rows; + USHORT columns = DeviceExtension->Columns; + ULONG offset; - case IOCTL_CONSOLE_SET_SCREEN_BUFFER_INFO: - { - PCONSOLE_SCREEN_BUFFER_INFO pcsbi = (PCONSOLE_SCREEN_BUFFER_INFO)Irp->AssociatedIrp.SystemBuffer; - unsigned int offset; - - if ( pcsbi->dwCursorPosition.X < 0 || pcsbi->dwCursorPosition.X >= DeviceExtension->Columns || - pcsbi->dwCursorPosition.Y < 0 || pcsbi->dwCursorPosition.Y >= DeviceExtension->Rows ) - { - Irp->IoStatus.Information = 0; - Status = STATUS_INVALID_PARAMETER; - break; - } - - DeviceExtension->CharAttribute = pcsbi->wAttributes; - offset = (pcsbi->dwCursorPosition.Y * DeviceExtension->Columns) + - pcsbi->dwCursorPosition.X; - - if (!InbvCheckDisplayOwnership()) - { - _disable(); - WRITE_PORT_UCHAR (CRTC_COMMAND, CRTC_CURSORPOSLO); - WRITE_PORT_UCHAR (CRTC_DATA, offset); - WRITE_PORT_UCHAR (CRTC_COMMAND, CRTC_CURSORPOSHI); - WRITE_PORT_UCHAR (CRTC_DATA, offset>>8); - _enable(); - } - - Irp->IoStatus.Information = 0; - Status = STATUS_SUCCESS; - } - break; + if (!InbvCheckDisplayOwnership()) + { + /* read cursor position from crtc */ + _disable(); + WRITE_PORT_UCHAR(CRTC_COMMAND, CRTC_CURSORPOSLO); + offset = READ_PORT_UCHAR(CRTC_DATA); + WRITE_PORT_UCHAR(CRTC_COMMAND, CRTC_CURSORPOSHI); + offset += (READ_PORT_UCHAR(CRTC_DATA) << 8); + _enable(); + } + else + { + offset = 0; + } - case IOCTL_CONSOLE_GET_CURSOR_INFO: - { - PCONSOLE_CURSOR_INFO pcci = (PCONSOLE_CURSOR_INFO)Irp->AssociatedIrp.SystemBuffer; + pcsbi->dwSize.X = columns; + pcsbi->dwSize.Y = rows; - pcci->dwSize = DeviceExtension->CursorSize; - pcci->bVisible = DeviceExtension->CursorVisible; + pcsbi->dwCursorPosition.X = (SHORT)(offset % columns); + pcsbi->dwCursorPosition.Y = (SHORT)(offset / columns); - Irp->IoStatus.Information = sizeof (CONSOLE_CURSOR_INFO); - Status = STATUS_SUCCESS; + pcsbi->wAttributes = DeviceExtension->CharAttribute; + + pcsbi->srWindow.Left = 0; + pcsbi->srWindow.Right = columns - 1; + pcsbi->srWindow.Top = 0; + pcsbi->srWindow.Bottom = rows - 1; + + pcsbi->dwMaximumWindowSize.X = columns; + pcsbi->dwMaximumWindowSize.Y = rows; + + Irp->IoStatus.Information = sizeof(CONSOLE_SCREEN_BUFFER_INFO); + Status = STATUS_SUCCESS; + break; } - break; - case IOCTL_CONSOLE_SET_CURSOR_INFO: + case IOCTL_CONSOLE_SET_SCREEN_BUFFER_INFO: { - PCONSOLE_CURSOR_INFO pcci = (PCONSOLE_CURSOR_INFO)Irp->AssociatedIrp.SystemBuffer; - UCHAR data, value; - ULONG size, height; + PCONSOLE_SCREEN_BUFFER_INFO pcsbi = (PCONSOLE_SCREEN_BUFFER_INFO)Irp->AssociatedIrp.SystemBuffer; + ULONG Offset; - DeviceExtension->CursorSize = pcci->dwSize; - DeviceExtension->CursorVisible = pcci->bVisible; + if ( pcsbi->dwCursorPosition.X < 0 || pcsbi->dwCursorPosition.X >= DeviceExtension->Columns || + pcsbi->dwCursorPosition.Y < 0 || pcsbi->dwCursorPosition.Y >= DeviceExtension->Rows ) + { + Irp->IoStatus.Information = 0; + Status = STATUS_INVALID_PARAMETER; + break; + } + + DeviceExtension->CharAttribute = pcsbi->wAttributes; - if (!InbvCheckDisplayOwnership()) - { - height = DeviceExtension->ScanLines; - data = (pcci->bVisible) ? 0x00 : 0x20; + Offset = (pcsbi->dwCursorPosition.Y * DeviceExtension->Columns) + + pcsbi->dwCursorPosition.X; - size = (pcci->dwSize * height) / 100; - if (size < 1) + if (!InbvCheckDisplayOwnership()) { - size = 1; + _disable(); + WRITE_PORT_UCHAR(CRTC_COMMAND, CRTC_CURSORPOSLO); + WRITE_PORT_UCHAR(CRTC_DATA, Offset); + WRITE_PORT_UCHAR(CRTC_COMMAND, CRTC_CURSORPOSHI); + WRITE_PORT_UCHAR(CRTC_DATA, Offset >> 8); + _enable(); } - data |= (UCHAR)(height - size); + Irp->IoStatus.Information = 0; + Status = STATUS_SUCCESS; + break; + } + + case IOCTL_CONSOLE_GET_CURSOR_INFO: + { + PCONSOLE_CURSOR_INFO pcci = (PCONSOLE_CURSOR_INFO)Irp->AssociatedIrp.SystemBuffer; - _disable(); - WRITE_PORT_UCHAR (CRTC_COMMAND, CRTC_CURSORSTART); - WRITE_PORT_UCHAR (CRTC_DATA, data); - WRITE_PORT_UCHAR (CRTC_COMMAND, CRTC_CURSOREND); - value = READ_PORT_UCHAR (CRTC_DATA) & 0xE0; - WRITE_PORT_UCHAR (CRTC_DATA, value | (height - 1)); + pcci->dwSize = DeviceExtension->CursorSize; + pcci->bVisible = DeviceExtension->CursorVisible; - _enable(); - } + Irp->IoStatus.Information = sizeof(CONSOLE_CURSOR_INFO); + Status = STATUS_SUCCESS; + break; + } - Irp->IoStatus.Information = 0; - Status = STATUS_SUCCESS; + case IOCTL_CONSOLE_SET_CURSOR_INFO: + { + PCONSOLE_CURSOR_INFO pcci = (PCONSOLE_CURSOR_INFO)Irp->AssociatedIrp.SystemBuffer; + UCHAR data, value; + ULONG size, height; + + DeviceExtension->CursorSize = pcci->dwSize; + DeviceExtension->CursorVisible = pcci->bVisible; + + if (!InbvCheckDisplayOwnership()) + { + height = DeviceExtension->ScanLines; + data = (pcci->bVisible) ? 0x00 : 0x20; + + size = (pcci->dwSize * height) / 100; + if (size < 1) + size = 1; + + data |= (UCHAR)(height - size); + + _disable(); + WRITE_PORT_UCHAR(CRTC_COMMAND, CRTC_CURSORSTART); + WRITE_PORT_UCHAR(CRTC_DATA, data); + WRITE_PORT_UCHAR(CRTC_COMMAND, CRTC_CURSOREND); + value = READ_PORT_UCHAR(CRTC_DATA) & 0xE0; + WRITE_PORT_UCHAR(CRTC_DATA, value | (height - 1)); + _enable(); + } + + Irp->IoStatus.Information = 0; + Status = STATUS_SUCCESS; + break; } - break; - case IOCTL_CONSOLE_GET_MODE: + case IOCTL_CONSOLE_GET_MODE: { - PCONSOLE_MODE pcm = (PCONSOLE_MODE)Irp->AssociatedIrp.SystemBuffer; + PCONSOLE_MODE pcm = (PCONSOLE_MODE)Irp->AssociatedIrp.SystemBuffer; - pcm->dwMode = DeviceExtension->Mode; + pcm->dwMode = DeviceExtension->Mode; - Irp->IoStatus.Information = sizeof(CONSOLE_MODE); - Status = STATUS_SUCCESS; + Irp->IoStatus.Information = sizeof(CONSOLE_MODE); + Status = STATUS_SUCCESS; + break; } - break; - case IOCTL_CONSOLE_SET_MODE: + case IOCTL_CONSOLE_SET_MODE: { - PCONSOLE_MODE pcm = (PCONSOLE_MODE)Irp->AssociatedIrp.SystemBuffer; + PCONSOLE_MODE pcm = (PCONSOLE_MODE)Irp->AssociatedIrp.SystemBuffer; - DeviceExtension->Mode = pcm->dwMode; + DeviceExtension->Mode = pcm->dwMode; - Irp->IoStatus.Information = 0; - Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + Status = STATUS_SUCCESS; + break; } - break; - case IOCTL_CONSOLE_FILL_OUTPUT_ATTRIBUTE: + case IOCTL_CONSOLE_FILL_OUTPUT_ATTRIBUTE: { - POUTPUT_ATTRIBUTE Buf = (POUTPUT_ATTRIBUTE)Irp->AssociatedIrp.SystemBuffer; - PUCHAR vidmem; - int offset; - ULONG dwCount; - ULONG nMaxLength = Buf->nLength; - - if ( Buf->dwCoord.X < 0 || Buf->dwCoord.X >= DeviceExtension->Columns || - Buf->dwCoord.Y < 0 || Buf->dwCoord.Y >= DeviceExtension->Rows ) - { - Buf->dwTransfered = 0; - Irp->IoStatus.Information = 0; - Status = STATUS_SUCCESS; - break; - } - - if (!InbvCheckDisplayOwnership()) - { - vidmem = DeviceExtension->VideoMemory; - offset = (Buf->dwCoord.Y * DeviceExtension->Columns * 2) + - (Buf->dwCoord.X * 2) + 1; - - nMaxLength = min(nMaxLength, - (DeviceExtension->Rows - Buf->dwCoord.Y) - * DeviceExtension->Columns - Buf->dwCoord.X); - - for (dwCount = 0; dwCount < nMaxLength; dwCount++) + POUTPUT_ATTRIBUTE Buf = (POUTPUT_ATTRIBUTE)Irp->AssociatedIrp.SystemBuffer; + PUCHAR vidmem; + int offset; + ULONG dwCount; + ULONG nMaxLength = Buf->nLength; + + if ( Buf->dwCoord.X < 0 || Buf->dwCoord.X >= DeviceExtension->Columns || + Buf->dwCoord.Y < 0 || Buf->dwCoord.Y >= DeviceExtension->Rows ) + { + Buf->dwTransfered = 0; + Irp->IoStatus.Information = 0; + Status = STATUS_SUCCESS; + break; + } + + if (!InbvCheckDisplayOwnership()) { - vidmem[offset + (dwCount * 2)] = (char) Buf->wAttribute; + vidmem = DeviceExtension->VideoMemory; + offset = (Buf->dwCoord.Y * DeviceExtension->Columns * 2) + + (Buf->dwCoord.X * 2) + 1; + + nMaxLength = min(nMaxLength, + (DeviceExtension->Rows - Buf->dwCoord.Y) + * DeviceExtension->Columns - Buf->dwCoord.X); + + for (dwCount = 0; dwCount < nMaxLength; dwCount++) + { + vidmem[offset + (dwCount * 2)] = (char)Buf->wAttribute; + } } - } - Buf->dwTransfered = nMaxLength; + Buf->dwTransfered = nMaxLength; - Irp->IoStatus.Information = 0; - Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + Status = STATUS_SUCCESS; + break; } - break; - case IOCTL_CONSOLE_READ_OUTPUT_ATTRIBUTE: + case IOCTL_CONSOLE_READ_OUTPUT_ATTRIBUTE: { - POUTPUT_ATTRIBUTE Buf = (POUTPUT_ATTRIBUTE)Irp->AssociatedIrp.SystemBuffer; - PUSHORT pAttr = (PUSHORT)MmGetSystemAddressForMdl(Irp->MdlAddress); - PUCHAR vidmem; - int offset; - ULONG dwCount; - ULONG nMaxLength; - - if ( Buf->dwCoord.X < 0 || Buf->dwCoord.X >= DeviceExtension->Columns || - Buf->dwCoord.Y < 0 || Buf->dwCoord.Y >= DeviceExtension->Rows ) - { - Buf->dwTransfered = 0; - Irp->IoStatus.Information = 0; - Status = STATUS_SUCCESS; - break; - } - - if (!InbvCheckDisplayOwnership()) - { - vidmem = DeviceExtension->VideoMemory; - offset = (Buf->dwCoord.Y * DeviceExtension->Columns * 2) + - (Buf->dwCoord.X * 2) + 1; - - nMaxLength = min(stk->Parameters.DeviceIoControl.OutputBufferLength, - (DeviceExtension->Rows - Buf->dwCoord.Y) - * DeviceExtension->Columns - Buf->dwCoord.X); - - for (dwCount = 0; dwCount < nMaxLength; dwCount++, pAttr++) + POUTPUT_ATTRIBUTE Buf = (POUTPUT_ATTRIBUTE)Irp->AssociatedIrp.SystemBuffer; + PUSHORT pAttr = (PUSHORT)MmGetSystemAddressForMdl(Irp->MdlAddress); + PUCHAR vidmem; + int offset; + ULONG dwCount; + ULONG nMaxLength; + + if ( Buf->dwCoord.X < 0 || Buf->dwCoord.X >= DeviceExtension->Columns || + Buf->dwCoord.Y < 0 || Buf->dwCoord.Y >= DeviceExtension->Rows ) { - *((char *)pAttr) = vidmem[offset + (dwCount * 2)]; + Buf->dwTransfered = 0; + Irp->IoStatus.Information = 0; + Status = STATUS_SUCCESS; + break; } - Buf->dwTransfered = dwCount; - } - else - { - Buf->dwTransfered = 0; - } + if (!InbvCheckDisplayOwnership()) + { + vidmem = DeviceExtension->VideoMemory; + offset = (Buf->dwCoord.Y * DeviceExtension->Columns * 2) + + (Buf->dwCoord.X * 2) + 1; + + nMaxLength = min(stk->Parameters.DeviceIoControl.OutputBufferLength, + (DeviceExtension->Rows - Buf->dwCoord.Y) + * DeviceExtension->Columns - Buf->dwCoord.X); + + for (dwCount = 0; dwCount < nMaxLength; dwCount++, pAttr++) + { + *((PCHAR)pAttr) = vidmem[offset + (dwCount * 2)]; + } - Irp->IoStatus.Information = sizeof(OUTPUT_ATTRIBUTE); - Status = STATUS_SUCCESS; + Buf->dwTransfered = dwCount; + } + else + { + Buf->dwTransfered = 0; + } + + Irp->IoStatus.Information = sizeof(OUTPUT_ATTRIBUTE); + Status = STATUS_SUCCESS; + break; } - break; - case IOCTL_CONSOLE_WRITE_OUTPUT_ATTRIBUTE: + case IOCTL_CONSOLE_WRITE_OUTPUT_ATTRIBUTE: { - COORD *pCoord = (COORD *)MmGetSystemAddressForMdl(Irp->MdlAddress); - CHAR *pAttr = (CHAR *)(pCoord + 1); - PUCHAR vidmem; - int offset; - ULONG dwCount; - ULONG nMaxLength; - - if ( pCoord->X < 0 || pCoord->X >= DeviceExtension->Columns || - pCoord->Y < 0 || pCoord->Y >= DeviceExtension->Rows ) - { - Irp->IoStatus.Information = 0; - Status = STATUS_SUCCESS; - break; - } - - if (!InbvCheckDisplayOwnership()) - { - vidmem = DeviceExtension->VideoMemory; - offset = (pCoord->Y * DeviceExtension->Columns * 2) + - (pCoord->X * 2) + 1; - - nMaxLength = min(stk->Parameters.DeviceIoControl.OutputBufferLength - sizeof(COORD), - (DeviceExtension->Rows - pCoord->Y) - * DeviceExtension->Columns - pCoord->X); - - for (dwCount = 0; dwCount < nMaxLength; dwCount++, pAttr++) + PCOORD pCoord = (PCOORD)MmGetSystemAddressForMdl(Irp->MdlAddress); + PCHAR pAttr = (PCHAR)(pCoord + 1); + PUCHAR vidmem; + int offset; + ULONG dwCount; + ULONG nMaxLength; + + if ( pCoord->X < 0 || pCoord->X >= DeviceExtension->Columns || + pCoord->Y < 0 || pCoord->Y >= DeviceExtension->Rows ) { - vidmem[offset + (dwCount * 2)] = *pAttr; + Irp->IoStatus.Information = 0; + Status = STATUS_SUCCESS; + break; + } + + if (!InbvCheckDisplayOwnership()) + { + vidmem = DeviceExtension->VideoMemory; + offset = (pCoord->Y * DeviceExtension->Columns * 2) + + (pCoord->X * 2) + 1; + + nMaxLength = min(stk->Parameters.DeviceIoControl.OutputBufferLength - sizeof(COORD), + (DeviceExtension->Rows - pCoord->Y) + * DeviceExtension->Columns - pCoord->X); + + for (dwCount = 0; dwCount < nMaxLength; dwCount++, pAttr++) + { + vidmem[offset + (dwCount * 2)] = *pAttr; + } } - } - Irp->IoStatus.Information = 0; - Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + Status = STATUS_SUCCESS; + break; } - break; - case IOCTL_CONSOLE_SET_TEXT_ATTRIBUTE: - DeviceExtension->CharAttribute = (USHORT)*(PUSHORT)Irp->AssociatedIrp.SystemBuffer; - Irp->IoStatus.Information = 0; - Status = STATUS_SUCCESS; - break; + case IOCTL_CONSOLE_SET_TEXT_ATTRIBUTE: + DeviceExtension->CharAttribute = (USHORT)*(PUSHORT)Irp->AssociatedIrp.SystemBuffer; + Irp->IoStatus.Information = 0; + Status = STATUS_SUCCESS; + break; - case IOCTL_CONSOLE_FILL_OUTPUT_CHARACTER: + case IOCTL_CONSOLE_FILL_OUTPUT_CHARACTER: { - POUTPUT_CHARACTER Buf = (POUTPUT_CHARACTER)Irp->AssociatedIrp.SystemBuffer; - PUCHAR vidmem; - int offset; - ULONG dwCount; - ULONG nMaxLength = Buf->nLength; - - if ( Buf->dwCoord.X < 0 || Buf->dwCoord.X >= DeviceExtension->Columns || - Buf->dwCoord.Y < 0 || Buf->dwCoord.Y >= DeviceExtension->Rows ) - { - Buf->dwTransfered = 0; - Irp->IoStatus.Information = 0; - Status = STATUS_SUCCESS; - break; - } - - if (!InbvCheckDisplayOwnership()) - { - vidmem = DeviceExtension->VideoMemory; - offset = (Buf->dwCoord.Y * DeviceExtension->Columns * 2) + - (Buf->dwCoord.X * 2); - - nMaxLength = min(nMaxLength, - (DeviceExtension->Rows - Buf->dwCoord.Y) - * DeviceExtension->Columns - Buf->dwCoord.X); - - for (dwCount = 0; dwCount < nMaxLength; dwCount++) + POUTPUT_CHARACTER Buf = (POUTPUT_CHARACTER)Irp->AssociatedIrp.SystemBuffer; + PUCHAR vidmem; + int offset; + ULONG dwCount; + ULONG nMaxLength = Buf->nLength; + + if ( Buf->dwCoord.X < 0 || Buf->dwCoord.X >= DeviceExtension->Columns || + Buf->dwCoord.Y < 0 || Buf->dwCoord.Y >= DeviceExtension->Rows ) { - vidmem[offset + (dwCount * 2)] = (char) Buf->cCharacter; + Buf->dwTransfered = 0; + Irp->IoStatus.Information = 0; + Status = STATUS_SUCCESS; + break; } - } - Buf->dwTransfered = nMaxLength; + if (!InbvCheckDisplayOwnership()) + { + vidmem = DeviceExtension->VideoMemory; + offset = (Buf->dwCoord.Y * DeviceExtension->Columns * 2) + + (Buf->dwCoord.X * 2); - Irp->IoStatus.Information = 0; - Status = STATUS_SUCCESS; + nMaxLength = min(nMaxLength, + (DeviceExtension->Rows - Buf->dwCoord.Y) + * DeviceExtension->Columns - Buf->dwCoord.X); + + for (dwCount = 0; dwCount < nMaxLength; dwCount++) + { + vidmem[offset + (dwCount * 2)] = (char)Buf->cCharacter; + } + } + + Buf->dwTransfered = nMaxLength; + + Irp->IoStatus.Information = 0; + Status = STATUS_SUCCESS; + break; } - break; - case IOCTL_CONSOLE_READ_OUTPUT_CHARACTER: + case IOCTL_CONSOLE_READ_OUTPUT_CHARACTER: { - POUTPUT_CHARACTER Buf = (POUTPUT_CHARACTER)Irp->AssociatedIrp.SystemBuffer; - LPSTR pChar = (LPSTR)MmGetSystemAddressForMdl(Irp->MdlAddress); - PUCHAR vidmem; - int offset; - ULONG dwCount; - ULONG nMaxLength; - - if ( Buf->dwCoord.X < 0 || Buf->dwCoord.X >= DeviceExtension->Columns || - Buf->dwCoord.Y < 0 || Buf->dwCoord.Y >= DeviceExtension->Rows ) - { - Buf->dwTransfered = 0; - Irp->IoStatus.Information = 0; - Status = STATUS_SUCCESS; - break; - } - - if (!InbvCheckDisplayOwnership()) - { - vidmem = DeviceExtension->VideoMemory; - offset = (Buf->dwCoord.Y * DeviceExtension->Columns * 2) + - (Buf->dwCoord.X * 2); - - nMaxLength = min(stk->Parameters.DeviceIoControl.OutputBufferLength, - (DeviceExtension->Rows - Buf->dwCoord.Y) - * DeviceExtension->Columns - Buf->dwCoord.X); - - for (dwCount = 0; dwCount < nMaxLength; dwCount++, pChar++) + POUTPUT_CHARACTER Buf = (POUTPUT_CHARACTER)Irp->AssociatedIrp.SystemBuffer; + PCHAR pChar = (PCHAR)MmGetSystemAddressForMdl(Irp->MdlAddress); + PUCHAR vidmem; + int offset; + ULONG dwCount; + ULONG nMaxLength; + + if ( Buf->dwCoord.X < 0 || Buf->dwCoord.X >= DeviceExtension->Columns || + Buf->dwCoord.Y < 0 || Buf->dwCoord.Y >= DeviceExtension->Rows ) { - *pChar = vidmem[offset + (dwCount * 2)]; + Buf->dwTransfered = 0; + Irp->IoStatus.Information = 0; + Status = STATUS_SUCCESS; + break; } - Buf->dwTransfered = dwCount; - } - else - { - Buf->dwTransfered = 0; - } + if (!InbvCheckDisplayOwnership()) + { + vidmem = DeviceExtension->VideoMemory; + offset = (Buf->dwCoord.Y * DeviceExtension->Columns * 2) + + (Buf->dwCoord.X * 2); + + nMaxLength = min(stk->Parameters.DeviceIoControl.OutputBufferLength, + (DeviceExtension->Rows - Buf->dwCoord.Y) + * DeviceExtension->Columns - Buf->dwCoord.X); + + for (dwCount = 0; dwCount < nMaxLength; dwCount++, pChar++) + { + *pChar = vidmem[offset + (dwCount * 2)]; + } + + Buf->dwTransfered = dwCount; + } + else + { + Buf->dwTransfered = 0; + } - Irp->IoStatus.Information = sizeof(OUTPUT_ATTRIBUTE); - Status = STATUS_SUCCESS; + Irp->IoStatus.Information = sizeof(OUTPUT_ATTRIBUTE); + Status = STATUS_SUCCESS; + break; } - break; - case IOCTL_CONSOLE_WRITE_OUTPUT_CHARACTER: + case IOCTL_CONSOLE_WRITE_OUTPUT_CHARACTER: { - COORD *pCoord = (COORD *)MmGetSystemAddressForMdl(Irp->MdlAddress); - LPSTR pChar = (CHAR *)(pCoord + 1); - PUCHAR vidmem; - int offset; - ULONG dwCount; - ULONG nMaxLength; - - if ( pCoord->X < 0 || pCoord->X >= DeviceExtension->Columns || - pCoord->Y < 0 || pCoord->Y >= DeviceExtension->Rows ) - { - Irp->IoStatus.Information = 0; - Status = STATUS_SUCCESS; - break; - } - - if (!InbvCheckDisplayOwnership()) - { - vidmem = DeviceExtension->VideoMemory; - offset = (pCoord->Y * DeviceExtension->Columns * 2) + - (pCoord->X * 2); - - nMaxLength = min(stk->Parameters.DeviceIoControl.OutputBufferLength - sizeof(COORD), - (DeviceExtension->Rows - pCoord->Y) - * DeviceExtension->Columns - pCoord->X); - - for (dwCount = 0; dwCount < nMaxLength; dwCount++, pChar++) + PCOORD pCoord = (PCOORD)MmGetSystemAddressForMdl(Irp->MdlAddress); + PCHAR pChar = (PCHAR)(pCoord + 1); + PUCHAR vidmem; + int offset; + ULONG dwCount; + ULONG nMaxLength; + + if ( pCoord->X < 0 || pCoord->X >= DeviceExtension->Columns || + pCoord->Y < 0 || pCoord->Y >= DeviceExtension->Rows ) { - vidmem[offset + (dwCount * 2)] = *pChar; + Irp->IoStatus.Information = 0; + Status = STATUS_SUCCESS; + break; } - } - Irp->IoStatus.Information = 0; - Status = STATUS_SUCCESS; + if (!InbvCheckDisplayOwnership()) + { + vidmem = DeviceExtension->VideoMemory; + offset = (pCoord->Y * DeviceExtension->Columns * 2) + + (pCoord->X * 2); + + nMaxLength = min(stk->Parameters.DeviceIoControl.OutputBufferLength - sizeof(COORD), + (DeviceExtension->Rows - pCoord->Y) + * DeviceExtension->Columns - pCoord->X); + + for (dwCount = 0; dwCount < nMaxLength; dwCount++, pChar++) + { + vidmem[offset + (dwCount * 2)] = *pChar; + } + } + + Irp->IoStatus.Information = 0; + Status = STATUS_SUCCESS; + break; } - break; - case IOCTL_CONSOLE_DRAW: + case IOCTL_CONSOLE_DRAW: { - PCONSOLE_DRAW ConsoleDraw; - PUCHAR Src, Dest; - UINT32 SrcDelta, DestDelta, i, Offset; - - if (!InbvCheckDisplayOwnership()) - { - ConsoleDraw = (PCONSOLE_DRAW) MmGetSystemAddressForMdl(Irp->MdlAddress); - Src = (PUCHAR) (ConsoleDraw + 1); - SrcDelta = ConsoleDraw->SizeX * 2; - Dest = DeviceExtension->VideoMemory + - (ConsoleDraw->Y * DeviceExtension->Columns + ConsoleDraw->X) * 2; - DestDelta = DeviceExtension->Columns * 2; - - for (i = 0; i < ConsoleDraw->SizeY; i++) + PCONSOLE_DRAW ConsoleDraw; + PUCHAR Src, Dest; + UINT32 SrcDelta, DestDelta, i, Offset; + + if (!InbvCheckDisplayOwnership()) { - RtlCopyMemory(Dest, Src, SrcDelta); - Src += SrcDelta; - Dest += DestDelta; - } + ConsoleDraw = (PCONSOLE_DRAW) MmGetSystemAddressForMdl(Irp->MdlAddress); + Src = (PUCHAR) (ConsoleDraw + 1); + SrcDelta = ConsoleDraw->SizeX * 2; + Dest = DeviceExtension->VideoMemory + + (ConsoleDraw->Y * DeviceExtension->Columns + ConsoleDraw->X) * 2; + DestDelta = DeviceExtension->Columns * 2; + + for (i = 0; i < ConsoleDraw->SizeY; i++) + { + RtlCopyMemory(Dest, Src, SrcDelta); + Src += SrcDelta; + Dest += DestDelta; + } - Offset = (ConsoleDraw->CursorY * DeviceExtension->Columns) + - ConsoleDraw->CursorX; + Offset = (ConsoleDraw->CursorY * DeviceExtension->Columns) + + ConsoleDraw->CursorX; - _disable(); - WRITE_PORT_UCHAR (CRTC_COMMAND, CRTC_CURSORPOSLO); - WRITE_PORT_UCHAR (CRTC_DATA, Offset); - WRITE_PORT_UCHAR (CRTC_COMMAND, CRTC_CURSORPOSHI); - WRITE_PORT_UCHAR (CRTC_DATA, Offset >> 8); - _enable(); - } + _disable(); + WRITE_PORT_UCHAR(CRTC_COMMAND, CRTC_CURSORPOSLO); + WRITE_PORT_UCHAR(CRTC_DATA, Offset); + WRITE_PORT_UCHAR(CRTC_COMMAND, CRTC_CURSORPOSHI); + WRITE_PORT_UCHAR(CRTC_DATA, Offset >> 8); + _enable(); + } - Irp->IoStatus.Information = 0; - Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + Status = STATUS_SUCCESS; + break; } - break; - case IOCTL_CONSOLE_LOADFONT: - { - UINT32 CodePage = (UINT32)*(PULONG)Irp->AssociatedIrp.SystemBuffer; + case IOCTL_CONSOLE_LOADFONT: + { + ULONG CodePage = *(PULONG)Irp->AssociatedIrp.SystemBuffer; - if (!InbvCheckDisplayOwnership()) - { + if (!InbvCheckDisplayOwnership()) + { /* Upload a font for the codepage if needed */ ScrLoadFontTable(CodePage); - } + } - Irp->IoStatus.Information = 0; - Status = STATUS_SUCCESS; - } - break; + Irp->IoStatus.Information = 0; + Status = STATUS_SUCCESS; + break; + } - default: - Status = STATUS_NOT_IMPLEMENTED; + default: + Status = STATUS_NOT_IMPLEMENTED; } - Irp->IoStatus.Status = Status; - IoCompleteRequest (Irp, IO_NO_INCREMENT); + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); - return Status; + return Status; } static DRIVER_DISPATCH ScrDispatch; -static NTSTATUS NTAPI -ScrDispatch(PDEVICE_OBJECT DeviceObject, - PIRP Irp) +static NTSTATUS +NTAPI +ScrDispatch( + _In_ PDEVICE_OBJECT DeviceObject, + _In_ PIRP Irp) { - PIO_STACK_LOCATION stk = IoGetCurrentIrpStackLocation(Irp); NTSTATUS Status; + PIO_STACK_LOCATION stk = IoGetCurrentIrpStackLocation(Irp); switch (stk->MajorFunction) { @@ -897,51 +911,50 @@ ScrDispatch(PDEVICE_OBJECT DeviceObject, break; } - Irp->IoStatus.Status = Status; - IoCompleteRequest (Irp, IO_NO_INCREMENT); - + IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; } - /* * Module entry point */ -NTSTATUS NTAPI -DriverEntry (PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath) +NTSTATUS +NTAPI +DriverEntry( + _In_ PDRIVER_OBJECT DriverObject, + _In_ PUNICODE_STRING RegistryPath) { - PDEVICE_OBJECT DeviceObject; NTSTATUS Status; + PDEVICE_OBJECT DeviceObject; UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Device\\BlueScreen"); UNICODE_STRING SymlinkName = RTL_CONSTANT_STRING(L"\\??\\BlueScreen"); - DPRINT ("Screen Driver 0.0.6\n"); + DPRINT("Screen Driver 0.0.6\n"); DriverObject->MajorFunction[IRP_MJ_CREATE] = ScrCreate; DriverObject->MajorFunction[IRP_MJ_CLOSE] = ScrDispatch; DriverObject->MajorFunction[IRP_MJ_READ] = ScrDispatch; DriverObject->MajorFunction[IRP_MJ_WRITE] = ScrWrite; - DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL ] = ScrIoControl; - - Status = IoCreateDevice (DriverObject, - sizeof(DEVICE_EXTENSION), - &DeviceName, - FILE_DEVICE_SCREEN, - FILE_DEVICE_SECURE_OPEN, - TRUE, - &DeviceObject); - + DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = ScrIoControl; + + Status = IoCreateDevice(DriverObject, + sizeof(DEVICE_EXTENSION), + &DeviceName, + FILE_DEVICE_SCREEN, + FILE_DEVICE_SECURE_OPEN, + TRUE, + &DeviceObject); if (!NT_SUCCESS(Status)) { return Status; } - Status = IoCreateSymbolicLink (&SymlinkName, &DeviceName); + Status = IoCreateSymbolicLink(&SymlinkName, &DeviceName); if (NT_SUCCESS(Status)) DeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; else - IoDeleteDevice (DeviceObject); + IoDeleteDevice(DeviceObject); return Status; } diff --git a/drivers/setup/blue/blue.h b/drivers/setup/blue/blue.h index a137f8f9711..b18edfc2e04 100644 --- a/drivers/setup/blue/blue.h +++ b/drivers/setup/blue/blue.h @@ -1,9 +1,9 @@ /* - * PROJECT: ReactOS Setup Driver - * LICENSE: GPL - See COPYING in the top level directory - * FILE: drivers/setup/blue/font.h - * PURPOSE: Loading specific fonts into VGA - * PROGRAMMERS: Aleksey Bragin (aleksey(a)reactos.org) + * PROJECT: ReactOS Console Text-Mode Device Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Main Header File. + * COPYRIGHT: Copyright 1999 Boudewijn Dekker + * Copyright 1999-2019 Eric Kohl */ #ifndef _BLUE_PCH_ @@ -11,34 +11,43 @@ #include <wdm.h> +#define TAG_BLUE 'EULB' + +#define TAB_WIDTH 8 +#define MAX_PATH 260 + typedef struct _SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES, *PSECURITY_ATTRIBUTES; // Define material that normally comes from PSDK // This is mandatory to prevent any inclusion of // user-mode stuff. -typedef struct tagCOORD { - SHORT X; - SHORT Y; +typedef struct tagCOORD +{ + SHORT X; + SHORT Y; } COORD, *PCOORD; -typedef struct tagSMALL_RECT { - SHORT Left; - SHORT Top; - SHORT Right; - SHORT Bottom; +typedef struct tagSMALL_RECT +{ + SHORT Left; + SHORT Top; + SHORT Right; + SHORT Bottom; } SMALL_RECT; -typedef struct tagCONSOLE_SCREEN_BUFFER_INFO { - COORD dwSize; - COORD dwCursorPosition; - USHORT wAttributes; - SMALL_RECT srWindow; - COORD dwMaximumWindowSize; +typedef struct tagCONSOLE_SCREEN_BUFFER_INFO +{ + COORD dwSize; + COORD dwCursorPosition; + USHORT wAttributes; + SMALL_RECT srWindow; + COORD dwMaximumWindowSize; } CONSOLE_SCREEN_BUFFER_INFO, *PCONSOLE_SCREEN_BUFFER_INFO; -typedef struct tagCONSOLE_CURSOR_INFO { - ULONG dwSize; - BOOLEAN bVisible; +typedef struct tagCONSOLE_CURSOR_INFO +{ + ULONG dwSize; + INT bVisible; // BOOL } CONSOLE_CURSOR_INFO, *PCONSOLE_CURSOR_INFO; #define ENABLE_PROCESSED_OUTPUT 0x0001 @@ -47,7 +56,17 @@ typedef struct tagCONSOLE_CURSOR_INFO { #include <blue/ntddblue.h> #include <ndk/inbvfuncs.h> -#define TAG_BLUE 'EULB' +/* + * Color attributes for text and screen background + */ +#define FOREGROUND_BLUE 0x0001 +#define FOREGROUND_GREEN 0x0002 +#define FOREGROUND_RED 0x0004 +#define FOREGROUND_INTENSITY 0x0008 +#define BACKGROUND_BLUE 0x0010 +#define BACKGROUND_GREEN 0x0020 +#define BACKGROUND_RED 0x0040 +#define BACKGROUND_INTENSITY 0x0080 typedef struct _CFHEADER { @@ -113,10 +132,6 @@ typedef struct _CFFILE #define ATTRC_READREG ((PUCHAR)0x3c1) #define ATTRC_INPST1 ((PUCHAR)0x3da) -#define TAB_WIDTH 8 - -#define MAX_PATH 260 - #define MISC (PUCHAR)0x3c2 #define SEQ (PUCHAR)0x3c4 #define SEQDATA (PUCHAR)0x3c5 @@ -130,7 +145,6 @@ typedef struct _CFFILE #define PELINDEX (PUCHAR)0x3c8 #define PELDATA (PUCHAR)0x3c9 -void ScrLoadFontTable(UINT32 CodePage); -NTSTATUS ExtractFont(UINT32 CodePage, PUCHAR FontBitField); +VOID ScrLoadFontTable(_In_ ULONG CodePage); #endif /* _BLUE_PCH_ */ diff --git a/drivers/setup/blue/font.c b/drivers/setup/blue/font.c index 0312b005d77..ba315f9e594 100644 --- a/drivers/setup/blue/font.c +++ b/drivers/setup/blue/font.c @@ -1,12 +1,11 @@ /* -* PROJECT: ReactOS Setup Driver -* LICENSE: GPL - See COPYING in the top level directory -* FILE: drivers/setup/blue/font.c -* PURPOSE: Loading specific fonts into VGA -* PROGRAMMERS: Aleksey Bragin (aleksey(a)reactos.org) -* Colin Finck (mail(a)colinfinck.de) -* Christoph von Wittich (christoph_vw(a)reactos.org) -*/ + * PROJECT: ReactOS Console Text-Mode Device Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Loading specific fonts into VGA. + * COPYRIGHT: Copyright 2008-2019 Aleksey Bragin (aleksey(a)reactos.org) + * Copyright 2008-2019 Colin Finck (mail(a)colinfinck.de) + * Copyright 2008-2019 Christoph von Wittich (christoph_vw(a)reactos.org) + */ /* INCLUDES ***************************************************************/ @@ -17,15 +16,16 @@ #define NDEBUG #include <debug.h> -VOID OpenBitPlane(); -VOID CloseBitPlane(); -VOID LoadFont(PUCHAR Bitplane, PUCHAR FontBitfield); +NTSTATUS ExtractFont(_In_ ULONG CodePage, _In_ PUCHAR FontBitField); +VOID OpenBitPlane(VOID); +VOID CloseBitPlane(VOID); +VOID LoadFont(_In_ PUCHAR Bitplane, _In_ PUCHAR FontBitfield); /* FUNCTIONS ****************************************************************/ VOID ScrLoadFontTable( - UINT32 CodePage) + _In_ ULONG CodePage) { PHYSICAL_ADDRESS BaseAddress; PUCHAR Bitplane; @@ -67,8 +67,8 @@ ScrLoadFontTable( NTSTATUS ExtractFont( - UINT32 CodePage, - PUCHAR FontBitField) + _In_ ULONG CodePage, + _In_ PUCHAR FontBitField) { BOOLEAN bFoundFile = FALSE; HANDLE Handle; @@ -299,8 +299,8 @@ CloseBitPlane(VOID) VOID LoadFont( - PUCHAR Bitplane, - PUCHAR FontBitfield) + _In_ PUCHAR Bitplane, + _In_ PUCHAR FontBitfield) { UINT32 i, j; diff --git a/sdk/include/reactos/drivers/blue/ntddblue.h b/sdk/include/reactos/drivers/blue/ntddblue.h index 755538556ac..50ef34d2365 100644 --- a/sdk/include/reactos/drivers/blue/ntddblue.h +++ b/sdk/include/reactos/drivers/blue/ntddblue.h @@ -8,13 +8,11 @@ #define IOCTL_CONSOLE_GET_MODE CTL_CODE(FILE_DEVICE_SCREEN, 0x805, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_CONSOLE_SET_MODE CTL_CODE(FILE_DEVICE_SCREEN, 0x806, METHOD_BUFFERED, FILE_WRITE_ACCESS) - #define IOCTL_CONSOLE_FILL_OUTPUT_ATTRIBUTE CTL_CODE(FILE_DEVICE_SCREEN, 0x810, METHOD_BUFFERED, FILE_WRITE_ACCESS) #define IOCTL_CONSOLE_READ_OUTPUT_ATTRIBUTE CTL_CODE(FILE_DEVICE_SCREEN, 0x811, METHOD_OUT_DIRECT, FILE_ANY_ACCESS) #define IOCTL_CONSOLE_WRITE_OUTPUT_ATTRIBUTE CTL_CODE(FILE_DEVICE_SCREEN, 0x812, METHOD_IN_DIRECT, FILE_ANY_ACCESS) #define IOCTL_CONSOLE_SET_TEXT_ATTRIBUTE CTL_CODE(FILE_DEVICE_SCREEN, 0x813, METHOD_BUFFERED, FILE_WRITE_ACCESS) - #define IOCTL_CONSOLE_FILL_OUTPUT_CHARACTER CTL_CODE(FILE_DEVICE_SCREEN, 0x820, METHOD_BUFFERED, FILE_WRITE_ACCESS) #define IOCTL_CONSOLE_READ_OUTPUT_CHARACTER CTL_CODE(FILE_DEVICE_SCREEN, 0x821, METHOD_OUT_DIRECT, FILE_ANY_ACCESS) #define IOCTL_CONSOLE_WRITE_OUTPUT_CHARACTER CTL_CODE(FILE_DEVICE_SCREEN, 0x822, METHOD_IN_DIRECT, FILE_ANY_ACCESS) @@ -23,44 +21,38 @@ #define IOCTL_CONSOLE_LOADFONT CTL_CODE(FILE_DEVICE_SCREEN, 0x840, METHOD_IN_DIRECT, FILE_WRITE_ACCESS) - /* TYPEDEFS **************************************************************/ - typedef struct tagCONSOLE_MODE { - ULONG dwMode; + ULONG dwMode; } CONSOLE_MODE, *PCONSOLE_MODE; - typedef struct tagOUTPUT_ATTRIBUTE { - USHORT wAttribute; - ULONG nLength; - COORD dwCoord; - ULONG dwTransfered; + USHORT wAttribute; + ULONG nLength; + COORD dwCoord; + ULONG dwTransfered; } OUTPUT_ATTRIBUTE, *POUTPUT_ATTRIBUTE; - typedef struct tagOUTPUT_CHARACTER { - CHAR cCharacter; - ULONG nLength; - COORD dwCoord; - ULONG dwTransfered; + CHAR cCharacter; + ULONG nLength; + COORD dwCoord; + ULONG dwTransfered; } OUTPUT_CHARACTER, *POUTPUT_CHARACTER; - typedef struct tagCONSOLE_DRAW { - ULONG X; /* Origin */ - ULONG Y; - ULONG SizeX; /* Size of the screen buffer (chars) */ - ULONG SizeY; - ULONG CursorX; /* New cursor position (screen-relative) */ - ULONG CursorY; - /* Followed by screen buffer in char/attrib format */ + ULONG X; /* Origin */ + ULONG Y; + ULONG SizeX; /* Size of the screen buffer (chars) */ + ULONG SizeY; + ULONG CursorX; /* New cursor position (screen-relative) */ + ULONG CursorY; + /* Followed by screen buffer in char/attrib format */ } CONSOLE_DRAW, *PCONSOLE_DRAW; - #endif /* _NTDDBLUE_H_INCLUDED_ */

5 years

[reactos] 01/01: [CONSRV] Fix for console windows shrinking on Minimize and Restore (#2014)

by Doug Lyons

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c917c442ad5bcd05ec634… commit c917c442ad5bcd05ec63400220fcbb6a55264a92 Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Sat Dec 14 09:51:49 2019 -0600 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Dec 14 16:51:49 2019 +0100 [CONSRV] Fix for console windows shrinking on Minimize and Restore (#2014) CORE-14200 --- win32ss/user/winsrv/consrv/frontends/gui/conwnd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c b/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c index 7676a99c22b..633317cd039 100644 --- a/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c +++ b/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c @@ -2037,7 +2037,7 @@ OnSize(PGUI_CONSOLE_DATA GuiData, WPARAM wParam, LPARAM lParam) PCONSRV_CONSOLE Console = GuiData->Console; /* Do nothing if the window is hidden */ - if (!GuiData->IsWindowVisible) return; + if (!GuiData->IsWindowVisible || IsIconic(GuiData->hWindow)) return; if (!ConDrvValidateConsoleUnsafe((PCONSOLE)Console, CONSOLE_RUNNING, TRUE)) return; @@ -2067,8 +2067,8 @@ OnSize(PGUI_CONSOLE_DATA GuiData, WPARAM wParam, LPARAM lParam) if ((windy % HeightUnit) >= (HeightUnit / 2)) ++chary; /* Compensate for added scroll bars in window */ - if (charx < (DWORD)Buff->ScreenBufferSize.X) windy -= GetSystemMetrics(SM_CYHSCROLL); // Window will have a horizontal scroll bar - if (chary < (DWORD)Buff->ScreenBufferSize.Y) windx -= GetSystemMetrics(SM_CXVSCROLL); // Window will have a vertical scroll bar + if (Buff->ViewSize.X < Buff->ScreenBufferSize.X) windy -= GetSystemMetrics(SM_CYHSCROLL); // Window will have a horizontal scroll bar + if (Buff->ViewSize.Y < Buff->ScreenBufferSize.Y) windx -= GetSystemMetrics(SM_CXVSCROLL); // Window will have a vertical scroll bar charx = windx / (int)WidthUnit ; chary = windy / (int)HeightUnit;

5 years

[reactos] 01/01: [ACPICA] Update to version 20191213. CORE-16559

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=be617cf987f94d3e0b083… commit be617cf987f94d3e0b083433dc80f9c975f609cc Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Dec 14 09:04:07 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Dec 14 09:48:11 2019 +0100 [ACPICA] Update to version 20191213. CORE-16559 --- drivers/bus/acpi/acpica/dispatcher/dsfield.c | 2 +- drivers/bus/acpi/acpica/dispatcher/dsopcode.c | 1 + drivers/bus/acpi/acpica/dispatcher/dswload.c | 22 ++++++++++++++++++++++ drivers/bus/acpi/acpica/executer/exfield.c | 10 ++++++++-- drivers/bus/acpi/acpica/hardware/hwxfsleep.c | 2 +- drivers/bus/acpi/acpica/include/acobject.h | 1 + drivers/bus/acpi/acpica/include/acpixf.h | 2 +- drivers/bus/acpi/acpica/include/platform/acenv.h | 15 +++++++++++++++ 8 files changed, 50 insertions(+), 5 deletions(-) diff --git a/drivers/bus/acpi/acpica/dispatcher/dsfield.c b/drivers/bus/acpi/acpica/dispatcher/dsfield.c index 4c3c7ff22f3..4d7280a1de9 100644 --- a/drivers/bus/acpi/acpica/dispatcher/dsfield.c +++ b/drivers/bus/acpi/acpica/dispatcher/dsfield.c @@ -305,7 +305,7 @@ Cleanup: * FUNCTION: AcpiDsGetFieldNames * * PARAMETERS: Info - CreateField info structure - * ` WalkState - Current method state + * WalkState - Current method state * Arg - First parser arg for the field name list * * RETURN: Status diff --git a/drivers/bus/acpi/acpica/dispatcher/dsopcode.c b/drivers/bus/acpi/acpica/dispatcher/dsopcode.c index 1d35c5be77c..b680bb78e44 100644 --- a/drivers/bus/acpi/acpica/dispatcher/dsopcode.c +++ b/drivers/bus/acpi/acpica/dispatcher/dsopcode.c @@ -266,6 +266,7 @@ AcpiDsInitBufferField ( } ObjDesc->BufferField.BufferObj = BufferDesc; + ObjDesc->BufferField.IsCreateField = AmlOpcode == AML_CREATE_FIELD_OP; /* Reference count for BufferDesc inherits ObjDesc count */ diff --git a/drivers/bus/acpi/acpica/dispatcher/dswload.c b/drivers/bus/acpi/acpica/dispatcher/dswload.c index bc99b2b166c..8badd9f897e 100644 --- a/drivers/bus/acpi/acpica/dispatcher/dswload.c +++ b/drivers/bus/acpi/acpica/dispatcher/dswload.c @@ -459,6 +459,28 @@ AcpiDsLoad1EndOp ( Op = WalkState->Op; ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH, "Op=%p State=%p\n", Op, WalkState)); + /* + * Disassembler: handle create field operators here. + * + * CreateBufferField is a deferred op that is typically processed in load + * pass 2. However, disassembly of control method contents walk the parse + * tree with ACPI_PARSE_LOAD_PASS1 and AML_CREATE operators are processed + * in a later walk. This is a problem when there is a control method that + * has the same name as the AML_CREATE object. In this case, any use of the + * name segment will be detected as a method call rather than a reference + * to a buffer field. + * + * This earlier creation during disassembly solves this issue by inserting + * the named object in the ACPI namespace so that references to this name + * would be a name string rather than a method call. + */ + if ((WalkState->ParseFlags & ACPI_PARSE_DISASSEMBLE) && + (WalkState->OpInfo->Flags & AML_CREATE)) + { + Status = AcpiDsCreateBufferField (Op, WalkState); + return_ACPI_STATUS (Status); + } + /* We are only interested in opcodes that have an associated name */ if (!(WalkState->OpInfo->Flags & (AML_NAMED | AML_FIELD))) diff --git a/drivers/bus/acpi/acpica/executer/exfield.c b/drivers/bus/acpi/acpica/executer/exfield.c index f4c4139b97c..70e73babde4 100644 --- a/drivers/bus/acpi/acpica/executer/exfield.c +++ b/drivers/bus/acpi/acpica/executer/exfield.c @@ -138,7 +138,8 @@ AcpiExGetProtocolBufferLength ( * RETURN: Status * * DESCRIPTION: Read from a named field. Returns either an Integer or a - * Buffer, depending on the size of the field. + * Buffer, depending on the size of the field and whether if a + * field is created by the CreateField() operator. * ******************************************************************************/ @@ -202,12 +203,17 @@ AcpiExReadDataFromField ( * the use of arithmetic operators on the returned value if the * field size is equal or smaller than an Integer. * + * However, all buffer fields created by CreateField operator needs to + * remain as a buffer to match other AML interpreter implementations. + * * Note: Field.length is in bits. */ BufferLength = (ACPI_SIZE) ACPI_ROUND_BITS_UP_TO_BYTES ( ObjDesc->Field.BitLength); - if (BufferLength > AcpiGbl_IntegerByteWidth) + if (BufferLength > AcpiGbl_IntegerByteWidth || + (ObjDesc->Common.Type == ACPI_TYPE_BUFFER_FIELD && + ObjDesc->BufferField.IsCreateField)) { /* Field is too large for an Integer, create a Buffer instead */ diff --git a/drivers/bus/acpi/acpica/hardware/hwxfsleep.c b/drivers/bus/acpi/acpica/hardware/hwxfsleep.c index d1c35c5a11d..401ed18589c 100644 --- a/drivers/bus/acpi/acpica/hardware/hwxfsleep.c +++ b/drivers/bus/acpi/acpica/hardware/hwxfsleep.c @@ -84,7 +84,7 @@ static ACPI_SLEEP_FUNCTIONS AcpiSleepDispatch[] = ACPI_HW_OPTIONAL_FUNCTION (AcpiHwLegacyWakePrep)), ACPI_STRUCT_INIT (ExtendedFunction, AcpiHwExtendedWakePrep) }, - {ACPI_STRUCT_INIT (Legacy_function, + {ACPI_STRUCT_INIT (LegacyFunction, ACPI_HW_OPTIONAL_FUNCTION (AcpiHwLegacyWake)), ACPI_STRUCT_INIT (ExtendedFunction, AcpiHwExtendedWake) } diff --git a/drivers/bus/acpi/acpica/include/acobject.h b/drivers/bus/acpi/acpica/include/acobject.h index 45f09839b6d..8fe08977777 100644 --- a/drivers/bus/acpi/acpica/include/acobject.h +++ b/drivers/bus/acpi/acpica/include/acobject.h @@ -381,6 +381,7 @@ typedef struct acpi_object_buffer_field { ACPI_OBJECT_COMMON_HEADER ACPI_COMMON_FIELD_INFO + BOOLEAN IsCreateField; /* Special case for objects created by CreateField() */ union acpi_operand_object *BufferObj; /* Containing Buffer object */ } ACPI_OBJECT_BUFFER_FIELD; diff --git a/drivers/bus/acpi/acpica/include/acpixf.h b/drivers/bus/acpi/acpica/include/acpixf.h index bf88d566950..c1d46e6bac2 100644 --- a/drivers/bus/acpi/acpica/include/acpixf.h +++ b/drivers/bus/acpi/acpica/include/acpixf.h @@ -46,7 +46,7 @@ /* Current ACPICA subsystem version in YYYYMMDD format */ -#define ACPI_CA_VERSION 0x20191018 +#define ACPI_CA_VERSION 0x20191213 #include "acconfig.h" #include "actypes.h" diff --git a/drivers/bus/acpi/acpica/include/platform/acenv.h b/drivers/bus/acpi/acpica/include/platform/acenv.h index a6b5ab18fd7..d81b91c2296 100644 --- a/drivers/bus/acpi/acpica/include/platform/acenv.h +++ b/drivers/bus/acpi/acpica/include/platform/acenv.h @@ -162,6 +162,21 @@ #define ACPI_DISASSEMBLER 1 #endif +/* + * acpisrc CR\LF support + * Unix file line endings do not include the carriage return. + * If the acpisrc utility is being built using a microsoft compiler, it means + * that it will be running on a windows machine which means that the output is + * expected to have CR/LF newlines. If the acpisrc utility is built with + * anything else, it will likely run on a system with LF newlines. This flag + * tells the acpisrc utility that newlines will be in the LF format. + */ +#if defined(ACPI_SRC_APP) && !defined(_MSC_VER) +#define ACPI_SRC_OS_LF_ONLY 1 +#else +#define ACPI_SRC_OS_LF_ONLY 0 +#endif + /*! [Begin] no source code translation */ /******************************************************************************

5 years

[reactos] 01/01: [MSI_WINETEST] Fix build with CMake 3.9.0 and higher (attempt #2)

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d495a4fcebf9a32f727f5… commit d495a4fcebf9a32f727f5e266f7696b99cfc4dd3 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Fri Dec 13 04:44:31 2019 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Fri Dec 13 04:44:31 2019 +0300 [MSI_WINETEST] Fix build with CMake 3.9.0 and higher (attempt #2) --- modules/rostests/winetests/msi/CMakeLists.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/rostests/winetests/msi/CMakeLists.txt b/modules/rostests/winetests/msi/CMakeLists.txt index 296252ebbeb..57bb6f310a3 100644 --- a/modules/rostests/winetests/msi/CMakeLists.txt +++ b/modules/rostests/winetests/msi/CMakeLists.txt @@ -32,9 +32,11 @@ list(APPEND SOURCE suminfo.c precomp.h) -# CMake 3.9 and higher requires to specify this dependency manually -# see https://gitlab.kitware.com/cmake/cmake/issues/19933 -set_property(SOURCE msi_winetest.rc PROPERTY OBJECT_DEPENDS custom.dll) +if(NOT ${CMAKE_VERSION} VERSION_LESS "3.9.0") + # CMake 3.9 and higher requires to specify this dependency manually + # see https://gitlab.kitware.com/cmake/cmake/issues/19933 + set_property(SOURCE msi_winetest.rc PROPERTY OBJECT_DEPENDS custom.dll) +endif() add_executable(msi_winetest ${SOURCE} testlist.c msi_winetest.rc) target_link_libraries(msi_winetest uuid)

5 years

[reactos] 01/01: [MSI_WINETEST] Fix build with CMake 3.9.0 and higher

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7c474426eb847936e4849… commit 7c474426eb847936e48496c37c03edfa92c2e7ba Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Fri Dec 13 04:15:57 2019 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Fri Dec 13 04:15:57 2019 +0300 [MSI_WINETEST] Fix build with CMake 3.9.0 and higher --- modules/rostests/winetests/msi/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/rostests/winetests/msi/CMakeLists.txt b/modules/rostests/winetests/msi/CMakeLists.txt index 351bda2869f..296252ebbeb 100644 --- a/modules/rostests/winetests/msi/CMakeLists.txt +++ b/modules/rostests/winetests/msi/CMakeLists.txt @@ -32,6 +32,10 @@ list(APPEND SOURCE suminfo.c precomp.h) +# CMake 3.9 and higher requires to specify this dependency manually +# see https://gitlab.kitware.com/cmake/cmake/issues/19933 +set_property(SOURCE msi_winetest.rc PROPERTY OBJECT_DEPENDS custom.dll) + add_executable(msi_winetest ${SOURCE} testlist.c msi_winetest.rc) target_link_libraries(msi_winetest uuid) set_module_type(msi_winetest win32cui)

5 years

[reactos] 01/01: [OSK] Refactor the registry configuration code (#2096)

by Bișoc George

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=14ebc0ba3d169fb253a36… commit 14ebc0ba3d169fb253a36d961654fd3e58f92f2b Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Thu Dec 12 00:25:55 2019 +0100 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Dec 12 08:25:55 2019 +0900 [OSK] Refactor the registry configuration code (#2096) Rewrite LoadDataFromRegistry() and SaveDataToRegistry() as function helpers. With these, we'll be able to load and save data to registry on our choice. --- base/applications/osk/main.c | 14 +- base/applications/osk/precomp.h | 12 +- base/applications/osk/settings.c | 303 +++++++++++++-------------------------- 3 files changed, 113 insertions(+), 216 deletions(-) diff --git a/base/applications/osk/main.c b/base/applications/osk/main.c index 7994571dfee..1dc36eae705 100644 --- a/base/applications/osk/main.c +++ b/base/applications/osk/main.c @@ -257,7 +257,7 @@ int OSK_DlgInitDialog(HWND hDlg) */ VOID OSK_RestoreDlgPlacement(HWND hDlg) { - LoadDataFromRegistry(); + LoadSettings(); SetWindowPos(hDlg, (Globals.bAlwaysOnTop ? HWND_TOPMOST : HWND_NOTOPMOST), Globals.PosX, Globals.PosY, 0, 0, SWP_NOSIZE); } @@ -282,8 +282,8 @@ int OSK_DlgClose(void) /* delete GDI objects */ if (Globals.hBrushGreenLed) DeleteObject(Globals.hBrushGreenLed); - /* Save the settings to the registry hive */ - SaveDataToRegistry(); + /* Save the application's settings on registry */ + SaveSettings(); return TRUE; } @@ -633,7 +633,7 @@ INT_PTR APIENTRY OSK_DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) */ Globals.bIsEnhancedKeyboard = TRUE; EndDialog(hDlg, FALSE); - SaveDataToRegistry(); + SaveSettings(); /* Change the condition of enhanced keyboard item menu to checked */ CheckMenuItem(GetMenu(hDlg), IDM_ENHANCED_KB, MF_BYCOMMAND | MF_CHECKED); @@ -666,7 +666,7 @@ INT_PTR APIENTRY OSK_DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) */ Globals.bIsEnhancedKeyboard = FALSE; EndDialog(hDlg, FALSE); - SaveDataToRegistry(); + SaveSettings(); /* Change the condition of standard keyboard item menu to checked */ CheckMenuItem(GetMenu(hDlg), IDM_ENHANCED_KB, MF_BYCOMMAND | MF_UNCHECKED); @@ -805,8 +805,8 @@ int WINAPI wWinMain(HINSTANCE hInstance, ZeroMemory(&Globals, sizeof(Globals)); Globals.hInstance = hInstance; - /* Load the settings from the registry hive */ - LoadDataFromRegistry(); + /* Load the application's settings from the registry */ + LoadSettings(); /* If the member of the struct (bShowWarning) is set then display the dialog box */ if (Globals.bShowWarning) diff --git a/base/applications/osk/precomp.h b/base/applications/osk/precomp.h index e2503f787e4..1b71c5860cc 100644 --- a/base/applications/osk/precomp.h +++ b/base/applications/osk/precomp.h @@ -68,11 +68,17 @@ LRESULT APIENTRY OSK_ThemeHandler(HWND hDlg, NMCUSTOMDRAW *pNmDraw); int WINAPI wWinMain(HINSTANCE, HINSTANCE, LPWSTR, int); VOID OSK_RestoreDlgPlacement(HWND hDlg); VOID OSK_RefreshLEDKeys(VOID); +INT_PTR CALLBACK OSK_WarningProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam); /* settings.c */ -BOOL LoadDataFromRegistry(VOID); -BOOL SaveDataToRegistry(VOID); -INT_PTR CALLBACK OSK_WarningProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam); +LONG LoadDataFromRegistry(IN LPCWSTR lpValueDataName, + OUT PDWORD pdwValueData); + +LONG SaveDataToRegistry(IN LPCWSTR lpValueDataName, + IN DWORD dwValueData); + +VOID LoadSettings(VOID); +VOID SaveSettings(VOID); /* DEFINES ********************************************************************/ diff --git a/base/applications/osk/settings.c b/base/applications/osk/settings.c index 1f4d9c94800..c674984994b 100644 --- a/base/applications/osk/settings.c +++ b/base/applications/osk/settings.c @@ -11,24 +11,18 @@ /* FUNCTIONS *******************************************************************/ -BOOL LoadDataFromRegistry(VOID) +LONG LoadDataFromRegistry(IN LPCWSTR lpValueDataName, + OUT PDWORD pdwValueData) { HKEY hKey; LONG lResult; DWORD dwValue; DWORD cbData = sizeof(dwValue); - /* Initialize the registry application settings */ - Globals.bShowWarning = TRUE; - Globals.bIsEnhancedKeyboard = TRUE; - Globals.bSoundClick = FALSE; - Globals.bAlwaysOnTop = TRUE; - - /* Set the coordinate values to default */ - Globals.PosX = CW_USEDEFAULT; - Globals.PosY = CW_USEDEFAULT; + /* Initialize the pointer parameter to default */ + *pdwValueData = 0; - /* Open the key, so that we can query it */ + /* Open our application's key in order to load its configuration data */ lResult = RegOpenKeyExW(HKEY_CURRENT_USER, L"Software\\Microsoft\\Osk", 0, @@ -37,133 +31,49 @@ BOOL LoadDataFromRegistry(VOID) if (lResult != ERROR_SUCCESS) { - /* Bail out and return FALSE if we fail */ - return FALSE; - } - - /* Query the key */ - lResult = RegQueryValueExW(hKey, - L"ShowWarning", - 0, - 0, - (BYTE *)&dwValue, - &cbData); - - if (lResult != ERROR_SUCCESS || cbData != sizeof(dwValue)) - { - /* Bail out and return FALSE if we fail */ - RegCloseKey(hKey); - return FALSE; - } - - /* Load the data value (it can be either FALSE or TRUE depending on the data itself) */ - Globals.bShowWarning = (dwValue != 0); - - /* Query the key */ - lResult = RegQueryValueExW(hKey, - L"IsEnhancedKeyboard", - 0, - 0, - (BYTE *)&dwValue, - &cbData); - - if (lResult != ERROR_SUCCESS || cbData != sizeof(dwValue)) - { - /* Bail out and return FALSE if we fail */ - RegCloseKey(hKey); - return FALSE; - } - - /* Load the dialog layout value */ - Globals.bIsEnhancedKeyboard = (dwValue != 0); - - /* Query the key */ - lResult = RegQueryValueExW(hKey, - L"ClickSound", - 0, - 0, - (BYTE *)&dwValue, - &cbData); - - if (lResult != ERROR_SUCCESS || cbData != sizeof(dwValue)) - { - /* Bail out and return FALSE if we fail */ - RegCloseKey(hKey); - return FALSE; + /* Bail out */ + DPRINT("LoadDataFromRegistry(): Failed to open the application's key! (Error - %li)\n", lResult); + return lResult; } - /* Load the sound on click value event */ - Globals.bSoundClick = (dwValue != 0); - - /* Query the key */ + /* Load the specific value based on the parameter caller, lpValueDataName */ lResult = RegQueryValueExW(hKey, - L"WindowLeft", + lpValueDataName, 0, 0, (BYTE *)&dwValue, &cbData); - if (lResult != ERROR_SUCCESS || cbData != sizeof(dwValue)) + if (lResult != ERROR_SUCCESS) { - /* Bail out and return FALSE if we fail */ - RegCloseKey(hKey); - return FALSE; - } - /* Load the X value data of the dialog's coordinate */ - Globals.PosX = dwValue; - - lResult = RegQueryValueExW(hKey, - L"WindowTop", - 0, - 0, - (BYTE *)&dwValue, - &cbData); - - if (lResult != ERROR_SUCCESS || cbData != sizeof(dwValue)) - { - /* Bail out and return FALSE if we fail */ + /* Bail out */ + DPRINT("LoadDataFromRegistry(): Failed to load the following value - \"%S\". (Error - %li)\n", lpValueDataName, lResult); RegCloseKey(hKey); - return FALSE; + return lResult; } - /* Load the Y value data of the dialog's coordinate */ - Globals.PosY = dwValue; - - lResult = RegQueryValueExW(hKey, - L"AlwaysOnTop", - 0, - 0, - (BYTE *)&dwValue, - &cbData); - - if (lResult != ERROR_SUCCESS || cbData != sizeof(dwValue)) + /* Is the buffer's size too small to query the required data? */ + if (cbData != sizeof(dwValue)) { - /* Bail out and return FALSE if we fail */ + /* It is therefore bail out */ + DPRINT("LoadDataFromRegistry(): The buffer is too small to hold the data!\n"); RegCloseKey(hKey); - return FALSE; + return ERROR_MORE_DATA; } - /* Load the window state value data */ - Globals.bAlwaysOnTop = (dwValue != 0); - - /* If we're here then we succeed, close the key and return TRUE */ + *pdwValueData = dwValue; RegCloseKey(hKey); - return TRUE; + return lResult; } -BOOL SaveDataToRegistry(VOID) +LONG SaveDataToRegistry(IN LPCWSTR lpValueDataName, + IN DWORD dwValueData) { HKEY hKey; LONG lResult; - DWORD dwValue; - WINDOWPLACEMENT wp; - /* Set the structure length and retrieve the dialog's placement */ - wp.length = sizeof(WINDOWPLACEMENT); - GetWindowPlacement(Globals.hMainWnd, &wp); - - /* If no key has been made, create one */ + /* Set up the application's key in case it has not been made yet */ lResult = RegCreateKeyExW(HKEY_CURRENT_USER, L"Software\\Microsoft\\Osk", 0, @@ -176,119 +86,100 @@ BOOL SaveDataToRegistry(VOID) if (lResult != ERROR_SUCCESS) { - /* Bail out and return FALSE if we fail */ - return FALSE; - } - - /* The data value of the subkey will be appended to the warning dialog switch */ - dwValue = Globals.bShowWarning; - - /* Welcome warning box value key */ - lResult = RegSetValueExW(hKey, - L"ShowWarning", - 0, - REG_DWORD, - (BYTE *)&dwValue, - sizeof(dwValue)); - - if (lResult != ERROR_SUCCESS) - { - /* Bail out and return FALSE if we fail */ - RegCloseKey(hKey); - return FALSE; + /* Bail out */ + DPRINT("SaveDataToRegistry(): Failed to create the application's key! (Error - %li)\n", lResult); + return lResult; } - /* The value will be appended to the layout dialog */ - dwValue = Globals.bIsEnhancedKeyboard; - - /* Keyboard dialog switcher */ + /* Save the data into the registry value */ lResult = RegSetValueExW(hKey, - L"IsEnhancedKeyboard", + lpValueDataName, 0, REG_DWORD, - (BYTE *)&dwValue, - sizeof(dwValue)); + (BYTE *)&dwValueData, + sizeof(dwValueData)); if (lResult != ERROR_SUCCESS) { - /* Bail out and return FALSE if we fail */ + /* Bail out */ + DPRINT("SaveDataToRegistry(): Failed to save the following value - \"%S\". (Error - %li)\n", lpValueDataName, lResult); RegCloseKey(hKey); - return FALSE; + return lResult; } - /* The value will be appended to the sound on click event */ - dwValue = Globals.bSoundClick; + RegCloseKey(hKey); + return lResult; +} - /* "Sound on Click" switcher value key */ - lResult = RegSetValueExW(hKey, - L"ClickSound", - 0, - REG_DWORD, - (BYTE *)&dwValue, - sizeof(dwValue)); +VOID LoadSettings(VOID) +{ + DWORD dwValue; + LONG lResult; - if (lResult != ERROR_SUCCESS) - { - /* Bail out and return FALSE if we fail */ - RegCloseKey(hKey); - return FALSE; - } + /* Initialize the registry application settings */ + Globals.bShowWarning = TRUE; + Globals.bIsEnhancedKeyboard = TRUE; + Globals.bAlwaysOnTop = TRUE; + Globals.bSoundClick = FALSE; - /* The value will be appended to the X coordination dialog's placement */ - dwValue = wp.rcNormalPosition.left; + /* Set the coordinate values to default */ + Globals.PosX = CW_USEDEFAULT; + Globals.PosY = CW_USEDEFAULT; - /* Position X coordination of dialog's placement value key */ - lResult = RegSetValueExW(hKey, - L"WindowLeft", - 0, - REG_DWORD, - (BYTE *)&dwValue, - sizeof(dwValue)); + /* Warning dialog registry setting */ + lResult = LoadDataFromRegistry(L"ShowWarning", &dwValue); + if (lResult == NO_ERROR) + Globals.bShowWarning = (dwValue != 0); + + /* Enhanced keyboard switch dialog registry setting */ + lResult = LoadDataFromRegistry(L"IsEnhancedKeyboard", &dwValue); + if (lResult == NO_ERROR) + Globals.bIsEnhancedKeyboard = (dwValue != 0); + + /* Sound on click event registry setting */ + lResult = LoadDataFromRegistry(L"ClickSound", &dwValue); + if (lResult == NO_ERROR) + Globals.bSoundClick = (dwValue != 0); + + /* X coordinate dialog placement registry setting */ + lResult = LoadDataFromRegistry(L"WindowLeft", &dwValue); + if (lResult == NO_ERROR) + Globals.PosX = dwValue; + + /* Y coordinate dialog placement registry setting */ + lResult = LoadDataFromRegistry(L"WindowTop", &dwValue); + if (lResult == NO_ERROR) + Globals.PosY = dwValue; + + /* Top window state registry setting */ + lResult = LoadDataFromRegistry(L"AlwaysOnTop", &dwValue); + if (lResult == NO_ERROR) + Globals.bAlwaysOnTop = (dwValue != 0); +} - if (lResult != ERROR_SUCCESS) - { - /* Bail out and return FALSE if we fail */ - RegCloseKey(hKey); - return FALSE; - } +VOID SaveSettings(VOID) +{ + WINDOWPLACEMENT wp; - /* The value will be appended to the Y coordination dialog's placement */ - dwValue = wp.rcNormalPosition.top; + /* Initialize the window placement structure */ + wp.length = sizeof(WINDOWPLACEMENT); + GetWindowPlacement(Globals.hMainWnd, &wp); - /* Position Y coordination of dialog's placement value key */ - lResult = RegSetValueExW(hKey, - L"WindowTop", - 0, - REG_DWORD, - (BYTE *)&dwValue, - sizeof(dwValue)); + /* Warning dialog registry setting */ + SaveDataToRegistry(L"ShowWarning", Globals.bShowWarning); - if (lResult != ERROR_SUCCESS) - { - /* Bail out and return FALSE if we fail */ - RegCloseKey(hKey); - return FALSE; - } + /* Enhanced keyboard switch dialog registry setting */ + SaveDataToRegistry(L"IsEnhancedKeyboard", Globals.bIsEnhancedKeyboard); - /* Window top state value */ - dwValue = Globals.bAlwaysOnTop; + /* Sound on click event registry setting */ + SaveDataToRegistry(L"ClickSound", Globals.bSoundClick); - /* "Always on Top" state value key */ - lResult = RegSetValueExW(hKey, - L"AlwaysOnTop", - 0, - REG_DWORD, - (BYTE *)&dwValue, - sizeof(dwValue)); + /* X coordinate dialog placement registry setting */ + SaveDataToRegistry(L"WindowLeft", wp.rcNormalPosition.left); - if (lResult != ERROR_SUCCESS) - { - /* Bail out and return FALSE if we fail */ - RegCloseKey(hKey); - return FALSE; - } + /* Y coordinate dialog placement registry setting */ + SaveDataToRegistry(L"WindowTop", wp.rcNormalPosition.top); - /* If we're here then we succeed, close the key and return TRUE */ - RegCloseKey(hKey); - return TRUE; + /* Top window state registry setting */ + SaveDataToRegistry(L"AlwaysOnTop", Globals.bAlwaysOnTop); }

5 years

[reactos] 01/01: [SHELL32] Do not return -1 if a file is not valid or not found - ExtractIconEx() (#2113)

by Bișoc George

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8ec05f5fa1108a50f378e… commit 8ec05f5fa1108a50f378e57b76b5015ab7613ffe Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Thu Dec 12 00:24:20 2019 +0100 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Dec 12 08:24:20 2019 +0900 [SHELL32] Do not return -1 if a file is not valid or not found - ExtractIconEx() (#2113) ExtractIconEx() returns the number of successfully extracted icons from a file. The routine may return 0 in case no icons could be extracted but it could also return 0 if the file is not a valid PE image file or the file couldn't be found. PrivateExtractIcons and the internal USER32 routine, ICO_ExtractIconExW(), return -1 in such scenarios. The behaviour is correct however we do not want that ExtractIconEx() returns -1 as well as it doesn't comply with the general documentation. In such cases, simply return 0 as no successful icons have been extracted due to related file failures. CORE-16535 --- dll/win32/shell32/iconcache.cpp | 20 +++++++++--- modules/rostests/apitests/shell32/CMakeLists.txt | 1 + .../rostests/apitests/shell32/ExtractIconEx.cpp | 37 ++++++++++++++++++++++ modules/rostests/apitests/shell32/testlist.c | 2 ++ 4 files changed, 56 insertions(+), 4 deletions(-) diff --git a/dll/win32/shell32/iconcache.cpp b/dll/win32/shell32/iconcache.cpp index 400f75cc456..5b35326a2b7 100644 --- a/dll/win32/shell32/iconcache.cpp +++ b/dll/win32/shell32/iconcache.cpp @@ -866,12 +866,13 @@ EXTERN_C INT WINAPI Shell_GetCachedImageIndex(LPCWSTR szPath, INT nIndex, UINT b /************************************************************************* * ExtractIconExW [SHELL32.@] * RETURNS - * 0 no icon found - * -1 file is not valid + * 0 no icon found (or the file is not valid) * or number of icons extracted */ UINT WINAPI ExtractIconExW(LPCWSTR lpszFile, INT nIconIndex, HICON * phiconLarge, HICON * phiconSmall, UINT nIcons) { + UINT ret = 0; + /* get entry point of undocumented function PrivateExtractIconExW() in user32 */ #if defined(__CYGWIN__) || defined (__MINGW32__) || defined(_MSC_VER) static UINT (WINAPI*PrivateExtractIconExW)(LPCWSTR,int,HICON*,HICON*,UINT) = NULL; @@ -881,13 +882,24 @@ UINT WINAPI ExtractIconExW(LPCWSTR lpszFile, INT nIconIndex, HICON * phiconLarge PrivateExtractIconExW = (UINT(WINAPI*)(LPCWSTR,int,HICON*,HICON*,UINT)) GetProcAddress(hUser32, "PrivateExtractIconExW"); if (!PrivateExtractIconExW) - return 0; + return ret; } #endif TRACE("%s %i %p %p %i\n", debugstr_w(lpszFile), nIconIndex, phiconLarge, phiconSmall, nIcons); + ret = PrivateExtractIconExW(lpszFile, nIconIndex, phiconLarge, phiconSmall, nIcons); - return PrivateExtractIconExW(lpszFile, nIconIndex, phiconLarge, phiconSmall, nIcons); + /* PrivateExtractIconExW() may return -1 if the provided file is not a valid PE image file or the said + * file couldn't be found. The behaviour is correct although ExtractIconExW() only returns the successfully + * extracted icons from a file. In such scenario, simply return 0. + */ + if (ret == 0xFFFFFFFF) + { + WARN("Invalid file or couldn't be found - %s\n", debugstr_w(lpszFile)); + ret = 0; + } + + return ret; } /************************************************************************* diff --git a/modules/rostests/apitests/shell32/CMakeLists.txt b/modules/rostests/apitests/shell32/CMakeLists.txt index f1cd11fefaa..22dbadf9dfb 100644 --- a/modules/rostests/apitests/shell32/CMakeLists.txt +++ b/modules/rostests/apitests/shell32/CMakeLists.txt @@ -18,6 +18,7 @@ list(APPEND SOURCE CUserNotification.cpp Control_RunDLLW.cpp DragDrop.cpp + ExtractIconEx.cpp IShellFolderViewCB.cpp OpenAs_RunDLL.cpp PathResolve.cpp diff --git a/modules/rostests/apitests/shell32/ExtractIconEx.cpp b/modules/rostests/apitests/shell32/ExtractIconEx.cpp new file mode 100644 index 00000000000..721c749350b --- /dev/null +++ b/modules/rostests/apitests/shell32/ExtractIconEx.cpp @@ -0,0 +1,37 @@ +/* + * PROJECT: ReactOS API Tests + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Tests for ExtractIconEx routine + * COPYRIGHT: Copyright 2019 Bișoc George (fraizeraust99 at gmail dot com) + */ + +#include "shelltest.h" + +typedef struct +{ + PCWSTR pszFilePath; + UINT nIcons; +} EXTRACTICONTESTS; + +EXTRACTICONTESTS IconTests[] = +{ + /* Executable file with icon */ + {L"%SystemRoot%\\System32\\cmd.exe", 1}, + + /* Executable file without icon */ + {L"%SystemRoot%\\System32\\autochk.exe", 0}, + + /* Non-existing files */ + {L"%SystemRoot%\\non-existent-file.sdf", 0} +}; + +START_TEST(ExtractIconEx) +{ + UINT i, nReturnedIcons; + + for (i = 0; i < _countof(IconTests); ++i) + { + nReturnedIcons = ExtractIconExW(IconTests[i].pszFilePath, 0, NULL, NULL, IconTests[i].nIcons); + ok(nReturnedIcons == IconTests[i].nIcons, "ExtractIconExW(%u): Expected %u icons, got %u\n", i, IconTests[i].nIcons, nReturnedIcons); + } +} diff --git a/modules/rostests/apitests/shell32/testlist.c b/modules/rostests/apitests/shell32/testlist.c index a274688b0f5..18939f998e3 100644 --- a/modules/rostests/apitests/shell32/testlist.c +++ b/modules/rostests/apitests/shell32/testlist.c @@ -12,6 +12,7 @@ extern void func_CShellDesktop(void); extern void func_CShellLink(void); extern void func_CUserNotification(void); extern void func_DragDrop(void); +extern void func_ExtractIconEx(void); extern void func_IShellFolderViewCB(void); extern void func_menu(void); extern void func_OpenAs_RunDLL(void); @@ -35,6 +36,7 @@ const struct test winetest_testlist[] = { "CShellLink", func_CShellLink }, { "CUserNotification", func_CUserNotification }, { "DragDrop", func_DragDrop }, + { "ExtractIconEx", func_ExtractIconEx }, { "IShellFolderViewCB", func_IShellFolderViewCB }, { "menu", func_menu }, { "OpenAs_RunDLL", func_OpenAs_RunDLL },

5 years

[reactos] 01/01: [VGA_NEW] Fix 2 'MAX_USHORT' typos in commented code (#2145)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cfdd483c0ee168529efc7… commit cfdd483c0ee168529efc702c0711b285cf558453 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Tue Dec 10 13:17:17 2019 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Dec 10 13:17:17 2019 +0100 [VGA_NEW] Fix 2 'MAX_USHORT' typos in commented code (#2145) --- win32ss/drivers/miniport/vga_new/vbemodes.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/win32ss/drivers/miniport/vga_new/vbemodes.c b/win32ss/drivers/miniport/vga_new/vbemodes.c index 04b9c2dddd2..11a5942c496 100644 --- a/win32ss/drivers/miniport/vga_new/vbemodes.c +++ b/win32ss/drivers/miniport/vga_new/vbemodes.c @@ -363,7 +363,7 @@ InitializeModeTable(IN PHW_DEVICE_EXTENSION VgaExtension) { /* Read the screen stride (scanline size) */ ScreenStride = RaiseToPower2(VbeModeInfo->BytesPerScanLine); - //ASSERT(ScreenStride <= MAX_USHORT); + //ASSERT(ScreenStride <= MAXUSHORT); VgaMode->wbytes = (USHORT)ScreenStride; VideoDebugPrint((0, "ScanLines: %lx Stride: %lx\n", VbeModeInfo->BytesPerScanLine, VgaMode->wbytes)); @@ -391,7 +391,7 @@ InitializeModeTable(IN PHW_DEVICE_EXTENSION VgaExtension) VideoDebugPrint((0, "LINEAR MODE!!!\n")); ScreenStride = (VbeVersion >= 0x300) ? VbeModeInfo->LinBytesPerScanLine : 0; if (!ScreenStride) ScreenStride = VbeModeInfo->BytesPerScanLine; - //ASSERT(ScreenStride <= MAX_USHORT); + //ASSERT(ScreenStride <= MAXUSHORT); VgaMode->wbytes = (USHORT)ScreenStride; VideoDebugPrint((0, "ScanLines: %lx Stride: %lx\n", VbeModeInfo->BytesPerScanLine, VgaMode->wbytes));

5 years

[reactos] 01/01: [SETUPLIB] Fix 'MAX_USHORT' typo in a comment (#2144)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=99f8ccdc7fb343e3e4fe9… commit 99f8ccdc7fb343e3e4fe95ece1629eddd267c078 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Tue Dec 10 13:16:46 2019 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Dec 10 13:16:46 2019 +0100 [SETUPLIB] Fix 'MAX_USHORT' typo in a comment (#2144) --- base/setup/lib/utils/bldrsup.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/setup/lib/utils/bldrsup.h b/base/setup/lib/utils/bldrsup.h index 41cc1bb11b8..39862660d8d 100644 --- a/base/setup/lib/utils/bldrsup.h +++ b/base/setup/lib/utils/bldrsup.h @@ -44,7 +44,7 @@ typedef struct _BOOT_STORE_OPTIONS * IS_INTRESOURCE macros for Win32 resources. * * A key consists of either a boot ID number, comprised between 0 and - * MAX_USHORT == 0xFFFF == 65535, or can be a pointer to a human-readable + * MAXUSHORT == 0xFFFF == 65535, or can be a pointer to a human-readable * string (section name), as in the case of FreeLDR, or to a GUID, as in the * case of BOOTMGR. *

5 years

[reactos] 01/01: [CMD] Fix 'MAX_ULONG' typo in a comment (#2143)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f6ad0938015505eb1ed58… commit f6ad0938015505eb1ed5804c4a35825cb03673f3 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Tue Dec 10 13:16:26 2019 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Dec 10 13:16:26 2019 +0100 [CMD] Fix 'MAX_ULONG' typo in a comment (#2143) --- base/shell/cmd/cmd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/shell/cmd/cmd.c b/base/shell/cmd/cmd.c index 5a3651d935f..2b63948d94e 100644 --- a/base/shell/cmd/cmd.c +++ b/base/shell/cmd/cmd.c @@ -1605,7 +1605,7 @@ LoadRegistrySettings(HKEY hKeyRoot) DWORD dwType, len; /* * Buffer big enough to hold the string L"4294967295", - * corresponding to the literal 0xFFFFFFFF (MAX_ULONG) in decimal. + * corresponding to the literal 0xFFFFFFFF (MAXULONG) in decimal. */ DWORD Buffer[6];

5 years

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2019