Ros-diffs March 2014

ros-diffs@reactos.org

14 participants
233 discussions

[akhaldi] 62375: [NTOSKRNL] * Generate a trace when we hit this issue.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Mar 2 11:49:18 2014 New Revision: 62375 URL: http://svn.reactos.org/svn/reactos?rev=62375&view=rev Log: [NTOSKRNL] * Generate a trace when we hit this issue. Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Sun Mar 2 11:49:18 2014 @@ -5300,6 +5300,7 @@ } DPRINT1("MM:MmGetPhysicalAddressFailed base address was %p\n", Address); + KeRosDumpStackFrames(NULL, 20); PhysicalAddress.QuadPart = 0; return PhysicalAddress; }

10 years, 9 months

[aandrejevic] 62374: [BASESRV] Move the GET_NEXT_VDM_COMMAND_DATA structure to a global header, and rename it to VDM_COMMAND_INFO. Implement BaseSrvCopyCommand, which moves the BASE_CHECK_VDM struc...

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Sun Mar 2 02:50:40 2014 New Revision: 62374 URL: http://svn.reactos.org/svn/reactos?rev=62374&view=rev Log: [BASESRV] Move the GET_NEXT_VDM_COMMAND_DATA structure to a global header, and rename it to VDM_COMMAND_INFO. Implement BaseSrvCopyCommand, which moves the BASE_CHECK_VDM structure data into a new VDM_COMMAND_INFO structure. Implement BaseSrvFreeVDMInfo which frees a VDM_COMMAND_INFO structure and everything in it. Modified: branches/ntvdm/dll/win32/kernel32/client/vdm.c branches/ntvdm/dll/win32/kernel32/include/vdm.h branches/ntvdm/include/reactos/subsys/win/vdm.h branches/ntvdm/subsystems/win/basesrv/vdm.c branches/ntvdm/subsystems/win/basesrv/vdm.h Modified: branches/ntvdm/dll/win32/kernel32/client/vdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/kernel32/client… ============================================================================== --- branches/ntvdm/dll/win32/kernel32/client/vdm.c [iso-8859-1] (original) +++ branches/ntvdm/dll/win32/kernel32/client/vdm.c [iso-8859-1] Sun Mar 2 02:50:40 2014 @@ -1130,7 +1130,7 @@ */ DWORD WINAPI -GetNextVDMCommand(PGET_NEXT_VDM_COMMAND_DATA CommandData) +GetNextVDMCommand(PVDM_COMMAND_INFO CommandData) { STUB; return 0; Modified: branches/ntvdm/dll/win32/kernel32/include/vdm.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/kernel32/includ… ============================================================================== --- branches/ntvdm/dll/win32/kernel32/include/vdm.h [iso-8859-1] (original) +++ branches/ntvdm/dll/win32/kernel32/include/vdm.h [iso-8859-1] Sun Mar 2 02:50:40 2014 @@ -24,39 +24,6 @@ #define VDM_UNDO_FULL 0x02 #define VDM_UNDO_REUSE 0x04 #define VDM_UNDO_COMPLETED 0x08 - -/* STRUCTURES *****************************************************************/ - -typedef struct _GET_NEXT_VDM_COMMAND_DATA -{ - ULONG iTask; - ULONG dwUnused; - ULONG dwExitCode; - ULONG dwCodePage; - HANDLE hStdIn; - HANDLE hStdOut; - HANDLE hStdErr; - LPSTR lpCmdLine; - LPSTR lpAppName; - LPSTR lpPifFile; - LPSTR lpCurDirectory; - LPSTR lpEnv; - ULONG dwEnvLen; - STARTUPINFOA StartupInfo; - LPSTR lpDesktop; - ULONG dwDesktopLen; - LPSTR lpTitle; - ULONG dwTitleLen; - LPVOID lpReserved; - ULONG dwReservedLen; - USHORT wCmdLen; - USHORT wAppLen; - USHORT wPifLen; - USHORT wCurDirectoryLen; - USHORT wVDMState; - USHORT wCurrentDrive; - BOOLEAN fComingFromBat; -} GET_NEXT_VDM_COMMAND_DATA, *PGET_NEXT_VDM_COMMAND_DATA; /* FUNCTION PROTOTYPES ********************************************************/ Modified: branches/ntvdm/include/reactos/subsys/win/vdm.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/reactos/subsys/wi… ============================================================================== --- branches/ntvdm/include/reactos/subsys/win/vdm.h [iso-8859-1] (original) +++ branches/ntvdm/include/reactos/subsys/win/vdm.h [iso-8859-1] Sun Mar 2 02:50:40 2014 @@ -30,6 +30,37 @@ #define VDM_NOT_READY 0x02 #define VDM_READY 0x04 +typedef struct +{ + ULONG TaskId; + ULONG Unused; + ULONG ExitCode; + ULONG CodePage; + HANDLE StdIn; + HANDLE StdOut; + HANDLE StdErr; + LPSTR CmdLine; + LPSTR AppName; + LPSTR PifFile; + LPSTR CurDirectory; + LPSTR Env; + ULONG EnvLen; + STARTUPINFOA StartupInfo; + LPSTR Desktop; + ULONG DesktopLen; + LPSTR Title; + ULONG TitleLen; + LPVOID Reserved; + ULONG ReservedLen; + USHORT CmdLen; + USHORT AppLen; + USHORT PifLen; + USHORT CurDirectoryLen; + USHORT VDMState; + USHORT CurrentDrive; + BOOLEAN ComingFromBat; +} VDM_COMMAND_INFO, *PVDM_COMMAND_INFO; + #endif // _VDM_H /* EOF */ Modified: branches/ntvdm/subsystems/win/basesrv/vdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/win/basesrv/vd… ============================================================================== --- branches/ntvdm/subsystems/win/basesrv/vdm.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/win/basesrv/vdm.c [iso-8859-1] Sun Mar 2 02:50:40 2014 @@ -185,6 +185,166 @@ if (!NT_SUCCESS(Status)) NtClose(*ServerEvent); return Status; +} + +VOID BaseSrvFreeVDMInfo(PVDM_COMMAND_INFO CommandInfo) +{ + /* Free the allocated structure members */ + if (CommandInfo->CmdLine != NULL) RtlFreeHeap(BaseSrvHeap, 0, CommandInfo->CmdLine); + if (CommandInfo->AppName != NULL) RtlFreeHeap(BaseSrvHeap, 0, CommandInfo->AppName); + if (CommandInfo->PifFile != NULL) RtlFreeHeap(BaseSrvHeap, 0, CommandInfo->PifFile); + if (CommandInfo->CurDirectory != NULL) RtlFreeHeap(BaseSrvHeap, 0, CommandInfo->CurDirectory); + if (CommandInfo->Env != NULL) RtlFreeHeap(BaseSrvHeap, 0, CommandInfo->Env); + if (CommandInfo->Desktop != NULL) RtlFreeHeap(BaseSrvHeap, 0, CommandInfo->Desktop); + if (CommandInfo->Title != NULL) RtlFreeHeap(BaseSrvHeap, 0, CommandInfo->Title); + if (CommandInfo->Reserved != NULL) RtlFreeHeap(BaseSrvHeap, 0, CommandInfo->Reserved); + + /* Free the structure itself */ + RtlFreeHeap(BaseSrvHeap, 0, CommandInfo); +} + +BOOLEAN NTAPI BaseSrvCopyCommand(PBASE_CHECK_VDM CheckVdmRequest, PVDM_DOS_RECORD DosRecord) +{ + BOOLEAN Success = FALSE; + PVDM_COMMAND_INFO CommandInfo = NULL; + + /* Allocate the command information structure */ + CommandInfo = (PVDM_COMMAND_INFO)RtlAllocateHeap(BaseSrvHeap, + HEAP_ZERO_MEMORY, + sizeof(VDM_COMMAND_INFO)); + if (CommandInfo == NULL) return FALSE; + + /* Fill the structure */ + CommandInfo->TaskId = CheckVdmRequest->iTask; + CommandInfo->ExitCode = DosRecord->ExitCode; + CommandInfo->CodePage = CheckVdmRequest->CodePage; + CommandInfo->StdIn = CheckVdmRequest->StdIn; + CommandInfo->StdOut = CheckVdmRequest->StdOut; + CommandInfo->StdErr = CheckVdmRequest->StdErr; + + /* Allocate memory for the command line */ + CommandInfo->CmdLine = RtlAllocateHeap(BaseSrvHeap, + HEAP_ZERO_MEMORY, + CheckVdmRequest->CmdLen); + if (CommandInfo->CmdLine == NULL) goto Cleanup; + + /* Copy the command line */ + RtlMoveMemory(CommandInfo->CmdLine, CheckVdmRequest->CmdLine, CheckVdmRequest->CmdLen); + + /* Allocate memory for the application name */ + CommandInfo->AppName = RtlAllocateHeap(BaseSrvHeap, + HEAP_ZERO_MEMORY, + CheckVdmRequest->AppLen); + if (CommandInfo->AppName == NULL) goto Cleanup; + + /* Copy the application name */ + RtlMoveMemory(CommandInfo->AppName, CheckVdmRequest->AppName, CheckVdmRequest->AppLen); + + /* Allocate memory for the PIF file name */ + if (CheckVdmRequest->PifLen != 0) + { + CommandInfo->PifFile = RtlAllocateHeap(BaseSrvHeap, + HEAP_ZERO_MEMORY, + CheckVdmRequest->PifLen); + if (CommandInfo->PifFile == NULL) goto Cleanup; + + /* Copy the PIF file name */ + RtlMoveMemory(CommandInfo->PifFile, CheckVdmRequest->PifFile, CheckVdmRequest->PifLen); + } + else CommandInfo->PifFile = NULL; + + /* Allocate memory for the current directory */ + if (CheckVdmRequest->CurDirectoryLen != 0) + { + CommandInfo->CurDirectory = RtlAllocateHeap(BaseSrvHeap, + HEAP_ZERO_MEMORY, + CheckVdmRequest->CurDirectoryLen); + if (CommandInfo->CurDirectory == NULL) goto Cleanup; + + /* Copy the current directory */ + RtlMoveMemory(CommandInfo->CurDirectory, + CheckVdmRequest->CurDirectory, + CheckVdmRequest->CurDirectoryLen); + } + else CommandInfo->CurDirectory = NULL; + + /* Allocate memory for the environment block */ + CommandInfo->Env = RtlAllocateHeap(BaseSrvHeap, + HEAP_ZERO_MEMORY, + CheckVdmRequest->EnvLen); + if (CommandInfo->Env == NULL) goto Cleanup; + + /* Copy the environment block */ + RtlMoveMemory(CommandInfo->Env, CheckVdmRequest->Env, CheckVdmRequest->EnvLen); + + CommandInfo->EnvLen = CheckVdmRequest->EnvLen; + RtlMoveMemory(&CommandInfo->StartupInfo, + CheckVdmRequest->StartupInfo, + sizeof(STARTUPINFOA)); + + /* Allocate memory for the desktop */ + if (CheckVdmRequest->DesktopLen != 0) + { + CommandInfo->Desktop = RtlAllocateHeap(BaseSrvHeap, + HEAP_ZERO_MEMORY, + CheckVdmRequest->DesktopLen); + if (CommandInfo->Desktop == NULL) goto Cleanup; + + /* Copy the desktop name */ + RtlMoveMemory(CommandInfo->Desktop, CheckVdmRequest->Desktop, CheckVdmRequest->DesktopLen); + } + else CommandInfo->Desktop = NULL; + + CommandInfo->DesktopLen = CheckVdmRequest->DesktopLen; + + /* Allocate memory for the title */ + if (CheckVdmRequest->TitleLen != 0) + { + CommandInfo->Title = RtlAllocateHeap(BaseSrvHeap, + HEAP_ZERO_MEMORY, + CheckVdmRequest->TitleLen); + if (CommandInfo->Title == NULL) goto Cleanup; + + /* Copy the title */ + RtlMoveMemory(CommandInfo->Title, CheckVdmRequest->Title, CheckVdmRequest->TitleLen); + } + else CommandInfo->Title = NULL; + + CommandInfo->TitleLen = CheckVdmRequest->TitleLen; + + /* Allocate memory for the reserved field */ + if (CheckVdmRequest->ReservedLen != 0) + { + CommandInfo->Reserved = RtlAllocateHeap(BaseSrvHeap, + HEAP_ZERO_MEMORY, + CheckVdmRequest->ReservedLen); + if (CommandInfo->Reserved == NULL) goto Cleanup; + + /* Copy the reserved field */ + RtlMoveMemory(CommandInfo->Reserved, + CheckVdmRequest->Reserved, + CheckVdmRequest->ReservedLen); + } + else CommandInfo->Reserved = NULL; + + CommandInfo->ReservedLen = CheckVdmRequest->ReservedLen; + + CommandInfo->CmdLen = CheckVdmRequest->CmdLen; + CommandInfo->AppLen = CheckVdmRequest->AppLen; + CommandInfo->PifLen = CheckVdmRequest->PifLen; + CommandInfo->CurDirectoryLen = CheckVdmRequest->CurDirectoryLen; + CommandInfo->VDMState = DosRecord->State; + // TODO: Set CommandInfo->CurrentDrive + // TODO: Set CommandInfo->ComingFromBat + + /* Set the DOS record's command structure */ + DosRecord->CommandInfo = CommandInfo; + +Cleanup: + /* If it wasn't successful, free the memory */ + if (!Success) BaseSrvFreeVDMInfo(CommandInfo); + + return Success; } VOID NTAPI BaseInitializeVDM(VOID) @@ -300,6 +460,14 @@ Status = BaseSrvCreatePairWaitHandles(&DosRecord->ServerEvent, &DosRecord->ClientEvent); if (!NT_SUCCESS(Status)) goto Cleanup; + /* Translate the input structure into a VDM command structure and set it in the DOS record */ + if (!BaseSrvCopyCommand(CheckVdmRequest, DosRecord)) + { + /* The only possibility is that an allocation failure occurred */ + Status = STATUS_NO_MEMORY; + goto Cleanup; + } + /* Add the DOS record */ InsertHeadList(&ConsoleRecord->DosListHead, &DosRecord->Entry); Modified: branches/ntvdm/subsystems/win/basesrv/vdm.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/win/basesrv/vd… ============================================================================== --- branches/ntvdm/subsystems/win/basesrv/vdm.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/win/basesrv/vdm.h [iso-8859-1] Sun Mar 2 02:50:40 2014 @@ -34,6 +34,7 @@ ULONG ExitCode; HANDLE ServerEvent; HANDLE ClientEvent; + PVDM_COMMAND_INFO CommandInfo; // TODO: Structure incomplete!!! } VDM_DOS_RECORD, *PVDM_DOS_RECORD;

