Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 59649: [HIVES]: Add "System Reserved" and "EMS" group types. [TXTSETUP]: Add sacdrv.sys to the list of setup drivers. [CMAKELISTS]: Add sac/sacdrv/sacmsg to the build. [SACMSG]: Update some m...
by ion＠svn.reactos.org 06 Aug '13

06 Aug '13

Author: ion Date: Tue Aug 6 01:12:08 2013 New Revision: 59649 URL: http://svn.reactos.org/svn/reactos?rev=59649&view=rev Log: [HIVES]: Add "System Reserved" and "EMS" group types. [TXTSETUP]: Add sacdrv.sys to the list of setup drivers. [CMAKELISTS]: Add sac/sacdrv/sacmsg to the build. [SACMSG]: Update some messages to give them identifiers. [SACDRV]: Reformat almost the entire driver to ReactOS standards. [SACDRV]: Implement about 50% of the driver, including most of the Channel Manager, Command Manager and Raw Channel Support. Comment and cleanup all of the old code that was there before. This is WIP -- it will only activate if you attempt to enable EMS. EMS/SAC support should be very helpful for Thorium Core/ARM port. Added: trunk/reactos/drivers/sac/CMakeLists.txt (with props) trunk/reactos/drivers/sac/driver/CMakeLists.txt (with props) Modified: trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/boot/bootdata/txtsetup.sif trunk/reactos/drivers/CMakeLists.txt trunk/reactos/drivers/sac/driver/chanmgr.c trunk/reactos/drivers/sac/driver/channel.c trunk/reactos/drivers/sac/driver/concmd.c trunk/reactos/drivers/sac/driver/conmgr.c trunk/reactos/drivers/sac/driver/data.c trunk/reactos/drivers/sac/driver/dispatch.c trunk/reactos/drivers/sac/driver/init.c trunk/reactos/drivers/sac/driver/memory.c trunk/reactos/drivers/sac/driver/rawchan.c trunk/reactos/drivers/sac/driver/sacdrv.h trunk/reactos/drivers/sac/driver/sacdrv.rc trunk/reactos/drivers/sac/driver/util.c trunk/reactos/include/reactos/mc/CMakeLists.txt trunk/reactos/include/reactos/mc/sacmsg.mc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… Modified: trunk/reactos/drivers/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/CMakeLists.txt?rev… Added: trunk/reactos/drivers/sac/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/CMakeLists.txt… Added: trunk/reactos/drivers/sac/driver/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/CMakeLi… Modified: trunk/reactos/drivers/sac/driver/chanmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/chanmgr… Modified: trunk/reactos/drivers/sac/driver/channel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/channel… Modified: trunk/reactos/drivers/sac/driver/concmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/concmd.… Modified: trunk/reactos/drivers/sac/driver/conmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/conmgr.… Modified: trunk/reactos/drivers/sac/driver/data.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/data.c?… Modified: trunk/reactos/drivers/sac/driver/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/dispatc… Modified: trunk/reactos/drivers/sac/driver/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/init.c?… Modified: trunk/reactos/drivers/sac/driver/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/memory.… Modified: trunk/reactos/drivers/sac/driver/rawchan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/rawchan… Modified: trunk/reactos/drivers/sac/driver/sacdrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/sacdrv.… Modified: trunk/reactos/drivers/sac/driver/sacdrv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/sacdrv.… Modified: trunk/reactos/drivers/sac/driver/util.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/util.c?… Modified: trunk/reactos/include/reactos/mc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/CMakeLi… Modified: trunk/reactos/include/reactos/mc/sacmsg.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/sacmsg.…

1 0

[aandrejevic] 59648: [NTVDM] Implement Video Graphics Array (VGA) support. Replace the old BIOS video code with new code that uses the VGA.
by aandrejevic＠svn.reactos.org 05 Aug '13

05 Aug '13

