Ros-diffs May 2014

ros-diffs@reactos.org

14 participants
437 discussions

[aandrejevic] 63122: [BASESRV] Don't accept NULL as a valid console handle.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Fri May 2 23:00:10 2014 New Revision: 63122 URL: http://svn.reactos.org/svn/reactos?rev=63122&view=rev Log: [BASESRV] Don't accept NULL as a valid console handle. Modified: branches/ntvdm/subsystems/win/basesrv/vdm.c 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] Fri May 2 23:00:10 2014 @@ -28,6 +28,9 @@ { PLIST_ENTRY i; PVDM_CONSOLE_RECORD CurrentRecord = NULL; + + /* NULL is not a valid console handle */ + if (ConsoleHandle == NULL) return STATUS_INVALID_PARAMETER; /* Search for a record that has the same console handle */ for (i = VDMConsoleListHead.Flink; i != &VDMConsoleListHead; i = i->Flink)

10 years, 7 months

[aandrejevic] 63121: [NTVDM][KERNEL32] Send the specified task ID to CSRSS in GetNextVDMCommand. In ntvdm, parse the command line parameters to find the session ID, and pass it in every call to Get...

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Fri May 2 22:23:34 2014 New Revision: 63121 URL: http://svn.reactos.org/svn/reactos?rev=63121&view=rev Log: [NTVDM][KERNEL32] Send the specified task ID to CSRSS in GetNextVDMCommand. In ntvdm, parse the command line parameters to find the session ID, and pass it in every call to GetNextVDMCommand. Modified: branches/ntvdm/dll/win32/kernel32/client/vdm.c branches/ntvdm/subsystems/ntvdm/dos/dos32krnl/dos.c branches/ntvdm/subsystems/ntvdm/ntvdm.c branches/ntvdm/subsystems/ntvdm/ntvdm.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] Fri May 2 22:23:34 2014 @@ -1149,6 +1149,7 @@ ZeroMemory(GetNextVdmCommand, sizeof(*GetNextVdmCommand)); /* Setup the input parameters */ + GetNextVdmCommand->iTask = CommandData->TaskId; GetNextVdmCommand->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle; GetNextVdmCommand->CmdLen = CommandData->CmdLen; GetNextVdmCommand->AppLen = CommandData->AppLen; Modified: branches/ntvdm/subsystems/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos/dos3… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Fri May 2 22:23:34 2014 @@ -1336,6 +1336,7 @@ ZeroMemory(&CommandInfo, sizeof(CommandInfo)); /* Initialize the structure members */ + CommandInfo.TaskId = SessionId; CommandInfo.VDMState = VDM_FLAG_NESTED_TASK | VDM_FLAG_DONT_WAIT; CommandInfo.CmdLine = CmdLine; CommandInfo.CmdLen = sizeof(CmdLine); @@ -1455,6 +1456,7 @@ if (CurrentPsp != SYSTEM_PSP) { /* Decrement the re-entry count */ + CommandInfo.TaskId = SessionId; CommandInfo.VDMState = VDM_DEC_REENTER_COUNT; GetNextVDMCommand(&CommandInfo); @@ -1462,6 +1464,7 @@ ZeroMemory(&CommandInfo, sizeof(CommandInfo)); /* Update the VDM state of the task */ + CommandInfo.TaskId = SessionId; CommandInfo.VDMState = VDM_FLAG_DONT_WAIT; GetNextVDMCommand(&CommandInfo); } 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] Fri May 2 22:23:34 2014 @@ -39,6 +39,7 @@ static INT VdmMenuPos = -1; static BOOLEAN ShowPointer = FALSE; +ULONG SessionId = 0; HANDLE VdmTaskEvent = NULL; /* @@ -382,6 +383,7 @@ ZeroMemory(&CommandInfo, sizeof(CommandInfo)); /* Initialize the structure members */ + CommandInfo.TaskId = SessionId; CommandInfo.VDMState = VDM_FLAG_DOS; CommandInfo.CmdLine = CmdLine; CommandInfo.CmdLen = sizeof(CmdLine); @@ -455,6 +457,20 @@ return 0; } +#else + INT i; + WCHAR *endptr; + + /* Parse the command line arguments */ + for (i = 1; i < argc; i++) + { + if (wcsncmp(argv[i], L"-i", 2) == 0) + { + /* This is the session ID */ + SessionId = wcstoul(argv[i] + 2, &endptr, 10); + } + } + #endif DPRINT1("\n\n\nNTVDM - Starting...\n\n\n"); Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.h?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.h [iso-8859-1] Fri May 2 22:23:34 2014 @@ -14,6 +14,7 @@ #include <stdio.h> #include <stdarg.h> #include <conio.h> +#include <wchar.h> #define WIN32_NO_STATUS #include <windef.h> @@ -33,6 +34,7 @@ /* FUNCTIONS ******************************************************************/ +extern ULONG SessionId; extern HANDLE VdmTaskEvent; VOID DisplayMessage(LPCWSTR Format, ...);

10 years, 7 months

[aandrejevic] 63120: [BASESRV] In BaseSrvGetConsoleRecord and GetConsoleRecordBySessionId, check if the console record was not found instead of returning the last one in the list. In BaseSrvCheckVD...

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Fri May 2 21:45:16 2014 New Revision: 63120 URL: http://svn.reactos.org/svn/reactos?rev=63120&view=rev Log: [BASESRV] In BaseSrvGetConsoleRecord and GetConsoleRecordBySessionId, check if the console record was not found instead of returning the last one in the list. In BaseSrvCheckVDM, return the session ID to the caller. Modified: branches/ntvdm/subsystems/win/basesrv/vdm.c 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] Fri May 2 21:45:16 2014 @@ -36,6 +36,9 @@ if (CurrentRecord->ConsoleHandle == ConsoleHandle) break; } + /* Check if nothing was found */ + if (i == &VDMConsoleListHead) CurrentRecord = NULL; + *Record = CurrentRecord; return CurrentRecord ? STATUS_SUCCESS : STATUS_NOT_FOUND; } @@ -51,6 +54,9 @@ CurrentRecord = CONTAINING_RECORD(i, VDM_CONSOLE_RECORD, Entry); if (CurrentRecord->SessionId == TaskId) break; } + + /* Check if nothing was found */ + if (i == &VDMConsoleListHead) CurrentRecord = NULL; *Record = CurrentRecord; return CurrentRecord ? STATUS_SUCCESS : STATUS_NOT_FOUND; @@ -656,6 +662,7 @@ InsertTailList(&VDMConsoleListHead, &ConsoleRecord->Entry); } + CheckVdmRequest->iTask = ConsoleRecord->SessionId; CheckVdmRequest->VDMState = NewConsoleRecord ? VDM_NOT_LOADED : VDM_READY; Status = STATUS_SUCCESS; }

10 years, 7 months

[aandrejevic] 63119: [NTVDM] Restore the console to normal size while no DOS task is running and keep track of the cursor position. Adapted from a patch by Hermès Bélusca-Maïto.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Fri May 2 21:17:05 2014 New Revision: 63119 URL: http://svn.reactos.org/svn/reactos?rev=63119&view=rev Log: [NTVDM] Restore the console to normal size while no DOS task is running and keep track of the cursor position. Adapted from a patch by Hermès Bélusca-Maïto. Modified: branches/ntvdm/subsystems/ntvdm/dos/dem.c branches/ntvdm/subsystems/ntvdm/hardware/vga.c branches/ntvdm/subsystems/ntvdm/hardware/vga.h branches/ntvdm/subsystems/ntvdm/ntvdm.c Modified: branches/ntvdm/subsystems/ntvdm/dos/dem.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos/dem.… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos/dem.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos/dem.c [iso-8859-1] Fri May 2 21:17:05 2014 @@ -20,6 +20,9 @@ #include "dem.h" #include "bop.h" +#include "bios/bios.h" +#include "hardware/vga.h" + /* Extra PSDK/NDK Headers */ #include <ndk/obtypes.h> @@ -117,7 +120,7 @@ STARTUPINFOA StartupInfo; PROCESS_INFORMATION ProcessInformation; - /* Remove return carriage character */ + /* NULL-terminate the command by removing the return carriage character */ while (*CmdPtr != '\r') CmdPtr++; *CmdPtr = '\0'; @@ -135,7 +138,8 @@ StartupInfo.cb = sizeof(StartupInfo); - DosPrintCharacter('\n'); + VgaRefreshDisplay(); + VgaDetachFromConsole(FALSE); Result = CreateProcessA(NULL, CommandLine, @@ -166,8 +170,10 @@ DPRINT1("Failed when launched command '%s'\n"); dwExitCode = GetLastError(); } - - DosPrintCharacter('\n'); + + VgaAttachToConsole(); + VgaRefreshDisplay(); + VidBiosSyncCursorPosition(); setAL((UCHAR)dwExitCode); 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] Fri May 2 21:17:05 2014 @@ -12,6 +12,7 @@ #include "emulator.h" #include "vga.h" +#include "../bios/vidbios.h" #include "io.h" @@ -189,6 +190,10 @@ static HANDLE EndEvent = NULL; static HANDLE AnotherEvent = NULL; +static CONSOLE_CURSOR_INFO OrgConsoleCursorInfo; +static CONSOLE_SCREEN_BUFFER_INFO OrgConsoleBufferInfo; + + /* * Text mode -- we always keep a valid text mode framebuffer * even if we are in graphics mode. This is needed in order to @@ -403,8 +408,24 @@ /* PRIVATE FUNCTIONS **********************************************************/ static inline DWORD VgaGetAddressSize(VOID); - -static BOOL VgaAttachToConsole(PCOORD Resolution) +static VOID VgaUpdateTextCursor(VOID); + +static VOID VgaUpdateCursorPosition(VOID) +{ + /* + * Update the cursor position in the VGA registers. + */ + WORD Offset = ConsoleInfo.dwCursorPosition.Y * TextResolution.X + + ConsoleInfo.dwCursorPosition.X; + + VgaCrtcRegisters[VGA_CRTC_CURSOR_LOC_LOW_REG] = LOBYTE(Offset); + VgaCrtcRegisters[VGA_CRTC_CURSOR_LOC_HIGH_REG] = HIBYTE(Offset); + + VidBiosSyncCursorPosition(); + VgaUpdateTextCursor(); +} + +static BOOL VgaAttachToConsoleInternal(PCOORD Resolution) { BOOL Success; ULONG Length = 0; @@ -414,12 +435,10 @@ DWORD AddressSize, ScanlineSize; DWORD Address = 0; DWORD CurrentAddr; - SMALL_RECT ScreenRect; // ConRect; + SMALL_RECT ConRect; COORD Origin = { 0, 0 }; ASSERT(TextFramebuffer == NULL); - - // ResetEvent(AnotherEvent); TextResolution = *Resolution; @@ -454,504 +473,9 @@ 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) -{ - 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." + * Resize the console */ - return GetConsoleMode(hHandle, &dwMode); -} - -static inline DWORD VgaGetAddressSize(VOID) -{ - if (VgaCrtcRegisters[VGA_CRTC_UNDERLINE_REG] & VGA_CRTC_UNDERLINE_DWORD) - { - /* Double-word addressing */ - return 4; // sizeof(DWORD) - } - else if (VgaCrtcRegisters[VGA_CRTC_MODE_CONTROL_REG] & VGA_CRTC_MODE_CONTROL_BYTE) - { - /* Byte addressing */ - return 1; // sizeof(BYTE) - } - else - { - /* Word addressing */ - return 2; // sizeof(WORD) - } -} - -static inline DWORD VgaTranslateReadAddress(DWORD Address) -{ - DWORD Offset = Address - VgaGetVideoBaseAddress(); - BYTE Plane; - - /* Check for chain-4 and odd-even mode */ - if (VgaSeqRegisters[VGA_SEQ_MEM_REG] & VGA_SEQ_MEM_C4) - { - /* The lowest two bits are the plane number */ - Plane = Offset & 3; - Offset >>= 2; - } - else if (VgaGcRegisters[VGA_GC_MODE_REG] & VGA_GC_MODE_OE) - { - /* The LSB is the plane number */ - Plane = Offset & 1; - Offset >>= 1; - } - else - { - /* Use the read mode */ - Plane = VgaGcRegisters[VGA_GC_READ_MAP_SEL_REG] & 0x03; - } - - /* Multiply the offset by the address size */ - Offset *= VgaGetAddressSize(); - - return Offset + Plane * VGA_BANK_SIZE; -} - -static inline DWORD VgaTranslateWriteAddress(DWORD Address) -{ - DWORD Offset = Address - VgaGetVideoBaseAddress(); - - /* Check for chain-4 and odd-even mode */ - if (VgaSeqRegisters[VGA_SEQ_MEM_REG] & VGA_SEQ_MEM_C4) - { - /* Shift the offset to the right by 2 */ - Offset >>= 2; - } - else if (VgaGcRegisters[VGA_GC_MODE_REG] & VGA_GC_MODE_OE) - { - /* Shift the offset to the right by 1 */ - Offset >>= 1; - } - - /* Multiply the offset by the address size */ - Offset *= VgaGetAddressSize(); - - /* Return the offset on plane 0 */ - return Offset; -} - -static inline BYTE VgaTranslateByteForWriting(BYTE Data, BYTE Plane) -{ - BYTE WriteMode = VgaGcRegisters[VGA_GC_MODE_REG] & 3; - BYTE BitMask = VgaGcRegisters[VGA_GC_BITMASK_REG]; - - if (WriteMode == 1) - { - /* In write mode 1 just return the latch register */ - return VgaLatchRegisters[Plane]; - } - - if (WriteMode != 2) - { - /* Write modes 0 and 3 rotate the data to the right first */ - BYTE RotateCount = VgaGcRegisters[VGA_GC_ROTATE_REG] & 7; - Data = LOBYTE(((DWORD)Data >> RotateCount) | ((DWORD)Data << (8 - RotateCount))); - } - else - { - /* Write mode 2 expands the appropriate bit to all 8 bits */ - Data = (Data & (1 << Plane)) ? 0xFF : 0x00; - } - - if (WriteMode == 0) - { - /* - * In write mode 0, the enable set/reset register decides if the - * set/reset bit should be expanded to all 8 bits. - */ - if (VgaGcRegisters[VGA_GC_ENABLE_RESET_REG] & (1 << Plane)) - { - /* Copy the bit from the set/reset register to all 8 bits */ - Data = (VgaGcRegisters[VGA_GC_RESET_REG] & (1 << Plane)) ? 0xFF : 0x00; - } - } - - if (WriteMode != 3) - { - /* Write modes 0 and 2 then perform a logical operation on the data and latch */ - BYTE LogicalOperation = (VgaGcRegisters[VGA_GC_ROTATE_REG] >> 3) & 3; - - if (LogicalOperation == 1) Data &= VgaLatchRegisters[Plane]; - else if (LogicalOperation == 2) Data |= VgaLatchRegisters[Plane]; - else if (LogicalOperation == 3) Data ^= VgaLatchRegisters[Plane]; - } - else - { - /* For write mode 3, we AND the bitmask with the data, which is used as the new bitmask */ - BitMask &= Data; - - /* Then we expand the bit in the set/reset field */ - Data = (VgaGcRegisters[VGA_GC_RESET_REG] & (1 << Plane)) ? 0xFF : 0x00; - } - - /* Bits cleared in the bitmask are replaced with latch register bits */ - Data = (Data & BitMask) | (VgaLatchRegisters[Plane] & (~BitMask)); - - /* Return the byte */ - return Data; -} - -static inline VOID VgaMarkForUpdate(SHORT Row, SHORT Column) -{ - /* Check if this is the first time the rectangle is updated */ - if (!NeedsUpdate) - { - UpdateRectangle.Left = UpdateRectangle.Top = MAXSHORT; - UpdateRectangle.Right = UpdateRectangle.Bottom = MINSHORT; - } - - /* Expand the rectangle to include the point */ - UpdateRectangle.Left = min(UpdateRectangle.Left, Column); - UpdateRectangle.Right = max(UpdateRectangle.Right, Column); - UpdateRectangle.Top = min(UpdateRectangle.Top, Row); - UpdateRectangle.Bottom = max(UpdateRectangle.Bottom, Row); - - /* Set the update request flag */ - NeedsUpdate = TRUE; -} - -static VOID VgaWriteSequencer(BYTE Data) -{ - ASSERT(VgaSeqIndex < VGA_SEQ_MAX_REG); - - /* Save the value */ - VgaSeqRegisters[VgaSeqIndex] = Data; -} - -static VOID VgaWriteGc(BYTE Data) -{ - ASSERT(VgaGcIndex < VGA_GC_MAX_REG); - - /* Save the value */ - VgaGcRegisters[VgaGcIndex] = Data; - - /* Check the index */ - switch (VgaGcIndex) - { - case VGA_GC_MISC_REG: - { - /* The GC misc register decides if it's text or graphics mode */ - ModeChanged = TRUE; - break; - } - } -} - -static VOID VgaWriteCrtc(BYTE Data) -{ - ASSERT(VgaGcIndex < VGA_CRTC_MAX_REG); - - /* Save the value */ - VgaCrtcRegisters[VgaCrtcIndex] = Data; - - /* Check the index */ - switch (VgaCrtcIndex) - { - case VGA_CRTC_END_HORZ_DISP_REG: - case VGA_CRTC_VERT_DISP_END_REG: - case VGA_CRTC_OVERFLOW_REG: - { - /* The video mode has changed */ - ModeChanged = TRUE; - break; - } - - case VGA_CRTC_CURSOR_LOC_LOW_REG: - case VGA_CRTC_CURSOR_LOC_HIGH_REG: - case VGA_CRTC_CURSOR_START_REG: - case VGA_CRTC_CURSOR_END_REG: - { - /* Set the cursor moved flag */ - CursorMoved = TRUE; - break; - } - } -} - -static VOID VgaWriteDac(BYTE Data) -{ - INT PaletteIndex; - PALETTEENTRY Entry; - - /* Set the value */ - VgaDacRegisters[VgaDacIndex] = Data; - - /* Find the palette index */ - PaletteIndex = VgaDacIndex / 3; - - /* Fill the entry structure */ - Entry.peRed = VGA_DAC_TO_COLOR(VgaDacRegisters[PaletteIndex * 3]); - Entry.peGreen = VGA_DAC_TO_COLOR(VgaDacRegisters[PaletteIndex * 3 + 1]); - Entry.peBlue = VGA_DAC_TO_COLOR(VgaDacRegisters[PaletteIndex * 3 + 2]); - Entry.peFlags = 0; - - /* Update the palette entry and set the palette change flag */ - SetPaletteEntries(PaletteHandle, PaletteIndex, 1, &Entry); - PaletteChanged = TRUE; - - /* Update the index */ - VgaDacIndex++; - VgaDacIndex %= VGA_PALETTE_SIZE; -} - -static VOID VgaWriteAc(BYTE Data) -{ - ASSERT(VgaAcIndex < VGA_AC_MAX_REG); - - /* Save the value */ - if (VgaAcIndex <= VGA_AC_PAL_F_REG) - { - if (VgaAcPalDisable) return; - - // DbgPrint(" AC Palette Writing %d to index %d\n", Data, VgaAcIndex); - if (VgaAcRegisters[VgaAcIndex] != Data) - { - /* Update the AC register and set the palette change flag */ - VgaAcRegisters[VgaAcIndex] = Data; - PaletteChanged = TRUE; - } - } - else - { - VgaAcRegisters[VgaAcIndex] = Data; - } -} - -static VOID VgaRestoreDefaultPalette(PPALETTEENTRY Entries, USHORT NumOfEntries) -{ - USHORT i; - - /* Copy the colors of the default palette to the DAC and console palette */ - for (i = 0; i < NumOfEntries; i++) - { - /* Set the palette entries */ - Entries[i].peRed = GetRValue(VgaDefaultPalette[i]); - Entries[i].peGreen = GetGValue(VgaDefaultPalette[i]); - Entries[i].peBlue = GetBValue(VgaDefaultPalette[i]); - Entries[i].peFlags = 0; - - /* Set the DAC registers */ - VgaDacRegisters[i * 3] = VGA_COLOR_TO_DAC(GetRValue(VgaDefaultPalette[i])); - VgaDacRegisters[i * 3 + 1] = VGA_COLOR_TO_DAC(GetGValue(VgaDefaultPalette[i])); - VgaDacRegisters[i * 3 + 2] = VGA_COLOR_TO_DAC(GetBValue(VgaDefaultPalette[i])); - } -} - -static BOOLEAN VgaInitializePalette(VOID) -{ - LPLOGPALETTE Palette; - - /* Allocate storage space for the palette */ - Palette = (LPLOGPALETTE)HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - sizeof(LOGPALETTE) + - VGA_MAX_COLORS * sizeof(PALETTEENTRY)); - if (Palette == NULL) return FALSE; - - /* Initialize the palette */ - Palette->palVersion = 0x0300; - Palette->palNumEntries = VGA_MAX_COLORS; - - /* Restore the default palette */ - VgaRestoreDefaultPalette(Palette->palPalEntry, Palette->palNumEntries); - - /* Create the palette */ - PaletteHandle = CreatePalette(Palette); - - /* Free the palette */ - HeapFree(GetProcessHeap(), 0, Palette); - - /* Fail if the palette wasn't successfully created... */ - if (PaletteHandle == NULL) return FALSE; - - /* ... otherwise return success */ - return TRUE; -} - -static BOOL VgaEnterGraphicsMode(PCOORD Resolution) -{ - DWORD i; - CONSOLE_GRAPHICS_BUFFER_INFO GraphicsBufferInfo; - BYTE BitmapInfoBuffer[VGA_BITMAP_INFO_SIZE]; - LPBITMAPINFO BitmapInfo = (LPBITMAPINFO)BitmapInfoBuffer; - LPWORD PaletteIndex = (LPWORD)(BitmapInfo->bmiColors); - - LONG Width = Resolution->X; - LONG Height = Resolution->Y; - - /* Use DoubleVision mode if the resolution is too small */ - if (Width < VGA_MINIMUM_WIDTH && Height < VGA_MINIMUM_HEIGHT) - { - DoubleVision = TRUE; - Width *= 2; - Height *= 2; - } - else - { - DoubleVision = FALSE; - } - - /* Fill the bitmap info header */ - ZeroMemory(&BitmapInfo->bmiHeader, sizeof(BITMAPINFOHEADER)); - BitmapInfo->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - BitmapInfo->bmiHeader.biWidth = Width; - BitmapInfo->bmiHeader.biHeight = Height; - BitmapInfo->bmiHeader.biBitCount = 8; - BitmapInfo->bmiHeader.biPlanes = 1; - BitmapInfo->bmiHeader.biCompression = BI_RGB; - BitmapInfo->bmiHeader.biSizeImage = Width * Height /* * 1 == biBitCount / 8 */; - - /* Fill the palette data */ - for (i = 0; i < (VGA_PALETTE_SIZE / 3); i++) PaletteIndex[i] = (WORD)i; - - /* Fill the console graphics buffer info */ - GraphicsBufferInfo.dwBitMapInfoLength = VGA_BITMAP_INFO_SIZE; - GraphicsBufferInfo.lpBitMapInfo = BitmapInfo; - GraphicsBufferInfo.dwUsage = DIB_PAL_COLORS; - - /* Create the buffer */ - GraphicsConsoleBuffer = CreateConsoleScreenBuffer(GENERIC_READ | GENERIC_WRITE, - FILE_SHARE_READ | FILE_SHARE_WRITE, - NULL, - CONSOLE_GRAPHICS_BUFFER, - &GraphicsBufferInfo); - if (GraphicsConsoleBuffer == INVALID_HANDLE_VALUE) return FALSE; - - /* Save the framebuffer address and mutex */ - ConsoleFramebuffer = GraphicsBufferInfo.lpBitMap; - ConsoleMutex = GraphicsBufferInfo.hMutex; - - /* Clear the framebuffer */ - ZeroMemory(ConsoleFramebuffer, BitmapInfo->bmiHeader.biSizeImage); - - /* Set the active buffer */ - SetConsoleActiveScreenBuffer(GraphicsConsoleBuffer); - - /* Set the graphics mode palette */ - SetConsolePalette(GraphicsConsoleBuffer, - PaletteHandle, - SYSPAL_NOSTATIC256); - - /* Set the screen mode flag */ - ScreenMode = GRAPHICS_MODE; - - return TRUE; -} - -static VOID VgaLeaveGraphicsMode(VOID) -{ - /* Release the console framebuffer mutex */ - ReleaseMutex(ConsoleMutex); - - /* Switch back to the default console text buffer */ - // SetConsoleActiveScreenBuffer(TextConsoleBuffer); - - /* Cleanup the video data */ - CloseHandle(ConsoleMutex); - ConsoleMutex = NULL; - ConsoleFramebuffer = NULL; - CloseHandle(GraphicsConsoleBuffer); - GraphicsConsoleBuffer = NULL; - DoubleVision = FALSE; -} - -static BOOL VgaEnterTextMode(PCOORD Resolution) -{ - SMALL_RECT ConRect; - - DPRINT1("VgaEnterTextMode\n"); - - /* Switch to the text buffer */ - SetConsoleActiveScreenBuffer(TextConsoleBuffer); - - /* Resize the console */ ConRect.Left = 0; ConRect.Top = ConsoleInfo.srWindow.Top; ConRect.Right = ConRect.Left + Resolution->X - 1; @@ -970,30 +494,551 @@ /* Update the saved console information */ GetConsoleScreenBufferInfo(TextConsoleBuffer, &ConsoleInfo); - /* Adjust the text framebuffer if we changed resolution */ + /* + * Copy console data into VGA memory + */ + + /* Get the data */ + AddressSize = VgaGetAddressSize(); + ConRect.Left = ConRect.Top = 0; + ConRect.Right = TextResolution.X; + ConRect.Bottom = TextResolution.Y; + ScanlineSize = (DWORD)VgaCrtcRegisters[VGA_CRTC_OFFSET_REG] * 2; + + /* Read the data from the console into the framebuffer... */ + ReadConsoleOutputA(TextConsoleBuffer, + CharBuff, + TextResolution, + Origin, + &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; + } + + VgaUpdateCursorPosition(); + + return TRUE; +} + +BOOL VgaAttachToConsole(VOID) +{ + if (TextResolution.X == 0 || TextResolution.Y == 0) + DPRINT1("VgaAttachToConsole -- TextResolution uninitialized\n"); + + if (TextResolution.X == 0) TextResolution.X = 80; + if (TextResolution.Y == 0) TextResolution.Y = 25; + + return VgaAttachToConsoleInternal(&TextResolution); +} + +VOID VgaDetachFromConsole(BOOL ChangingMode) +{ + ULONG dummyLength; + PVOID dummyPtr; + COORD dummySize = {0}; + + __RegisterConsoleVDM(0, + NULL, + NULL, + NULL, + 0, + &dummyLength, + &dummyPtr, + NULL, + 0, + dummySize, + (PCHAR*)&dummyPtr); + + TextFramebuffer = NULL; + + if (!ChangingMode) + { + SMALL_RECT ConRect; + + /* Restore the old screen buffer */ + SetConsoleActiveScreenBuffer(TextConsoleBuffer); + + /* Restore the original console size */ + ConRect.Left = 0; + ConRect.Top = 0; + ConRect.Right = ConRect.Left + OrgConsoleBufferInfo.srWindow.Right - OrgConsoleBufferInfo.srWindow.Left; + ConRect.Bottom = ConRect.Top + OrgConsoleBufferInfo.srWindow.Bottom - OrgConsoleBufferInfo.srWindow.Top ; + /* + * See the following trick explanation in VgaAttachToConsoleInternal. + */ + SetConsoleScreenBufferSize(TextConsoleBuffer, OrgConsoleBufferInfo.dwSize); + SetConsoleWindowInfo(TextConsoleBuffer, TRUE, &ConRect); + SetConsoleScreenBufferSize(TextConsoleBuffer, OrgConsoleBufferInfo.dwSize); + + /* Restore the original cursor shape */ + SetConsoleCursorInfo(TextConsoleBuffer, &OrgConsoleCursorInfo); + } +} + +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) +{ + if (VgaCrtcRegisters[VGA_CRTC_UNDERLINE_REG] & VGA_CRTC_UNDERLINE_DWORD) + { + /* Double-word addressing */ + return 4; // sizeof(DWORD) + } + else if (VgaCrtcRegisters[VGA_CRTC_MODE_CONTROL_REG] & VGA_CRTC_MODE_CONTROL_BYTE) + { + /* Byte addressing */ + return 1; // sizeof(BYTE) + } + else + { + /* Word addressing */ + return 2; // sizeof(WORD) + } +} + +static inline DWORD VgaTranslateReadAddress(DWORD Address) +{ + DWORD Offset = Address - VgaGetVideoBaseAddress(); + BYTE Plane; + + /* Check for chain-4 and odd-even mode */ + if (VgaSeqRegisters[VGA_SEQ_MEM_REG] & VGA_SEQ_MEM_C4) + { + /* The lowest two bits are the plane number */ + Plane = Offset & 3; + Offset >>= 2; + } + else if (VgaGcRegisters[VGA_GC_MODE_REG] & VGA_GC_MODE_OE) + { + /* The LSB is the plane number */ + Plane = Offset & 1; + Offset >>= 1; + } + else + { + /* Use the read mode */ + Plane = VgaGcRegisters[VGA_GC_READ_MAP_SEL_REG] & 0x03; + } + + /* Multiply the offset by the address size */ + Offset *= VgaGetAddressSize(); + + return Offset + Plane * VGA_BANK_SIZE; +} + +static inline DWORD VgaTranslateWriteAddress(DWORD Address) +{ + DWORD Offset = Address - VgaGetVideoBaseAddress(); + + /* Check for chain-4 and odd-even mode */ + if (VgaSeqRegisters[VGA_SEQ_MEM_REG] & VGA_SEQ_MEM_C4) + { + /* Shift the offset to the right by 2 */ + Offset >>= 2; + } + else if (VgaGcRegisters[VGA_GC_MODE_REG] & VGA_GC_MODE_OE) + { + /* Shift the offset to the right by 1 */ + Offset >>= 1; + } + + /* Multiply the offset by the address size */ + Offset *= VgaGetAddressSize(); + + /* Return the offset on plane 0 */ + return Offset; +} + +static inline BYTE VgaTranslateByteForWriting(BYTE Data, BYTE Plane) +{ + BYTE WriteMode = VgaGcRegisters[VGA_GC_MODE_REG] & 3; + BYTE BitMask = VgaGcRegisters[VGA_GC_BITMASK_REG]; + + if (WriteMode == 1) + { + /* In write mode 1 just return the latch register */ + return VgaLatchRegisters[Plane]; + } + + if (WriteMode != 2) + { + /* Write modes 0 and 3 rotate the data to the right first */ + BYTE RotateCount = VgaGcRegisters[VGA_GC_ROTATE_REG] & 7; + Data = LOBYTE(((DWORD)Data >> RotateCount) | ((DWORD)Data << (8 - RotateCount))); + } + else + { + /* Write mode 2 expands the appropriate bit to all 8 bits */ + Data = (Data & (1 << Plane)) ? 0xFF : 0x00; + } + + if (WriteMode == 0) + { + /* + * In write mode 0, the enable set/reset register decides if the + * set/reset bit should be expanded to all 8 bits. + */ + if (VgaGcRegisters[VGA_GC_ENABLE_RESET_REG] & (1 << Plane)) + { + /* Copy the bit from the set/reset register to all 8 bits */ + Data = (VgaGcRegisters[VGA_GC_RESET_REG] & (1 << Plane)) ? 0xFF : 0x00; + } + } + + if (WriteMode != 3) + { + /* Write modes 0 and 2 then perform a logical operation on the data and latch */ + BYTE LogicalOperation = (VgaGcRegisters[VGA_GC_ROTATE_REG] >> 3) & 3; + + if (LogicalOperation == 1) Data &= VgaLatchRegisters[Plane]; + else if (LogicalOperation == 2) Data |= VgaLatchRegisters[Plane]; + else if (LogicalOperation == 3) Data ^= VgaLatchRegisters[Plane]; + } + else + { + /* For write mode 3, we AND the bitmask with the data, which is used as the new bitmask */ + BitMask &= Data; + + /* Then we expand the bit in the set/reset field */ + Data = (VgaGcRegisters[VGA_GC_RESET_REG] & (1 << Plane)) ? 0xFF : 0x00; + } + + /* Bits cleared in the bitmask are replaced with latch register bits */ + Data = (Data & BitMask) | (VgaLatchRegisters[Plane] & (~BitMask)); + + /* Return the byte */ + return Data; +} + +static inline VOID VgaMarkForUpdate(SHORT Row, SHORT Column) +{ + /* Check if this is the first time the rectangle is updated */ + if (!NeedsUpdate) + { + UpdateRectangle.Left = UpdateRectangle.Top = MAXSHORT; + UpdateRectangle.Right = UpdateRectangle.Bottom = MINSHORT; + } + + /* Expand the rectangle to include the point */ + UpdateRectangle.Left = min(UpdateRectangle.Left, Column); + UpdateRectangle.Right = max(UpdateRectangle.Right, Column); + UpdateRectangle.Top = min(UpdateRectangle.Top, Row); + UpdateRectangle.Bottom = max(UpdateRectangle.Bottom, Row); + + /* Set the update request flag */ + NeedsUpdate = TRUE; +} + +static VOID VgaWriteSequencer(BYTE Data) +{ + ASSERT(VgaSeqIndex < VGA_SEQ_MAX_REG); + + /* Save the value */ + VgaSeqRegisters[VgaSeqIndex] = Data; +} + +static VOID VgaWriteGc(BYTE Data) +{ + ASSERT(VgaGcIndex < VGA_GC_MAX_REG); + + /* Save the value */ + VgaGcRegisters[VgaGcIndex] = Data; + + /* Check the index */ + switch (VgaGcIndex) + { + case VGA_GC_MISC_REG: + { + /* The GC misc register decides if it's text or graphics mode */ + ModeChanged = TRUE; + break; + } + } +} + +static VOID VgaWriteCrtc(BYTE Data) +{ + ASSERT(VgaGcIndex < VGA_CRTC_MAX_REG); + + /* Save the value */ + VgaCrtcRegisters[VgaCrtcIndex] = Data; + + /* Check the index */ + switch (VgaCrtcIndex) + { + case VGA_CRTC_END_HORZ_DISP_REG: + case VGA_CRTC_VERT_DISP_END_REG: + case VGA_CRTC_OVERFLOW_REG: + { + /* The video mode has changed */ + ModeChanged = TRUE; + break; + } + + case VGA_CRTC_CURSOR_LOC_LOW_REG: + case VGA_CRTC_CURSOR_LOC_HIGH_REG: + case VGA_CRTC_CURSOR_START_REG: + case VGA_CRTC_CURSOR_END_REG: + { + /* Set the cursor moved flag */ + CursorMoved = TRUE; + break; + } + } +} + +static VOID VgaWriteDac(BYTE Data) +{ + INT PaletteIndex; + PALETTEENTRY Entry; + + /* Set the value */ + VgaDacRegisters[VgaDacIndex] = Data; + + /* Find the palette index */ + PaletteIndex = VgaDacIndex / 3; + + /* Fill the entry structure */ + Entry.peRed = VGA_DAC_TO_COLOR(VgaDacRegisters[PaletteIndex * 3]); + Entry.peGreen = VGA_DAC_TO_COLOR(VgaDacRegisters[PaletteIndex * 3 + 1]); + Entry.peBlue = VGA_DAC_TO_COLOR(VgaDacRegisters[PaletteIndex * 3 + 2]); + Entry.peFlags = 0; + + /* Update the palette entry and set the palette change flag */ + SetPaletteEntries(PaletteHandle, PaletteIndex, 1, &Entry); + PaletteChanged = TRUE; + + /* Update the index */ + VgaDacIndex++; + VgaDacIndex %= VGA_PALETTE_SIZE; +} + +static VOID VgaWriteAc(BYTE Data) +{ + ASSERT(VgaAcIndex < VGA_AC_MAX_REG); + + /* Save the value */ + if (VgaAcIndex <= VGA_AC_PAL_F_REG) + { + if (VgaAcPalDisable) return; + + // DbgPrint(" AC Palette Writing %d to index %d\n", Data, VgaAcIndex); + if (VgaAcRegisters[VgaAcIndex] != Data) + { + /* Update the AC register and set the palette change flag */ + VgaAcRegisters[VgaAcIndex] = Data; + PaletteChanged = TRUE; + } + } + else + { + VgaAcRegisters[VgaAcIndex] = Data; + } +} + +static VOID VgaRestoreDefaultPalette(PPALETTEENTRY Entries, USHORT NumOfEntries) +{ + USHORT i; + + /* Copy the colors of the default palette to the DAC and console palette */ + for (i = 0; i < NumOfEntries; i++) + { + /* Set the palette entries */ + Entries[i].peRed = GetRValue(VgaDefaultPalette[i]); + Entries[i].peGreen = GetGValue(VgaDefaultPalette[i]); + Entries[i].peBlue = GetBValue(VgaDefaultPalette[i]); + Entries[i].peFlags = 0; + + /* Set the DAC registers */ + VgaDacRegisters[i * 3] = VGA_COLOR_TO_DAC(GetRValue(VgaDefaultPalette[i])); + VgaDacRegisters[i * 3 + 1] = VGA_COLOR_TO_DAC(GetGValue(VgaDefaultPalette[i])); + VgaDacRegisters[i * 3 + 2] = VGA_COLOR_TO_DAC(GetBValue(VgaDefaultPalette[i])); + } +} + +static BOOLEAN VgaInitializePalette(VOID) +{ + LPLOGPALETTE Palette; + + /* Allocate storage space for the palette */ + Palette = (LPLOGPALETTE)HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(LOGPALETTE) + + VGA_MAX_COLORS * sizeof(PALETTEENTRY)); + if (Palette == NULL) return FALSE; + + /* Initialize the palette */ + Palette->palVersion = 0x0300; + Palette->palNumEntries = VGA_MAX_COLORS; + + /* Restore the default palette */ + VgaRestoreDefaultPalette(Palette->palPalEntry, Palette->palNumEntries); + + /* Create the palette */ + PaletteHandle = CreatePalette(Palette); + + /* Free the palette */ + HeapFree(GetProcessHeap(), 0, Palette); + + /* Fail if the palette wasn't successfully created... */ + if (PaletteHandle == NULL) return FALSE; + + /* ... otherwise return success */ + return TRUE; +} + +static BOOL VgaEnterGraphicsMode(PCOORD Resolution) +{ + DWORD i; + CONSOLE_GRAPHICS_BUFFER_INFO GraphicsBufferInfo; + BYTE BitmapInfoBuffer[VGA_BITMAP_INFO_SIZE]; + LPBITMAPINFO BitmapInfo = (LPBITMAPINFO)BitmapInfoBuffer; + LPWORD PaletteIndex = (LPWORD)(BitmapInfo->bmiColors); + + LONG Width = Resolution->X; + LONG Height = Resolution->Y; + + /* Use DoubleVision mode if the resolution is too small */ + if (Width < VGA_MINIMUM_WIDTH && Height < VGA_MINIMUM_HEIGHT) + { + DoubleVision = TRUE; + Width *= 2; + Height *= 2; + } + else + { + DoubleVision = FALSE; + } + + /* Fill the bitmap info header */ + ZeroMemory(&BitmapInfo->bmiHeader, sizeof(BITMAPINFOHEADER)); + BitmapInfo->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + BitmapInfo->bmiHeader.biWidth = Width; + BitmapInfo->bmiHeader.biHeight = Height; + BitmapInfo->bmiHeader.biBitCount = 8; + BitmapInfo->bmiHeader.biPlanes = 1; + BitmapInfo->bmiHeader.biCompression = BI_RGB; + BitmapInfo->bmiHeader.biSizeImage = Width * Height /* * 1 == biBitCount / 8 */; + + /* Fill the palette data */ + for (i = 0; i < (VGA_PALETTE_SIZE / 3); i++) PaletteIndex[i] = (WORD)i; + + /* Fill the console graphics buffer info */ + GraphicsBufferInfo.dwBitMapInfoLength = VGA_BITMAP_INFO_SIZE; + GraphicsBufferInfo.lpBitMapInfo = BitmapInfo; + GraphicsBufferInfo.dwUsage = DIB_PAL_COLORS; + + /* Create the buffer */ + GraphicsConsoleBuffer = CreateConsoleScreenBuffer(GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, + CONSOLE_GRAPHICS_BUFFER, + &GraphicsBufferInfo); + if (GraphicsConsoleBuffer == INVALID_HANDLE_VALUE) return FALSE; + + /* Save the framebuffer address and mutex */ + ConsoleFramebuffer = GraphicsBufferInfo.lpBitMap; + ConsoleMutex = GraphicsBufferInfo.hMutex; + + /* Clear the framebuffer */ + ZeroMemory(ConsoleFramebuffer, BitmapInfo->bmiHeader.biSizeImage); + + /* Set the active buffer */ + SetConsoleActiveScreenBuffer(GraphicsConsoleBuffer); + + /* Set the graphics mode palette */ + SetConsolePalette(GraphicsConsoleBuffer, + PaletteHandle, + SYSPAL_NOSTATIC256); + + /* Set the screen mode flag */ + ScreenMode = GRAPHICS_MODE; + + return TRUE; +} + +static VOID VgaLeaveGraphicsMode(VOID) +{ + /* Release the console framebuffer mutex */ + ReleaseMutex(ConsoleMutex); + + /* Switch back to the default console text buffer */ + // SetConsoleActiveScreenBuffer(TextConsoleBuffer); + + /* Cleanup the video data */ + CloseHandle(ConsoleMutex); + ConsoleMutex = NULL; + ConsoleFramebuffer = NULL; + CloseHandle(GraphicsConsoleBuffer); + GraphicsConsoleBuffer = NULL; + DoubleVision = FALSE; +} + +static BOOL VgaEnterTextMode(PCOORD Resolution) +{ + DPRINT1("VgaEnterTextMode\n"); + + /* Switch to the text buffer */ + SetConsoleActiveScreenBuffer(TextConsoleBuffer); + + /* Adjust the text framebuffer if we changed the resolution */ if (TextResolution.X != Resolution->X || TextResolution.Y != Resolution->Y) { - WORD Offset; - - VgaDetachFromConsole(); - - /* VgaAttachToConsole sets TextResolution to the new resolution */ - if (!VgaAttachToConsole(Resolution)) + VgaDetachFromConsole(TRUE); + + /* + * VgaAttachToConsoleInternal sets TextResolution to the + * new resolution and updates ConsoleInfo. + */ + if (!VgaAttachToConsoleInternal(Resolution)) { DisplayMessage(L"An unexpected error occurred!\n"); EmulatorTerminate(); 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; - } + } + else VgaUpdateCursorPosition(); /* The active framebuffer is now the text framebuffer */ ConsoleFramebuffer = TextFramebuffer; @@ -1825,11 +1870,13 @@ if (!IsConsoleHandle(TextHandle)) return FALSE; TextConsoleBuffer = TextHandle; - /* Save the console information */ - if (!GetConsoleScreenBufferInfo(TextConsoleBuffer, &ConsoleInfo)) + /* Save the original cursor and console screen buffer information */ + if (!GetConsoleCursorInfo(TextConsoleBuffer, &OrgConsoleCursorInfo) || + !GetConsoleScreenBufferInfo(TextConsoleBuffer, &OrgConsoleBufferInfo)) { return FALSE; } + ConsoleInfo = OrgConsoleBufferInfo; /* Initialize the VGA palette and fail if it isn't successfully created */ if (!VgaInitializePalette()) return FALSE; @@ -1873,7 +1920,7 @@ VgaLeaveTextMode(); } - VgaDetachFromConsole(); + VgaDetachFromConsole(FALSE); CloseHandle(AnotherEvent); CloseHandle(EndEvent); 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] Fri May 2 21:17:05 2014 @@ -250,6 +250,9 @@ /* FUNCTIONS ******************************************************************/ +BOOL VgaAttachToConsole(VOID); +VOID VgaDetachFromConsole(BOOL ChangeMode); + DWORD VgaGetVideoBaseAddress(VOID); DWORD VgaGetVideoLimitAddress(VOID); COORD VgaGetDisplayResolution(VOID); 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] Fri May 2 21:17:05 2014 @@ -32,8 +32,6 @@ static HANDLE ConsoleInput = INVALID_HANDLE_VALUE; static HANDLE ConsoleOutput = INVALID_HANDLE_VALUE; static DWORD OrgConsoleInputMode, OrgConsoleOutputMode; -static CONSOLE_CURSOR_INFO OrgConsoleCursorInfo; -static CONSOLE_SCREEN_BUFFER_INFO OrgConsoleBufferInfo; static BOOLEAN AcceptCommands = TRUE; static HANDLE CommandThread = NULL; @@ -344,16 +342,6 @@ return FALSE; } - /* Save the original cursor and console screen buffer information */ - if (!GetConsoleCursorInfo(ConsoleOutput, &OrgConsoleCursorInfo) || - !GetConsoleScreenBufferInfo(ConsoleOutput, &OrgConsoleBufferInfo)) - { - CloseHandle(ConsoleOutput); - CloseHandle(ConsoleInput); - wprintf(L"FATAL: Cannot save console cursor/screen-buffer info\n"); - return FALSE; - } - /* Initialize the UI */ ConsoleInitUI(); @@ -362,26 +350,6 @@ VOID ConsoleCleanup(VOID) { - SMALL_RECT ConRect; - - /* Restore the old screen buffer */ - SetConsoleActiveScreenBuffer(ConsoleOutput); - - /* Restore the original console size */ - ConRect.Left = 0; - ConRect.Top = 0; - ConRect.Right = ConRect.Left + OrgConsoleBufferInfo.srWindow.Right - OrgConsoleBufferInfo.srWindow.Left; - ConRect.Bottom = ConRect.Top + OrgConsoleBufferInfo.srWindow.Bottom - OrgConsoleBufferInfo.srWindow.Top ; - /* - * See the following trick explanation in vga.c:VgaEnterTextMode() . - */ - SetConsoleScreenBufferSize(ConsoleOutput, OrgConsoleBufferInfo.dwSize); - SetConsoleWindowInfo(ConsoleOutput, TRUE, &ConRect); - SetConsoleScreenBufferSize(ConsoleOutput, OrgConsoleBufferInfo.dwSize); - - /* Restore the original cursor shape */ - SetConsoleCursorInfo(ConsoleOutput, &OrgConsoleCursorInfo); - /* Restore the original input and output console modes */ SetConsoleMode(ConsoleOutput, OrgConsoleOutputMode); SetConsoleMode(ConsoleInput , OrgConsoleInputMode ); @@ -428,11 +396,7 @@ CommandInfo.Env = Env; CommandInfo.EnvLen = sizeof(Env); - if (First) - { - CommandInfo.VDMState |= VDM_FLAG_FIRST_TASK; - First = FALSE; - } + if (First) CommandInfo.VDMState |= VDM_FLAG_FIRST_TASK; /* Wait for the next available VDM */ if (!GetNextVDMCommand(&CommandInfo)) break; @@ -446,6 +410,12 @@ DisplayMessage(L"Could not start '%S'. Error: %u", AppName, Result); break; } + + /* Attach to the console */ + if (!First) VgaAttachToConsole(); + + /* Perform a screen refresh */ + VgaRefreshDisplay(); /* Start simulation */ SetEvent(VdmTaskEvent); @@ -453,6 +423,11 @@ /* Perform another screen refresh */ VgaRefreshDisplay(); + + /* Detach from the console */ + VgaDetachFromConsole(FALSE); + + First = FALSE; } return 0;

10 years, 7 months

[aandrejevic] 63118: [NTVDM] Initialize the reference counts of the DOS console handles.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Fri May 2 18:49:15 2014 New Revision: 63118 URL: http://svn.reactos.org/svn/reactos?rev=63118&view=rev Log: [NTVDM] Initialize the reference counts of the DOS console handles. Modified: branches/ntvdm/subsystems/ntvdm/dos/dos32krnl/dos.c Modified: branches/ntvdm/subsystems/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos/dos3… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Fri May 2 18:49:15 2014 @@ -2784,6 +2784,9 @@ DosSystemFileTable[1] = GetStdHandle(STD_OUTPUT_HANDLE); DosSystemFileTable[2] = GetStdHandle(STD_ERROR_HANDLE); + /* Initialize the reference counts */ + DosSftRefCount[0] = DosSftRefCount[1] = DosSftRefCount[2] = 1; + #endif /* Initialize the callback context */

10 years, 7 months

[hbelusca] 63117: [CONSRV] - Move some functions where they belong. - Start to differentiate frontends for consrv terminal, and terminals.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri May 2 18:44:26 2014 New Revision: 63117 URL: http://svn.reactos.org/svn/reactos?rev=63117&view=rev Log: [CONSRV] - Move some functions where they belong. - Start to differentiate frontends for consrv terminal, and terminals. Added: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/dummyterm.c - copied, changed from r63112, branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/dummyfrontend.c branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/terminal.c - copied, changed from r63112, branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/dummyfrontend.c Removed: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/dummyfrontend.c Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv.cmake branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/coninput.c branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/console.c branches/condrv_restructure/win32ss/user/winsrv/consrv/coninput.h branches/condrv_restructure/win32ss/user/winsrv/consrv/console.c branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/input.c branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio_winsrv.h Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv.cmake URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv.cmake [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv.cmake [iso-8859-1] Fri May 2 18:44:26 2014 @@ -18,10 +18,11 @@ consrv/condrv/coninput.c consrv/condrv/conoutput.c consrv/condrv/console.c - consrv/condrv/dummyfrontend.c + consrv/condrv/dummyterm.c consrv/condrv/graphics.c consrv/condrv/text.c consrv/frontends/input.c + consrv/frontends/terminal.c consrv/frontends/gui/conwnd.c consrv/frontends/gui/fullscreen.c consrv/frontends/gui/guiterm.c Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/coninput.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/coninput.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/coninput.c [iso-8859-1] Fri May 2 18:44:26 2014 @@ -17,10 +17,10 @@ /* GLOBALS ********************************************************************/ #define ConsoleInputUnicodeCharToAnsiChar(Console, dChar, sWChar) \ - WideCharToMultiByte((Console)->CodePage, 0, (sWChar), 1, (dChar), 1, NULL, NULL) + WideCharToMultiByte((Console)->InputCodePage, 0, (sWChar), 1, (dChar), 1, NULL, NULL) #define ConsoleInputAnsiCharToUnicodeChar(Console, dWChar, sChar) \ - MultiByteToWideChar((Console)->CodePage, 0, (sChar), 1, (dWChar), 1) + MultiByteToWideChar((Console)->InputCodePage, 0, (sChar), 1, (dWChar), 1) typedef struct ConsoleInput_t { @@ -142,82 +142,6 @@ } CloseHandle(Console->InputBuffer.ActiveEvent); -} - -/* - * This function explicitely references Console->ActiveBuffer - * (and also makes use of keyboard functions...). - * It is possible that it will move into frontends... - */ -VOID NTAPI -ConDrvProcessKey(IN PCONSOLE Console, - IN BOOLEAN Down, - IN UINT VirtualKeyCode, - IN UINT VirtualScanCode, - IN WCHAR UnicodeChar, - IN ULONG ShiftState, - IN BYTE KeyStateCtrl) -{ - INPUT_RECORD er; - - /* process Ctrl-C and Ctrl-Break */ - if ( Console->InputBuffer.Mode & ENABLE_PROCESSED_INPUT && - Down && (VirtualKeyCode == VK_PAUSE || VirtualKeyCode == 'C') && - (ShiftState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED) || KeyStateCtrl & 0x80) ) - { - DPRINT1("Console_Api Ctrl-C\n"); - ConSrvConsoleProcessCtrlEvent(Console, 0, CTRL_C_EVENT); - - if (Console->LineBuffer && !Console->LineComplete) - { - /* Line input is in progress; end it */ - Console->LinePos = Console->LineSize = 0; - Console->LineComplete = TRUE; - } - return; - } - - if ( (ShiftState & (RIGHT_ALT_PRESSED | LEFT_ALT_PRESSED)) != 0 && - (VK_UP == VirtualKeyCode || VK_DOWN == VirtualKeyCode) ) - { - if (!Down) return; - - /* scroll up or down */ - if (VK_UP == VirtualKeyCode) - { - /* only scroll up if there is room to scroll up into */ - if (Console->ActiveBuffer->CursorPosition.Y != Console->ActiveBuffer->ScreenBufferSize.Y - 1) - { - Console->ActiveBuffer->VirtualY = (Console->ActiveBuffer->VirtualY + - Console->ActiveBuffer->ScreenBufferSize.Y - 1) % - Console->ActiveBuffer->ScreenBufferSize.Y; - Console->ActiveBuffer->CursorPosition.Y++; - } - } - else - { - /* only scroll down if there is room to scroll down into */ - if (Console->ActiveBuffer->CursorPosition.Y != 0) - { - Console->ActiveBuffer->VirtualY = (Console->ActiveBuffer->VirtualY + 1) % - Console->ActiveBuffer->ScreenBufferSize.Y; - Console->ActiveBuffer->CursorPosition.Y--; - } - } - - ConioDrawConsole(Console); - return; - } - - er.EventType = KEY_EVENT; - er.Event.KeyEvent.bKeyDown = Down; - er.Event.KeyEvent.wRepeatCount = 1; - er.Event.KeyEvent.wVirtualKeyCode = VirtualKeyCode; - er.Event.KeyEvent.wVirtualScanCode = VirtualScanCode; - er.Event.KeyEvent.uChar.UnicodeChar = UnicodeChar; - er.Event.KeyEvent.dwControlKeyState = ShiftState; - - ConioProcessInputEvent(Console, &er); } Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/console.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/console.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/console.c [iso-8859-1] Fri May 2 18:44:26 2014 @@ -453,7 +453,7 @@ // LineWakeupMask /* Set-up the code page */ - Console->CodePage = Console->OutputCodePage = ConsoleInfo->CodePage; + Console->InputCodePage = Console->OutputCodePage = ConsoleInfo->CodePage; /* Initialize a new text-mode screen buffer with default settings */ ScreenBufferInfo.ScreenBufferSize = ConsoleInfo->ScreenBufferSize; @@ -862,7 +862,7 @@ if (*BufLength >= sizeof(CHAR)) { Length = min(*BufLength - sizeof(CHAR), Console->Title.Length / sizeof(WCHAR)); - Length = WideCharToMultiByte(Console->CodePage, 0, + Length = WideCharToMultiByte(Console->InputCodePage, 0, Console->Title.Buffer, Length, TitleBuffer, Length, NULL, NULL); @@ -898,7 +898,7 @@ else { /* Use the console input CP for the conversion */ - Length = MultiByteToWideChar(Console->CodePage, 0, + Length = MultiByteToWideChar(Console->InputCodePage, 0, TitleBuffer, BufLength, NULL, 0); /* The returned Length was in number of wchars, convert it in bytes */ @@ -923,7 +923,7 @@ } else { - MultiByteToWideChar(Console->CodePage, 0, + MultiByteToWideChar(Console->InputCodePage, 0, TitleBuffer, BufLength, Console->Title.Buffer, Console->Title.Length / sizeof(WCHAR)); @@ -944,7 +944,7 @@ if (Console == NULL || CodePage == NULL) return STATUS_INVALID_PARAMETER; - *CodePage = (OutputCP ? Console->OutputCodePage : Console->CodePage); + *CodePage = (OutputCP ? Console->OutputCodePage : Console->InputCodePage); return STATUS_SUCCESS; } @@ -960,7 +960,7 @@ if (OutputCP) Console->OutputCodePage = CodePage; else - Console->CodePage = CodePage; + Console->InputCodePage = CodePage; return STATUS_SUCCESS; } Removed: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/dummyfrontend.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/dummyfrontend.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/dummyfrontend.c (removed) @@ -1,213 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Console Server DLL - * FILE: win32ss/user/winsrv/consrv/condrv/dummyfrontend.c - * PURPOSE: Dummy Terminal Front-End used when no frontend - * is attached to the specified console. - * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) - */ - -/* INCLUDES *******************************************************************/ - -#include <consrv.h> - -/* DUMMY FRONTEND INTERFACE ***************************************************/ - -static NTSTATUS NTAPI -DummyInitFrontEnd(IN OUT PFRONTEND This, - IN PCONSOLE Console) -{ - /* Load some settings ?? */ - return STATUS_SUCCESS; -} - -static VOID NTAPI -DummyDeinitFrontEnd(IN OUT PFRONTEND This) -{ - /* Free some settings ?? */ -} - -static VOID NTAPI -DummyDrawRegion(IN OUT PFRONTEND This, - SMALL_RECT* Region) -{ -} - -static VOID NTAPI -DummyWriteStream(IN OUT PFRONTEND This, - SMALL_RECT* Region, - SHORT CursorStartX, - SHORT CursorStartY, - UINT ScrolledLines, - PWCHAR Buffer, - UINT Length) -{ -} - -static BOOL NTAPI -DummySetCursorInfo(IN OUT PFRONTEND This, - PCONSOLE_SCREEN_BUFFER Buff) -{ - return TRUE; -} - -static BOOL NTAPI -DummySetScreenInfo(IN OUT PFRONTEND This, - PCONSOLE_SCREEN_BUFFER Buff, - SHORT OldCursorX, - SHORT OldCursorY) -{ - return TRUE; -} - -static VOID NTAPI -DummyResizeTerminal(IN OUT PFRONTEND This) -{ -} - -static VOID NTAPI -DummySetActiveScreenBuffer(IN OUT PFRONTEND This) -{ -} - -static VOID NTAPI -DummyReleaseScreenBuffer(IN OUT PFRONTEND This, - IN PCONSOLE_SCREEN_BUFFER ScreenBuffer) -{ -} - -static BOOL NTAPI -DummyProcessKeyCallback(IN OUT PFRONTEND This, - MSG* msg, - BYTE KeyStateMenu, - DWORD ShiftState, - UINT VirtualKeyCode, - BOOL Down) -{ - return FALSE; -} - -static VOID NTAPI -DummyRefreshInternalInfo(IN OUT PFRONTEND This) -{ -} - -static VOID NTAPI -DummyChangeTitle(IN OUT PFRONTEND This) -{ -} - -static BOOL NTAPI -DummyChangeIcon(IN OUT PFRONTEND This, - HICON IconHandle) -{ - return TRUE; -} - -static HWND NTAPI -DummyGetConsoleWindowHandle(IN OUT PFRONTEND This) -{ - return NULL; -} - -static VOID NTAPI -DummyGetLargestConsoleWindowSize(IN OUT PFRONTEND This, - PCOORD pSize) -{ -} - -static BOOL NTAPI -DummyGetSelectionInfo(IN OUT PFRONTEND This, - PCONSOLE_SELECTION_INFO pSelectionInfo) -{ - return TRUE; -} - -static BOOL NTAPI -DummySetPalette(IN OUT PFRONTEND This, - HPALETTE PaletteHandle, - UINT PaletteUsage) -{ - return TRUE; -} - -static ULONG NTAPI -DummyGetDisplayMode(IN OUT PFRONTEND This) -{ - return 0; -} - -static BOOL NTAPI -DummySetDisplayMode(IN OUT PFRONTEND This, - ULONG NewMode) -{ - return TRUE; -} - -static INT NTAPI -DummyShowMouseCursor(IN OUT PFRONTEND This, - BOOL Show) -{ - return 0; -} - -static BOOL NTAPI -DummySetMouseCursor(IN OUT PFRONTEND This, - HCURSOR CursorHandle) -{ - return TRUE; -} - -static HMENU NTAPI -DummyMenuControl(IN OUT PFRONTEND This, - UINT CmdIdLow, - UINT CmdIdHigh) -{ - return NULL; -} - -static BOOL NTAPI -DummySetMenuClose(IN OUT PFRONTEND This, - BOOL Enable) -{ - return TRUE; -} - -static FRONTEND_VTBL DummyVtbl = -{ - DummyInitFrontEnd, - DummyDeinitFrontEnd, - DummyDrawRegion, - DummyWriteStream, - DummySetCursorInfo, - DummySetScreenInfo, - DummyResizeTerminal, - DummySetActiveScreenBuffer, - DummyReleaseScreenBuffer, - DummyProcessKeyCallback, - DummyRefreshInternalInfo, - DummyChangeTitle, - DummyChangeIcon, - DummyGetConsoleWindowHandle, - DummyGetLargestConsoleWindowSize, - DummyGetSelectionInfo, - DummySetPalette, - DummyGetDisplayMode, - DummySetDisplayMode, - DummyShowMouseCursor, - DummySetMouseCursor, - DummyMenuControl, - DummySetMenuClose, -}; - -VOID -ResetFrontEnd(IN PCONSOLE Console) -{ - if (!Console) return; - - /* Reinitialize the frontend interface */ - RtlZeroMemory(&Console->FrontEndIFace, sizeof(Console->FrontEndIFace)); - Console->FrontEndIFace.Vtbl = &DummyVtbl; -} - -/* EOF */ Copied: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/dummyterm.c (from r63112, branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/dummyfrontend.c) URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/dummyfrontend.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/dummyterm.c [iso-8859-1] Fri May 2 18:44:26 2014 @@ -1,8 +1,8 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Console Server DLL - * FILE: win32ss/user/winsrv/consrv/condrv/dummyfrontend.c - * PURPOSE: Dummy Terminal Front-End used when no frontend + * FILE: condrv/dummyterm.c + * PURPOSE: Dummy Terminal used when no terminal * is attached to the specified console. * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ @@ -11,7 +11,7 @@ #include <consrv.h> -/* DUMMY FRONTEND INTERFACE ***************************************************/ +/* DUMMY TERMINAL INTERFACE ***************************************************/ static NTSTATUS NTAPI DummyInitFrontEnd(IN OUT PFRONTEND This, Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/coninput.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/coninput.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/coninput.h [iso-8859-1] Fri May 2 18:44:26 2014 @@ -10,12 +10,3 @@ #pragma once VOID PurgeInputBuffer(PCONSOLE Console); - -VOID NTAPI -ConDrvProcessKey(IN PCONSOLE Console, - IN BOOLEAN Down, - IN UINT VirtualKeyCode, - IN UINT VirtualScanCode, - IN WCHAR UnicodeChar, - IN ULONG ShiftState, - IN BYTE KeyStateCtrl); Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/console.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/console.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/console.c [iso-8859-1] Fri May 2 18:44:26 2014 @@ -13,12 +13,7 @@ #include "consrv.h" #include <ndk/psfuncs.h> - #include "procinit.h" - -#ifdef TUITERM_COMPILE -#include "frontends/tui/tuiterm.h" -#endif #define NDEBUG #include <debug.h> @@ -27,69 +22,6 @@ NTSTATUS NTAPI RtlGetLastNtStatus(VOID); /* GLOBALS ********************************************************************/ - -/***************/ -#ifdef TUITERM_COMPILE -NTSTATUS NTAPI -TuiLoadFrontEnd(IN OUT PFRONTEND FrontEnd, - IN OUT PCONSOLE_INFO ConsoleInfo, - IN OUT PVOID ExtraConsoleInfo, - IN ULONG ProcessId); -NTSTATUS NTAPI -TuiUnloadFrontEnd(IN OUT PFRONTEND FrontEnd); -#endif - -NTSTATUS NTAPI -GuiLoadFrontEnd(IN OUT PFRONTEND FrontEnd, - IN OUT PCONSOLE_INFO ConsoleInfo, - IN OUT PVOID ExtraConsoleInfo, - IN ULONG ProcessId); -NTSTATUS NTAPI -GuiUnloadFrontEnd(IN OUT PFRONTEND FrontEnd); -/***************/ - -typedef -NTSTATUS (NTAPI *FRONTEND_LOAD)(IN OUT PFRONTEND FrontEnd, - IN OUT PCONSOLE_INFO ConsoleInfo, - IN OUT PVOID ExtraConsoleInfo, - IN ULONG ProcessId); - -typedef -NTSTATUS (NTAPI *FRONTEND_UNLOAD)(IN OUT PFRONTEND FrontEnd); - -/* - * If we are not in GUI-mode, start the text-mode terminal emulator. - * If we fail, try to start the GUI-mode terminal emulator. - * - * Try to open the GUI-mode terminal emulator. Two cases are possible: - * - We are in GUI-mode, therefore GuiMode == TRUE, the previous test-case - * failed and we start GUI-mode terminal emulator. - * - We are in text-mode, therefore GuiMode == FALSE, the previous test-case - * succeeded BUT we failed at starting text-mode terminal emulator. - * Then GuiMode was switched to TRUE in order to try to open the GUI-mode - * terminal emulator (Win32k will automatically switch to graphical mode, - * therefore no additional code is needed). - */ - -/* - * NOTE: Each entry of the table should be retrieved when loading a front-end - * (examples of the CSR servers which register some data for CSRSS). - */ -struct -{ - CHAR FrontEndName[80]; - FRONTEND_LOAD FrontEndLoad; - FRONTEND_UNLOAD FrontEndUnload; -} FrontEndLoadingMethods[] = -{ -#ifdef TUITERM_COMPILE - {"TUI", TuiLoadFrontEnd, TuiUnloadFrontEnd}, -#endif - {"GUI", GuiLoadFrontEnd, GuiUnloadFrontEnd}, - -// {"Not found", 0, NULL} -}; - /* PRIVATE FUNCTIONS **********************************************************/ @@ -150,6 +82,14 @@ } +/* static */ NTSTATUS +ConSrvLoadFrontEnd(IN OUT PFRONTEND FrontEnd, + IN OUT PCONSOLE_INFO ConsoleInfo, + IN OUT PVOID ExtraConsoleInfo, + IN ULONG ProcessId); +/* static */ NTSTATUS +ConSrvUnloadFrontEnd(IN PFRONTEND FrontEnd); + NTSTATUS NTAPI ConSrvInitConsole(OUT PHANDLE NewConsoleHandle, OUT PCONSOLE* NewConsole, @@ -161,7 +101,7 @@ PCONSOLE Console; CONSOLE_INFO ConsoleInfo; SIZE_T Length = 0; - ULONG i = 0; + FRONTEND FrontEnd; if (NewConsole == NULL || ConsoleStartInfo == NULL) @@ -182,39 +122,31 @@ wcsncpy(ConsoleInfo.ConsoleTitle, ConsoleStartInfo->ConsoleTitle, Length); ConsoleInfo.ConsoleTitle[Length] = L'\0'; - - /* - * Choose an adequate terminal front-end to load, and load it - */ - Status = STATUS_SUCCESS; - for (i = 0; i < sizeof(FrontEndLoadingMethods) / sizeof(FrontEndLoadingMethods[0]); ++i) - { - DPRINT("CONSRV: Trying to load %s terminal emulator...\n", FrontEndLoadingMethods[i].FrontEndName); - Status = FrontEndLoadingMethods[i].FrontEndLoad(&FrontEnd, - &ConsoleInfo, - ConsoleStartInfo, - ConsoleLeaderProcessId); - if (NT_SUCCESS(Status)) - { - DPRINT("CONSRV: %s terminal emulator loaded successfully\n", FrontEndLoadingMethods[i].FrontEndName); - break; - } - else - { - DPRINT1("CONSRV: Loading %s terminal emulator failed, Status = 0x%08lx , continuing...\n", FrontEndLoadingMethods[i].FrontEndName, Status); - } - } - +#if 0 + /* 3. Initialize the ConSrv terminal */ + Status = ConSrvInitTerminal(&Terminal, + &ConsoleInfo, + ConsoleStartInfo, + ConsoleLeaderProcessId); + if (!NT_SUCCESS(Status)) + { + DPRINT1("CONSRV: Failed to initialize a terminal, Status = 0x%08lx\n", Status); + return Status; + } + DPRINT("CONSRV: Terminal initialized\n"); +#else + Status = ConSrvLoadFrontEnd(&FrontEnd, + &ConsoleInfo, + ConsoleStartInfo, + ConsoleLeaderProcessId); if (!NT_SUCCESS(Status)) { DPRINT1("CONSRV: Failed to initialize a frontend, Status = 0x%08lx\n", Status); return Status; } - DPRINT("CONSRV: Frontend initialized\n"); - - -/******************************************************************************/ +#endif + /* * 4. Load the remaining console settings via the registry. */ @@ -249,8 +181,8 @@ /* Set-up the code page */ ConsoleInfo.CodePage = GetOEMCP(); -/******************************************************************************/ - + + /* Initialize a new console via the driver */ Status = ConDrvInitConsole(&ConsoleHandle, &Console, &ConsoleInfo, @@ -258,7 +190,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Creating a new console failed, Status = 0x%08lx\n", Status); - FrontEndLoadingMethods[i].FrontEndUnload(&FrontEnd); + ConSrvUnloadFrontEnd(&FrontEnd); return Status; } @@ -266,20 +198,26 @@ DPRINT("Console initialized\n"); /*** Register ConSrv features ***/ + + /* Initialize process support */ InitializeListHead(&Console->ProcessList); Console->NotifiedLastCloseProcess = NULL; Console->NotifyLastClose = FALSE; + + /* Initialize pausing support */ + Console->PauseFlags = 0; InitializeListHead(&Console->ReadWaitQueue); InitializeListHead(&Console->WriteWaitQueue); - Console->PauseFlags = 0; - Console->QuickEdit = ConsoleInfo.QuickEdit; - + + Console->QuickEdit = ConsoleInfo.QuickEdit; + + /* Attach the ConSrv terminal to the console */ Status = ConDrvRegisterFrontEnd(Console, &FrontEnd); if (!NT_SUCCESS(Status)) { DPRINT1("Failed to register frontend to the given console, Status = 0x%08lx\n", Status); ConDrvDeleteConsole(Console); - FrontEndLoadingMethods[i].FrontEndUnload(&FrontEnd); + ConSrvUnloadFrontEnd(&FrontEnd); return Status; } DPRINT("FrontEnd registered\n"); Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/input.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/input.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/input.c [iso-8859-1] Fri May 2 18:44:26 2014 @@ -19,6 +19,77 @@ /* PRIVATE FUNCTIONS **********************************************************/ + +static VOID +ConDrvProcessKey(IN PCONSOLE Console, + IN BOOLEAN Down, + IN UINT VirtualKeyCode, + IN UINT VirtualScanCode, + IN WCHAR UnicodeChar, + IN ULONG ShiftState, + IN BYTE KeyStateCtrl) +{ + INPUT_RECORD er; + + /* process Ctrl-C and Ctrl-Break */ + if ( Console->InputBuffer.Mode & ENABLE_PROCESSED_INPUT && + Down && (VirtualKeyCode == VK_PAUSE || VirtualKeyCode == 'C') && + (ShiftState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED) || KeyStateCtrl & 0x80) ) + { + DPRINT1("Console_Api Ctrl-C\n"); + ConSrvConsoleProcessCtrlEvent(Console, 0, CTRL_C_EVENT); + + if (Console->LineBuffer && !Console->LineComplete) + { + /* Line input is in progress; end it */ + Console->LinePos = Console->LineSize = 0; + Console->LineComplete = TRUE; + } + return; + } + + if ( (ShiftState & (RIGHT_ALT_PRESSED | LEFT_ALT_PRESSED)) != 0 && + (VK_UP == VirtualKeyCode || VK_DOWN == VirtualKeyCode) ) + { + if (!Down) return; + + /* scroll up or down */ + if (VK_UP == VirtualKeyCode) + { + /* only scroll up if there is room to scroll up into */ + if (Console->ActiveBuffer->CursorPosition.Y != Console->ActiveBuffer->ScreenBufferSize.Y - 1) + { + Console->ActiveBuffer->VirtualY = (Console->ActiveBuffer->VirtualY + + Console->ActiveBuffer->ScreenBufferSize.Y - 1) % + Console->ActiveBuffer->ScreenBufferSize.Y; + Console->ActiveBuffer->CursorPosition.Y++; + } + } + else + { + /* only scroll down if there is room to scroll down into */ + if (Console->ActiveBuffer->CursorPosition.Y != 0) + { + Console->ActiveBuffer->VirtualY = (Console->ActiveBuffer->VirtualY + 1) % + Console->ActiveBuffer->ScreenBufferSize.Y; + Console->ActiveBuffer->CursorPosition.Y--; + } + } + + ConioDrawConsole(Console); + return; + } + + er.EventType = KEY_EVENT; + er.Event.KeyEvent.bKeyDown = Down; + er.Event.KeyEvent.wRepeatCount = 1; + er.Event.KeyEvent.wVirtualKeyCode = VirtualKeyCode; + er.Event.KeyEvent.wVirtualScanCode = VirtualScanCode; + er.Event.KeyEvent.uChar.UnicodeChar = UnicodeChar; + er.Event.KeyEvent.dwControlKeyState = ShiftState; + + ConioProcessInputEvent(Console, &er); +} static DWORD ConioGetShiftState(PBYTE KeyState, LPARAM lParam) Copied: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/terminal.c (from r63112, branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/dummyfrontend.c) URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/dummyfrontend.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/terminal.c [iso-8859-1] Fri May 2 18:44:26 2014 @@ -1,9 +1,8 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Console Server DLL - * FILE: win32ss/user/winsrv/consrv/condrv/dummyfrontend.c - * PURPOSE: Dummy Terminal Front-End used when no frontend - * is attached to the specified console. + * FILE: frontends/terminal.c + * PURPOSE: ConSrv terminal. * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ @@ -11,7 +10,129 @@ #include <consrv.h> +#ifdef TUITERM_COMPILE +#include "frontends/tui/tuiterm.h" +#endif + +#define NDEBUG +#include <debug.h> + +/* CONSRV TERMINAL FRONTENDS INTERFACE ****************************************/ + +/***************/ +#ifdef TUITERM_COMPILE +NTSTATUS NTAPI +TuiLoadFrontEnd(IN OUT PFRONTEND FrontEnd, + IN OUT PCONSOLE_INFO ConsoleInfo, + IN OUT PVOID ExtraConsoleInfo, + IN ULONG ProcessId); +NTSTATUS NTAPI +TuiUnloadFrontEnd(IN OUT PFRONTEND FrontEnd); +#endif + +NTSTATUS NTAPI +GuiLoadFrontEnd(IN OUT PFRONTEND FrontEnd, + IN OUT PCONSOLE_INFO ConsoleInfo, + IN OUT PVOID ExtraConsoleInfo, + IN ULONG ProcessId); +NTSTATUS NTAPI +GuiUnloadFrontEnd(IN OUT PFRONTEND FrontEnd); +/***************/ + +typedef +NTSTATUS (NTAPI *FRONTEND_LOAD)(IN OUT PFRONTEND FrontEnd, + IN OUT PCONSOLE_INFO ConsoleInfo, + IN OUT PVOID ExtraConsoleInfo, + IN ULONG ProcessId); + +typedef +NTSTATUS (NTAPI *FRONTEND_UNLOAD)(IN OUT PFRONTEND FrontEnd); + +/* + * If we are not in GUI-mode, start the text-mode terminal emulator. + * If we fail, try to start the GUI-mode terminal emulator. + * + * Try to open the GUI-mode terminal emulator. Two cases are possible: + * - We are in GUI-mode, therefore GuiMode == TRUE, the previous test-case + * failed and we start GUI-mode terminal emulator. + * - We are in text-mode, therefore GuiMode == FALSE, the previous test-case + * succeeded BUT we failed at starting text-mode terminal emulator. + * Then GuiMode was switched to TRUE in order to try to open the GUI-mode + * terminal emulator (Win32k will automatically switch to graphical mode, + * therefore no additional code is needed). + */ + +/* + * NOTE: Each entry of the table should be retrieved when loading a front-end + * (examples of the CSR servers which register some data for CSRSS). + */ +struct +{ + CHAR FrontEndName[80]; + FRONTEND_LOAD FrontEndLoad; + FRONTEND_UNLOAD FrontEndUnload; +} FrontEndLoadingMethods[] = +{ +#ifdef TUITERM_COMPILE + {"TUI", TuiLoadFrontEnd, TuiUnloadFrontEnd}, +#endif + {"GUI", GuiLoadFrontEnd, GuiUnloadFrontEnd}, + +// {"Not found", 0, NULL} +}; + + +/* static */ NTSTATUS +ConSrvLoadFrontEnd(IN OUT PFRONTEND FrontEnd, + IN OUT PCONSOLE_INFO ConsoleInfo, + IN OUT PVOID ExtraConsoleInfo, + IN ULONG ProcessId) +{ + NTSTATUS Status = STATUS_SUCCESS; + ULONG i; + + /* + * Choose an adequate terminal front-end to load, and load it + */ + for (i = 0; i < sizeof(FrontEndLoadingMethods) / sizeof(FrontEndLoadingMethods[0]); ++i) + { + DPRINT("CONSRV: Trying to load %s frontend...\n", + FrontEndLoadingMethods[i].FrontEndName); + Status = FrontEndLoadingMethods[i].FrontEndLoad(FrontEnd, + ConsoleInfo, + ExtraConsoleInfo, + ProcessId); + if (NT_SUCCESS(Status)) + { + /* Save the unload callback */ + FrontEnd->UnloadFrontEnd = FrontEndLoadingMethods[i].FrontEndUnload; + + DPRINT("CONSRV: %s frontend loaded successfully\n", + FrontEndLoadingMethods[i].FrontEndName); + break; + } + else + { + DPRINT1("CONSRV: Loading %s frontend failed, Status = 0x%08lx , continuing...\n", + FrontEndLoadingMethods[i].FrontEndName, Status); + } + } + + return Status; +} + +/* static */ NTSTATUS +ConSrvUnloadFrontEnd(IN PFRONTEND FrontEnd) +{ + if (FrontEnd == NULL) return STATUS_INVALID_PARAMETER; + // return FrontEnd->Vtbl->UnloadFrontEnd(FrontEnd); + return FrontEnd->UnloadFrontEnd(FrontEnd); +} + + /* DUMMY FRONTEND INTERFACE ***************************************************/ + +#if 0 static NTSTATUS NTAPI DummyInitFrontEnd(IN OUT PFRONTEND This, @@ -210,4 +331,6 @@ Console->FrontEndIFace.Vtbl = &DummyVtbl; } +#endif + /* EOF */ Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h [iso-8859-1] Fri May 2 18:44:26 2014 @@ -297,7 +297,7 @@ /**************************** Input buffer and data ***************************/ CONSOLE_INPUT_BUFFER InputBuffer; /* Input buffer of the console */ - UINT CodePage; + UINT InputCodePage; /** Put those things in TEXTMODE_SCREEN_BUFFER ?? **/ PWCHAR LineBuffer; /* Current line being input, in line buffered mode */ Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio_winsrv.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio_winsrv.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio_winsrv.h [iso-8859-1] Fri May 2 18:44:26 2014 @@ -85,6 +85,8 @@ struct _FRONTEND { PFRONTEND_VTBL Vtbl; /* Virtual table */ + NTSTATUS (NTAPI *UnloadFrontEnd)(IN OUT PFRONTEND This); + struct _CONSOLE* Console; /* Console to which the frontend is attached to */ PVOID Data; /* Private data */ PVOID OldData; /* Reserved */

10 years, 7 months

[aandrejevic] 63116: [NTVDM] Use VdmRunning to keep the state of the whole VDM, not a VDM task. Add an event whose signaled state determines the state of the VDM task. Use FILE_SHARE_READ when open...

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Fri May 2 18:24:40 2014 New Revision: 63116 URL: http://svn.reactos.org/svn/reactos?rev=63116&view=rev Log: [NTVDM] Use VdmRunning to keep the state of the whole VDM, not a VDM task. Add an event whose signaled state determines the state of the VDM task. Use FILE_SHARE_READ when opening executables. Modified: branches/ntvdm/subsystems/ntvdm/dos/dos32krnl/dos.c branches/ntvdm/subsystems/ntvdm/emulator.c branches/ntvdm/subsystems/ntvdm/ntvdm.c branches/ntvdm/subsystems/ntvdm/ntvdm.h Modified: branches/ntvdm/subsystems/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos/dos3… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Fri May 2 18:24:40 2014 @@ -1075,7 +1075,7 @@ /* Open a handle to the executable */ FileHandle = CreateFileA(ExecutablePath, GENERIC_READ, - 0, + FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, @@ -1443,12 +1443,16 @@ if (Psp == CurrentPsp) { CurrentPsp = PspBlock->ParentPsp; - if (CurrentPsp == SYSTEM_PSP) VdmRunning = FALSE; + if (CurrentPsp == SYSTEM_PSP) + { + ResetEvent(VdmTaskEvent); + EmulatorUnsimulate(); + } } // FIXME: This is probably not the best way to do it /* Check if this was a nested DOS task */ - if (VdmRunning) + if (CurrentPsp != SYSTEM_PSP) { /* Decrement the re-entry count */ CommandInfo.VDMState = VDM_DEC_REENTER_COUNT; @@ -2646,8 +2650,9 @@ { UNREFERENCED_PARAMETER(Stack); - /* Stop the VDM */ - VdmRunning = FALSE; + /* Stop the VDM task */ + ResetEvent(VdmTaskEvent); + EmulatorUnsimulate(); } VOID WINAPI DosFastConOut(LPWORD Stack) 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] Fri May 2 18:24:40 2014 @@ -203,7 +203,7 @@ } CpuCallLevel++; - VdmRunning = CpuSimulate = TRUE; + CpuSimulate = TRUE; while (VdmRunning && CpuSimulate) ClockUpdate(); CpuCallLevel--; 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] Fri May 2 18:24:40 2014 @@ -40,6 +40,8 @@ static HMENU hConsoleMenu = NULL; static INT VdmMenuPos = -1; static BOOLEAN ShowPointer = FALSE; + +HANDLE VdmTaskEvent = NULL; /* * Those menu helpers were taken from the GUI frontend in winsrv.dll @@ -200,10 +202,11 @@ } case CTRL_LAST_CLOSE_EVENT: { - if (!VdmRunning) + if (WaitForSingleObject(VdmTaskEvent, 0) == WAIT_TIMEOUT) { /* Exit immediately */ if (CommandThread) TerminateThread(CommandThread, 0); + EmulatorTerminate(); } else { @@ -243,6 +246,9 @@ while (VdmRunning) { + /* Make sure the task event is signaled */ + WaitForSingleObject(VdmTaskEvent, INFINITE); + /* Wait for an input record */ if (!ReadConsoleInput(ConsoleInput, &InputRecord, 1, &Count)) { @@ -442,6 +448,7 @@ } /* Start simulation */ + SetEvent(VdmTaskEvent); EmulatorSimulate(); /* Perform another screen refresh */ @@ -476,6 +483,10 @@ #endif DPRINT1("\n\n\nNTVDM - Starting...\n\n\n"); + + /* Create the task event */ + VdmTaskEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + ASSERT(VdmTaskEvent != NULL); /* Initialize the console */ if (!ConsoleInit()) @@ -539,6 +550,7 @@ } /* Start simulation */ + SetEvent(VdmTaskEvent); EmulatorSimulate(); /* Perform another screen refresh */ Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.h?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.h [iso-8859-1] Fri May 2 18:24:40 2014 @@ -33,6 +33,8 @@ /* FUNCTIONS ******************************************************************/ +extern HANDLE VdmTaskEvent; + VOID DisplayMessage(LPCWSTR Format, ...); #endif // _NTVDM_H_

10 years, 7 months

[dquintana] 63115: [SHELL32] * Fix redundant clauses by converting the code to a switch block. Adapted from a patch by Victor Martinez. CORE-8161 #resolve #comment Fixed in the shell-experiments br...

by dquintana＠svn.reactos.org

Author: dquintana Date: Fri May 2 17:27:28 2014 New Revision: 63115 URL: http://svn.reactos.org/svn/reactos?rev=63115&view=rev Log: [SHELL32] * Fix redundant clauses by converting the code to a switch block. Adapted from a patch by Victor Martinez. CORE-8161 #resolve #comment Fixed in the shell-experiments branch. Thanks. Modified: branches/shell-experiments/dll/win32/shell32/shellitem.cpp Modified: branches/shell-experiments/dll/win32/shell32/shellitem.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/shellitem.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/shellitem.cpp [iso-8859-1] Fri May 2 17:27:28 2014 @@ -122,20 +122,24 @@ hr = get_parent_shellfolder(&parent_folder); if (SUCCEEDED(hr)) { - if (sigdnName == SIGDN_PARENTRELATIVEEDITING) + switch (sigdnName) + { + case SIGDN_PARENTRELATIVEEDITING: uFlags = SHGDN_FOREDITING | SHGDN_INFOLDER; - else if (sigdnName == SIGDN_DESKTOPABSOLUTEEDITING) + break; + case SIGDN_DESKTOPABSOLUTEEDITING: uFlags = SHGDN_FOREDITING; - else if (sigdnName == SIGDN_PARENTRELATIVEEDITING) - uFlags = SHGDN_FOREDITING | SHGDN_INFOLDER; - else if (sigdnName == SIGDN_DESKTOPABSOLUTEEDITING) - uFlags = SHGDN_FOREDITING; - else if (sigdnName == SIGDN_PARENTRELATIVEPARSING) + break; + case SIGDN_PARENTRELATIVEPARSING: uFlags = SHGDN_FORPARSING | SHGDN_INFOLDER; - else if (sigdnName == SIGDN_DESKTOPABSOLUTEPARSING) + break; + case SIGDN_DESKTOPABSOLUTEPARSING: uFlags = SHGDN_FORPARSING; - else + break; + default: uFlags = SHGDN_NORMAL; + break; + } hr = parent_folder->GetDisplayNameOf(m_pidl, uFlags, &name); if (SUCCEEDED(hr))

10 years, 7 months

[dquintana] 63114: [BROWSEUI] * Do not set the imagelist if the bitmap wasn't loaded. * Fix the flags that caused the toolbar not to relocate when toggling the lock mode.

by dquintana＠svn.reactos.org

Author: dquintana Date: Fri May 2 17:25:19 2014 New Revision: 63114 URL: http://svn.reactos.org/svn/reactos?rev=63114&view=rev Log: [BROWSEUI] * Do not set the imagelist if the bitmap wasn't loaded. * Fix the flags that caused the toolbar not to relocate when toggling the lock mode. Modified: branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp branches/shell-experiments/dll/win32/browseui/toolsband.cpp Modified: branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] Fri May 2 17:25:19 2014 @@ -849,7 +849,7 @@ hResult = CreateToolsBar(&toolsBar); if (FAILED(hResult)) return hResult; - AddDockItem(toolsBar, ITBBID_TOOLSBAND, CDockSite::ITF_NOTITLE | CDockSite::ITF_NEWBANDALWAYS); + AddDockItem(toolsBar, ITBBID_TOOLSBAND, CDockSite::ITF_NOTITLE | CDockSite::ITF_NEWBANDALWAYS | CDockSite::ITF_GRIPPERALWAYS); fControlsBar.Attach(toolsBar.Detach()); // transfer the ref count hResult = fControlsBar->QueryInterface(IID_PPV_ARG(IOleWindow, &toolbarOleWindow)); if (FAILED(hResult)) @@ -862,7 +862,7 @@ hResult = CreateAddressBand(&navigationBar); if (FAILED(hResult)) return hResult; - AddDockItem(navigationBar, ITBBID_ADDRESSBAND, CDockSite::ITF_NEWBANDALWAYS); + AddDockItem(navigationBar, ITBBID_ADDRESSBAND, CDockSite::ITF_NEWBANDALWAYS | CDockSite::ITF_GRIPPERALWAYS); hResult = navigationBar->QueryInterface(IID_PPV_ARG(IOleWindow, &navigationOleWindow)); hResult = navigationOleWindow->GetWindow(&fNavigationWindow); fNavigationBar.Attach(navigationBar.Detach()); Modified: branches/shell-experiments/dll/win32/browseui/toolsband.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/toolsband.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/toolsband.cpp [iso-8859-1] Fri May 2 17:25:19 2014 @@ -278,14 +278,17 @@ LoadImage(shell32Instance, MAKEINTRESOURCE(214), IMAGE_BITMAP, 0, 0, LR_DEFAULTSIZE | LR_CREATEDIBSECTION)); - DIBSECTION bitmapInfo; - GetObjectW(imageBitmap, sizeof(bitmapInfo), &bitmapInfo); - HIMAGELIST imageList = ImageList_Create(bitmapInfo.dsBm.bmHeight, bitmapInfo.dsBm.bmHeight, ILC_COLOR32, 4, 4); - - ImageList_Add(imageList, imageBitmap, NULL); - DeleteObject(imageBitmap); - - SendMessage(TB_SETIMAGELIST, 0, (LPARAM)imageList); + if (imageBitmap) + { + DIBSECTION bitmapInfo; + GetObjectW(imageBitmap, sizeof(bitmapInfo), &bitmapInfo); + HIMAGELIST imageList = ImageList_Create(bitmapInfo.dsBm.bmHeight, bitmapInfo.dsBm.bmHeight, ILC_COLOR32, 4, 4); + + ImageList_Add(imageList, imageBitmap, NULL); + DeleteObject(imageBitmap); + + SendMessage(TB_SETIMAGELIST, 0, (LPARAM) imageList); + } SendMessage(TB_ADDBUTTONSW, numShownButtons, (LPARAM)&tbButtonsAdd);

10 years, 7 months

[hbelusca] 63113: [KERNEL32] Compare against "NE", not "N" only. Caught by Victor Martinez, thanks ; ) CORE-8159 #resolve

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri May 2 17:11:13 2014 New Revision: 63113 URL: http://svn.reactos.org/svn/reactos?rev=63113&view=rev Log: [KERNEL32] Compare against "NE", not "N" only. Caught by Victor Martinez, thanks ;) CORE-8159 #resolve Modified: branches/ntvdm/dll/win32/kernel32/client/vdm.c 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] Fri May 2 17:11:13 2014 @@ -677,7 +677,7 @@ if (!lpEnvironment) { /* Nope, create one */ - Status = RtlCreateEnvironment(TRUE, (PWCHAR*)&Environment); + Status = RtlCreateEnvironment(TRUE, &Environment); if (!NT_SUCCESS(Status)) goto Quickie; } else @@ -718,6 +718,7 @@ p = NewEnvironment; /* FIXME: Code here */ + DPRINT1("BaseCreateVDMEnvironment is half-plemented!\n"); /* Terminate it */ *p++ = UNICODE_NULL; @@ -916,7 +917,7 @@ return BINARY_PE_EXE32; } - if(!memcmp(magic, "NE", 1)) + if(!memcmp(magic, "NE", 2)) { /* This is a Windows executable (NE) header. This can * mean either a 16-bit OS/2 or a 16-bit Windows or even a @@ -1603,12 +1604,15 @@ /* * @unimplemented */ -DWORD -WINAPI -VDMOperationStarted ( - DWORD Unknown0 - ) -{ - STUB; - return 0; -} +BOOL +WINAPI +VDMOperationStarted(IN ULONG Unknown0) +{ + DPRINT1("VDMOperationStarted(%d)\n", Unknown0); + + return + BaseUpdateVDMEntry(VdmEntryUpdateControlCHandler, + NULL, + 0, + Unknown0); +}

10 years, 7 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 May 2014