10 years, 9 months

[hbelusca] 62373: [NTVDM] - Finally get rid of console output handles in the BIOS. - Move console text buffer copy from BIOS back into VGA memory (~= revert part of r61542), but do it ONLY when att...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Mar 2 01:45:57 2014 New Revision: 62373 URL: http://svn.reactos.org/svn/reactos?rev=62373&view=rev Log: [NTVDM] - Finally get rid of console output handles in the BIOS. - Move console text buffer copy from BIOS back into VGA memory (~= revert part of r61542), but do it ONLY when attaching the VGA emulation to the console. - Fix cursor positioning in BIOS & VGA (work in progress). - Initialize PS/2 after having setting basic console modes. - Showing/hiding mouse cursor (see the option in the console menu) is done in while() loops to be sure the cursor is really shown/hidden (based on the return value of ShowConsoleCursor). Modified: branches/ntvdm/subsystems/ntvdm/bios/bios.c branches/ntvdm/subsystems/ntvdm/bios/bios.h branches/ntvdm/subsystems/ntvdm/bios/bios32/bios32.c branches/ntvdm/subsystems/ntvdm/bios/bios32/bios32.h branches/ntvdm/subsystems/ntvdm/bios/bios32/vidbios32.c branches/ntvdm/subsystems/ntvdm/bios/bios32/vidbios32.h branches/ntvdm/subsystems/ntvdm/emulator.c branches/ntvdm/subsystems/ntvdm/hardware/vga.c branches/ntvdm/subsystems/ntvdm/ntvdm.c Modified: branches/ntvdm/subsystems/ntvdm/bios/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios/bio… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios/bios.c [iso-8859-1] Sun Mar 2 01:45:57 2014 @@ -86,8 +86,7 @@ /* PUBLIC FUNCTIONS ***********************************************************/ BOOLEAN -BiosInitialize(IN LPCSTR BiosFileName, - IN HANDLE ConsoleOutput) +BiosInitialize(IN LPCSTR BiosFileName) { /* Register the BIOS support BOPs */ RegisterBop(BOP_BIOSINIT, BiosInitBop); @@ -143,7 +142,7 @@ } else { - Bios32Loaded = Bios32Initialize(ConsoleOutput); + Bios32Loaded = Bios32Initialize(); return Bios32Loaded; } } Modified: branches/ntvdm/subsystems/ntvdm/bios/bios.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios/bio… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios/bios.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios/bios.h [iso-8859-1] Sun Mar 2 01:45:57 2014 @@ -106,8 +106,7 @@ extern PBIOS_DATA_AREA Bda; BOOLEAN -BiosInitialize(IN LPCSTR BiosFileName, - IN HANDLE ConsoleOutput); +BiosInitialize(IN LPCSTR BiosFileName); VOID BiosCleanup(VOID); Modified: branches/ntvdm/subsystems/ntvdm/bios/bios32/bios32.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios/bio… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios/bios32/bios32.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios/bios32/bios32.c [iso-8859-1] Sun Mar 2 01:45:57 2014 @@ -361,7 +361,7 @@ /* * The BIOS POST (Power On-Self Test) */ -BOOLEAN Bios32Initialize(IN HANDLE ConsoleOutput) +BOOLEAN Bios32Initialize(VOID) { BOOLEAN Success; UCHAR Low, High; @@ -403,7 +403,7 @@ if (!KbdBios32Initialize()) return FALSE; /* Initialize the Video BIOS */ - if (!VidBios32Initialize(ConsoleOutput)) return FALSE; + if (!VidBios32Initialize()) return FALSE; /* Enable interrupts */ setIF(1); Modified: branches/ntvdm/subsystems/ntvdm/bios/bios32/bios32.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios/bio… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios/bios32/bios32.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios/bios32/bios32.h [iso-8859-1] Sun Mar 2 01:45:57 2014 @@ -129,7 +129,7 @@ VOID EnableHwIRQ(UCHAR hwirq, EMULATOR_INT32_PROC func); VOID PicIRQComplete(LPWORD Stack); -BOOLEAN Bios32Initialize(IN HANDLE ConsoleOutput); +BOOLEAN Bios32Initialize(VOID); VOID Bios32Cleanup(VOID); #endif // _BIOS32_H_ Modified: branches/ntvdm/subsystems/ntvdm/bios/bios32/vidbios32.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios/bio… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios/bios32/vidbios32.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios/bios32/vidbios32.c [iso-8859-1] Sun Mar 2 01:45:57 2014 @@ -733,58 +733,6 @@ return TRUE; } -static VOID VidBiosCopyTextConsoleToVgaMemory(HANDLE ConsoleOutput, PCOORD ConsoleSize) -{ - PCHAR_INFO CharBuffer; - COORD BufferSize = {Bda->ScreenColumns, Bda->ScreenRows + 1}; - COORD Origin = { 0, 0 }; - SMALL_RECT ConRect; - - INT i, j; - INT Counter = 0; - WORD Character; - DWORD VideoAddress = TO_LINEAR(TEXT_VIDEO_SEG, Bda->VideoPage * Bda->VideoPageSize); - - /* Allocate a temporary buffer for ReadConsoleOutput */ - CharBuffer = HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - BufferSize.X * BufferSize.Y - * sizeof(CHAR_INFO)); - if (CharBuffer == NULL) return; - - ConRect.Left = 0; - ConRect.Top = ConsoleSize->Y - BufferSize.Y; - ConRect.Right = ConRect.Left + BufferSize.X - 1; - ConRect.Bottom = ConRect.Top + BufferSize.Y - 1; - - /* Read the data from the console into the temporary buffer... */ - ReadConsoleOutputA(ConsoleOutput, - CharBuffer, - BufferSize, - Origin, - &ConRect); - - /* ... and copy the temporary buffer into the VGA memory */ - for (i = 0; i < BufferSize.Y; i++) - { - for (j = 0; j < BufferSize.X; j++) - { - Character = MAKEWORD(CharBuffer[Counter].Char.AsciiChar, - (BYTE)CharBuffer[Counter].Attributes); - ++Counter; - - /* Write to video memory */ - EmulatorWriteMemory(&EmulatorContext, - VideoAddress + (i * Bda->ScreenColumns + j) * sizeof(WORD), - (LPVOID)&Character, - sizeof(WORD)); - } - } - - /* Free the temporary buffer */ - HeapFree(GetProcessHeap(), 0, CharBuffer); -} - static BOOLEAN VgaSetRegisters(PVGA_REGISTERS Registers) { INT i; @@ -925,6 +873,24 @@ VgaSetPalette(Palette, Size); } +static VOID VgaGetCursorPosition(PBYTE Row, PBYTE Column) +{ + SHORT ScreenColumns = VgaGetDisplayResolution().X; + BYTE OffsetLow, OffsetHigh; + WORD Offset; + + /* Get the cursor location */ + IOWriteB(VGA_CRTC_INDEX, VGA_CRTC_CURSOR_LOC_LOW_REG); + OffsetLow = IOReadB(VGA_CRTC_DATA); + IOWriteB(VGA_CRTC_INDEX, VGA_CRTC_CURSOR_LOC_HIGH_REG); + OffsetHigh = IOReadB(VGA_CRTC_DATA); + + Offset = MAKEWORD(OffsetLow, OffsetHigh); + + *Row = (BYTE)(Offset / ScreenColumns); + *Column = (BYTE)(Offset % ScreenColumns); +} + static VOID VidBiosGetCursorPosition(PBYTE Row, PBYTE Column, BYTE Page) { /* Make sure the selected video page is valid */ @@ -1000,10 +966,11 @@ IOWriteB(VGA_CRTC_INDEX, VGA_CRTC_START_ADDR_HIGH_REG); IOWriteB(VGA_CRTC_DATA , HIBYTE(Bda->VideoPageOffset)); - /* Get the character height */ + /* Update the character height */ IOWriteB(VGA_CRTC_INDEX, VGA_CRTC_MAX_SCAN_LINE_REG); Bda->CharacterHeight = 1 + (IOReadB(VGA_CRTC_DATA) & 0x1F); + /* Update the screen size */ Resolution = VgaGetDisplayResolution(); Bda->ScreenColumns = Resolution.X; Bda->ScreenRows = Resolution.Y - 1; @@ -1011,6 +978,9 @@ /* Set the cursor position for each page */ for (Page = 0; Page < BIOS_MAX_PAGES; ++Page) VidBiosSetCursorPosition(0, 0, Page); + + /* Refresh display */ + VgaRefreshDisplay(); return TRUE; } @@ -1533,8 +1503,10 @@ /* PUBLIC FUNCTIONS ***********************************************************/ -BOOLEAN VidBios32Initialize(HANDLE ConsoleOutput) -{ +BOOLEAN VidBios32Initialize(VOID) +{ + BYTE Row, Column; + /* Some interrupts are in fact addresses to tables */ ((PULONG)BaseAddress)[0x1D] = (ULONG)NULL; ((PULONG)BaseAddress)[0x1F] = (ULONG)NULL; @@ -1545,21 +1517,9 @@ /* Set the default video mode */ VidBiosSetVideoMode(BIOS_DEFAULT_VIDEO_MODE); - /* Set some screen properties if the console output handle is valid */ - if (ConsoleOutput != INVALID_HANDLE_VALUE) - { - CONSOLE_SCREEN_BUFFER_INFO ConsoleInfo; - - GetConsoleScreenBufferInfo(ConsoleOutput, &ConsoleInfo); - - /* Copy console data into VGA memory */ - VidBiosCopyTextConsoleToVgaMemory(ConsoleOutput, &ConsoleInfo.dwSize); - - /* Update the cursor position for the current page */ - VidBiosSetCursorPosition(ConsoleInfo.dwCursorPosition.Y, - ConsoleInfo.dwCursorPosition.X, - Bda->VideoPage); - } + /* Update cursor position */ + VgaGetCursorPosition(&Row, &Column); + VidBiosSetCursorPosition(Row, Column, Bda->VideoPage); /* Register the BIOS 32-bit Interrupts */ RegisterBiosInt32(BIOS_VIDEO_INTERRUPT, VidBiosVideoService); Modified: branches/ntvdm/subsystems/ntvdm/bios/bios32/vidbios32.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios/bio… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios/bios32/vidbios32.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios/bios32/vidbios32.h [iso-8859-1] Sun Mar 2 01:45:57 2014 @@ -36,7 +36,7 @@ /* FUNCTIONS ******************************************************************/ -BOOLEAN VidBios32Initialize(HANDLE BiosConsoleOutput); +BOOLEAN VidBios32Initialize(VOID); VOID VidBios32Cleanup(VOID); #endif // _VIDBIOS32_H_ Modified: branches/ntvdm/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] Sun Mar 2 01:45:57 2014 @@ -380,13 +380,14 @@ /* Register the I/O Ports */ RegisterIoPort(CONTROL_SYSTEM_PORT61H, Port61hRead, Port61hWrite); - /* Initialize the PS2 port */ - PS2Initialize(ConsoleInput); - /* Set the console input mode */ // FIXME: Activate ENABLE_WINDOW_INPUT when we will want to perform actions // upon console window events (screen buffer resize, ...). SetConsoleMode(ConsoleInput, ENABLE_PROCESSED_INPUT /* | ENABLE_WINDOW_INPUT */); + // SetConsoleMode(ConsoleOutput, ENABLE_PROCESSED_OUTPUT | ENABLE_WRAP_AT_EOL_OUTPUT); + + /* Initialize the PS2 port */ + PS2Initialize(ConsoleInput); /* Start the input thread */ InputThread = CreateThread(NULL, 0, &PumpConsoleInput, ConsoleInput, 0, NULL); Modified: branches/ntvdm/subsystems/ntvdm/hardware/vga.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/hardware… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/hardware/vga.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/hardware/vga.c [iso-8859-1] Sun Mar 2 01:45:57 2014 @@ -402,11 +402,20 @@ /* PRIVATE FUNCTIONS **********************************************************/ +static inline DWORD VgaGetAddressSize(VOID); + static BOOL VgaAttachToConsole(PCOORD Resolution) { - BOOL Success = FALSE; + BOOL Success; ULONG Length = 0; PVIDEO_HARDWARE_STATE_HEADER State; + + SHORT i, j; + DWORD AddressSize, ScanlineSize; + DWORD Address = 0; + DWORD CurrentAddr; + SMALL_RECT ScreenRect; // ConRect; + COORD Origin = { 0, 0 }; ASSERT(TextFramebuffer == NULL); @@ -442,9 +451,53 @@ { DisplayMessage(L"RegisterConsoleVDM failed with error %d\n", GetLastError()); VdmRunning = FALSE; - } - - return Success; + return FALSE; + } + + /* Copy console data into VGA memory */ + + /* Get the data */ + AddressSize = VgaGetAddressSize(); + ScreenRect.Left = ScreenRect.Top = 0; + ScreenRect.Right = TextResolution.X; + ScreenRect.Bottom = TextResolution.Y; + + // ConRect.Left = 0; + // ConRect.Top = ConsoleSize->Y - BufferSize.Y; + // ConRect.Right = ConRect.Left + BufferSize.X - 1; + // ConRect.Bottom = ConRect.Top + BufferSize.Y - 1; + + ScanlineSize = (DWORD)VgaCrtcRegisters[VGA_CRTC_OFFSET_REG] * 2; + + /* Read the data from the console into the framebuffer... */ + ReadConsoleOutputA(TextConsoleBuffer, + CharBuff, + TextResolution, + Origin, + &ScreenRect); // &ConRect); + + /* ... and copy the framebuffer into the VGA memory */ + + /* Loop through the scanlines */ + for (i = 0; i < TextResolution.Y; i++) + { + /* Loop through the characters */ + for (j = 0; j < TextResolution.X; j++) + { + CurrentAddr = LOWORD((Address + j) * AddressSize); + + /* Store the character in plane 0 */ + VgaMemory[CurrentAddr] = CharBuff[i * TextResolution.X + j].Char.AsciiChar; + + /* Store the attribute in plane 1 */ + VgaMemory[CurrentAddr + VGA_BANK_SIZE] = (BYTE)CharBuff[i * TextResolution.X + j].Attributes; + } + + /* Move to the next scanline */ + Address += ScanlineSize; + } + + return TRUE; } static VOID VgaDetachFromConsole(VOID) @@ -893,12 +946,14 @@ { SMALL_RECT ConRect; + DPRINT1("VgaEnterTextMode\n"); + /* Switch to the text buffer */ SetConsoleActiveScreenBuffer(TextConsoleBuffer); /* Resize the console */ ConRect.Left = 0; // ConsoleInfo.srWindow.Left; - ConRect.Top = ConsoleInfo.srWindow.Top; + ConRect.Top = ConsoleInfo.srWindow.Top; // ConsoleSize->Y - Resolution->Y; ConRect.Right = ConRect.Left + Resolution->X - 1; ConRect.Bottom = ConRect.Top + Resolution->Y - 1; /* @@ -919,6 +974,8 @@ if (TextResolution.X != Resolution->X || TextResolution.Y != Resolution->Y) { + WORD Offset; + VgaDetachFromConsole(); /* VgaAttachToConsole sets TextResolution to the new resolution */ @@ -928,6 +985,14 @@ VdmRunning = FALSE; return FALSE; } + + /* Update the cursor position in the registers */ + Offset = ConsoleInfo.dwCursorPosition.Y * Resolution->X + + ConsoleInfo.dwCursorPosition.X; + DPRINT1("X = %d ; Y = %d\n", ConsoleInfo.dwCursorPosition.X, ConsoleInfo.dwCursorPosition.Y); + VgaCrtcRegisters[VGA_CRTC_CURSOR_LOC_LOW_REG] = LOBYTE(Offset); + VgaCrtcRegisters[VGA_CRTC_CURSOR_LOC_HIGH_REG] = HIBYTE(Offset); + CursorMoved = TRUE; } /* The active framebuffer is now the text framebuffer */ @@ -1217,8 +1282,8 @@ CharInfo.Attributes = VgaMemory[CurrentAddr + VGA_BANK_SIZE]; /* Now check if the resulting character data has changed */ - if ((CharBuffer[i * Resolution.X + j].Char != CharInfo.Char) - || (CharBuffer[i * Resolution.X + j].Attributes != CharInfo.Attributes)) + if ((CharBuffer[i * Resolution.X + j].Char != CharInfo.Char) || + (CharBuffer[i * Resolution.X + j].Attributes != CharInfo.Attributes)) { /* Yes, write the new value */ CharBuffer[i * Resolution.X + j] = CharInfo; @@ -1265,8 +1330,10 @@ Location += (VgaCrtcRegisters[VGA_CRTC_CURSOR_END_REG] >> 5) & 3; /* Find the coordinates of the new position */ - Position.X = (WORD)(Location % ScanlineSize); - Position.Y = (WORD)(Location / ScanlineSize); + Position.X = (SHORT)(Location % ScanlineSize); + Position.Y = (SHORT)(Location / ScanlineSize); + + DPRINT1("VgaUpdateTextCursor: X = %d ; Y = %d\n", Position.X, Position.Y); /* Update the physical cursor */ SetConsoleCursorInfo(TextConsoleBuffer, &CursorInfo); Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.c?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] Sun Mar 2 01:45:57 2014 @@ -151,7 +151,16 @@ { WCHAR szMenuString[255] = L""; - ShowConsoleCursor(ConOutHandle, ShowPtr); + if (ShowPtr) + { + /* Be sure the cursor will be shown */ + while (ShowConsoleCursor(ConOutHandle, TRUE) < 0) ; + } + else + { + /* Be sure the cursor will be hidden */ + while (ShowConsoleCursor(ConOutHandle, FALSE) >= 0) ; + } if (LoadStringW(GetModuleHandle(NULL), (!ShowPtr ? IDS_SHOW_MOUSE : IDS_HIDE_MOUSE), @@ -400,7 +409,7 @@ } /* Initialize the system BIOS */ - if (!BiosInitialize(NULL, ConsoleOutput)) + if (!BiosInitialize(NULL)) { wprintf(L"FATAL: Failed to initialize the VDM BIOS.\n"); goto Cleanup;