Author: aandrejevic Date: Mon Aug 5 23:20:25 2013 New Revision: 59648 URL: http://svn.reactos.org/svn/reactos?rev=59648&view=rev Log: [NTVDM] Implement Video Graphics Array (VGA) support. Replace the old BIOS video code with new code that uses the VGA. Added: branches/ntvdm/subsystems/ntvdm/vga.c (with props) branches/ntvdm/subsystems/ntvdm/vga.h (with props) Modified: branches/ntvdm/subsystems/ntvdm/CMakeLists.txt branches/ntvdm/subsystems/ntvdm/bios.c branches/ntvdm/subsystems/ntvdm/bios.h branches/ntvdm/subsystems/ntvdm/dos.h branches/ntvdm/subsystems/ntvdm/emulator.c branches/ntvdm/subsystems/ntvdm/ntvdm.c Modified: branches/ntvdm/subsystems/ntvdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/CMakeLis… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/CMakeLists.txt [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/CMakeLists.txt [iso-8859-1] Mon Aug 5 23:20:25 2013 @@ -8,6 +8,7 @@ pic.c timer.c ps2.c + vga.c ntvdm.c ntvdm.rc) Modified: branches/ntvdm/subsystems/ntvdm/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.c?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] Mon Aug 5 23:20:25 2013 @@ -12,6 +12,7 @@ #include "bios.h" #include "emulator.h" +#include "vga.h" #include "pic.h" #include "ps2.h" #include "timer.h" @@ -22,81 +23,138 @@ static BYTE BiosKeyboardMap[256]; static HANDLE BiosConsoleInput = INVALID_HANDLE_VALUE; static HANDLE BiosConsoleOutput = INVALID_HANDLE_VALUE; -static HANDLE BiosGraphicsOutput = NULL; -static LPVOID ConsoleFramebuffer = NULL; -static HANDLE ConsoleMutex = NULL; -static BYTE CurrentVideoMode, CurrentVideoPage; -static BOOLEAN VideoNeedsUpdate = TRUE; -static SMALL_RECT UpdateRectangle = { 0, 0, 0, 0 }; static CONSOLE_SCREEN_BUFFER_INFO BiosSavedBufferInfo; -static VIDEO_MODE VideoModes[] = -{ - /* Width | Height | Text | Bpp | Gray | Pages | Segment */ - { 40, 25, TRUE, 16, TRUE, 8, 0xB800}, /* Mode 00h */ - { 40, 25, TRUE, 16, FALSE, 8, 0xB800}, /* Mode 01h */ - { 80, 25, TRUE, 16, TRUE, 8, 0xB800}, /* Mode 02h */ - { 80, 25, TRUE, 16, FALSE, 8, 0xB800}, /* Mode 03h */ - { 320, 200, FALSE, 2, FALSE, 1, 0xB800}, /* Mode 04h */ - { 320, 200, FALSE, 2, TRUE, 1, 0xB800}, /* Mode 05h */ - { 640, 200, FALSE, 1, FALSE, 1, 0xB800}, /* Mode 06h */ - { 80, 25, TRUE, 8, FALSE, 1, 0xB000}, /* Mode 07h */ - { 0, 0, FALSE, 0, FALSE, 0, 0x0000}, /* Mode 08h - not used */ - { 0, 0, FALSE, 0, FALSE, 0, 0x0000}, /* Mode 09h - not used */ - { 0, 0, FALSE, 0, FALSE, 0, 0x0000}, /* Mode 0Ah - not used */ - { 0, 0, FALSE, 0, FALSE, 0, 0x0000}, /* Mode 0Bh - not used */ - { 0, 0, FALSE, 0, FALSE, 0, 0x0000}, /* Mode 0Ch - not used */ - { 320, 200, FALSE, 4, FALSE, 1, 0xA000}, /* Mode 0Dh */ - { 640, 200, FALSE, 4, FALSE, 1, 0xA000}, /* Mode 0Eh */ - { 640, 350, FALSE, 1, FALSE, 1, 0xA000}, /* Mode 0Fh */ - { 640, 350, FALSE, 4, FALSE, 1, 0xA000}, /* Mode 10h */ - { 640, 480, FALSE, 1, FALSE, 1, 0xA000}, /* Mode 11h */ - { 640, 480, FALSE, 4, FALSE, 1, 0xA000}, /* Mode 12h */ - { 320, 200, FALSE, 8, FALSE, 1, 0xA000} /* Mode 13h */ +static BYTE VideoMode_40x25_text[] = +{ + /* Miscellaneous Register */ + 0x67, + + /* Sequencer Registers */ + 0x03, 0x08, 0x03, 0x00, 0x02, + + /* GC Registers */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x0E, 0x0F, 0xFF, + + /* CRTC Registers */ + 0x2D, 0x27, 0x28, 0x90, 0x2B, 0xA0, 0xBF, 0x1F, 0x00, 0x4F, 0x0E, 0x0F, + 0x00, 0x00, 0x00, 0x00, 0x9C, 0x8E, 0x8F, 0x14, 0x1F, 0x96, 0xB9, 0xA3, + 0xFF, + + /* AC Registers */ + 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x14, 0x07, 0x38, 0x39, 0x3A, 0x3B, + 0x3C, 0x3D, 0x3E, 0x3F, 0x0C, 0x01, 0x0F, 0x13, 0x00 }; +static BYTE VideoMode_80x25_text[] = +{ + /* Miscellaneous Register */ + 0x67, + + /* Sequencer Registers */ + 0x03, 0x00, 0x03, 0x00, 0x02, + + /* GC Registers */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x0E, 0x0F, 0xFF, + + /* CRTC Registers */ + 0x5F, 0x4F, 0x50, 0x82, 0x55, 0x81, 0xBF, 0x1F, 0x00, 0x4F, 0x0E, 0x0F, + 0x00, 0x00, 0x00, 0x00, 0x9C, 0x8E, 0x8F, 0x28, 0x1F, 0x96, 0xB9, 0xA3, + 0xFF, + + /* AC Registers */ + 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x14, 0x07, 0x38, 0x39, 0x3A, 0x3B, + 0x3C, 0x3D, 0x3E, 0x3F, 0x0C, 0x01, 0x0F, 0x13, 0x00 +}; + +static BYTE VideoMode_320x200_4color[] = +{ + /* Miscellaneous Register */ + 0x63, + + /* Sequencer Registers */ + 0x03, 0x09, 0x03, 0x00, 0x02, + + /* GC Registers */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x0F, 0x0F, 0xFF, + + /* CRTC Registers */ + 0x2D, 0x27, 0x28, 0x90, 0x2B, 0x80, 0xBF, 0x1F, 0x00, 0xC1, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x9C, 0x8E, 0x8F, 0x14, 0x00, 0x96, 0xB9, 0xA2, + 0xFF, + + /* AC Registers */ + 0x00, 0x13, 0x15, 0x17, 0x02, 0x04, 0x06, 0x07, 0x10, 0x11, 0x12, 0x13, + 0x14, 0x15, 0x16, 0x17, 0x01, 0x00, 0x03, 0x00, 0x00 +}; + +static BYTE VideoMode_640x480_16color[] = +{ + /* Miscellaneous Register */ + 0xE3, + + /* Sequencer Registers */ + 0x03, 0x01, 0x08, 0x00, 0x06, + + /* GC Registers */ + 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x05, 0x0F, 0xFF, + + /* CRTC Registers */ + 0x5F, 0x4F, 0x50, 0x82, 0x54, 0x80, 0x0B, 0x3E, 0x00, 0x40, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xEA, 0x0C, 0xDF, 0x28, 0x00, 0xE7, 0x04, 0xE3, + 0xFF, + + /* AC Registers */ + 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x14, 0x07, 0x38, 0x39, 0x3A, 0x3B, + 0x3C, 0x3D, 0x3E, 0x3F, 0x01, 0x00, 0x0F, 0x00, 0x00 +}; + +static BYTE VideoMode_320x200_256color[] = +{ + /* Miscellaneous Register */ + 0x63, + + /* Sequencer Registers */ + 0x03, 0x01, 0x0F, 0x00, 0x0E, + + /* GC Registers */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x05, 0x0F, 0xFF, + + /* CRTC Registers */ + 0x5F, 0x4F, 0x50, 0x82, 0x54, 0x80, 0xBF, 0x1F, 0x00, 0x41, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x9C, 0x0E, 0x8F, 0x28, 0x40, 0x96, 0xB9, 0xA3, + 0xFF, + + /* AC Registers */ + 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, + 0x0C, 0x0D, 0x0E, 0x0F, 0x41, 0x00, 0x0F, 0x00, 0x00 +}; + +static LPBYTE VideoModes[] = +{ + VideoMode_40x25_text, /* Mode 00h */ + VideoMode_40x25_text, /* Mode 01h */ + VideoMode_80x25_text, /* Mode 02h */ + VideoMode_80x25_text, /* Mode 03h */ + VideoMode_320x200_4color, /* Mode 04h */ + VideoMode_320x200_4color, /* Mode 05h */ + NULL, /* Mode 06h */ + NULL, /* Mode 07h */ + NULL, /* Mode 08h */ + NULL, /* Mode 09h */ + NULL, /* Mode 0Ah */ + NULL, /* Mode 0Bh */ + NULL, /* Mode 0Ch */ + NULL, /* Mode 0Dh */ + NULL, /* Mode 0Eh */ + NULL, /* Mode 0Fh */ + NULL, /* Mode 10h */ + NULL, /* Mode 11h */ + VideoMode_640x480_16color, /* Mode 12h */ + VideoMode_320x200_256color, /* Mode 13h */ +}; + /* PRIVATE FUNCTIONS **********************************************************/ - -static DWORD BiosGetVideoPageSize(VOID) -{ - INT i; - DWORD BufferSize = VideoModes[CurrentVideoMode].Width - * VideoModes[CurrentVideoMode].Height - * VideoModes[CurrentVideoMode].Bpp - / 8; - - for (i = 0; i < 32; i++) if ((1 << i) >= BufferSize) break; - - return 1 << i; -} - -static BYTE BiosVideoAddressToPage(ULONG Address) -{ - return (Address - BiosGetVideoMemoryStart()) - / BiosGetVideoPageSize(); -} - -static COORD BiosVideoAddressToCoord(ULONG Address) -{ - COORD Result = {0, 0}; - DWORD PageStart = BiosVideoAddressToPage(Address) * BiosGetVideoPageSize(); - DWORD Offset = Address - BiosGetVideoMemoryStart() - PageStart; - - if (VideoModes[CurrentVideoMode].Text) - { - Result.X = (Offset / sizeof(WORD)) % VideoModes[CurrentVideoMode].Width; - Result.Y = (Offset / sizeof(WORD)) / VideoModes[CurrentVideoMode].Width; - } - else - { - Result.X = ((Offset * 8) / VideoModes[CurrentVideoMode].Bpp) - % VideoModes[CurrentVideoMode].Width; - Result.Y = ((Offset * 8) / VideoModes[CurrentVideoMode].Bpp) - / VideoModes[CurrentVideoMode].Width; - } - - return Result; -} static BOOLEAN BiosKbdBufferPush(WORD Data) { @@ -154,205 +212,125 @@ return TRUE; } -static BOOLEAN BiosCreateGraphicsBuffer(BYTE ModeNumber) +static VOID BiosReadWindow(LPWORD Buffer, SMALL_RECT Rectangle, BYTE Page) +{ + INT i, j; + INT Counter = 0; + DWORD VideoAddress = TO_LINEAR(TEXT_VIDEO_SEG, Page * Bda->VideoPageSize); + + for (i = Rectangle.Top; i <= Rectangle.Bottom; i++) + { + for (j = Rectangle.Left; j <= Rectangle.Right; j++) + { + WORD Character; + + /* Read from video memory */ + VgaReadMemory(VideoAddress + (i * Bda->ScreenColumns + j) * sizeof(WORD), + (LPVOID)&Character, + sizeof(WORD)); + + /* Write the data to the buffer in row order */ + Buffer[Counter++] = Character; + } + } +} + +static VOID BiosWriteWindow(LPWORD Buffer, SMALL_RECT Rectangle, BYTE Page) +{ + INT i, j; + INT Counter = 0; + DWORD VideoAddress = TO_LINEAR(TEXT_VIDEO_SEG, Page * Bda->VideoPageSize); + + for (i = Rectangle.Top; i <= Rectangle.Bottom; i++) + { + for (j = Rectangle.Left; j <= Rectangle.Right; j++) + { + WORD Character = Buffer[Counter++]; + + /* Read from video memory */ + VgaWriteMemory(VideoAddress + (i * Bda->ScreenColumns + j) * sizeof(WORD), + (LPVOID)&Character, + sizeof(WORD)); + } + } +} + +/* PUBLIC FUNCTIONS ***********************************************************/ + +BYTE BiosGetVideoMode(VOID) +{ + return Bda->VideoMode; +} + +BOOLEAN BiosSetVideoMode(BYTE ModeNumber) { INT i; - CONSOLE_GRAPHICS_BUFFER_INFO GraphicsBufferInfo; - LPBITMAPINFO BitmapInfo; - LPWORD PaletteIndex; - - /* Allocate a bitmap info structure */ - BitmapInfo = (LPBITMAPINFO)HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - sizeof(BITMAPINFOHEADER) - + (1 << VideoModes[ModeNumber].Bpp) - * sizeof(WORD)); - if (BitmapInfo == NULL) return FALSE; - - /* Fill the bitmap info header */ - ZeroMemory(&BitmapInfo->bmiHeader, sizeof(BITMAPINFOHEADER)); - BitmapInfo->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - BitmapInfo->bmiHeader.biWidth = VideoModes[ModeNumber].Width; - BitmapInfo->bmiHeader.biHeight = VideoModes[ModeNumber].Height; - BitmapInfo->bmiHeader.biPlanes = 1; - BitmapInfo->bmiHeader.biCompression = BI_RGB; - BitmapInfo->bmiHeader.biBitCount = VideoModes[ModeNumber].Bpp; - - /* Calculate the image size */ - BitmapInfo->bmiHeader.biSizeImage = BitmapInfo->bmiHeader.biWidth - * BitmapInfo->bmiHeader.biHeight - * (BitmapInfo->bmiHeader.biBitCount >> 3); - - /* Fill the palette data */ - PaletteIndex = (LPWORD)((ULONG_PTR)BitmapInfo + sizeof(BITMAPINFOHEADER)); - for (i = 0; i < (1 << VideoModes[ModeNumber].Bpp); i++) - { - PaletteIndex[i] = i; - } - - /* Fill the console graphics buffer info */ - GraphicsBufferInfo.dwBitMapInfoLength = sizeof(BITMAPINFOHEADER) - + (1 << VideoModes[ModeNumber].Bpp) - * sizeof(WORD); - GraphicsBufferInfo.lpBitMapInfo = BitmapInfo; - GraphicsBufferInfo.dwUsage = DIB_PAL_COLORS; - - /* Create the buffer */ - BiosGraphicsOutput = CreateConsoleScreenBuffer(GENERIC_READ | GENERIC_WRITE, - FILE_SHARE_READ | FILE_SHARE_WRITE, - NULL, - CONSOLE_GRAPHICS_BUFFER, - &GraphicsBufferInfo); - - /* Save the framebuffer address and mutex */ - ConsoleFramebuffer = GraphicsBufferInfo.lpBitMap; - ConsoleMutex = GraphicsBufferInfo.hMutex; - - /* Free the bitmap information */ - HeapFree(GetProcessHeap(), 0, BitmapInfo); + COORD Resolution; + LPBYTE Values = VideoModes[ModeNumber]; + + if (Values == NULL) return FALSE; + + /* Write the misc register */ + VgaWritePort(VGA_MISC_WRITE, *(Values++)); + + /* Write the sequencer registers */ + for (i = 0; i < VGA_SEQ_MAX_REG; i++) + { + VgaWritePort(VGA_SEQ_INDEX, i); + VgaWritePort(VGA_SEQ_DATA, *(Values++)); + } + + /* Write the GC registers */ + for (i = 0; i < VGA_GC_MAX_REG; i++) + { + VgaWritePort(VGA_GC_INDEX, i); + VgaWritePort(VGA_GC_DATA, *(Values++)); + } + + /* Write the CRTC registers */ + for (i = 0; i < VGA_CRTC_MAX_REG; i++) + { + VgaWritePort(VGA_CRTC_INDEX, i); + VgaWritePort(VGA_CRTC_DATA, *(Values++)); + } + + /* Write the AC registers */ + for (i = 0; i < VGA_AC_MAX_REG; i++) + { + VgaWritePort(VGA_AC_INDEX, i); + VgaWritePort(VGA_AC_WRITE, *(Values++)); + } + + /* Update the values in the BDA */ + Bda->VideoMode = ModeNumber; + Bda->VideoPage = 0; + Bda->VideoPageSize = BIOS_PAGE_SIZE; + Bda->VideoPageOffset = 0; + Bda->CharacterHeight = 16; + + Resolution = VgaGetDisplayResolution(); + Bda->ScreenColumns = Resolution.X; + Bda->ScreenRows = Resolution.Y - 1; return TRUE; } -static VOID BiosDestroyGraphicsBuffer(VOID) -{ - CloseHandle(ConsoleMutex); - CloseHandle(BiosGraphicsOutput); -} - -/* PUBLIC FUNCTIONS ***********************************************************/ - -BYTE BiosGetVideoMode(VOID) -{ - return CurrentVideoMode; -} - -BOOLEAN BiosSetVideoMode(BYTE ModeNumber) -{ - COORD Coord; - - /* Make sure this is a valid video mode */ - if (ModeNumber > BIOS_MAX_VIDEO_MODE) return FALSE; - if (VideoModes[ModeNumber].Pages == 0) return FALSE; - - /* Set the new video mode size */ - Coord.X = VideoModes[ModeNumber].Width; - Coord.Y = VideoModes[ModeNumber].Height; - - if (VideoModes[ModeNumber].Text && VideoModes[CurrentVideoMode].Text) - { - /* Switching from text mode to another text mode */ - - /* Resize the text buffer */ - SetConsoleScreenBufferSize(BiosConsoleOutput, Coord); - } - else if (VideoModes[ModeNumber].Text && !VideoModes[CurrentVideoMode].Text) - { - /* Switching from graphics mode to text mode */ - - /* Resize the text buffer */ - SetConsoleScreenBufferSize(BiosConsoleOutput, Coord); - - /* Change the active screen buffer to the text buffer */ - SetConsoleActiveScreenBuffer(BiosConsoleOutput); - - /* Cleanup the graphics buffer */ - BiosDestroyGraphicsBuffer(); - } - else if (!VideoModes[ModeNumber].Text && VideoModes[CurrentVideoMode].Text) - { - /* Switching from text mode to graphics mode */ - if (!BiosCreateGraphicsBuffer(ModeNumber)) return FALSE; - - SetConsoleActiveScreenBuffer(BiosGraphicsOutput); - } - else if (!VideoModes[ModeNumber].Text && !VideoModes[CurrentVideoMode].Text) - { - /* Switching from graphics mode to another graphics mode */ - - /* Temporarily switch to the text mode buffer */ - SetConsoleActiveScreenBuffer(BiosConsoleOutput); - - /* Cleanup the current graphics mode buffer */ - BiosDestroyGraphicsBuffer(); - - /* Create a new graphics mode buffer */ - if (!BiosCreateGraphicsBuffer(ModeNumber)) return FALSE; - - /* Switch to it */ - SetConsoleActiveScreenBuffer(BiosGraphicsOutput); - } - - /* Change the mode number */ - CurrentVideoMode = ModeNumber; - CurrentVideoPage = 0; - - /* Update the BDA */ - Bda->VideoMode = CurrentVideoMode; - Bda->VideoPage = CurrentVideoPage; - Bda->VideoPageSize = BiosGetVideoPageSize(); - Bda->VideoPageOffset = 0; - Bda->ScreenColumns = VideoModes[ModeNumber].Width; +BOOLEAN BiosSetVideoPage(BYTE PageNumber) +{ + if (PageNumber >= BIOS_MAX_PAGES) return FALSE; + + /* Set the values in the BDA */ + Bda->VideoPage = PageNumber; + Bda->VideoPageSize = BIOS_PAGE_SIZE; + Bda->VideoPageOffset = PageNumber * BIOS_PAGE_SIZE; + + /* Set the start address in the CRTC */ + VgaWritePort(VGA_CRTC_INDEX, VGA_CRTC_CURSOR_LOC_LOW_REG); + VgaWritePort(VGA_CRTC_DATA, LOBYTE(Bda->VideoPageOffset)); + VgaWritePort(VGA_CRTC_INDEX, VGA_CRTC_CURSOR_LOC_HIGH_REG); + VgaWritePort(VGA_CRTC_DATA, HIBYTE(Bda->VideoPageOffset)); return TRUE; -} - -BOOLEAN BiosSetVideoPage(BYTE PageNumber) -{ - ULONG PageStart; - COORD Coordinates; - CONSOLE_SCREEN_BUFFER_INFO BufferInfo; - - /* Make sure this is a valid page number */ - if (PageNumber >= VideoModes[CurrentVideoMode].Pages) return FALSE; - - /* Save the current console buffer in the video memory */ - PageStart = BiosGetVideoMemoryStart() + CurrentVideoPage * BiosGetVideoPageSize(); - BiosUpdateVideoMemory(PageStart, PageStart + BiosGetVideoPageSize()); - - /* Save the cursor */ - if (!GetConsoleScreenBufferInfo(BiosConsoleOutput, &BufferInfo)) return FALSE; - Bda->CursorPosition[CurrentVideoPage] = MAKEWORD(BufferInfo.dwCursorPosition.X, - BufferInfo.dwCursorPosition.Y); - - /* Set the page */ - CurrentVideoPage = PageNumber; - - /* Update the BDA */ - Bda->VideoPage = CurrentVideoPage; - Bda->VideoPageSize = BiosGetVideoPageSize(); - Bda->VideoPageOffset = CurrentVideoPage * Bda->VideoPageSize; - - /* Update the console */ - PageStart = BiosGetVideoMemoryStart() + Bda->VideoPage * BiosGetVideoPageSize(); - BiosUpdateConsole(PageStart, PageStart + BiosGetVideoPageSize()); - - /* Set the cursor */ - Coordinates.X = LOBYTE(Bda->CursorPosition[Bda->VideoPage]); - Coordinates.Y = HIBYTE(Bda->CursorPosition[Bda->VideoPage]); - SetConsoleCursorPosition(BiosConsoleOutput, Coordinates); - - return TRUE; -} - -inline DWORD BiosGetVideoMemoryStart(VOID) -{ - return (VideoModes[CurrentVideoMode].Segment << 4); -} - -inline VOID BiosVerticalRefresh(VOID) -{ - /* Ignore if we're in text mode */ - if (VideoModes[CurrentVideoMode].Text) return; - - /* Ignore if there's nothing to update */ - if (!VideoNeedsUpdate) return; - - /* Redraw the screen */ - InvalidateConsoleDIBits(BiosGraphicsOutput, &UpdateRectangle); - - /* Clear the update flag */ - VideoNeedsUpdate = FALSE; } BOOLEAN BiosInitialize(VOID) @@ -425,8 +403,7 @@ Bda->CursorPosition[0] = MAKEWORD(BiosSavedBufferInfo.dwCursorPosition.X, BiosSavedBufferInfo.dwCursorPosition.Y); - /* Set the default video mode */ - BiosSetVideoMode(BIOS_DEFAULT_VIDEO_MODE); + VgaInitialize(BiosConsoleOutput); /* Set the console input mode */ SetConsoleMode(BiosConsoleInput, ENABLE_MOUSE_INPUT | ENABLE_PROCESSED_INPUT); @@ -466,149 +443,9 @@ /* Restore the screen buffer size */ SetConsoleScreenBufferSize(BiosConsoleOutput, BiosSavedBufferInfo.dwSize); - /* Free the graphics buffer */ - if (!VideoModes[CurrentVideoMode].Text) BiosDestroyGraphicsBuffer(); - /* Close the console handles */ if (BiosConsoleInput != INVALID_HANDLE_VALUE) CloseHandle(BiosConsoleInput); if (BiosConsoleOutput != INVALID_HANDLE_VALUE) CloseHandle(BiosConsoleOutput); -} - -VOID BiosUpdateConsole(ULONG StartAddress, ULONG EndAddress) -{ - ULONG i; - COORD Coordinates; - COORD Origin = { 0, 0 }; - COORD UnitSize = { 1, 1 }; - CHAR_INFO Character; - SMALL_RECT Rect; - - /* Start from the character address */ - StartAddress &= ~1; - - if (VideoModes[CurrentVideoMode].Text) - { - /* Loop through all the addresses */ - for (i = StartAddress; i < EndAddress; i += 2) - { - /* Get the coordinates */ - Coordinates = BiosVideoAddressToCoord(i); - - /* Make sure this is the current page */ - if (BiosVideoAddressToPage(i) != CurrentVideoPage) continue; - - /* Fill the rectangle structure */ - Rect.Left = Coordinates.X; - Rect.Top = Coordinates.Y; - Rect.Right = Rect.Left; - Rect.Bottom = Rect.Top; - - /* Fill the character data */ - Character.Char.AsciiChar = *((PCHAR)((ULONG_PTR)BaseAddress + i)); - Character.Attributes = *((PBYTE)((ULONG_PTR)BaseAddress + i + 1)); - - /* Write the character */ - WriteConsoleOutputA(BiosConsoleOutput, - &Character, - UnitSize, - Origin, - &Rect); - } - } - else - { - /* Wait for the mutex object */ - WaitForSingleObject(ConsoleMutex, INFINITE); - - /* Copy the data to the framebuffer */ - RtlCopyMemory((LPVOID)((ULONG_PTR)ConsoleFramebuffer - + StartAddress - BiosGetVideoMemoryStart()), - (LPVOID)((ULONG_PTR)BaseAddress + StartAddress), - EndAddress - StartAddress); - - /* Release the mutex */ - ReleaseMutex(ConsoleMutex); - - /* Check if this is the first time the rectangle is updated */ - if (!VideoNeedsUpdate) - { - UpdateRectangle.Left = UpdateRectangle.Top = (SHORT)0x7FFF; - UpdateRectangle.Right = UpdateRectangle.Bottom = (SHORT)0x8000; - } - - /* Expand the update rectangle */ - for (i = StartAddress; i < EndAddress; i++) - { - /* Get the coordinates */ - Coordinates = BiosVideoAddressToCoord(i); - - /* Expand the rectangle to include the point */ - UpdateRectangle.Left = min(UpdateRectangle.Left, Coordinates.X); - UpdateRectangle.Right = max(UpdateRectangle.Right, Coordinates.X); - UpdateRectangle.Top = min(UpdateRectangle.Top, Coordinates.Y); - UpdateRectangle.Bottom = max(UpdateRectangle.Bottom, Coordinates.Y); - } - - /* Set the update flag */ - VideoNeedsUpdate = TRUE; - } -} - -VOID BiosUpdateVideoMemory(ULONG StartAddress, ULONG EndAddress) -{ - ULONG i; - COORD Coordinates; - WORD Attribute; - DWORD CharsWritten; - - if (VideoModes[CurrentVideoMode].Text) - { - /* Loop through all the addresses */ - for (i = StartAddress; i < EndAddress; i++) - { - /* Get the coordinates */ - Coordinates = BiosVideoAddressToCoord(i); - - /* Make sure this is the current page */ - if (BiosVideoAddressToPage(i) != CurrentVideoPage) continue; - - /* Check if this is a character byte or an attribute byte */ - if ((i - BiosGetVideoMemoryStart()) % 2 == 0) - { - /* This is a regular character */ - ReadConsoleOutputCharacterA(BiosConsoleOutput, - (LPSTR)((ULONG_PTR)BaseAddress + i), - sizeof(CHAR), - Coordinates, - &CharsWritten); - } - else - { - /* This is an attribute */ - ReadConsoleOutputAttribute(BiosConsoleOutput, - &Attribute, - sizeof(CHAR), - Coordinates, - &CharsWritten); - - *(PCHAR)((ULONG_PTR)BaseAddress + i) = LOBYTE(Attribute); - } - } - } - else - { - /* Wait for the mutex object */ - WaitForSingleObject(ConsoleMutex, INFINITE); - - /* Copy the data to the emulator memory */ - RtlCopyMemory((LPVOID)((ULONG_PTR)BaseAddress + StartAddress), - (LPVOID)((ULONG_PTR)ConsoleFramebuffer - + StartAddress - BiosGetVideoMemoryStart()), - EndAddress - StartAddress); - - /* Release the mutex */ - ReleaseMutex(ConsoleMutex); - } } WORD BiosPeekCharacter(VOID) @@ -660,19 +497,124 @@ return CharacterData; } +VOID BiosSetCursorPosition(BYTE Row, BYTE Column, BYTE Page) +{ + /* Make sure the selected video page is valid */ + if (Page >= BIOS_MAX_PAGES) return; + + /* Update the position in the BDA */ + Bda->CursorPosition[Page] = (Row << 8) | Column; + + /* Check if this is the current video page */ + if (Page == Bda->VideoPage) + { + WORD Offset = Row * Bda->ScreenColumns + Column; + + /* Modify the CRTC registers */ + VgaWritePort(VGA_CRTC_INDEX, VGA_CRTC_CURSOR_LOC_LOW_REG); + VgaWritePort(VGA_CRTC_DATA, LOBYTE(Offset)); + VgaWritePort(VGA_CRTC_INDEX, VGA_CRTC_CURSOR_LOC_HIGH_REG); + VgaWritePort(VGA_CRTC_DATA, HIBYTE(Offset)); + } +} + +BOOLEAN BiosScrollWindow(INT Direction, + DWORD Amount, + SMALL_RECT Rectangle, + BYTE Page, + BYTE FillAttribute) +{ + INT i; + LPWORD WindowData; + DWORD WindowSize = (Rectangle.Bottom - Rectangle.Top + 1) + * (Rectangle.Right - Rectangle.Left + 1); + + /* Allocate a buffer for the window */ + WindowData = (LPWORD)HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + WindowSize * sizeof(WORD)); + if (WindowData == NULL) return FALSE; + + /* Read the window data */ + BiosReadWindow(WindowData, Rectangle, Page); + + if (Amount == 0) + { + /* Fill the window */ + for (i = 0; i < WindowSize; i++) + { + WindowData[i] = ' ' | (FillAttribute << 8); + } + + goto Done; + } + + // TODO: Scroll the window! + +Done: + /* Write back the window data */ + BiosWriteWindow(WindowData, Rectangle, Page); + + /* Free the window buffer */ + HeapFree(GetProcessHeap(), 0, WindowData); + + return TRUE; +} + +VOID BiosPrintCharacter(CHAR Character, BYTE Attribute, BYTE Page) +{ + WORD CharData = (Attribute << 8) | Character; + BYTE Row, Column; + + /* Make sure the page exists */ + if (Page >= BIOS_MAX_PAGES) return; + + /* Get the cursor location */ + Row = HIBYTE(Bda->CursorPosition[Page]); + Column = LOBYTE(Bda->CursorPosition[Page]); + + /* Write the character */ + VgaWriteMemory(TO_LINEAR(TEXT_VIDEO_SEG, + (Row * Bda->ScreenColumns + Column) * sizeof(WORD)), + (LPVOID)&CharData, + sizeof(WORD)); + + /* Advance the cursor */ + Column++; + + /* Check if it passed the end of the row */ + if (Column == Bda->ScreenColumns) + { + /* Return to the first column */ + Column = 0; + + if (Row == Bda->ScreenRows) + { + /* The screen must be scrolled */ + SMALL_RECT Rectangle = { 0, 0, Bda->ScreenColumns - 1, Bda->ScreenRows }; + + BiosScrollWindow(SCROLL_DIRECTION_UP, + 1, + Rectangle, + Page, + DEFAULT_ATTRIBUTE); + } + else Row++; + } + + /* Set the cursor position */ + BiosSetCursorPosition(Row, Column, Page); +} + VOID BiosVideoService(LPWORD Stack) { - INT i, CursorHeight; - BOOLEAN Invisible = FALSE; - COORD Position; - CONSOLE_CURSOR_INFO CursorInfo; - CHAR_INFO Character; - SMALL_RECT Rect; DWORD Eax = EmulatorGetRegister(EMULATOR_REG_AX); DWORD Ecx = EmulatorGetRegister(EMULATOR_REG_CX); DWORD Edx = EmulatorGetRegister(EMULATOR_REG_DX); DWORD Ebx = EmulatorGetRegister(EMULATOR_REG_BX); + UNREFERENCED_PARAMETER(Ecx); + switch (HIBYTE(Eax)) { /* Set Video Mode */ @@ -685,20 +627,15 @@ /* Set Text-Mode Cursor Shape */ case 0x01: { - /* Retrieve and validate the input */ - Invisible = ((HIBYTE(Ecx) >> 5) & 0x03) ? TRUE : FALSE; - CursorHeight = (HIBYTE(Ecx) & 0x1F) - (LOBYTE(Ecx) & 0x1F); - if (CursorHeight < 1) CursorHeight = 1; - if (CursorHeight > 100) CursorHeight = 100; - /* Update the BDA */ Bda->CursorStartLine = HIBYTE(Ecx); - Bda->CursorEndLine = LOBYTE(Ecx) & 0x1F; - - /* Set the cursor */ - CursorInfo.dwSize = (CursorHeight * 100) / CONSOLE_FONT_HEIGHT; - CursorInfo.bVisible = !Invisible; - SetConsoleCursorInfo(BiosConsoleOutput, &CursorInfo); + Bda->CursorEndLine = LOBYTE(Ecx); + + /* Modify the CRTC registers */ + VgaWritePort(VGA_CRTC_INDEX, VGA_CRTC_CURSOR_START_REG); + VgaWritePort(VGA_CRTC_DATA, Bda->CursorStartLine); + VgaWritePort(VGA_CRTC_INDEX, VGA_CRTC_CURSOR_END_REG); + VgaWritePort(VGA_CRTC_DATA, Bda->CursorEndLine); break; } @@ -706,20 +643,7 @@ /* Set Cursor Position */ case 0x02: { - /* Make sure the selected video page exists */ - if (HIBYTE(Ebx) >= VideoModes[CurrentVideoMode].Pages) break; - - Bda->CursorPosition[HIBYTE(Ebx)] = LOWORD(Edx); - - /* Check if this is the current video page */ - if (HIBYTE(Ebx) == CurrentVideoPage) - { - /* Yes, change the actual cursor */ - Position.X = LOBYTE(Edx); - Position.Y = HIBYTE(Edx); - SetConsoleCursorPosition(BiosConsoleOutput, Position); - } - + BiosSetCursorPosition(HIBYTE(Edx), LOBYTE(Edx), HIBYTE(Ebx)); break; } @@ -727,7 +651,7 @@ case 0x03: { /* Make sure the selected video page exists */ - if (HIBYTE(Ebx) >= VideoModes[CurrentVideoMode].Pages) break; + if (HIBYTE(Ebx) >= BIOS_MAX_PAGES) break; /* Return the result */ EmulatorSetRegister(EMULATOR_REG_AX, 0); @@ -742,10 +666,10 @@ case 0x05: { /* Check if the page exists */ - if (LOBYTE(Eax) >= VideoModes[CurrentVideoMode].Pages) break; + if (LOBYTE(Eax) >= BIOS_MAX_PAGES) break; /* Check if this is the same page */ - if (LOBYTE(Eax) == CurrentVideoPage) break; + if (LOBYTE(Eax) == Bda->VideoPage) break; /* Change the video page */ BiosSetVideoPage(LOBYTE(Eax)); @@ -753,110 +677,63 @@ break; } - /* Scroll Up/Down Window */ - // TODO: Implement for different pages + /* Scroll Window Up/Down */ case 0x06: case 0x07: { - BYTE Lines = LOBYTE(Eax); - - Rect.Top = HIBYTE(Ecx); - Rect.Left = LOBYTE(Ecx); - Rect.Bottom = HIBYTE(Edx); - Rect.Right = LOBYTE(Edx); - Character.Char.UnicodeChar = L' '; - Character.Attributes = HIBYTE(Ebx); - Position.X = Rect.Left; - - /* 0 means clear entire window */ - if (Lines == 0) Lines = Rect.Bottom - Rect.Top; - - if (HIBYTE(Eax) == 0x06) Position.Y = Rect.Top - Lines; - else Position.Y = Rect.Top + Lines; - - ScrollConsoleScreenBuffer(BiosConsoleOutput, - &Rect, - &Rect, - Position, - &Character); - - break; - } - - /* Read Character And Attribute At Cursor Position */ + SMALL_RECT Rectangle = + { + LOBYTE(Ecx), + HIBYTE(Ecx), + LOBYTE(Edx), + HIBYTE(Edx) + }; + + /* Call the internal function */ + BiosScrollWindow((HIBYTE(Eax)== 0x06) + ? SCROLL_DIRECTION_UP : SCROLL_DIRECTION_DOWN, + LOBYTE(Eax), + Rectangle, + Bda->VideoPage, + HIBYTE(Ebx)); + + break; + } + + /* Read/Write Character From Cursor Position */ case 0x08: - { - DWORD Address; - - /* Make sure this is text mode */ - if (!VideoModes[CurrentVideoMode].Text) break; - - /* Make sure the selected video page exists */ - if (HIBYTE(Ebx) >= VideoModes[CurrentVideoMode].Pages) break; - - /* Find the address */ - Address = BiosGetVideoMemoryStart() - + HIBYTE(Ebx) * BiosGetVideoPageSize() - + (HIBYTE(Bda->CursorPosition[HIBYTE(Ebx)]) - * VideoModes[CurrentVideoMode].Height - + LOBYTE(Bda->CursorPosition[HIBYTE(Ebx)])) - * VideoModes[CurrentVideoMode].Bpp / 8; - - /* Update the video memory at that address */ - BiosUpdateVideoMemory(Address, - Address + VideoModes[CurrentVideoMode].Bpp / 8); - - /* Return the result in AX */ - EmulatorSetRegister(EMULATOR_REG_AX, - *((LPWORD)((ULONG_PTR)BaseAddress + Address))); - - break; - } EmulatorSetFlag(EMULATOR_FLAG_ZF); - - - /* Write Character And Attribute At Cursor Position */ case 0x09: case 0x0A: { - BYTE PixelSize = VideoModes[CurrentVideoMode].Bpp / 8; - WORD Data = (LOBYTE(Ebx) << 8) | LOBYTE(Eax); - WORD Repeat = LOWORD(Ecx); - DWORD Address = BiosGetVideoMemoryStart() - + CurrentVideoPage * BiosGetVideoPageSize() - + (HIBYTE(Bda->CursorPosition[CurrentVideoPage]) - * VideoModes[CurrentVideoMode].Height - + LOBYTE(Bda->CursorPosition[CurrentVideoPage])) - * PixelSize; - - /* Make sure this is text mode */ - if (!VideoModes[CurrentVideoMode].Text) break; - - /* Make sure the selected video page exists */ - if (HIBYTE(Ebx) >= VideoModes[CurrentVideoMode].Pages) break; - - /* Make sure we don't write over the end of video memory */ - Repeat = min(Repeat, - (CONSOLE_VIDEO_MEM_END - Address) - / PixelSize); - - /* Copy the values to the memory */ - for (i = 0; i < Repeat; i++) + WORD CharacterData = MAKEWORD(LOBYTE(Eax), LOBYTE(Ebx)); + BYTE Page = HIBYTE(Ebx); + DWORD Offset; + + /* Check if the page exists */ + if (Page >= BIOS_MAX_PAGES) break; + + /* Find the offset of the character */ + Offset = Page * Bda->VideoPageSize + + (HIBYTE(Bda->CursorPosition[Page]) * Bda->ScreenColumns + + LOBYTE(Bda->CursorPosition[Page])) * 2; + + if (HIBYTE(Eax) == 0x08) { - if (PixelSize == sizeof(BYTE) || HIBYTE(Eax) == 0x0A) - { - /* Just characters, no attributes */ - *((LPBYTE)((ULONG_PTR)BaseAddress + Address) + i * PixelSize) = LOBYTE(Data); - } - else if (PixelSize == sizeof(WORD)) - { - /* First byte for characters, second for attributes */ - *((LPWORD)((ULONG_PTR)BaseAddress + Address) + i) = Data; - } + /* Read from the video memory */ + VgaReadMemory(TO_LINEAR(TEXT_VIDEO_SEG, Offset), + (LPVOID)&CharacterData, + sizeof(WORD)); + + /* Return the character in AX */ + EmulatorSetRegister(EMULATOR_REG_AX, CharacterData); } - - /* Update the range */ - BiosUpdateConsole(Address, - Address + Repeat * (VideoModes[CurrentVideoMode].Bpp / 8)); + else + { + /* Write to video memory */ + VgaWriteMemory(TO_LINEAR(TEXT_VIDEO_SEG, Offset), + (LPVOID)&CharacterData, + (HIBYTE(Ebx) == 0x09) ? sizeof(WORD) : sizeof(BYTE)); + } break; } @@ -864,22 +741,7 @@ /* Teletype Output */ case 0x0E: { - CHAR Character = LOBYTE(Eax); - DWORD NumWritten; - - /* Make sure the page exists */ - if (HIBYTE(Ebx) >= VideoModes[CurrentVideoMode].Pages) break; - - /* Set the attribute */ - SetConsoleTextAttribute(BiosConsoleOutput, LOBYTE(Ebx)); - - /* Write the character */ - WriteConsoleA(BiosConsoleOutput, - &Character, - sizeof(CHAR), - &NumWritten, - NULL); - + BiosPrintCharacter(LOBYTE(Eax), LOBYTE(Ebx), HIBYTE(Ebx)); break; } @@ -897,25 +759,20 @@ /* Scroll Window */ case 0x12: { - Rect.Top = HIBYTE(Ecx); - Rect.Left = LOBYTE(Ecx); - Rect.Bottom = HIBYTE(Edx); - Rect.Right = LOBYTE(Edx); - Character.Char.UnicodeChar = L' '; - Character.Attributes = 0x07; - Position.X = Rect.Left; - Position.Y = Rect.Top; - - if (LOBYTE(Ebx) == 0) Position.Y -= LOBYTE(Eax); - else if (LOBYTE(Ebx) == 1) Position.Y += LOBYTE(Eax); - else if (LOBYTE(Ebx) == 2) Position.X -= LOBYTE(Eax); - else if (LOBYTE(Ebx) == 3) Position.X += LOBYTE(Eax); - - ScrollConsoleScreenBuffer(BiosConsoleOutput, - &Rect, - &Rect, - Position, - &Character); + SMALL_RECT Rectangle = + { + LOBYTE(Ecx), + HIBYTE(Ecx), + LOBYTE(Edx), + HIBYTE(Edx) + }; + + /* Call the internal function */ + BiosScrollWindow(LOBYTE(Ebx), + LOBYTE(Eax), + Rectangle, + Bda->VideoPage, + DEFAULT_ATTRIBUTE); break; } Modified: branches/ntvdm/subsystems/ntvdm/bios.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.h?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.h [iso-8859-1] Mon Aug 5 23:20:25 2013 @@ -15,7 +15,6 @@ /* DEFINES ********************************************************************/ -#define CONSOLE_VIDEO_MEM_END 0xBFFFF #define ROM_AREA_START 0xE0000 #define ROM_AREA_END 0xFFFFF #define BDA_SEGMENT 0x40 @@ -32,18 +31,19 @@ #define BIOS_EQUIPMENT_LIST 0x2C // HACK: Disable FPU for now #define BIOS_DEFAULT_VIDEO_MODE 0x03 #define BIOS_MAX_PAGES 8 +#define BIOS_PAGE_SIZE 0x1000 #define BIOS_MAX_VIDEO_MODE 0x13 +#define DEFAULT_ATTRIBUTE 0x07 +#define GRAPHICS_VIDEO_SEG 0xA000 +#define TEXT_VIDEO_SEG 0xB800 -typedef struct +enum { - DWORD Width; - DWORD Height; - BOOLEAN Text; - BYTE Bpp; - BOOLEAN Gray; - BYTE Pages; - WORD Segment; -} VIDEO_MODE; + SCROLL_DIRECTION_UP, + SCROLL_DIRECTION_DOWN, + SCROLL_DIRECTION_LEFT, + SCROLL_DIRECTION_RIGHT +}; #pragma pack(push, 1) @@ -91,6 +91,8 @@ BYTE ComTimeOut[4]; WORD KeybdBufferStart; WORD KeybdBufferEnd; + BYTE ScreenRows; + WORD CharacterHeight; } BIOS_DATA_AREA, *PBIOS_DATA_AREA; #pragma pack(pop) @@ -99,10 +101,8 @@ BOOLEAN BiosInitialize(VOID); VOID BiosCleanup(VOID); -VOID BiosUpdateConsole(ULONG StartAddress, ULONG EndAddress); -VOID BiosUpdateVideoMemory(ULONG StartAddress, ULONG EndAddress); -inline DWORD BiosGetVideoMemoryStart(VOID); -inline VOID BiosVerticalRefresh(VOID); +BYTE BiosGetVideoMode(VOID); +BOOLEAN BiosSetVideoMode(BYTE ModeNumber); WORD BiosPeekCharacter(VOID); WORD BiosGetCharacter(VOID); VOID BiosVideoService(LPWORD Stack); @@ -111,5 +111,12 @@ VOID BiosTimeService(LPWORD Stack); VOID BiosHandleIrq(BYTE IrqNumber, LPWORD Stack); VOID BiosSystemTimerInterrupt(LPWORD Stack); +BOOLEAN BiosScrollWindow( + INT Direction, + DWORD Amount, + SMALL_RECT Rectangle, + BYTE Page, + BYTE FillAttribute +); #endif Modified: branches/ntvdm/subsystems/ntvdm/dos.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.h?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos.h [iso-8859-1] Mon Aug 5 23:20:25 2013 @@ -98,6 +98,15 @@ CHAR Buffer[ANYSIZE_ARRAY]; } DOS_INPUT_BUFFER, *PDOS_INPUT_BUFFER; +typedef struct _DOS_DRIVER_HEADER +{ + DWORD NextDriver; + WORD Attributes; + WORD StrategyEntry; + WORD InterruptEntry; + CHAR DeviceName[8]; +} DOS_DRIVER_HEADER, *PDOS_DRIVER_HEADER; + #pragma pack(pop) /* FUNCTIONS ******************************************************************/ 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] Mon Aug 5 23:20:25 2013 @@ -13,6 +13,7 @@ #include "emulator.h" #include "bios.h" #include "dos.h" +#include "vga.h" #include "pic.h" #include "ps2.h" #include "timer.h" @@ -40,17 +41,19 @@ /* Make sure the requested address is valid */ if ((Address + Size) >= MAX_ADDRESS) return; - /* Are we reading some of the console video memory? */ - if (((Address + Size) >= BiosGetVideoMemoryStart()) - && (Address < CONSOLE_VIDEO_MEM_END)) - { - /* Call the VDM BIOS to update the video memory */ - BiosUpdateVideoMemory(max(Address, BiosGetVideoMemoryStart()), - min(Address + Size, CONSOLE_VIDEO_MEM_END)); - } - /* Read the data from the virtual address space and store it in the buffer */ RtlCopyMemory(Buffer, (LPVOID)((ULONG_PTR)BaseAddress + Address), Size); + + /* Check if we modified the console video memory */ + if (((Address + Size) >= VgaGetVideoBaseAddress()) + && (Address < VgaGetVideoLimitAddress())) + { + DWORD VgaAddress = max(Address, VgaGetVideoBaseAddress()); + LPBYTE VgaBuffer = &Buffer[VgaAddress - Address]; + + /* Read from the VGA memory */ + VgaReadMemory(VgaAddress, VgaBuffer, Size); + } } static VOID EmulatorWriteMemory(PVOID Context, UINT Address, LPBYTE Buffer, INT Size) @@ -68,12 +71,14 @@ RtlCopyMemory((LPVOID)((ULONG_PTR)BaseAddress + Address), Buffer, Size); /* Check if we modified the console video memory */ - if (((Address + Size) >= BiosGetVideoMemoryStart()) - && (Address < CONSOLE_VIDEO_MEM_END)) - { - /* Call the VDM BIOS to update the screen */ - BiosUpdateConsole(max(Address, BiosGetVideoMemoryStart()), - min(Address + Size, CONSOLE_VIDEO_MEM_END)); + if (((Address + Size) >= VgaGetVideoBaseAddress()) + && (Address < VgaGetVideoLimitAddress())) + { + DWORD VgaAddress = max(Address, VgaGetVideoBaseAddress()); + LPBYTE VgaBuffer = &Buffer[VgaAddress - Address]; + + /* Write to the VGA memory */ + VgaWriteMemory(VgaAddress, VgaBuffer, Size); } } @@ -115,6 +120,26 @@ break; } + case VGA_AC_WRITE: + case VGA_AC_READ: + case VGA_SEQ_INDEX: + case VGA_SEQ_DATA: + case VGA_DAC_READ_INDEX: + case VGA_DAC_WRITE_INDEX: + case VGA_DAC_DATA: + case VGA_MISC_READ: + case VGA_MISC_WRITE: + case VGA_CRTC_INDEX: + case VGA_CRTC_DATA: + case VGA_GC_INDEX: + case VGA_GC_DATA: + case VGA_STAT_MONO: + case VGA_STAT_COLOR: + { + *Buffer = VgaReadPort(Address); + break; + } + default: { DPRINT1("Read from unknown port: 0x%X\n", Address); @@ -165,6 +190,26 @@ case PS2_DATA_PORT: { KeyboardWriteData(Byte); + break; + } + + case VGA_AC_WRITE: + case VGA_AC_READ: + case VGA_SEQ_INDEX: + case VGA_SEQ_DATA: + case VGA_DAC_READ_INDEX: + case VGA_DAC_WRITE_INDEX: + case VGA_DAC_DATA: + case VGA_MISC_READ: + case VGA_MISC_WRITE: + case VGA_CRTC_INDEX: + case VGA_CRTC_DATA: + case VGA_GC_INDEX: + case VGA_GC_DATA: + case VGA_STAT_MONO: + case VGA_STAT_COLOR: + { + VgaWritePort(Address, Byte); break; } @@ -478,6 +523,9 @@ /* Skip the opcodes */ EmulatorContext.state->reg_ip += 4; + // HACK: Refresh the display because the called function may wait. + VgaRefreshDisplay(); + /* Call the BOP handler */ EmulatorBop(Instruction[1]); } 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] Mon Aug 5 23:20:25 2013 @@ -13,6 +13,7 @@ #include "ntvdm.h" #include "emulator.h" #include "bios.h" +#include "vga.h" #include "dos.h" #include "timer.h" #include "pic.h" @@ -137,7 +138,7 @@ DisplayMessage(L"Could not start program: %S", CommandLine); return -1; } - + /* Set the last timer tick to the current time */ QueryPerformanceCounter(&LastTimerTick); @@ -146,18 +147,18 @@ { /* Get the current number of ticks */ CurrentTickCount = GetTickCount(); - + /* Get the current performance counter value */ QueryPerformanceCounter(&Counter); - + /* Get the number of PIT ticks that have passed */ TimerTicks = ((Counter.QuadPart - LastTimerTick.QuadPart) * PIT_BASE_FREQUENCY) / Frequency.QuadPart; - + /* Update the PIT */ for (i = 0; i < TimerTicks; i++) PitDecrementCount(); LastTimerTick = Counter; - + /* Check for console input events every millisecond */ if (CurrentTickCount != LastTickCount) { @@ -165,20 +166,23 @@ LastTickCount = CurrentTickCount; } - /* Check for vertical refresh */ + /* Check for vertical retrace */ if ((CurrentTickCount - LastVerticalRefresh) >= 16) { - BiosVerticalRefresh(); + VgaRefreshDisplay(); LastVerticalRefresh = CurrentTickCount; } - + + /* Horizontal retrace occurs as fast as possible */ + VgaHorizontalRetrace(); + /* Continue CPU emulation */ for (i = 0; (i < STEPS_PER_CYCLE) && VdmRunning; i++) { EmulatorStep(); Cycles++; } - + if ((CurrentTickCount - LastCyclePrintout) >= 1000) { DPRINT1("NTVDM: %d Instructions Per Second\n", Cycles); @@ -187,6 +191,9 @@ } } + /* Perform another screen refresh */ + VgaRefreshDisplay(); + Cleanup: BiosCleanup(); EmulatorCleanup(); Added: branches/ntvdm/subsystems/ntvdm/vga.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/vga.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/vga.c (added) +++ branches/ntvdm/subsystems/ntvdm/vga.c [iso-8859-1] Mon Aug 5 23:20:25 2013 @@ -0,0 +1,974 @@ +/* + * COPYRIGHT: GPL - See COPYING in the top level directory + * PROJECT: ReactOS Virtual DOS Machine + * FILE: vga.c + * PURPOSE: VGA hardware emulation + * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + */ + +/* INCLUDES *******************************************************************/ + +#define NDEBUG + +#include "vga.h" +#include "bios.h" + +/* PRIVATE VARIABLES **********************************************************/ + +static BYTE VgaMemory[VGA_NUM_BANKS * VGA_BANK_SIZE]; +static BYTE VgaMiscRegister; +static BYTE VgaSeqIndex = VGA_SEQ_RESET_REG; +static BYTE VgaSeqRegisters[VGA_SEQ_MAX_REG]; +static BYTE VgaGcIndex = VGA_GC_RESET_REG; +static BYTE VgaGcRegisters[VGA_GC_MAX_REG]; +static BYTE VgaCrtcIndex = VGA_CRTC_HORZ_TOTAL_REG; +static BYTE VgaCrtcRegisters[VGA_CRTC_MAX_REG]; +static BYTE VgaAcIndex = VGA_AC_PAL_0_REG; +static BOOLEAN VgaAcLatch = FALSE; +static BYTE VgaAcRegisters[VGA_AC_MAX_REG]; +static BYTE VgaDacIndex = 0; +static BOOLEAN VgaDacReadWrite = FALSE; +static BYTE VgaDacRegisters[VGA_PALETTE_SIZE]; +static BOOLEAN InVerticalRetrace = FALSE; +static BOOLEAN InHorizontalRetrace = FALSE; +static HANDLE TextConsoleBuffer = NULL; +static HANDLE GraphicsConsoleBuffer = NULL; +static LPVOID ConsoleFramebuffer = NULL; +static HANDLE ConsoleMutex = NULL; +static BOOLEAN NeedsUpdate = FALSE; +static BOOLEAN ModeChanged = TRUE; +static BOOLEAN CursorMoved = FALSE; +static BOOLEAN TextMode = TRUE; +static SMALL_RECT UpdateRectangle = { 0, 0, 0, 0 }; + +/* PRIVATE FUNCTIONS **********************************************************/ + +static inline INT VgaGetAddressSize(VOID) +{ + if (VgaCrtcRegisters[VGA_CRTC_UNDERLINE_REG] & VGA_CRTC_UNDERLINE_DWORD) + { + /* Double-word addressing */ + return 4; + } + + if (VgaCrtcRegisters[VGA_CRTC_MODE_CONTROL_REG] & VGA_CRTC_MODE_CONTROL_BYTE) + { + /* Byte addressing */ + return 1; + } + + /* Word addressing */ + return 2; +} + +static inline DWORD VgaTranslateReadAddress(DWORD Address) +{ + CONST DWORD MemoryBase[] = { 0xA0000, 0xA0000, 0xB0000, 0xB8000 }; + DWORD Offset = Address - MemoryBase[(VgaGcRegisters[VGA_GC_MISC_REG] >> 2) & 0x03]; + 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) +{ + CONST DWORD MemoryBase[] = { 0xA0000, 0xA0000, 0xB0000, 0xB8000 }; + DWORD Offset = Address - MemoryBase[(VgaGcRegisters[VGA_GC_MISC_REG] >> 2) & 0x03]; + + /* 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 VOID VgaMarkForUpdate(SHORT Row, SHORT Column) +{ + DPRINT("VgaMarkForUpdate: Row %d, Column %d\n", Row, Column); + + /* Check if this is the first time the rectangle is updated */ + if (!NeedsUpdate) + { + UpdateRectangle.Left = UpdateRectangle.Top = (SHORT)0x7FFF; + UpdateRectangle.Right = UpdateRectangle.Bottom = (SHORT)0x8000; + } + + /* 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) +{ + /* Set the value */ + VgaDacRegisters[VgaDacIndex++] = Data; + VgaDacIndex %= VGA_PALETTE_SIZE; + + // TODO: Change the palette! +} + +static VOID VgaWriteAc(BYTE Data) +{ + ASSERT(VgaAcIndex < VGA_AC_MAX_REG); + + /* Save the value */ + VgaAcRegisters[VgaAcIndex] = Data; +} + +static VOID VgaEnterGraphicsMode(UINT Width, UINT Height, UINT BitDepth) +{ + INT i; + CONSOLE_GRAPHICS_BUFFER_INFO GraphicsBufferInfo; + BYTE BitmapInfoBuffer[VGA_BITMAP_INFO_SIZE]; + LPBITMAPINFO BitmapInfo = (LPBITMAPINFO)BitmapInfoBuffer; + LPWORD PaletteIndex = (LPWORD)(BitmapInfoBuffer + sizeof(BITMAPINFOHEADER)); + + /* 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 * (BitDepth / 8); + + /* Fill the palette data */ + for (i = 0; i < BitDepth; i++) PaletteIndex[i] = 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); + + /* Save the framebuffer address and mutex */ + ConsoleFramebuffer = GraphicsBufferInfo.lpBitMap; + ConsoleMutex = GraphicsBufferInfo.hMutex; + + /* Set the active buffer */ + SetConsoleActiveScreenBuffer(GraphicsConsoleBuffer); +} + +static VOID VgaLeaveGraphicsMode() +{ + /* Switch back to the text buffer */ + SetConsoleActiveScreenBuffer(TextConsoleBuffer); + + /* Cleanup the video data */ + CloseHandle(ConsoleMutex); + CloseHandle(GraphicsConsoleBuffer); + GraphicsConsoleBuffer = NULL; +} + +static VOID VgaUpdateMode(VOID) +{ + COORD Resolution = VgaGetDisplayResolution(); + + if (!TextMode) + { + /* Switching from graphics mode to text mode */ + VgaLeaveGraphicsMode(); + } + else + { + /* Free the old framebuffer */ + HeapFree(GetProcessHeap(), 0, ConsoleFramebuffer); + ConsoleFramebuffer = NULL; + } + + /* Check if the new mode is alphanumeric */ + if (!(VgaGcRegisters[VGA_GC_MISC_REG] & VGA_GC_MISC_NOALPHA)) + { + /* Resize the console */ + SetConsoleScreenBufferSize(TextConsoleBuffer, Resolution); + + /* Allocate a framebuffer */ + ConsoleFramebuffer = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(CHAR_INFO) + * Resolution.X + * Resolution.Y); + if (ConsoleFramebuffer == NULL) + { + DisplayMessage(L"An unexpected error occurred!\n"); + VdmRunning = FALSE; + return; + } + + /* Set the text mode flag */ + TextMode = TRUE; + } + else + { + /* Enter 8-bit graphics mode */ + VgaEnterGraphicsMode(Resolution.X, Resolution.Y, 8); + + /* Clear the text mode flag */ + TextMode = FALSE; + } + + /* Perform a full update */ + NeedsUpdate = TRUE; + UpdateRectangle.Left = 0; + UpdateRectangle.Top = 0; + UpdateRectangle.Right = Resolution.X; + UpdateRectangle.Bottom = Resolution.Y; +} + +static VOID VgaUpdateFramebuffer(VOID) +{ + INT i, j, k; + COORD Resolution = VgaGetDisplayResolution(); + INT AddressSize = VgaGetAddressSize(); + DWORD Address = (VgaCrtcRegisters[VGA_CRTC_START_ADDR_HIGH_REG] << 8) + + VgaCrtcRegisters[VGA_CRTC_START_ADDR_LOW_REG]; + DWORD ScanlineSize = (DWORD)VgaCrtcRegisters[VGA_CRTC_OFFSET_REG] * 2; + PCHAR_INFO CharBuffer = (PCHAR_INFO)ConsoleFramebuffer; + PBYTE GraphicsBuffer = (PBYTE)ConsoleFramebuffer; + + /* Loop through the scanlines */ + for (i = 0; i < Resolution.Y; i++) + { + /* Check if this is text mode or graphics mode */ + if (VgaGcRegisters[VGA_GC_MISC_REG] & VGA_GC_MISC_NOALPHA) + { + /* Graphics mode */ + + /* Loop through the pixels */ + for (j = 0; j < Resolution.X; j++) + { + BYTE PixelData = 0; + + /* Check the shifting mode */ + if (VgaGcRegisters[VGA_GC_MODE_REG] & VGA_GC_MODE_SHIFT256) + { + /* 4 bits shifted from each plane */ + + /* Check if this is 16 or 256 color mode */ + if (VgaAcRegisters[VGA_AC_CONTROL_REG] & VGA_AC_CONTROL_8BIT) + { + /* One byte per pixel */ + PixelData = VgaMemory[(j % VGA_NUM_BANKS) * VGA_BANK_SIZE + + (Address + (j / VGA_NUM_BANKS)) + * AddressSize]; + } + else + { + /* 4-bits per pixel */ + + PixelData = VgaMemory[(j % VGA_NUM_BANKS) * VGA_BANK_SIZE + + (Address + (j / (VGA_NUM_BANKS * 2))) + * AddressSize]; + + /* Check if we should use the highest 4 bits or lowest 4 */ + if (((j / VGA_NUM_BANKS) % 2) == 0) + { + /* Highest 4 */ + PixelData >>= 4; + } + else + { + /* Lowest 4 */ + PixelData &= 0x0F; + } + } + } + else if (VgaGcRegisters[VGA_GC_MODE_REG] & VGA_GC_MODE_SHIFTREG) + { + /* + * 2 bits shifted from plane 0 and 2 for the first 4 pixels, + * then 2 bits shifted from plane 1 and 3 for the next 4 + */ + + // TODO: NOT IMPLEMENTED! + DPRINT1("Interleaved shift mode is not implemented!\n"); + } + else + { + /* 1 bit shifted from each plane */ + + /* Check if this is 16 or 256 color mode */ + if (VgaAcRegisters[VGA_AC_CONTROL_REG] & VGA_AC_CONTROL_8BIT) + { + /* 8 bits per pixel, 2 on each plane */ + + for (k = 0; k < VGA_NUM_BANKS; k++) + { + /* The data is on plane k, 4 pixels per byte */ + BYTE PlaneData = VgaMemory[k * VGA_BANK_SIZE + + (Address + (j / 4)) * AddressSize]; + + /* The mask of the first bit in the pair */ + BYTE BitMask = 1 << (((3 - (j % 4)) * 2) + 1); + + /* Bits 0, 1, 2 and 3 come from the first bit of the pair */ + if (PlaneData & BitMask) PixelData |= 1 << k; + + /* Bits 4, 5, 6 and 7 come from the second bit of the pair */ + if (PlaneData & (BitMask >> 1)) PixelData |= 1 << (k + 4); + } + } + else + { + /* 4 bits per pixel, 1 on each plane */ + + for (k = 0; k < VGA_NUM_BANKS; k++) + { + BYTE PlaneData = VgaMemory[k * VGA_BANK_SIZE + + (Address + (j / 8)) * AddressSize]; + + /* If the bit on that plane is set, set it */ + if (PlaneData & (1 << (7 - (j % 8)))) PixelData |= 1 << k; + } + } + } + + /* Now check if the resulting pixel data has changed */ + if (GraphicsBuffer[i * Resolution.X + j] != PixelData) + { + /* Yes, write the new value */ + GraphicsBuffer[i * Resolution.X + j] = PixelData; + + /* Mark the specified pixel as changed */ + VgaMarkForUpdate(i, j); + } + } + } + else + { + /* Text mode */ + + /* Loop through the characters */ + for (j = 0; j < Resolution.X; j++) + { + DWORD CurrentAddr = LOWORD((Address + j) * AddressSize); + CHAR_INFO CharInfo; + + /* Plane 0 holds the character itself */ + CharInfo.Char.AsciiChar = 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) + || (CharBuffer[i * Resolution.X + j].Attributes != CharInfo.Attributes)) + { + /* Yes, write the new value */ + CharBuffer[i * Resolution.X + j] = CharInfo; + + /* Mark the specified pixel as changed */ + VgaMarkForUpdate(i, j); + } + } + } + + /* Move to the next scanline */ + Address += ScanlineSize; + } +} + +static VOID VgaUpdateTextCursor(VOID) +{ + COORD Position; + CONSOLE_CURSOR_INFO CursorInfo; + BYTE CursorStart = VgaCrtcRegisters[VGA_CRTC_CURSOR_START_REG] & 0x3F; + BYTE CursorEnd = VgaCrtcRegisters[VGA_CRTC_CURSOR_END_REG] & 0x1F; + DWORD ScanlineSize = (DWORD)VgaCrtcRegisters[VGA_CRTC_OFFSET_REG] * 2; + WORD Location = MAKEWORD(VgaCrtcRegisters[VGA_CRTC_CURSOR_LOC_LOW_REG], + VgaCrtcRegisters[VGA_CRTC_CURSOR_LOC_HIGH_REG]); + + if (CursorStart < CursorEnd) + { + /* Visible cursor */ + CursorInfo.bVisible = TRUE; + CursorInfo.dwSize = (100 * (CursorEnd - CursorStart)) >> 5; + } + else + { + /* No cursor */ + CursorInfo.bVisible = FALSE; + CursorInfo.dwSize = 0; + } + + /* Add the cursor skew to the location */ + Location += (VgaCrtcRegisters[VGA_CRTC_CURSOR_END_REG] >> 5) & 3; + + /* Find the coordinates of the new position */ + Position.X = Location % ScanlineSize; + Position.Y = Location / ScanlineSize; + + /* Update the physical cursor */ + SetConsoleCursorInfo(TextConsoleBuffer, &CursorInfo); + SetConsoleCursorPosition(TextConsoleBuffer, Position); +} + +/* PUBLIC FUNCTIONS ***********************************************************/ + +DWORD VgaGetVideoBaseAddress(VOID) +{ + CONST DWORD MemoryBase[] = { 0xA0000, 0xA0000, 0xB0000, 0xB8000 }; + return MemoryBase[(VgaGcRegisters[VGA_GC_MISC_REG] >> 2) & 0x03]; +} + +DWORD VgaGetVideoLimitAddress(VOID) +{ + CONST DWORD MemoryLimit[] = { 0xA7FFF, 0xA7FFF, 0xB7FFF, 0xBFFFF }; + return MemoryLimit[(VgaGcRegisters[VGA_GC_MISC_REG] >> 2) & 0x03]; +} + +COORD VgaGetDisplayResolution(VOID) +{ + COORD Resolution; + + /* The low 8 bits are in the display registers */ + Resolution.X = VgaCrtcRegisters[VGA_CRTC_END_HORZ_DISP_REG]; + Resolution.Y = VgaCrtcRegisters[VGA_CRTC_VERT_DISP_END_REG]; + + /* Set the top bits from the overflow register */ + if (VgaCrtcRegisters[VGA_CRTC_OVERFLOW_REG] & VGA_CRTC_OVERFLOW_VDE8) + { + Resolution.Y |= 1 << 8; + } + if (VgaCrtcRegisters[VGA_CRTC_OVERFLOW_REG] & VGA_CRTC_OVERFLOW_VDE9) + { + Resolution.Y |= 1 << 9; + } + + /* Increase the values by 1 */ + Resolution.X++; + Resolution.Y++; + + if (VgaGcRegisters[VGA_GC_MISC_REG] & VGA_GC_MISC_NOALPHA) + { + /* Multiply the horizontal resolution by the 9/8 dot mode */ + Resolution.X *= (VgaSeqRegisters[VGA_SEQ_CLOCK_REG] & VGA_SEQ_CLOCK_98DM) + ? 8 : 9; + + /* The horizontal resolution is halved in 8-bit mode */ + if (VgaAcRegisters[VGA_AC_CONTROL_REG] & VGA_AC_CONTROL_8BIT) Resolution.X /= 2; + + /* Divide the vertical resolution by the maximum scan line */ + Resolution.Y /= ((DWORD)VgaCrtcRegisters[VGA_CRTC_MAX_SCAN_LINE_REG] & 0x1F) + 1; + } + else + { + /* Divide the number of scanlines by the font size */ + Resolution.Y /= 16; + } + + /* Return the resolution */ + return Resolution; +} + +VOID VgaRefreshDisplay(VOID) +{ + COORD Resolution = VgaGetDisplayResolution(); + + DPRINT("VgaRefreshDisplay\n"); + + if (ModeChanged) + { + /* Change the display mode */ + VgaUpdateMode(); + + /* Reset the mode change flag */ + ModeChanged = FALSE; + } + + if (CursorMoved) + { + /* Change the text cursor location */ + VgaUpdateTextCursor(); + + /* Reset the cursor move flag */ + CursorMoved = FALSE; + } + + /* Update the contents of the framebuffer */ + VgaUpdateFramebuffer(); + + /* Set the vertical retrace flag */ + InVerticalRetrace = TRUE; + + /* Ignore if there's nothing to update */ + if (!NeedsUpdate) return; + + DPRINT("Updating screen rectangle (%d, %d, %d, %d)\n", + UpdateRectangle.Left, + UpdateRectangle.Top, + UpdateRectangle.Right, + UpdateRectangle.Bottom); + + /* Check if this is text mode or graphics mode */ + if (VgaGcRegisters[VGA_GC_MISC_REG] & VGA_GC_MISC_NOALPHA) + { + /* Graphics mode */ + + /* Redraw the screen */ + InvalidateConsoleDIBits(GraphicsConsoleBuffer, &UpdateRectangle); + } + else + { + /* Text mode */ + COORD Origin = { UpdateRectangle.Left, UpdateRectangle.Top }; + + /* Write the data to the console */ + WriteConsoleOutputA(TextConsoleBuffer, + (PCHAR_INFO)ConsoleFramebuffer, + Resolution, + Origin, + &UpdateRectangle); + + } + + /* Clear the update flag */ + NeedsUpdate = FALSE; +} + +VOID VgaHorizontalRetrace(VOID) +{ + /* Set the flag */ + InHorizontalRetrace = TRUE; +} + +VOID VgaReadMemory(DWORD Address, LPBYTE Buffer, DWORD Size) +{ + INT i; + + DPRINT("VgaReadMemory: Address 0x%08X, Size %lu\n", + Address, + Size); + + /* Ignore if video RAM access is disabled */ + if (!(VgaMiscRegister & VGA_MISC_RAM_ENABLED)) return; + + /* Loop through each byte */ + for (i = 0; i < Size; i++) + { + DWORD VideoAddress = VgaTranslateReadAddress(Address + i); + + /* Copy the value to the buffer */ + Buffer[i] = VgaMemory[VideoAddress]; + } +} + +VOID VgaWriteMemory(DWORD Address, LPBYTE Buffer, DWORD Size) +{ + INT i, j; + + DPRINT("VgaWriteMemory: Address 0x%08X, Size %lu\n", + Address, + Size); + + /* Ignore if video RAM access is disabled */ + if (!(VgaMiscRegister & VGA_MISC_RAM_ENABLED)) return; + + /* Also ignore if write access to all planes is disabled */ + if ((VgaSeqRegisters[VGA_SEQ_MASK_REG] & 0x0F) == 0x00) return; + + /* Loop through each byte */ + for (i = 0; i < Size; i++) + { + DWORD VideoAddress = VgaTranslateWriteAddress(Address + i); + + for (j = 0; j < VGA_NUM_BANKS; j++) + { + /* Make sure the page is writeable */ + if (!(VgaSeqRegisters[VGA_SEQ_MASK_REG] & (1 << j))) continue; + + /* Check if this is chain-4 mode */ + if (VgaSeqRegisters[VGA_SEQ_MEM_REG] & VGA_SEQ_MEM_C4) + { + if (((Address + i) & 3) != j) + { + /* This plane will not be accessed */ + continue; + } + } + + /* Check if this is odd-even mode */ + if (VgaGcRegisters[VGA_GC_MODE_REG] & VGA_GC_MODE_OE) + { + if (((Address + i) & 1) != (j & 1)) + { + /* This plane will not be accessed */ + continue; + } + } + + /* Copy the value to the VGA memory */ + VgaMemory[VideoAddress + j * VGA_BANK_SIZE] = Buffer[i]; + } + } +} + +BYTE VgaReadPort(WORD Port) +{ + DPRINT("VgaReadPort: Port 0x%04X\n", Port); + + switch (Port) + { + case VGA_AC_INDEX: + { + return VgaAcIndex; + } + + case VGA_AC_READ: + { + return VgaAcRegisters[VgaAcIndex]; + } + + case VGA_SEQ_INDEX: + { + return VgaSeqIndex; + } + + case VGA_SEQ_DATA: + { + return VgaSeqRegisters[VgaSeqIndex]; + } + + case VGA_DAC_READ_INDEX: + { + /* This returns the read/write state */ + return VgaDacReadWrite ? 0 : 3; + } + + case VGA_DAC_WRITE_INDEX: + { + return VgaDacIndex; + } + + case VGA_DAC_DATA: + { + /* Ignore reads in write mode */ + if (!VgaDacReadWrite) + { + BYTE Data = VgaDacRegisters[VgaDacIndex++]; + VgaDacIndex %= VGA_PALETTE_SIZE; + return Data; + } + + break; + } + + case VGA_MISC_READ: + { + return VgaMiscRegister; + } + + case VGA_CRTC_INDEX: + { + return VgaCrtcIndex; + } + + case VGA_CRTC_DATA: + { + return VgaCrtcRegisters[VgaCrtcIndex]; + } + + case VGA_GC_INDEX: + { + return VgaGcIndex; + } + + case VGA_GC_DATA: + { + return VgaGcRegisters[VgaGcIndex]; + } + + case VGA_STAT_MONO: + case VGA_STAT_COLOR: + { + BYTE Result = 0; + + /* Reset the AC latch */ + VgaAcLatch = FALSE; + + /* Set a flag if there is a vertical or horizontal retrace */ + if (InVerticalRetrace || InHorizontalRetrace) Result |= VGA_STAT_DD; + + /* Set an additional flag if there was a vertical retrace */ + if (InVerticalRetrace) Result |= VGA_STAT_VRETRACE; + + /* Clear the flags */ + InHorizontalRetrace = InVerticalRetrace = FALSE; + + return Result; + } + } + + return 0; +} + +VOID VgaWritePort(WORD Port, BYTE Data) +{ + DPRINT("VgaWritePort: Port 0x%04X, Data 0x%02X\n", Port, Data); + + switch (Port) + { + case VGA_AC_INDEX: + { + if (!VgaAcLatch) + { + /* Change the index */ + if (Data < VGA_AC_MAX_REG) VgaAcIndex = Data; + } + else + { + /* Write the data */ + VgaWriteAc(Data); + } + + /* Toggle the latch */ + VgaAcLatch = !VgaAcLatch; + + break; + } + + case VGA_SEQ_INDEX: + { + /* Set the sequencer index register */ + if (Data < VGA_SEQ_MAX_REG) VgaSeqIndex = Data; + + break; + } + + case VGA_SEQ_DATA: + { + /* Call the sequencer function */ + VgaWriteSequencer(Data); + + break; + } + + case VGA_DAC_READ_INDEX: + { + VgaDacReadWrite = FALSE; + VgaDacIndex = Data % VGA_PALETTE_SIZE; + + break; + } + + case VGA_DAC_WRITE_INDEX: + { + VgaDacReadWrite = TRUE; + VgaDacIndex = Data % VGA_PALETTE_SIZE; + + break; + } + + case VGA_DAC_DATA: + { + /* Ignore writes in read mode */ + if (VgaDacReadWrite) VgaWriteDac(Data & 0x3F); + + break; + } + + case VGA_MISC_WRITE: + { + VgaMiscRegister = Data; + + break; + } + + case VGA_CRTC_INDEX: + { + /* Set the CRTC index register */ + if (Data < VGA_CRTC_MAX_REG) VgaCrtcIndex = Data; + + break; + } + + case VGA_CRTC_DATA: + { + /* Call the CRTC function */ + VgaWriteCrtc(Data); + + break; + } + + case VGA_GC_INDEX: + { + /* Set the GC index register */ + if (Data < VGA_GC_MAX_REG) VgaGcIndex = Data; + break; + } + + case VGA_GC_DATA: + { + /* Call the GC function */ + VgaWriteGc(Data); + + break; + } + } +} + +VOID VgaInitialize(HANDLE TextHandle) +{ + INT i, j; + COORD Resolution; + INT AddressSize; + DWORD ScanlineSize; + COORD Origin = { 0, 0 }; + SMALL_RECT ScreenRect; + PCHAR_INFO CharBuffer; + DWORD Address = 0; + + /* Set the global handle */ + TextConsoleBuffer = TextHandle; + + /* Set the default video mode */ + BiosSetVideoMode(BIOS_DEFAULT_VIDEO_MODE); + VgaUpdateMode(); + ModeChanged = FALSE; + + /* Get the data */ + Resolution = VgaGetDisplayResolution(); + CharBuffer = (PCHAR_INFO)ConsoleFramebuffer; + AddressSize = VgaGetAddressSize(); + ScreenRect.Left = ScreenRect.Top = 0; + ScreenRect.Right = Resolution.X; + ScreenRect.Bottom = Resolution.Y; + ScanlineSize = (DWORD)VgaCrtcRegisters[VGA_CRTC_OFFSET_REG] * 2; + + /* Read the data from the console into the framebuffer */ + ReadConsoleOutputA(TextConsoleBuffer, + ConsoleFramebuffer, + Resolution, + Origin, + &ScreenRect); + + + /* Loop through the scanlines */ + for (i = 0; i < Resolution.Y; i++) + { + /* Loop through the characters */ + for (j = 0; j < Resolution.X; j++) + { + DWORD CurrentAddr = LOWORD((Address + j) * AddressSize); + + /* Store the character in plane 0 */ + VgaMemory[CurrentAddr] = CharBuffer[i * Resolution.X + j].Char.AsciiChar; + + /* Store the attribute in plane 1 */ + VgaMemory[CurrentAddr + VGA_BANK_SIZE] = CharBuffer[i * Resolution.X + j].Attributes; + } + + /* Move to the next scanline */ + Address += ScanlineSize; + } +} + +/* EOF */ + Propchange: branches/ntvdm/subsystems/ntvdm/vga.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ntvdm/subsystems/ntvdm/vga.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/vga.h?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/vga.h (added) +++ branches/ntvdm/subsystems/ntvdm/vga.h [iso-8859-1] Mon Aug 5 23:20:25 2013 @@ -0,0 +1,200 @@ +/* + * COPYRIGHT: GPL - See COPYING in the top level directory + * PROJECT: ReactOS Virtual DOS Machine + * FILE: vga.h + * PURPOSE: VGA hardware emulation (header file) + * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + */ + +#ifndef _VGA_H_ +#define _VGA_H_ + +/* INCLUDES *******************************************************************/ + +#include "ntvdm.h" + +/* DEFINES ********************************************************************/ + +/* Register I/O ports */ +#define VGA_AC_INDEX 0x3C0 +#define VGA_AC_WRITE 0x3C0 +#define VGA_AC_READ 0x3C1 +#define VGA_SEQ_INDEX 0x3C4 +#define VGA_SEQ_DATA 0x3C5 +#define VGA_DAC_READ_INDEX 0x3C7 +#define VGA_DAC_WRITE_INDEX 0x3C8 +#define VGA_DAC_DATA 0x3C9 +#define VGA_MISC_READ 0x3CC +#define VGA_MISC_WRITE 0x3C2 +#define VGA_CRTC_INDEX 0x3D4 +#define VGA_CRTC_DATA 0x3D5 +#define VGA_GC_INDEX 0x3CE +#define VGA_GC_DATA 0x3CF +#define VGA_STAT_MONO 0x3BA +#define VGA_STAT_COLOR 0x3DA + +#define VGA_NUM_BANKS 4 +#define VGA_BANK_SIZE 0x10000 +#define VGA_PALETTE_SIZE 768 +#define VGA_BITMAP_INFO_SIZE (sizeof(BITMAPINFOHEADER) + 2 * (VGA_PALETTE_SIZE / 3)) + +/* Sequencer reset register bits */ +#define VGA_SEQ_RESET_AR (1 << 0) +#define VGA_SEQ_RESET_SR (1 << 1) + +/* Sequencer clock register bits */ +#define VGA_SEQ_CLOCK_98DM (1 << 0) +#define VGA_SEQ_CLOCK_SLR (1 << 2) +#define VGA_SEQ_CLOCK_DCR (1 << 3) +#define VGA_SEQ_CLOCK_S4 (1 << 4) +#define VGA_SEQ_CLOCK_SD (1 << 5) + +/* Sequencer memory register bits */ +#define VGA_SEQ_MEM_EXT (1 << 1) +#define VGA_SEQ_MEM_OE (1 << 2) +#define VGA_SEQ_MEM_C4 (1 << 3) + +/* Graphics controller mode register bits */ +#define VGA_GC_MODE_READ (1 << 3) +#define VGA_GC_MODE_OE (1 << 4) +#define VGA_GC_MODE_SHIFTREG (1 << 5) +#define VGA_GC_MODE_SHIFT256 (1 << 6) + +/* Graphics controller miscellaneous register bits */ +#define VGA_GC_MISC_NOALPHA (1 << 0) +#define VGA_GC_MISC_OE (1 << 1) + +/* CRTC overflow register bits */ +#define VGA_CRTC_OVERFLOW_VT8 (1 << 0) +#define VGA_CRTC_OVERFLOW_VDE8 (1 << 1) +#define VGA_CRTC_OVERFLOW_VRS8 (1 << 2) +#define VGA_CRTC_OVERFLOW_SVB8 (1 << 3) +#define VGA_CRTC_OVERFLOW_LC8 (1 << 4) +#define VGA_CRTC_OVERFLOW_VT9 (1 << 5) +#define VGA_CRTC_OVERFLOW_VDE9 (1 << 6) +#define VGA_CRTC_OVERFLOW_VRS9 (1 << 7) + +/* CRTC underline register bits */ +#define VGA_CRTC_UNDERLINE_DWORD (1 << 6) + +/* CRTC mode control register bits */ +#define VGA_CRTC_MODE_CONTROL_WRAP (1 << 5) +#define VGA_CRTC_MODE_CONTROL_BYTE (1 << 6) +#define VGA_CRTC_MODE_CONTROL_SYNC (1 << 7) + +/* AC control register bits */ +#define VGA_AC_CONTROL_ATGE (1 << 0) +#define VGA_AC_CONTROL_MONO (1 << 1) +#define VGA_AC_CONTROL_LGE (1 << 2) +#define VGA_AC_CONTROL_BLINK (1 << 3) +#define VGA_AC_CONTROL_PPM (1 << 5) +#define VGA_AC_CONTROL_8BIT (1 << 6) +#define VGA_AC_CONTROL_P54S (1 << 7) + +/* Miscellaneous register bits */ +#define VGA_MISC_COLOR (1 << 0) +#define VGA_MISC_RAM_ENABLED (1 << 1) +#define VGA_MISC_OE_INVERT (1 << 5) +#define VGA_MISC_HSYNCP (1 << 6) +#define VGA_MISC_VSYNCP (1 << 7) + +/* Status register flags */ +#define VGA_STAT_DD (1 << 0) +#define VGA_STAT_VRETRACE (1 << 3) + +enum +{ + VGA_SEQ_RESET_REG, + VGA_SEQ_CLOCK_REG, + VGA_SEQ_MASK_REG, + VGA_SEQ_CHAR_REG, + VGA_SEQ_MEM_REG, + VGA_SEQ_MAX_REG +}; + +enum +{ + VGA_GC_RESET_REG, + VGA_GC_ENABLE_RESET_REG, + VGA_GC_COLOR_COMPARE_REG, + VGA_GC_ROTATE_REG, + VGA_GC_READ_MAP_SEL_REG, + VGA_GC_MODE_REG, + VGA_GC_MISC_REG, + VGA_GC_COLOR_IGNORE_REG, + VGA_GC_BITMASK_REG, + VGA_GC_MAX_REG +}; + +enum +{ + VGA_CRTC_HORZ_TOTAL_REG, + VGA_CRTC_END_HORZ_DISP_REG, + VGA_CRTC_START_HORZ_BLANKING_REG, + VGA_CRTC_END_HORZ_BLANKING_REG, + VGA_CRTC_START_HORZ_RETRACE_REG, + VGA_CRTC_END_HORZ_RETRACE_REG, + VGA_CRTC_VERT_TOTAL_REG, + VGA_CRTC_OVERFLOW_REG, + VGA_CRTC_PRESET_ROW_SCAN_REG, + VGA_CRTC_MAX_SCAN_LINE_REG, + VGA_CRTC_CURSOR_START_REG, + VGA_CRTC_CURSOR_END_REG, + VGA_CRTC_START_ADDR_HIGH_REG, + VGA_CRTC_START_ADDR_LOW_REG, + VGA_CRTC_CURSOR_LOC_HIGH_REG, + VGA_CRTC_CURSOR_LOC_LOW_REG, + VGA_CRTC_VERT_RETRACE_START_REG, + VGA_CRTC_VERT_RETRACE_END_REG, + VGA_CRTC_VERT_DISP_END_REG, + VGA_CRTC_OFFSET_REG, + VGA_CRTC_UNDERLINE_REG, + VGA_CRTC_START_VERT_BLANKING_REG, + VGA_CRTC_END_VERT_BLANKING, + VGA_CRTC_MODE_CONTROL_REG, + VGA_CRTC_LINE_COMPARE_REG, + VGA_CRTC_MAX_REG +}; + +enum +{ + VGA_AC_PAL_0_REG, + VGA_AC_PAL_1_REG, + VGA_AC_PAL_2_REG, + VGA_AC_PAL_3_REG, + VGA_AC_PAL_4_REG, + VGA_AC_PAL_5_REG, + VGA_AC_PAL_6_REG, + VGA_AC_PAL_7_REG, + VGA_AC_PAL_8_REG, + VGA_AC_PAL_9_REG, + VGA_AC_PAL_A_REG, + VGA_AC_PAL_B_REG, + VGA_AC_PAL_C_REG, + VGA_AC_PAL_D_REG, + VGA_AC_PAL_E_REG, + VGA_AC_PAL_F_REG, + VGA_AC_CONTROL_REG, + VGA_AC_OVERSCAN_REG, + VGA_AC_COLOR_PLANE_REG, + VGA_AC_HORZ_PANNING_REG, + VGA_AC_COLOR_SEL_REG, + VGA_AC_MAX_REG +}; + +/* FUNCTIONS ******************************************************************/ + +DWORD VgaGetVideoBaseAddress(VOID); +DWORD VgaGetVideoLimitAddress(VOID); +COORD VgaGetDisplayResolution(VOID); +VOID VgaRefreshDisplay(VOID); +VOID VgaHorizontalRetrace(VOID); +VOID VgaReadMemory(DWORD Address, LPBYTE Buffer, DWORD Size); +VOID VgaWriteMemory(DWORD Address, LPBYTE Buffer, DWORD Size); +BYTE VgaReadPort(WORD Port); +VOID VgaWritePort(WORD Port, BYTE Data); +VOID VgaInitialize(HANDLE TextHandle); + +#endif + +/* EOF */ Propchange: branches/ntvdm/subsystems/ntvdm/vga.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[ion] 59647: [KERNEL32]: Parsing fixes
by ion＠svn.reactos.org 05 Aug '13

05 Aug '13

Author: ion Date: Mon Aug 5 18:33:52 2013 New Revision: 59647 URL: http://svn.reactos.org/svn/reactos?rev=59647&view=rev Log: [KERNEL32]: Parsing fixes Modified: trunk/reactos/dll/win32/kernel32/client/proc.c Modified: trunk/reactos/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] Mon Aug 5 18:33:52 2013 @@ -2291,7 +2291,7 @@ SECTION_IMAGE_INFORMATION ImageInformation; IO_STATUS_BLOCK IoStatusBlock; CLIENT_ID ClientId; - ULONG NoWindow, RegionSize, StackSize, ImageMachine, dwErrCode, Flags; + ULONG NoWindow, RegionSize, StackSize, ImageMachine, ErrorCode, Flags; ULONG ParameterFlags, PrivilegeValue, HardErrorMode, ErrorResponse; ULONG_PTR ErrorParameters[2]; BOOLEAN InJob, SaferNeeded, UseLargePages, HavePrivilege; @@ -2320,14 +2320,14 @@ // PCHAR pcScan; SIZE_T n; - WCHAR TempChar; + WCHAR SaveChar; ULONG Length, CurdirLength, CmdQuoteLength; ULONG CmdLineLength, ResultSize; PWCHAR QuotedCmdLine, AnsiCmdCommand, ExtBuffer, CurrentDirectory; - PWCHAR TempNull, WhiteScan, NameBuffer, SearchPath, DebuggerCmdLine; + PWCHAR NullBuffer, ScanString, NameBuffer, SearchPath, DebuggerCmdLine; ANSI_STRING AnsiEnv; UNICODE_STRING UnicodeEnv, PathName; - BOOLEAN SearchRetry, QuotesNeeded, CmdLineIsAppName; + BOOLEAN SearchRetry, QuotesNeeded, CmdLineIsAppName, HasQuotes; // // Variables used for Fusion/SxS (Side-by-Side Assemblies) @@ -2405,13 +2405,13 @@ DebuggerCmdLine = NULL; PathBuffer = NULL; SearchPath = NULL; - TempNull = 0; + NullBuffer = 0; FreeBuffer = NULL; NameBuffer = NULL; CurrentDirectory = NULL; FilePart = NULL; DebuggerString.Buffer = NULL; - QuotesNeeded = FALSE; + HasQuotes = FALSE; QuotedCmdLine = NULL; /* Zero out initial VDM state */ @@ -2624,7 +2624,7 @@ } /* Set the initial parsing state. This code can loop -- don't move this! */ - dwErrCode = FALSE; + ErrorCode = 0; SearchRetry = TRUE; QuotesNeeded = FALSE; CmdLineIsAppName = FALSE; @@ -2647,29 +2647,29 @@ } /* Initialize the application name and our parsing parameters */ - lpApplicationName = TempNull = WhiteScan = lpCommandLine; + lpApplicationName = NullBuffer = ScanString = lpCommandLine; /* Check for an initial quote*/ if (*lpCommandLine == L'\"') { /* We found a quote, keep searching for another one */ SearchRetry = FALSE; - WhiteScan++; - lpApplicationName = TempNull = WhiteScan; - while (*WhiteScan) + ScanString++; + lpApplicationName = ScanString; + while (*ScanString) { /* Have we found the terminating quote? */ - if (*WhiteScan == L'\"') + if (*ScanString == L'\"') { /* We're done, get out of here */ - TempNull = WhiteScan; - QuotesNeeded = TRUE; + NullBuffer = ScanString; + HasQuotes = TRUE; break; } /* Keep searching for the quote */ - WhiteScan++; - TempNull = WhiteScan; + ScanString++; + NullBuffer = ScanString; } } else @@ -2677,25 +2677,25 @@ StartScan: /* We simply make the application name be the command line*/ lpApplicationName = lpCommandLine; - while (*WhiteScan) + while (*ScanString) { /* Check if it starts with a space or tab */ - if ((*WhiteScan == L' ') || (*WhiteScan == '\t')) + if ((*ScanString == L' ') || (*ScanString == L'\t')) { /* Break out of the search loop */ - TempNull = WhiteScan; + NullBuffer = ScanString; break; } /* Keep searching for a space or tab */ - WhiteScan++; - TempNull = WhiteScan; + ScanString++; + NullBuffer = ScanString; } } /* We have found the end of the application name, terminate it */ - TempChar = *TempNull; - *TempNull = UNICODE_NULL; + SaveChar = *NullBuffer; + *NullBuffer = UNICODE_NULL; /* New iteration -- free any existing saved path */ if (SearchPath) @@ -2746,7 +2746,7 @@ if ((Length) && (Length < MAX_PATH)) { /* Everything looks good, restore the name */ - *TempNull = TempChar; + *NullBuffer = SaveChar; lpApplicationName = NameBuffer; } else @@ -2779,23 +2779,23 @@ } /* Did we already fail once? */ - if (dwErrCode) + if (ErrorCode) { /* Set the error code */ - SetLastError(dwErrCode); + SetLastError(ErrorCode); } else { /* Not yet, cache it */ - dwErrCode = GetLastError(); + ErrorCode = GetLastError(); } /* Put back the command line */ - *TempNull = TempChar; + *NullBuffer = SaveChar; lpApplicationName = NameBuffer; /* It's possible there's whitespace in the directory name */ - if (!(*WhiteScan) || !(SearchRetry)) + if (!(*ScanString) || !(SearchRetry)) { /* Not the case, give up completely */ Result = FALSE; @@ -2803,11 +2803,12 @@ } /* There are spaces, so keep trying the next possibility */ - WhiteScan++; - TempNull = WhiteScan; + ScanString++; + NullBuffer = ScanString; /* We will have to add a quote, since there is a space */ QuotesNeeded = TRUE; + HasQuotes = TRUE; goto StartScan; } } @@ -3437,10 +3438,10 @@ } /* Check if we need to account for quotes around the path */ - CmdQuoteLength = CmdLineIsAppName || QuotesNeeded; + CmdQuoteLength = CmdLineIsAppName || HasQuotes; if (!CmdLineIsAppName) { - if (QuotesNeeded) CmdQuoteLength++; + if (HasQuotes) CmdQuoteLength++; } else { @@ -3466,12 +3467,12 @@ /* Build it */ wcscpy(AnsiCmdCommand, CMD_STRING); - if ((CmdLineIsAppName) || (QuotesNeeded)) + if ((CmdLineIsAppName) || (HasQuotes)) { wcscat(AnsiCmdCommand, L"\""); } wcscat(AnsiCmdCommand, lpCommandLine); - if ((CmdLineIsAppName) || (QuotesNeeded)) + if ((CmdLineIsAppName) || (HasQuotes)) { wcscat(AnsiCmdCommand, L"\""); } @@ -4062,8 +4063,8 @@ /* Allocate our buffer, plus enough space for quotes and a NULL */ QuotedCmdLine = RtlAllocateHeap(RtlGetProcessHeap(), 0, - wcslen(lpCommandLine) * sizeof(WCHAR) + - 2 * sizeof(L'\"') + sizeof(UNICODE_NULL)); + (wcslen(lpCommandLine) * sizeof(WCHAR)) + + (2 * sizeof(L'\"') + sizeof(UNICODE_NULL))); if (QuotedCmdLine) { /* Copy the first quote */ @@ -4072,8 +4073,8 @@ /* Save the current null-character */ if (QuotesNeeded) { - TempChar = *TempNull; - *TempNull = UNICODE_NULL; + SaveChar = *NullBuffer; + *NullBuffer = UNICODE_NULL; } /* Copy the command line and the final quote */ @@ -4083,8 +4084,8 @@ /* Copy the null-char back */ if (QuotesNeeded) { - *TempNull = TempChar; - wcscat(QuotedCmdLine, TempNull); + *NullBuffer = SaveChar; + wcscat(QuotedCmdLine, NullBuffer); } } else @@ -4095,8 +4096,11 @@ } } - /* Reserve the first 1MB if needed */ + /* Use isolation if needed */ if (CreateProcessMsg->Sxs.Flags & 1) ParameterFlags |= 1; + + /* Set the new command-line if needed */ + if ((QuotesNeeded) || (CmdLineIsAppName)) lpCommandLine = QuotedCmdLine; /* Call the helper function in charge of RTL_USER_PROCESS_PARAMETERS */ Result = BasePushProcessParameters(ParameterFlags, @@ -4104,8 +4108,7 @@ RemotePeb, lpApplicationName, CurrentDirectory, - ((QuotesNeeded) || (CmdLineIsAppName)) ? - QuotedCmdLine : lpCommandLine, + lpCommandLine, lpEnvironment, &StartupInfo, dwCreationFlags | NoWindow,