10 years, 9 months

[hbelusca] 62372: [FTP] Fix download with ftp.exe, the problem was that we didn't switch download mode to binary when needed, because of idiotic defines used that where pointless here. We have this...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Mar 1 22:42:38 2014 New Revision: 62372 URL: http://svn.reactos.org/svn/reactos?rev=62372&view=rev Log: [FTP] Fix download with ftp.exe, the problem was that we didn't switch download mode to binary when needed, because of idiotic defines used that where pointless here. We have this bug since revision 12776... Patch by Alexander Varnin, see CORE-3682 for details. CORE-3682 #resolve #comment Committed in revision, cheers ;) Modified: trunk/reactos/base/applications/network/ftp/cmds.c Modified: trunk/reactos/base/applications/network/ftp/cmds.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ftp/cmds.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ftp/cmds.c [iso-8859-1] Sat Mar 1 22:42:38 2014 @@ -85,18 +85,11 @@ } host = hookup(argv[1], portnum); if (host) { -#if defined(unix) && NBBY == 8 int overbose; -#endif connected = 1; if (autologin) (void) login(argv[1]); -#if defined(unix) && NBBY == 8 -/* - * this ifdef is to keep someone form "porting" this to an incompatible - * system and not checking this out. This way they have to think about it. - */ overbose = verbose; if (debug == 0) verbose = -1; @@ -119,7 +112,7 @@ *cp = c; } if (!strncmp(reply_string, "215 UNIX Type: L8", 17)) { - setbinary(); + setbinary(0, NULL); /* allbinary = 1; this violates the RFC */ if (overbose) printf("Using %s mode to transfer files.\n", @@ -130,7 +123,6 @@ "Remember to set tenex mode when transfering binary files from this machine.\n"); } verbose = overbose; -#endif /* unix */ } (void) fflush(stdout); }