1 0

[zguo] 59646: [RAPPS] Update Media Player Classic Home Cinema URL as per the request of a MPC dev.
by zguo＠svn.reactos.org 05 Aug '13

05 Aug '13

Author: zguo Date: Mon Aug 5 18:05:41 2013 New Revision: 59646 URL: http://svn.reactos.org/svn/reactos?rev=59646&view=rev Log: [RAPPS] Update Media Player Classic Home Cinema URL as per the request of a MPC dev. Modified: trunk/reactos/base/applications/rapps/rapps/mpc.txt Modified: trunk/reactos/base/applications/rapps/rapps/mpc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mpc.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mpc.txt [iso-8859-1] Mon Aug 5 18:05:41 2013 @@ -7,7 +7,7 @@ Description = A media player. Size = 7.08MB Category = 1 -URLSite = http://mpc-hc.sourceforge.net/ +URLSite = http://mpc-hc.org/ URLDownload = http://garr.dl.sourceforge.net/project/mpc-hc/MPC%20HomeCinema%20-%20Win32/… CDPath = none

1 0

[akhaldi] 59645: [RAPPS] * Fix the MSVC build.
by akhaldi＠svn.reactos.org 05 Aug '13

05 Aug '13

Author: akhaldi Date: Mon Aug 5 17:57:22 2013 New Revision: 59645 URL: http://svn.reactos.org/svn/reactos?rev=59645&view=rev Log: [RAPPS] * Fix the MSVC build. Modified: trunk/reactos/base/applications/rapps/rsrc.rc Modified: trunk/reactos/base/applications/rapps/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/rs… ============================================================================== --- trunk/reactos/base/applications/rapps/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rsrc.rc [iso-8859-1] Mon Aug 5 17:57:22 2013 @@ -58,4 +58,4 @@ #endif #ifdef LANGUAGE_ZH_TW #include "lang/zh-TW.rc" -#endif +#endif

1 0

[zguo] 59644: [ROSAPPS] Add Chinese translations for ROSAPPS. Translation by Yuntian Zhang. CORE-7348 #resolve
by zguo＠svn.reactos.org 05 Aug '13

05 Aug '13

Author: zguo Date: Mon Aug 5 17:44:28 2013 New Revision: 59644 URL: http://svn.reactos.org/svn/reactos?rev=59644&view=rev Log: [ROSAPPS] Add Chinese translations for ROSAPPS. Translation by Yuntian Zhang. CORE-7348 #resolve Added: trunk/reactos/base/applications/rapps/lang/zh-TW.rc (with props) Modified: trunk/reactos/base/applications/rapps/lang/zh-CN.rc trunk/reactos/base/applications/rapps/rsrc.rc Modified: trunk/reactos/base/applications/rapps/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/zh-CN.rc [iso-8859-1] Mon Aug 5 17:44:28 2013 @@ -22,7 +22,7 @@ MENUITEM SEPARATOR MENUITEM "å·æ°(&R)", ID_REFRESH MENUITEM SEPARATOR - MENUITEM "Update Da&tabase", ID_RESETDB + MENUITEM "æ´æ°æ°æ®åº(&A)", ID_RESETDB END POPUP "å¸®å©" BEGIN @@ -52,7 +52,7 @@ MENUITEM SEPARATOR MENUITEM "å·æ°(&R)", ID_REFRESH MENUITEM SEPARATOR - MENUITEM "Update Da&tabase", ID_RESETDB + MENUITEM "æ´æ°æ°æ®åº(&A)", ID_RESETDB END END Added: trunk/reactos/base/applications/rapps/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/zh-TW.rc (added) +++ trunk/reactos/base/applications/rapps/lang/zh-TW.rc [iso-8859-1] Mon Aug 5 17:44:28 2013 @@ -0,0 +1,202 @@ +/* + * Translated by Song Fuchang (0xfc) <sfc_0(a)yahoo.com.cn> + * Converted by OpenCC 0.4.2 <opencc.googlecode.com> + */ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL + +IDR_MAINMENU MENU +BEGIN + POPUP "æªæ¡(&F)" + BEGIN + MENUITEM "è¨å®(&S)", ID_SETTINGS + MENUITEM SEPARATOR + MENUITEM "éåº(&X)", ID_EXIT + END + POPUP "ç¨å¼(&P)" + BEGIN + MENUITEM "å®è£(&I)", ID_INSTALL + MENUITEM "è§£é¤å®è£(&U)", ID_UNINSTALL + MENUITEM "ä¿®æ¹(&M)", ID_MODIFY + MENUITEM SEPARATOR + MENUITEM "å¾ç»éæªåªé¤(&E)", ID_REGREMOVE + MENUITEM SEPARATOR + MENUITEM "éæ°æ´ç(&R)", ID_REFRESH + MENUITEM SEPARATOR + MENUITEM "æ´æ°è³æåº«(&A)", ID_RESETDB + END + POPUP "å¹«å©" + BEGIN + MENUITEM "å¹«å©å§å®¹", ID_HELP, GRAYED + MENUITEM "éæ¼", ID_ABOUT + END +END + +IDR_LINKMENU MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "å¨çè¦½å¨ä¸éåé£çµ(&O)", ID_OPEN_LINK + MENUITEM "è¤è£½é£çµå°åªè²¼ç°¿(&C)", ID_COPY_LINK + END +END + +IDR_APPLICATIONMENU MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "å®è£(&I)", ID_INSTALL + MENUITEM "è§£é¤å®è£(&U)", ID_UNINSTALL + MENUITEM "ä¿®æ¹(&M)", ID_MODIFY + MENUITEM SEPARATOR + MENUITEM "å¾ç»éæªåªé¤(&E)", ID_REGREMOVE + MENUITEM SEPARATOR + MENUITEM "éæ°æ´ç(&R)", ID_REFRESH + MENUITEM SEPARATOR + MENUITEM "æ´æ°è³æåº«(&A)", ID_RESETDB + END +END + +IDD_SETTINGS_DIALOG DIALOGEX DISCARDABLE 0, 0, 250, 144 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "è¨å®" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "æ®é", -1, 4, 2, 240, 61 + AUTOCHECKBOX "å²åè¦çªä½ç½®(&S)", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12 + AUTOCHECKBOX "ååææ´æ°å¯ç²å¾çç¨å¼åè¡¨(&U)", IDC_UPDATE_AVLIST, 15, 29, 222, 12 + AUTOCHECKBOX "å°ç¨å¼çå®è£åè§£é¤å®è£è¨éå°æ¥èª(&L)", IDC_LOG_ENABLED, 15, 46, 219, 12 + + GROUPBOX "æ£å¨ä¸è¼", -1, 4, 65, 240, 51 + LTEXT "ä¸è¼è³æå¤¾ï¼", -1, 16, 75, 100, 9 + EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP + PUSHBUTTON "é¸æ(&C)", IDC_CHOOSE, 187, 85, 50, 14 + AUTOCHECKBOX "å¨å®è£å®ç¨å¼å¾åªé¤å®è£ç¨å¼(&D)", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 + + PUSHBUTTON "é è¨", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 + PUSHBUTTON "ç¢ºå®", IDOK, 116, 124, 60, 14 + PUSHBUTTON "åæ¶", IDCANCEL, 181, 124, 60, 14 +END + +IDD_INSTALL_DIALOG DIALOGEX DISCARDABLE 0, 0, 216, 97 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "å®è£ç¨å¼" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "...", IDC_INSTALL_TEXT, 4, 5, 209, 35 + + AUTORADIOBUTTON "å¾åå²è£ç½®å®è£ (CD æ DVD)(&I)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP + AUTORADIOBUTTON "ä¸è¼ä¸¦å®è£(&D)", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP + + PUSHBUTTON "ç¢ºå®", IDOK, 86, 78, 60, 14 + PUSHBUTTON "åæ¶", IDCANCEL, 150, 78, 60, 14 +END + +IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 +STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE +CAPTION "æ£å¨ä¸è¼..." +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12 + LTEXT "", IDC_DOWNLOAD_STATUS, 10, 30, 200, 10, SS_CENTER + PUSHBUTTON "åæ¶", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP +END + +IDD_ABOUT_DIALOG DIALOGEX 22, 16, 190, 66 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +CAPTION "éæ¼" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ReactOS ç¨å¼ç®¡çå¨ çæ¬ææ (C) 2009\nä½è Dmitry Chapyshev (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 130, 39 + PUSHBUTTON "éé", IDOK, 133, 46, 50, 14 + ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30 +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLTIP_INSTALL "å®è£" + IDS_TOOLTIP_UNINSTALL "è§£é¤å®è£" + IDS_TOOLTIP_MODIFY "ä¿®æ¹" + IDS_TOOLTIP_SETTINGS "è¨å®" + IDS_TOOLTIP_REFRESH "éæ°æ´ç" + IDS_TOOLTIP_EXIT "éåº" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APP_NAME "åç¨±" + IDS_APP_INST_VERSION "çæ¬" + IDS_APP_DESCRIPTION "æè¿°" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_INFO_VERSION "çæ¬ï¼" + IDS_INFO_DESCRIPTION "æè¿°ï¼" + IDS_INFO_PUBLISHER "\néåºèï¼" + IDS_INFO_HELPLINK "\nå¹«å©é£çµï¼" + IDS_INFO_HELPPHONE "\nå¹«å©é»è©±ï¼" + IDS_INFO_README "\nå¿è®ï¼" + IDS_INFO_REGOWNER "\nè¨»åææèï¼" + IDS_INFO_PRODUCTID "\nç¢å IDï¼" + IDS_INFO_CONTACT "\nè¯ç¹«æ¹å¼ï¼" + IDS_INFO_UPDATEINFO "\næ´æ°è³è¨ï¼" + IDS_INFO_INFOABOUT "\néæ¼è³è¨ï¼" + IDS_INFO_COMMENTS "\nè¨»éï¼" + IDS_INFO_INSTLOCATION "\nå®è£ä½ç½®ï¼" + IDS_INFO_INSTALLSRC "\nå®è£æºï¼" + IDS_INFO_UNINSTALLSTR "\nè§£é¤å®è£ååä¸²ï¼" + IDS_INFO_MODIFYPATH "\nä¿®æ¹è·¯å¾ï¼" + IDS_INFO_INSTALLDATE "\nå®è£æ¥æï¼" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_AINFO_VERSION "\nçæ¬ï¼" + IDS_AINFO_DESCRIPTION "\næè¿°ï¼" + IDS_AINFO_SIZE "\nå¤§å°ï¼" + IDS_AINFO_URLSITE "\nä¸»é ï¼" + IDS_AINFO_LICENCE "\nåè°ï¼" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_CAT_AUDIO "é³è¨" + IDS_CAT_DEVEL "éç¼" + IDS_CAT_DRIVERS "é©åç¨å¼" + IDS_CAT_EDU "æè²èå¨æ¨" + IDS_CAT_ENGINEER "å·¥ç¨" + IDS_CAT_FINANCE "ç¶æ¿" + IDS_CAT_GAMES "éæ²èå¨æ¨" + IDS_CAT_GRAPHICS "åå½¢" + IDS_CAT_INTERNET "Internet èç¶²è·¯" + IDS_CAT_LIBS "åº«" + IDS_CAT_OFFICE "è¾¦å¬" + IDS_CAT_OTHER "å¶ä»" + IDS_CAT_SCIENCE "ç§å¸" + IDS_CAT_TOOLS "å·¥å·" + IDS_CAT_VIDEO "è¦è¨" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPTITLE "ReactOS ç¨å¼ç®¡çå¨" + IDS_SEARCH_TEXT "æç´¢..." + IDS_INSTALL "å®è£" + IDS_UNINSTALL "è§£é¤å®è£" + IDS_MODIFY "ä¿®æ¹" + IDS_APPS_COUNT "ç¨å¼åæ¸ï¼%d" + IDS_WELCOME_TITLE "æ¡è¿ä¾å° ReactOS ç¨å¼ç®¡çå¨ï¼\n\n" + IDS_WELCOME_TEXT "å¾å·¦æ¬é¸æä¸åé¡å¥ï¼ç¶å¾é¸æè¦å®è£æè§£é¤å®è£çç¨å¼ã\nReactOS ç¶²ç«ï¼" + IDS_WELCOME_URL "http://www.reactos.org" + IDS_INSTALLED "å·²å®è£" + IDS_AVAILABLEFORINST "å¯å®è£" + IDS_UPDATES "æ´æ°" + IDS_APPLICATIONS "æç¨ç¨å¼" + IDS_CHOOSE_FOLDER_TEXT "è«é¸æç¨ä¾å²åä¸è¼æªæ¡çè³æå¤¾ï¼" + IDS_CHOOSE_FOLDER_ERROR "æ¨é¸æçè³æå¤¾ä¸åå¨ãåµå»ºåï¼" + IDS_USER_NOT_ADMIN "æ¨å¿é ä»¥ç®¡çå¡è¨±å¯æ¬åå ""ReactOS ç¨å¼ç®¡çå¨""ï¼" + IDS_APP_REG_REMOVE "æ¨ç¢ºå®è¦å¾ç»éæªåªé¤è©²ç¨å¼çè³æåï¼" + IDS_INFORMATION "è³è¨" + IDS_UNABLE_TO_REMOVE "ç¡æ³å¾ç»éæªåªé¤è©²ç¨å¼çè³æï¼" +END Propchange: trunk/reactos/base/applications/rapps/lang/zh-TW.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/rapps/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/rs… ============================================================================== --- trunk/reactos/base/applications/rapps/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rsrc.rc [iso-8859-1] Mon Aug 5 17:44:28 2013 @@ -56,3 +56,6 @@ #ifdef LANGUAGE_ZH_CN #include "lang/zh-CN.rc" #endif +#ifdef LANGUAGE_ZH_TW + #include "lang/zh-TW.rc" +#endif