10 years, 9 months

[hbelusca] 62371: [NTVDM] The RegisterConsoleVDM API (undocumented) allows NTVDM to get a VGA-like text framebuffer hold by the console server. This text framebuffer is unique, per-console (so that...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Mar 1 20:58:42 2014 New Revision: 62371 URL: http://svn.reactos.org/svn/reactos?rev=62371&view=rev Log: [NTVDM] The RegisterConsoleVDM API (undocumented) allows NTVDM to get a VGA-like text framebuffer hold by the console server. This text framebuffer is unique, per-console (so that changing the active text screen buffer doesn't change the text framebuffer) and exists even if you use a graphics screen buffer. NTVDM can write in this framebuffer, and when a call to InvalidateConsoleDIBits is done, it is painted on the screen. Since RegisterConsoleVDM is unimplemented on ReactOS, I start an implementation of this API *inside* NTVDM (that will then be moved to kernel32/winsrv when it will work correctly). I adapt the code of the VGA emulation to support RegisterConsoleVDM. Modified: branches/ntvdm/subsystems/ntvdm/emulator.c branches/ntvdm/subsystems/ntvdm/hardware/vga.c branches/ntvdm/subsystems/ntvdm/hardware/vga.h Modified: branches/ntvdm/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] Sat Mar 1 20:58:42 2014 @@ -409,7 +409,7 @@ VOID EmulatorCleanup(VOID) { - // VgaCleanup(); + VgaCleanup(); /* Close the input thread handle */ if (InputThread != NULL) CloseHandle(InputThread); Modified: branches/ntvdm/subsystems/ntvdm/hardware/vga.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/hardware… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/hardware/vga.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/hardware/vga.c [iso-8859-1] Sat Mar 1 20:58:42 2014 @@ -170,15 +170,44 @@ #endif +/* + * Console interface -- VGA-mode-agnostic + */ +typedef struct _CHAR_CELL +{ + CHAR Char; + BYTE Attributes; +} CHAR_CELL, *PCHAR_CELL; +C_ASSERT(sizeof(CHAR_CELL) == 2); + +static LPVOID ConsoleFramebuffer = NULL; // Active framebuffer, points to + // either TextFramebuffer or a valid + // graphics framebuffer. +static HPALETTE PaletteHandle = NULL; + +static HANDLE StartEvent = NULL; +static HANDLE EndEvent = NULL; +static HANDLE AnotherEvent = NULL; + +/* + * Text mode -- we always keep a valid text mode framebuffer + * even if we are in graphics mode. This is needed in order to + * keep a consistent VGA state. + */ static CONSOLE_SCREEN_BUFFER_INFO ConsoleInfo; - -static BYTE VgaMemory[VGA_NUM_BANKS * VGA_BANK_SIZE]; -static LPVOID ConsoleFramebuffer = NULL; +static COORD TextResolution = {0}; +static PCHAR_CELL TextFramebuffer = NULL; static HANDLE TextConsoleBuffer = NULL; + +/* Graphics mode */ static HANDLE GraphicsConsoleBuffer = NULL; static HANDLE ConsoleMutex = NULL; -static HPALETTE PaletteHandle = NULL; static BOOLEAN DoubleVision = FALSE; + +/* + * VGA Hardware + */ +static BYTE VgaMemory[VGA_NUM_BANKS * VGA_BANK_SIZE]; static BYTE VgaLatchRegisters[VGA_NUM_BANKS] = {0, 0, 0, 0}; @@ -210,7 +239,7 @@ static BOOLEAN InHorizontalRetrace = FALSE; static BOOLEAN NeedsUpdate = FALSE; -static BOOLEAN ModeChanged = TRUE; +static BOOLEAN ModeChanged = FALSE; static BOOLEAN CursorMoved = FALSE; static BOOLEAN PaletteChanged = FALSE; @@ -223,7 +252,245 @@ static SMALL_RECT UpdateRectangle = { 0, 0, 0, 0 }; +/* RegisterConsoleVDM EMULATION ***********************************************/ + +#include <ntddvdeo.h> + +typedef +BOOL +(WINAPI *pRegisterConsoleVDM) +( + BOOL IsDosVDM_flag, + HANDLE EventHandle_1, + HANDLE EventHandle_2, + HANDLE EventHandle_3, + int Unused1, + PVOID returned_val_1, + PVOID *returned_val_2, + PVOID lpUnknownBuffer, + DWORD theUnknownBufferLength, + COORD theVDMBufferSize, + PCHAR *lpVDMBuffer +); + +#if 0 +BOOL +WINAPI +RegisterConsoleVDM +( + BOOL IsDosVDM_flag, + HANDLE EventHandle_1, + HANDLE EventHandle_2, + HANDLE EventHandle_3, + int Unused1, + PVOID returned_val_1, + PVOID *returned_val_2, + PVOID lpUnknownBuffer, + DWORD theUnknownBufferLength, + COORD theVDMBufferSize, + PVOID *lpVDMBuffer +); + +HMODULE hKernel32 = NULL; +pRegisterConsoleVDM RegisterConsoleVDM = NULL; +#endif + +/* + * This private buffer, per-console, is used by + * RegisterConsoleVDM and InvalidateConsoleDIBits. + */ +static COORD VDMBufferSize = {0}; +static PCHAR_CELL VDMBuffer = NULL; + +static PCHAR_INFO CharBuff = NULL; // This is a hack, which is unneeded + // for the real RegisterConsoleVDM and + // InvalidateConsoleDIBits + +BOOL +WINAPI +__RegisterConsoleVDM(BOOL IsDosVDM_flag, + HANDLE EventHandle_1, + HANDLE EventHandle_2, + HANDLE EventHandle_3, + int Unused1, + PVOID returned_val_1, + PVOID *returned_val_2, + PVOID lpUnknownBuffer, + DWORD theUnknownBufferLength, + COORD theVDMBufferSize, + PCHAR *lpVDMBuffer) +{ + UNREFERENCED_PARAMETER(EventHandle_3); + UNREFERENCED_PARAMETER(Unused1); + UNREFERENCED_PARAMETER(returned_val_1); + UNREFERENCED_PARAMETER(returned_val_2); + UNREFERENCED_PARAMETER(lpUnknownBuffer); + UNREFERENCED_PARAMETER(theUnknownBufferLength); + + SetLastError(0); + DPRINT1("__RegisterConsoleVDM(%d)\n", IsDosVDM_flag); + + if (lpVDMBuffer == NULL) return FALSE; + + if (IsDosVDM_flag) + { + // if (EventHandle_1 == NULL || EventHandle_2 == NULL) return FALSE; + if (VDMBuffer != NULL) return FALSE; + + VDMBufferSize = theVDMBufferSize; + + /* HACK: Cache -- to be removed in the real implementation */ + CharBuff = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + theVDMBufferSize.X * theVDMBufferSize.Y + * sizeof(CHAR_INFO)); + ASSERT(CharBuff); + + VDMBuffer = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + theVDMBufferSize.X * theVDMBufferSize.Y + * sizeof(CHAR_CELL)); + *lpVDMBuffer = (PCHAR)VDMBuffer; + return (VDMBuffer != NULL); + } + else + { + /* HACK: Cache -- to be removed in the real implementation */ + if (CharBuff) HeapFree(GetProcessHeap(), 0, CharBuff); + CharBuff = NULL; + + if (VDMBuffer) HeapFree(GetProcessHeap(), 0, VDMBuffer); + VDMBuffer = NULL; + + VDMBufferSize.X = VDMBufferSize.Y = 0; + + return TRUE; + } +} + +BOOL +__InvalidateConsoleDIBits(IN HANDLE hConsoleOutput, + IN PSMALL_RECT lpRect) +{ + if ((hConsoleOutput == TextConsoleBuffer) && (VDMBuffer != NULL)) + { + /* HACK: Write the cached data to the console */ + + COORD Origin = { lpRect->Left, lpRect->Top }; + SHORT i, j; + + ASSERT(CharBuff); + + for (i = 0; i < VDMBufferSize.Y; i++) + { + for (j = 0; j < VDMBufferSize.X; j++) + { + CharBuff[i * VDMBufferSize.X + j].Char.AsciiChar = VDMBuffer[i * VDMBufferSize.X + j].Char; + CharBuff[i * VDMBufferSize.X + j].Attributes = VDMBuffer[i * VDMBufferSize.X + j].Attributes; + } + } + + WriteConsoleOutputA(hConsoleOutput, + CharBuff, + VDMBufferSize, + Origin, + lpRect); + } + + return InvalidateConsoleDIBits(hConsoleOutput, lpRect); +} + /* PRIVATE FUNCTIONS **********************************************************/ + +static BOOL VgaAttachToConsole(PCOORD Resolution) +{ + BOOL Success = FALSE; + ULONG Length = 0; + PVIDEO_HARDWARE_STATE_HEADER State; + + ASSERT(TextFramebuffer == NULL); + + // ResetEvent(AnotherEvent); + + TextResolution = *Resolution; + + /* + * Windows 2k3 winsrv.dll calls NtVdmControl(VdmQueryVdmProcess == 14, &ConsoleHandle); + * in the two following APIs: + * SrvRegisterConsoleVDM (corresponding win32 API: RegisterConsoleVDM) + * SrvVDMConsoleOperation (corresponding Win32 API: ) + * to check whether the current process is a VDM process, and fails otherwise with the + * error 0xC0000022 (). + * + * It is worth it to notice that also basesrv.dll does the same only for the + * BaseSrvIsFirstVDM API... + */ + + Success = + __RegisterConsoleVDM(1, + StartEvent, + EndEvent, + AnotherEvent, // NULL, + 0, + &Length, // NULL, <-- putting this (and null in the next var) makes the API returning error 12 "ERROR_INVALID_ACCESS" + (PVOID*)&State, // NULL, + NULL, + 0, + TextResolution, + (PCHAR*)&TextFramebuffer); + if (!Success) + { + DisplayMessage(L"RegisterConsoleVDM failed with error %d\n", GetLastError()); + VdmRunning = FALSE; + } + + return Success; +} + +static VOID VgaDetachFromConsole(VOID) +{ + ULONG dummyLength; + PVOID dummyPtr; + COORD dummySize = {0}; + + __RegisterConsoleVDM(0, + NULL, + NULL, + NULL, + 0, + &dummyLength, + &dummyPtr, + NULL, + 0, + dummySize, + (PCHAR*)&dummyPtr); + + TextFramebuffer = NULL; +} + +static BOOL IsConsoleHandle(HANDLE hHandle) +{ + DWORD dwMode; + + /* Check whether the handle may be that of a console... */ + if ((GetFileType(hHandle) & ~FILE_TYPE_REMOTE) != FILE_TYPE_CHAR) + return FALSE; + + /* + * It may be. Perform another test... The idea comes from the + * MSDN description of the WriteConsole API: + * + * "WriteConsole fails if it is used with a standard handle + * that is redirected to a file. If an application processes + * multilingual output that can be redirected, determine whether + * the output handle is a console handle (one method is to call + * the GetConsoleMode function and check whether it succeeds). + * If the handle is a console handle, call WriteConsole. If the + * handle is not a console handle, the output is redirected and + * you should call WriteFile to perform the I/O." + */ + return GetConsoleMode(hHandle, &dwMode); +} static inline DWORD VgaGetAddressSize(VOID) { @@ -648,17 +915,23 @@ /* Update the saved console information */ GetConsoleScreenBufferInfo(TextConsoleBuffer, &ConsoleInfo); - /* Allocate a framebuffer */ - ConsoleFramebuffer = HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - Resolution->X * Resolution->Y - * sizeof(CHAR_INFO)); - if (ConsoleFramebuffer == NULL) - { - DisplayMessage(L"An unexpected error occurred!\n"); - VdmRunning = FALSE; - return FALSE; - } + /* Adjust the text framebuffer if we changed resolution */ + if (TextResolution.X != Resolution->X || + TextResolution.Y != Resolution->Y) + { + VgaDetachFromConsole(); + + /* VgaAttachToConsole sets TextResolution to the new resolution */ + if (!VgaAttachToConsole(Resolution)) + { + DisplayMessage(L"An unexpected error occurred!\n"); + VdmRunning = FALSE; + return FALSE; + } + } + + /* The active framebuffer is now the text framebuffer */ + ConsoleFramebuffer = TextFramebuffer; /* * Set the text mode palette. @@ -681,8 +954,7 @@ static VOID VgaLeaveTextMode(VOID) { - /* Free the old framebuffer */ - HeapFree(GetProcessHeap(), 0, ConsoleFramebuffer); + /* Reset the active framebuffer */ ConsoleFramebuffer = NULL; } @@ -736,7 +1008,7 @@ static VOID VgaUpdateFramebuffer(VOID) { - INT i, j, k; + SHORT i, j, k; COORD Resolution = VgaGetDisplayResolution(); DWORD AddressSize = VgaGetAddressSize(); DWORD Address = MAKEWORD(VgaCrtcRegisters[VGA_CRTC_START_ADDR_LOW_REG], @@ -927,8 +1199,8 @@ { /* Text mode */ DWORD CurrentAddr; - PCHAR_INFO CharBuffer = (PCHAR_INFO)ConsoleFramebuffer; - CHAR_INFO CharInfo; + PCHAR_CELL CharBuffer = (PCHAR_CELL)ConsoleFramebuffer; + CHAR_CELL CharInfo; /* Loop through the scanlines */ for (i = 0; i < Resolution.Y; i++) @@ -939,13 +1211,13 @@ CurrentAddr = LOWORD((Address + j) * AddressSize); /* Plane 0 holds the character itself */ - CharInfo.Char.AsciiChar = VgaMemory[CurrentAddr]; + CharInfo.Char = VgaMemory[CurrentAddr]; /* Plane 1 holds the attribute */ CharInfo.Attributes = VgaMemory[CurrentAddr + VGA_BANK_SIZE]; /* Now check if the resulting character data has changed */ - if ((CharBuffer[i * Resolution.X + j].Char.AsciiChar != CharInfo.Char.AsciiChar) + if ((CharBuffer[i * Resolution.X + j].Char != CharInfo.Char) || (CharBuffer[i * Resolution.X + j].Attributes != CharInfo.Attributes)) { /* Yes, write the new value */ @@ -1361,32 +1633,24 @@ { /* Graphics mode */ ConsoleBufferHandle = GraphicsConsoleBuffer; + + /* In DoubleVision mode, scale the update rectangle */ + if (DoubleVision) + { + UpdateRectangle.Left *= 2; + UpdateRectangle.Top *= 2; + UpdateRectangle.Right = UpdateRectangle.Right * 2 + 1; + UpdateRectangle.Bottom = UpdateRectangle.Bottom * 2 + 1; + } } else { /* Text mode */ - COORD Origin = { UpdateRectangle.Left, UpdateRectangle.Top }; ConsoleBufferHandle = TextConsoleBuffer; - - /* Write the data to the console */ - WriteConsoleOutputA(TextConsoleBuffer, - (PCHAR_INFO)ConsoleFramebuffer, - Resolution, - Origin, - &UpdateRectangle); - } - - /* In DoubleVision mode, scale the update rectangle */ - if (DoubleVision) - { - UpdateRectangle.Left *= 2; - UpdateRectangle.Top *= 2; - UpdateRectangle.Right = UpdateRectangle.Right * 2 + 1; - UpdateRectangle.Bottom = UpdateRectangle.Bottom * 2 + 1; } /* Redraw the screen */ - InvalidateConsoleDIBits(ConsoleBufferHandle, &UpdateRectangle); + __InvalidateConsoleDIBits(ConsoleBufferHandle, &UpdateRectangle); /* Clear the update flag */ NeedsUpdate = FALSE; @@ -1491,7 +1755,7 @@ BOOLEAN VgaInitialize(HANDLE TextHandle) { /* Save the default text-mode console output handle */ - if (TextHandle == INVALID_HANDLE_VALUE) return FALSE; + if (!IsConsoleHandle(TextHandle)) return FALSE; TextConsoleBuffer = TextHandle; /* Save the console information */ @@ -1529,4 +1793,29 @@ return TRUE; } +VOID VgaCleanup(VOID) +{ + if (ScreenMode == GRAPHICS_MODE) + { + /* Leave the current graphics mode */ + VgaLeaveGraphicsMode(); + } + else + { + /* Leave the current text mode */ + VgaLeaveTextMode(); + } + + VgaDetachFromConsole(); + + CloseHandle(AnotherEvent); + CloseHandle(EndEvent); + CloseHandle(StartEvent); + +#if 0 + RegisterConsoleVDM = NULL; + FreeLibrary(hKernel32); +#endif +} + /* EOF */ Modified: branches/ntvdm/subsystems/ntvdm/hardware/vga.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/hardware… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/hardware/vga.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/hardware/vga.h [iso-8859-1] Sat Mar 1 20:58:42 2014 @@ -258,7 +258,9 @@ VOID VgaReadMemory(DWORD Address, LPBYTE Buffer, DWORD Size); VOID VgaWriteMemory(DWORD Address, LPBYTE Buffer, DWORD Size); VOID VgaClearMemory(VOID); + BOOLEAN VgaInitialize(HANDLE TextHandle); +VOID VgaCleanup(VOID); #endif // _VGA_H_

10 years, 9 months

[hbelusca] 62370: [NTVDM]: Rework the code template to be used when we will support mice in ntvdm.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Mar 1 20:52:46 2014 New Revision: 62370 URL: http://svn.reactos.org/svn/reactos?rev=62370&view=rev Log: [NTVDM]: Rework the code template to be used when we will support mice in ntvdm. Modified: branches/ntvdm/subsystems/ntvdm/hardware/ps2.c Modified: branches/ntvdm/subsystems/ntvdm/hardware/ps2.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/hardware… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/hardware/ps2.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/hardware/ps2.c [iso-8859-1] Sat Mar 1 20:52:46 2014 @@ -337,17 +337,20 @@ RegisterIoPort(PS2_DATA_PORT , PS2ReadPort, PS2WritePort); #if 0 - if (MousePresent) - { - /* Support mouse input events if there is a mouse on the system */ - if (GetConsoleMode(ConsoleInput, &ConInMode)) - SetConsoleMode(ConsoleInput, ConInMode | ENABLE_MOUSE_INPUT); - } - else - { - /* Do not support mouse input events if there is no mouse on the system */ - if (GetConsoleMode(ConsoleInput, &ConInMode)) - SetConsoleMode(ConsoleInput, ConInMode & ~ENABLE_MOUSE_INPUT); + if (GetConsoleMode(ConsoleInput, &ConInMode)) + { + if (MousePresent) + { + /* Support mouse input events if there is a mouse on the system */ + ConInMode |= ENABLE_MOUSE_INPUT; + } + else + { + /* Do not support mouse input events if there is no mouse on the system */ + ConInMode &= ~ENABLE_MOUSE_INPUT; + } + + SetConsoleMode(ConsoleInput, ConInMode); } #endif

10 years, 9 months

[ekohl] 62369: [MSGINA] MyLogonUser: Pass the sub status to the caller.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Mar 1 20:45:10 2014 New Revision: 62369 URL: http://svn.reactos.org/svn/reactos?rev=62369&view=rev Log: [MSGINA] MyLogonUser: Pass the sub status to the caller. Modified: trunk/reactos/dll/win32/msgina/lsa.c trunk/reactos/dll/win32/msgina/msgina.c trunk/reactos/dll/win32/msgina/msgina.h trunk/reactos/dll/win32/msgina/tui.c Modified: trunk/reactos/dll/win32/msgina/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lsa.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msgina/lsa.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lsa.c [iso-8859-1] Sat Mar 1 20:45:10 2014 @@ -7,7 +7,7 @@ #include "msgina.h" -BOOL +NTSTATUS ConnectToLsa( PGINA_CONTEXT pgContext) { @@ -18,7 +18,7 @@ /* We are already connected to the LSA */ if (pgContext->LsaHandle != NULL) - return TRUE; + return STATUS_SUCCESS; /* Connect to the LSA server */ RtlInitAnsiString((PANSI_STRING)&LogonProcessName, @@ -30,7 +30,7 @@ if (!NT_SUCCESS(Status)) { ERR("LsaRegisterLogonProcess failed (Status 0x%08lx)\n", Status); - return FALSE; + return Status; } /* Get the authentication package */ @@ -43,21 +43,21 @@ if (!NT_SUCCESS(Status)) { ERR("LsaLookupAuthenticationPackage failed (Status 0x%08lx)\n", Status); - return FALSE; - } - - return TRUE; + } + + return Status; } -BOOL +NTSTATUS MyLogonUser( HANDLE LsaHandle, ULONG AuthenticationPackage, LPWSTR lpszUsername, LPWSTR lpszDomain, LPWSTR lpszPassword, - PHANDLE phToken) + PHANDLE phToken, + PNTSTATUS SubStatus) { SID_IDENTIFIER_AUTHORITY LocalAuthority = {SECURITY_LOCAL_SID_AUTHORITY}; SID_IDENTIFIER_AUTHORITY SystemAuthority = {SECURITY_NT_AUTHORITY}; @@ -78,7 +78,6 @@ LUID LogonId = {0, 0}; HANDLE TokenHandle = NULL; QUOTA_LIMITS QuotaLimits; - NTSTATUS SubStatus = STATUS_SUCCESS; NTSTATUS Status; *phToken = NULL; @@ -209,7 +208,7 @@ &Luid, &TokenHandle, &QuotaLimits, - &SubStatus); + SubStatus); if (!NT_SUCCESS(Status)) { ERR("LsaLogonUser failed (Status 0x%08lx)\n", Status); @@ -259,13 +258,7 @@ if (AuthInfo != NULL) RtlFreeHeap(RtlGetProcessHeap(), 0, AuthInfo); - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - - return TRUE; + return Status; } /* EOF */ Modified: trunk/reactos/dll/win32/msgina/msgina.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.c?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] Sat Mar 1 20:45:10 2014 @@ -612,20 +612,27 @@ ULONG Size; ULONG i; NTSTATUS Status; + NTSTATUS SubStatus = STATUS_SUCCESS; TRACE("(%S %S %S)\n", UserName, Domain, Password); - if (!ConnectToLsa(pgContext)) - return FALSE; - - if (!MyLogonUser(pgContext->LsaHandle, - pgContext->AuthenticationPackage, - UserName, - Domain, - Password, - &pgContext->UserToken)) - { - WARN("LogonUserW() failed\n"); + Status = ConnectToLsa(pgContext); + if (!NT_SUCCESS(Status)) + { + WARN("ConnectToLsa() failed\n"); + return FALSE; + } + + Status = MyLogonUser(pgContext->LsaHandle, + pgContext->AuthenticationPackage, + UserName, + Domain, + Password, + &pgContext->UserToken, + &SubStatus); + if (!NT_SUCCESS(Status)) + { + WARN("MyLogonUser() failed\n"); return FALSE; } @@ -693,18 +700,26 @@ DWORD cbStats, cbSize; DWORD dwLength; BOOL bResult; - - if (!ConnectToLsa(pgContext)) - return FALSE; - - if (!MyLogonUser(pgContext->LsaHandle, - pgContext->AuthenticationPackage, - UserName, - Domain, - Password, - &pgContext->UserToken)) - { - WARN("LogonUserW() failed\n"); + NTSTATUS SubStatus; + NTSTATUS Status; + + Status = ConnectToLsa(pgContext); + if (!NT_SUCCESS(Status)) + { + WARN("ConnectToLsa() failed\n"); + return FALSE; + } + + Status = MyLogonUser(pgContext->LsaHandle, + pgContext->AuthenticationPackage, + UserName, + Domain, + Password, + &pgContext->UserToken, + &SubStatus); + if (!NT_SUCCESS(Status)) + { + WARN("MyLogonUser() failed\n"); goto cleanup; } Modified: trunk/reactos/dll/win32/msgina/msgina.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.h?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.h [iso-8859-1] Sat Mar 1 20:45:10 2014 @@ -81,18 +81,19 @@ /* lsa.c */ -BOOL +NTSTATUS ConnectToLsa( PGINA_CONTEXT pgContext); -BOOL +NTSTATUS MyLogonUser( HANDLE LsaHandle, ULONG AuthenticationPackage, LPWSTR lpszUsername, LPWSTR lpszDomain, LPWSTR lpszPassword, - PHANDLE phToken); + PHANDLE phToken, + PNTSTATUS SubStatus); /* msgina.c */ Modified: trunk/reactos/dll/win32/msgina/tui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/tui.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msgina/tui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/tui.c [iso-8859-1] Sat Mar 1 20:45:10 2014 @@ -221,6 +221,8 @@ HANDLE hToken; WCHAR UserName[256]; WCHAR Password[256]; + NTSTATUS SubStatus; + NTSTATUS Status; TRACE("TUILockedSAS()\n"); @@ -235,17 +237,23 @@ if (!ReadString(IDS_ASKFORPASSWORD, Password, 256, FALSE)) return WLX_SAS_ACTION_NONE; - if (!ConnectToLsa(pgContext)) - return WLX_SAS_ACTION_NONE; - - if (!MyLogonUser(pgContext->LsaHandle, - pgContext->AuthenticationPackage, - UserName, - NULL, - Password, - &hToken)) - { - WARN("LogonUserW() failed\n"); + Status = ConnectToLsa(pgContext); + if (!NT_SUCCESS(Status)) + { + WARN("ConnectToLsa() failed\n"); + return WLX_SAS_ACTION_NONE; + } + + Status = MyLogonUser(pgContext->LsaHandle, + pgContext->AuthenticationPackage, + UserName, + NULL, + Password, + &hToken, + &SubStatus); + if (!NT_SUCCESS(Status)) + { + WARN("MyLogonUser() failed\n"); return WLX_SAS_ACTION_NONE; }

10 years, 9 months

[ekohl] 62368: [MSV1_0] LsaApLogonUser: Add checks for account restrictions (account disabled and account locked).

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Mar 1 17:12:21 2014 New Revision: 62368 URL: http://svn.reactos.org/svn/reactos?rev=62368&view=rev Log: [MSV1_0] LsaApLogonUser: Add checks for account restrictions (account disabled and account locked). Modified: trunk/reactos/dll/win32/msv1_0/msv1_0.c Modified: trunk/reactos/dll/win32/msv1_0/msv1_0.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msv1_0/msv1_0.c?… ============================================================================== --- trunk/reactos/dll/win32/msv1_0/msv1_0.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msv1_0/msv1_0.c [iso-8859-1] Sat Mar 1 17:12:21 2014 @@ -1083,7 +1083,33 @@ TRACE("UserName: %S\n", UserInfo->All.UserName.Buffer); - /* FIXME: Check restrictions */ + /* Check account restrictions for non-administrator accounts */ + if (RelativeIds.Element[0] != DOMAIN_USER_RID_ADMIN) + { + /* Check if the account has been disabled */ + if (UserInfo->All.UserAccountControl & USER_ACCOUNT_DISABLED) + { + ERR("Account disabled!\n"); + *SubStatus = STATUS_ACCOUNT_DISABLED; + Status = STATUS_ACCOUNT_RESTRICTION; + goto done; + } + + /* Check if the account has been locked */ + if (UserInfo->All.UserAccountControl & USER_ACCOUNT_AUTO_LOCKED) + { + ERR("Account disabled!\n"); + *SubStatus = STATUS_ACCOUNT_LOCKED_OUT; + Status = STATUS_ACCOUNT_RESTRICTION; + goto done; + } + + /* FIXME: more checks */ +// *SubStatus = STATUS_PASSWORD_EXPIRED; +// *SubStatus = STATUS_INVALID_LOGON_HOURS; +// *SubStatus = STATUS_INVALID_WORKSTATION; + + } /* Check the password */ if ((UserInfo->All.UserAccountControl & USER_PASSWORD_NOT_REQUIRED) == 0)

10 years, 9 months

[aandrejevic] 62367: [BASESRV] Implement a function that creates a pair of event handles - BaseSrvCreatePairWaitHandles. As already explained in the comments of BaseCheckForVDM (in kernel32), the h...

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Sat Mar 1 15:13:54 2014 New Revision: 62367 URL: http://svn.reactos.org/svn/reactos?rev=62367&view=rev Log: [BASESRV] Implement a function that creates a pair of event handles - BaseSrvCreatePairWaitHandles. As already explained in the comments of BaseCheckForVDM (in kernel32), the hParent parameter is actually an event handle (or more precisely, the client event handle), not a process handle. Modified: branches/ntvdm/subsystems/win/basesrv/vdm.c branches/ntvdm/subsystems/win/basesrv/vdm.h Modified: branches/ntvdm/subsystems/win/basesrv/vdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/win/basesrv/vd… ============================================================================== --- branches/ntvdm/subsystems/win/basesrv/vdm.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/win/basesrv/vdm.c [iso-8859-1] Sat Mar 1 15:13:54 2014 @@ -164,6 +164,27 @@ } return VdmAllowed; +} + +NTSTATUS NTAPI BaseSrvCreatePairWaitHandles(PHANDLE ServerEvent, PHANDLE ClientEvent) +{ + NTSTATUS Status; + + /* Create the event */ + Status = NtCreateEvent(ServerEvent, EVENT_ALL_ACCESS, NULL, NotificationEvent, FALSE); + if (!NT_SUCCESS(Status)) return Status; + + /* Duplicate the event into the client process */ + Status = NtDuplicateObject(NtCurrentProcess(), + *ServerEvent, + CsrGetClientThread()->Process->ProcessHandle, + ClientEvent, + 0, + 0, + DUPLICATE_SAME_ATTRIBUTES | DUPLICATE_SAME_ACCESS); + + if (!NT_SUCCESS(Status)) NtClose(*ServerEvent); + return Status; } VOID NTAPI BaseInitializeVDM(VOID) @@ -276,6 +297,9 @@ DosRecord->ExitCode = 0; // TODO: The DOS record structure is incomplete + Status = BaseSrvCreatePairWaitHandles(&DosRecord->ServerEvent, &DosRecord->ClientEvent); + if (!NT_SUCCESS(Status)) goto Cleanup; + /* Add the DOS record */ InsertHeadList(&ConsoleRecord->DosListHead, &DosRecord->Entry); @@ -423,7 +447,7 @@ for (i = ConsoleRecord->DosListHead.Flink; i != &ConsoleRecord->DosListHead; i = i->Flink) { DosRecord = CONTAINING_RECORD(i, VDM_DOS_RECORD, Entry); - if (DosRecord->ParentProcess == GetVDMExitCodeRequest->hParent) break; + if (DosRecord->ClientEvent == GetVDMExitCodeRequest->hParent) break; } /* Check if no DOS record was found */ Modified: branches/ntvdm/subsystems/win/basesrv/vdm.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/win/basesrv/vd… ============================================================================== --- branches/ntvdm/subsystems/win/basesrv/vdm.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/win/basesrv/vdm.h [iso-8859-1] Sat Mar 1 15:13:54 2014 @@ -32,7 +32,8 @@ LIST_ENTRY Entry; USHORT State; ULONG ExitCode; - HANDLE ParentProcess; + HANDLE ServerEvent; + HANDLE ClientEvent; // TODO: Structure incomplete!!! } VDM_DOS_RECORD, *PVDM_DOS_RECORD;

10 years, 9 months

[ekohl] 62366: [NETAPI32] NetUserSetInfo: Enable info levels 4, 22, 1017 and 1018.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Mar 1 12:11:26 2014 New Revision: 62366 URL: http://svn.reactos.org/svn/reactos?rev=62366&view=rev Log: [NETAPI32] NetUserSetInfo: Enable info levels 4, 22, 1017 and 1018. Modified: trunk/reactos/dll/win32/netapi32/user.c Modified: trunk/reactos/dll/win32/netapi32/user.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/user.c?… ============================================================================== --- trunk/reactos/dll/win32/netapi32/user.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/user.c [iso-8859-1] Sat Mar 1 12:11:26 2014 @@ -3887,9 +3887,9 @@ case 1: case 2: case 3: -// case 4: + case 4: // case 21: -// case 22: + case 22: case 1003: // case 1005: case 1006: @@ -3901,8 +3901,8 @@ case 1012: case 1013: case 1014: -// case 1017: -// case 1018: + case 1017: + case 1018: // case 1020: case 1024: case 1025:

10 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2014