1 0

[zguo] 59643: [VGAFONTEDIT] Add Chinese translation for VGA font edit utility. ROSAPPS-254 #resolve
by zguo＠svn.reactos.org 05 Aug '13

05 Aug '13

Author: zguo Date: Mon Aug 5 17:24:09 2013 New Revision: 59643 URL: http://svn.reactos.org/svn/reactos?rev=59643&view=rev Log: [VGAFONTEDIT] Add Chinese translation for VGA font edit utility. ROSAPPS-254 #resolve Added: trunk/rosapps/applications/devutils/vgafontedit/lang/zh-CN.rc (with props) Modified: trunk/rosapps/applications/devutils/vgafontedit/rsrc.rc Added: trunk/rosapps/applications/devutils/vgafontedit/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf… ============================================================================== --- trunk/rosapps/applications/devutils/vgafontedit/lang/zh-CN.rc (added) +++ trunk/rosapps/applications/devutils/vgafontedit/lang/zh-CN.rc [iso-8859-1] Mon Aug 5 17:24:09 2013 @@ -0,0 +1,94 @@ +/* + * PROJECT: ReactOS VGA Font Editor + * LICENSE: GNU General Public License Version 2.0 or any later version + * FILE: devutils/vgafontedit/lang/zh-CN.rc + * PURPOSE: Simplified Chinese resource file + * COPYRIGHT: Copyright 2008 Colin Finck <mail(a)colinfinck.de> + * TRANSLATOR: BinSys <binsys(a)163.com> + */ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +IDD_ABOUT DIALOGEX 10, 10, 130, 62 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "å³äº" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_MAIN, IDC_STATIC, 10, 10, 20, 20 + LTEXT "ReactOS VGA åä½ ç¼è¾å¨", IDC_STATIC, 37, 10, 93, 10 + LTEXT "Copyright 2008 Colin Finck", IDC_STATIC, 37, 20, 93, 10 + DEFPUSHBUTTON "ç¡®å®", IDCANCEL, 40, 44, 55, 15 +END + +IDD_EDITGLYPH DIALOGEX 32768, 32768, 246, 197 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "ç¼è¾ åå½¢" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_EDIT_GLYPH_TOOLBOX, TOOLBARCLASSNAMEA, CCS_NODIVIDER | CCS_NORESIZE, 5, 5, 24, 82 + CONTROL "", IDC_EDIT_GLYPH_EDIT, EDIT_GLYPH_EDIT_CLASSW, 0, 39, 5, 160, 160 + CONTROL "", IDC_EDIT_GLYPH_PREVIEW, EDIT_GLYPH_PREVIEW_CLASSW, 0, 209, 5, 32, 32 + + DEFPUSHBUTTON "ç¡®å®", IDOK, 48, 177, 70, 14 + PUSHBUTTON "åæ¶", IDCANCEL, 125, 177, 70, 14 +END + +IDM_MAINMENU MENU +BEGIN + POPUP "æä»¶(&F)" + BEGIN + MENUITEM "æ°å»º(&N)\tCtrl+N", ID_FILE_NEW + MENUITEM "æå¼(&O)...\tCtrl+O", ID_FILE_OPEN + MENUITEM "å³é", ID_FILE_CLOSE + MENUITEM SEPARATOR + MENUITEM "ä¿å\tCtrl+S", ID_FILE_SAVE + MENUITEM "å¦åä¸º...", ID_FILE_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "éåº\tAlt+F4", ID_FILE_EXIT + END + + POPUP "ç¼è¾(&E)" + BEGIN + MENUITEM "å¤å¶\tCtrl+C", ID_EDIT_COPY + MENUITEM "ç²è´´\tCtrl+V", ID_EDIT_PASTE + MENUITEM SEPARATOR + MENUITEM "ç¼è¾ åå½¢...", ID_EDIT_GLYPH + END + + POPUP "çªå£(&W)" + BEGIN + MENUITEM "å±å (&C)", ID_WINDOW_CASCADE + MENUITEM "æ°´å¹³å¹³éº(&H)", ID_WINDOW_TILE_HORZ + MENUITEM "åç´å¹³éº(&V)", ID_WINDOW_TILE_VERT + MENUITEM "æåå¾æ (&A)", ID_WINDOW_ARRANGE + MENUITEM SEPARATOR + MENUITEM "ä¸ä¸ä¸ª(&t)\tCtrl+F6", ID_WINDOW_NEXT + END + + POPUP "å¸®å©(&H)" + BEGIN + MENUITEM "å³äº(&A)...", ID_HELP_ABOUT + END +END + +STRINGTABLE +BEGIN + IDS_OPENFILTER, "å¨é¨æ¯æçæ ¼å¼ (*.bin,*.psf)|*.bin;*.psf|Binary Font Files (*.bin)|*.bin|PC Screen Fonts Version 1 (*.psf)|*.psf|" + IDS_SAVEFILTER, "äºè¿å¶åä½æä»¶ (*.bin)|*.bin|" + IDS_OPENERROR, "æå¼æä»¶æ¶åçéè¯¯! (éè¯¯ç %1!u!)" + IDS_READERROR, "è¯»åæä»¶æ¶åçéè¯¯! (éè¯¯ç %1!u!)" + IDS_WRITEERROR, "åå¥æä»¶æ¶åçéè¯¯! (éè¯¯ç %1!u!)" + IDS_UNSUPPORTEDFORMAT, "ä¸æ¯æçæä»¶æ ¼å¼!" + IDS_UNSUPPORTEDPSF, "ä¸æ¯æç PSF åä½æ ¼å¼! ç¼è¾å¨ä»æ¯æéç¹æ®æ¨¡å¼ 8x8 åä½ã" + IDS_DOCNAME, "åä½ %1!u!" + IDS_SAVEPROMPT, "æä»¶ ""%1"" å·²æ´æ¹ï¼ä½æªä¿å.\n\næ¯å¦ä¿åæä»¶ï¼" + IDS_APPTITLE, "ReactOS VGA åä½ ç¼è¾å¨" + IDS_CLOSEEDIT, "è¯·åå³éå¨é¨æå¼çç¼è¾çªå£ã" + + IDS_TOOLTIP_NEW, "æ°å»º" + IDS_TOOLTIP_OPEN, "æå¼" + IDS_TOOLTIP_SAVE, "ä¿å" + IDS_TOOLTIP_EDIT_GLYPH, "ç¼è¾ åå½¢" + IDS_TOOLTIP_COPY, "å¤å¶" + IDS_TOOLTIP_PASTE, "ç²è´´" +END Propchange: trunk/rosapps/applications/devutils/vgafontedit/lang/zh-CN.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/devutils/vgafontedit/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf… ============================================================================== --- trunk/rosapps/applications/devutils/vgafontedit/rsrc.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/devutils/vgafontedit/rsrc.rc [iso-8859-1] Mon Aug 5 17:24:09 2013 @@ -43,3 +43,6 @@ #ifdef LANGUAGE_UK_UA #include "lang/uk-UA.rc" #endif +#ifdef LANGUAGE_ZH_CN + #include "lang/zh-CN.rc" +#endif

1 0

[ion] 59642: [KERNEL32]: Fix incorrect bracing which was causing SearchPath failures to enter a weird code path. Fix a debug print.
by ion＠svn.reactos.org 04 Aug '13

04 Aug '13

Author: ion Date: Sun Aug 4 20:46:55 2013 New Revision: 59642 URL: http://svn.reactos.org/svn/reactos?rev=59642&view=rev Log: [KERNEL32]: Fix incorrect bracing which was causing SearchPath failures to enter a weird code path. Fix a debug print. Modified: trunk/reactos/dll/win32/kernel32/client/path.c trunk/reactos/dll/win32/kernel32/client/proc.c Modified: trunk/reactos/dll/win32/kernel32/client/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/path.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/path.c [iso-8859-1] Sun Aug 4 20:46:55 2013 @@ -401,7 +401,7 @@ BaseComputeProcessExePath(IN LPWSTR FullPath) { PBASE_SEARCH_PATH_TYPE PathOrder; - DPRINT1("Computing EXE path: %wZ\n", FullPath); + DPRINT1("Computing EXE path: %S\n", FullPath); /* Check if we should use the current directory */ PathOrder = NeedCurrentDirectoryForExePathW(FullPath) ? Modified: trunk/reactos/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] Sun Aug 4 20:46:55 2013 @@ -2733,11 +2733,11 @@ /* This was a directory, fail later on */ Length = 0; } - } - else - { - /* It's a file! */ - Length++; + else + { + /* It's a file! */ + Length++; + } } DPRINT1("Length: %lx Buffer: %S\n", Length, NameBuffer);

1 0

[ekohl] 59641: [SYSSETUP] Add missing class installer stubs.
by ekohl＠svn.reactos.org 04 Aug '13

04 Aug '13

Author: ekohl Date: Sun Aug 4 20:28:26 2013 New Revision: 59641 URL: http://svn.reactos.org/svn/reactos?rev=59641&view=rev Log: [SYSSETUP] Add missing class installer stubs. Modified: trunk/reactos/dll/win32/syssetup/classinst.c trunk/reactos/dll/win32/syssetup/syssetup.spec Modified: trunk/reactos/dll/win32/syssetup/classinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/classin… ============================================================================== --- trunk/reactos/dll/win32/syssetup/classinst.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/classinst.c [iso-8859-1] Sun Aug 4 20:28:26 2013 @@ -10,6 +10,45 @@ #define NDEBUG #include <debug.h> + + +/* + * @unimplemented + */ +DWORD +WINAPI +ComputerClassInstaller( + IN DI_FUNCTION InstallFunction, + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL) +{ + switch (InstallFunction) + { + default: + DPRINT1("Install function %u ignored\n", InstallFunction); + return ERROR_DI_DO_DEFAULT; + } +} + + +/* + * @unimplemented + */ +DWORD +WINAPI +DeviceBayClassInstaller( + IN DI_FUNCTION InstallFunction, + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL) +{ + switch (InstallFunction) + { + default: + DPRINT("Install function %u ignored\n", InstallFunction); + return ERROR_DI_DO_DEFAULT; + } +} + /* * @implemented @@ -61,3 +100,62 @@ return ERROR_DI_DO_DEFAULT; } } + + +/* + * @unimplemented + */ +DWORD +WINAPI +NtApmClassInstaller( + IN DI_FUNCTION InstallFunction, + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL) +{ + switch (InstallFunction) + { + default: + DPRINT("Install function %u ignored\n", InstallFunction); + return ERROR_DI_DO_DEFAULT; + } +} + + +/* + * @unimplemented + */ +DWORD +WINAPI +ScsiClassInstaller( + IN DI_FUNCTION InstallFunction, + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL) +{ + switch (InstallFunction) + { + default: + DPRINT("Install function %u ignored\n", InstallFunction); + return ERROR_DI_DO_DEFAULT; + } +} + + +/* + * @unimplemented + */ +DWORD +WINAPI +TapeClassInstaller( + IN DI_FUNCTION InstallFunction, + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL) +{ + switch (InstallFunction) + { + default: + DPRINT("Install function %u ignored\n", InstallFunction); + return ERROR_DI_DO_DEFAULT; + } +} + +/* EOF */ Modified: trunk/reactos/dll/win32/syssetup/syssetup.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/syssetu… ============================================================================== --- trunk/reactos/dll/win32/syssetup/syssetup.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/syssetup.spec [iso-8859-1] Sun Aug 4 20:28:26 2013 @@ -8,13 +8,13 @@ @ stub AsrpGetLocalVolumeInfo @ stub AsprRestoreNonCriticalDisksW @ stub CdromPropPageProvider -@ stub ComputerClassInstaller +@ stdcall ComputerClassInstaller(long ptr ptr) @ stub CreateLocalAdminAccount @ stub CreateLocalAdminAccountEx @ stub CreateLocalUserAccount @ stub CriticalDeviceCoInstaller @ stub DevInstallW -@ stub DeviceBayClassInstaller +@ stdcall DeviceBayClassInstaller(long ptr ptr) @ stub DiskPropPageProvider @ stub DoInstallComponentInfs @ stub EisaUpHalCoInstaller @@ -29,7 +29,7 @@ @ stub LegacyDriverPropPageProvider @ stub MigrateExceptionPackages @ stdcall MouseClassInstaller(long ptr ptr) -@ stub NtApmClassInstaller +@ stdcall NtApmClassInstaller(long ptr ptr) @ stub OpkCheckVersion @ stub PS2MousePropPageProvider @ stub PnPInitializationThread @@ -37,7 +37,7 @@ @ stub RepairStartMenuItems @ stub ReportError @ stub RunOEMExtraTasks -@ stub ScsiClassInstaller +@ stdcall ScsiClassInstaller(long ptr ptr) @ stub SetAccountDomainSid @ stub SetupAddOrRemoveTestCertificate @ stdcall SetupChangeFontSize(ptr wstr) @@ -76,7 +76,7 @@ @ stub SetupUnregisterOsComponent @ stub StorageCoInstaller @ stub SystemUpdateUserProfileDirectory -@ stub TapeClassInstaller +@ stdcall TapeClassInstaller(long ptr ptr) @ stub TapePropPageProvider @ stdcall TerminateSetupActionLog() @ stub UpdatePnpDeviceDrivers

1 0

[ion] 59640: [NDK/NTOSKRNL]: Use correct flags. Spotted by Thomas Fabber.
by ion＠svn.reactos.org 04 Aug '13

04 Aug '13

Author: ion Date: Sun Aug 4 19:28:37 2013 New Revision: 59640 URL: http://svn.reactos.org/svn/reactos?rev=59640&view=rev Log: [NDK/NTOSKRNL]: Use correct flags. Spotted by Thomas Fabber. Modified: trunk/reactos/include/ndk/pstypes.h trunk/reactos/ntoskrnl/ps/process.c Modified: trunk/reactos/include/ndk/pstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/pstypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/pstypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/pstypes.h [iso-8859-1] Sun Aug 4 19:28:37 2013 @@ -89,11 +89,17 @@ // // Flags for NtCreateProcessEx // -#define PROCESS_CREATE_FLAGS_BREAKAWAY 0x00000001 -#define PROCESS_CREATE_FLAGS_NO_DEBUG_INHERIT 0x00000002 -#define PROCESS_CREATE_FLAGS_INHERIT_HANDLES 0x00000004 +#define PROCESS_CREATE_FLAGS_BREAKAWAY 0x00000001 +#define PROCESS_CREATE_FLAGS_NO_DEBUG_INHERIT 0x00000002 +#define PROCESS_CREATE_FLAGS_INHERIT_HANDLES 0x00000004 #define PROCESS_CREATE_FLAGS_OVERRIDE_ADDRESS_SPACE 0x00000008 -#define PROCESS_CREATE_FLAGS_LARGE_PAGES 0x00000010 +#define PROCESS_CREATE_FLAGS_LARGE_PAGES 0x00000010 +#define PROCESS_CREATE_FLAGS_ALL_LARGE_PAGE_FLAGS PROCESS_CREATE_FLAGS_LARGE_PAGES +#define PROCESS_CREATE_FLAGS_LEGAL_MASK (PROCESS_CREATE_FLAGS_BREAKAWAY | \ + PROCESS_CREATE_FLAGS_NO_DEBUG_INHERIT | \ + PROCESS_CREATE_FLAGS_INHERIT_HANDLES | \ + PROCESS_CREATE_FLAGS_OVERRIDE_ADDRESS_SPACE | \ + PROCESS_CREATE_FLAGS_ALL_LARGE_PAGE_FLAGS) // // Process priority classes @@ -105,18 +111,6 @@ #define PROCESS_PRIORITY_CLASS_REALTIME 4 #define PROCESS_PRIORITY_CLASS_BELOW_NORMAL 5 #define PROCESS_PRIORITY_CLASS_ABOVE_NORMAL 6 - -// -// NtCreateProcessEx flags -// -#define PS_REQUEST_BREAKAWAY 1 -#define PS_NO_DEBUG_INHERIT 2 -#define PS_INHERIT_HANDLES 4 -#define PS_LARGE_PAGES 8 -#define PS_ALL_FLAGS (PS_REQUEST_BREAKAWAY | \ - PS_NO_DEBUG_INHERIT | \ - PS_INHERIT_HANDLES | \ - PS_LARGE_PAGES) // // Process base priorities Modified: trunk/reactos/ntoskrnl/ps/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/process.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ps/process.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/process.c [iso-8859-1] Sun Aug 4 19:28:37 2013 @@ -369,7 +369,7 @@ "ProcessHandle: %p Parent: %p\n", ProcessHandle, ParentProcess); /* Validate flags */ - if (Flags & ~PS_ALL_FLAGS) return STATUS_INVALID_PARAMETER; + if (Flags & ~PROCESS_CREATE_FLAGS_LEGAL_MASK) return STATUS_INVALID_PARAMETER; /* Check for parent */ if (ParentProcess) @@ -508,7 +508,7 @@ Process->DebugPort = DebugObject; /* Check if the caller doesn't want the debug stuff inherited */ - if (Flags & PS_NO_DEBUG_INHERIT) + if (Flags & PROCESS_CREATE_FLAGS_NO_DEBUG_INHERIT) { /* Set the process flag */ InterlockedOr((PLONG)&Process->Flags, PSF_NO_DEBUG_INHERIT_BIT); @@ -595,7 +595,8 @@ } /* Initialize object manager for the process */ - Status = ObInitProcess(Flags & PS_INHERIT_HANDLES ? Parent : NULL, + Status = ObInitProcess(Flags & PROCESS_CREATE_FLAGS_INHERIT_HANDLES ? + Parent : NULL, Process); if (!NT_SUCCESS(Status)) goto CleanupWithRef; } @@ -643,7 +644,7 @@ else { /* This is the initial system process */ - Flags &= ~PS_LARGE_PAGES; + Flags &= ~PROCESS_CREATE_FLAGS_LARGE_PAGES; Status = MmInitializeProcessAddressSpace(Process, NULL, NULL, @@ -1347,9 +1348,9 @@ "Parent: %p Attributes: %p\n", ParentProcess, ObjectAttributes); /* Set new-style flags */ - if ((ULONG)SectionHandle & 1) Flags = PS_REQUEST_BREAKAWAY; - if ((ULONG)DebugPort & 1) Flags |= PS_NO_DEBUG_INHERIT; - if (InheritObjectTable) Flags |= PS_INHERIT_HANDLES; + if ((ULONG)SectionHandle & 1) Flags |= PROCESS_CREATE_FLAGS_BREAKAWAY; + if ((ULONG)DebugPort & 1) Flags |= PROCESS_CREATE_FLAGS_NO_DEBUG_INHERIT; + if (InheritObjectTable) Flags |= PROCESS_CREATE_FLAGS_INHERIT_HANDLES; /* Call the new API */ return NtCreateProcessEx(ProcessHandle,

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs