Ros-diffs November 2014

ros-diffs@reactos.org

18 participants
373 discussions

[hbelusca] 65425: [NTVDM]: Use the ScreenMode variable in other places too...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Nov 17 00:34:29 2014 New Revision: 65425 URL: http://svn.reactos.org/svn/reactos?rev=65425&view=rev Log: [NTVDM]: Use the ScreenMode variable in other places too... Modified: trunk/reactos/subsystems/ntvdm/hardware/vga.c Modified: trunk/reactos/subsystems/ntvdm/hardware/vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/vga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/vga.c [iso-8859-1] Mon Nov 17 00:34:29 2014 @@ -1057,8 +1057,8 @@ */ if (ConsoleFramebuffer == NULL) return; - /* Check if this is text mode or graphics mode */ - if (VgaGcRegisters[VGA_GC_MISC_REG] & VGA_GC_MISC_NOALPHA) + /* Check if we are in text or graphics mode */ + if (ScreenMode == GRAPHICS_MODE) { /* Graphics mode */ PBYTE GraphicsBuffer = (PBYTE)ConsoleFramebuffer; @@ -1333,7 +1333,7 @@ VgaCrtcRegisters[VGA_CRTC_CURSOR_LOC_HIGH_REG]); /* Just return if we are not in text mode */ - if (VgaGcRegisters[VGA_GC_MISC_REG] & VGA_GC_MISC_NOALPHA) return; + if (ScreenMode != TEXT_MODE) return; if (CursorStart < CursorEnd) { @@ -1844,8 +1844,8 @@ UpdateRectangle.Right, UpdateRectangle.Bottom); - /* Check if this is text mode or graphics mode */ - if (VgaGcRegisters[VGA_GC_MISC_REG] & VGA_GC_MISC_NOALPHA) + /* Check if we are in text or graphics mode */ + if (ScreenMode == GRAPHICS_MODE) { /* Graphics mode */ ConsoleBufferHandle = GraphicsConsoleBuffer;

10 years, 1 month

[hbelusca] 65424: [NTVDM] - Do not recalculate at each refresh the new resolution that usually does not change (if it changes because of a modification of some VGA register, we detect that, and we ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Nov 17 00:12:20 2014 New Revision: 65424 URL: http://svn.reactos.org/svn/reactos?rev=65424&view=rev Log: [NTVDM] - Do not recalculate at each refresh the new resolution that usually does not change (if it changes because of a modification of some VGA register, we detect that, and we change the vga mode). So keep the current resolution and use it in paint functions. - Really reenter a new text/graphic mode when needed (ie. when alphanumeric bit and computed resolution change), this avoids useless console screenbuffers recreations (and flickering), things go faster, yet the VGA registers are still updated (as expected). See r65379, r65018 and r65015 for more details. Modified: trunk/reactos/subsystems/ntvdm/hardware/vga.c Modified: trunk/reactos/subsystems/ntvdm/hardware/vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/vga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/vga.c [iso-8859-1] Mon Nov 17 00:12:20 2014 @@ -284,12 +284,14 @@ static BOOLEAN CursorChanged = FALSE; static BOOLEAN PaletteChanged = FALSE; -static -enum SCREEN_MODE +typedef enum _SCREEN_MODE { TEXT_MODE, GRAPHICS_MODE -} ScreenMode = TEXT_MODE; +} SCREEN_MODE, *PSCREEN_MODE; + +static SCREEN_MODE ScreenMode = TEXT_MODE; +static COORD CurrResolution = {0}; static SMALL_RECT UpdateRectangle = { 0, 0, 0, 0 }; @@ -920,8 +922,6 @@ static BOOL VgaEnterTextMode(PCOORD Resolution) { - DPRINT1("VgaEnterTextMode\n"); - /* Switch to the text buffer */ VgaSetActiveScreenBuffer(TextConsoleBuffer); @@ -977,7 +977,20 @@ static VOID VgaChangeMode(VOID) { - COORD Resolution = VgaGetDisplayResolution(); + COORD NewResolution = VgaGetDisplayResolution(); + SCREEN_MODE NewScreenMode = + !(VgaGcRegisters[VGA_GC_MISC_REG] & VGA_GC_MISC_NOALPHA) ? TEXT_MODE + : GRAPHICS_MODE; + + /* + * No need to switch to a different screen mode + resolution + * if the new ones are the same as the old ones. + */ + if ((ScreenMode == NewScreenMode) && + (CurrResolution.X == NewResolution.X && CurrResolution.Y == NewResolution.Y)) + { + goto Quit; + } if (ScreenMode == GRAPHICS_MODE) { @@ -990,11 +1003,16 @@ VgaLeaveTextMode(); } + /* Update the current resolution */ + CurrResolution = NewResolution; + + /* The new screen mode will be updated via the VgaEnterText/GraphicsMode functions */ + /* Check if the new mode is alphanumeric */ - if (!(VgaGcRegisters[VGA_GC_MISC_REG] & VGA_GC_MISC_NOALPHA)) + if (NewScreenMode == TEXT_MODE) { /* Enter new text mode */ - if (!VgaEnterTextMode(&Resolution)) + if (!VgaEnterTextMode(&CurrResolution)) { DisplayMessage(L"An unexpected VGA error occurred while switching into text mode. Error: %u", GetLastError()); EmulatorTerminate(); @@ -1004,7 +1022,7 @@ else { /* Enter graphics mode */ - if (!VgaEnterGraphicsMode(&Resolution)) + if (!VgaEnterGraphicsMode(&CurrResolution)) { DisplayMessage(L"An unexpected VGA error occurred while switching into graphics mode. Error: %u", GetLastError()); EmulatorTerminate(); @@ -1012,12 +1030,14 @@ } } +Quit: + /* Trigger a full update of the screen */ NeedsUpdate = TRUE; UpdateRectangle.Left = 0; - UpdateRectangle.Top = 0; - UpdateRectangle.Right = Resolution.X; - UpdateRectangle.Bottom = Resolution.Y; + UpdateRectangle.Top = 0; + UpdateRectangle.Right = CurrResolution.X; + UpdateRectangle.Bottom = CurrResolution.Y; /* Reset the mode change flag */ ModeChanged = FALSE; @@ -1026,7 +1046,6 @@ static VOID VgaUpdateFramebuffer(VOID) { SHORT i, j, k; - COORD Resolution = VgaGetDisplayResolution(); DWORD AddressSize = VgaGetAddressSize(); DWORD Address = MAKEWORD(VgaCrtcRegisters[VGA_CRTC_START_ADDR_LOW_REG], VgaCrtcRegisters[VGA_CRTC_START_ADDR_HIGH_REG]); @@ -1058,7 +1077,7 @@ } /* Loop through the scanlines */ - for (i = 0; i < Resolution.Y; i++) + for (i = 0; i < CurrResolution.Y; i++) { if ((VgaGcRegisters[VGA_GC_MISC_REG] & VGA_GC_MISC_OE) && (i & 1)) { @@ -1067,7 +1086,7 @@ } /* Loop through the pixels */ - for (j = 0; j < Resolution.X; j++) + for (j = 0; j < CurrResolution.X; j++) { BYTE PixelData = 0; @@ -1189,13 +1208,13 @@ if (DoubleWidth && DoubleHeight) { /* Now check if the resulting pixel data has changed */ - if (GraphicsBuffer[(i * 2 * Resolution.X * 2) + (j * 2)] != PixelData) + if (GraphicsBuffer[(i * 2 * CurrResolution.X * 2) + (j * 2)] != PixelData) { /* Yes, write the new value */ - GraphicsBuffer[(i * 2 * Resolution.X * 2) + (j * 2)] = PixelData; - GraphicsBuffer[(i * 2 * Resolution.X * 2) + (j * 2 + 1)] = PixelData; - GraphicsBuffer[((i * 2 + 1) * Resolution.X * 2) + (j * 2)] = PixelData; - GraphicsBuffer[((i * 2 + 1) * Resolution.X * 2) + (j * 2 + 1)] = PixelData; + GraphicsBuffer[(i * 2 * CurrResolution.X * 2) + (j * 2)] = PixelData; + GraphicsBuffer[(i * 2 * CurrResolution.X * 2) + (j * 2 + 1)] = PixelData; + GraphicsBuffer[((i * 2 + 1) * CurrResolution.X * 2) + (j * 2)] = PixelData; + GraphicsBuffer[((i * 2 + 1) * CurrResolution.X * 2) + (j * 2 + 1)] = PixelData; /* Mark the specified pixel as changed */ VgaMarkForUpdate(i, j); @@ -1204,11 +1223,11 @@ else if (DoubleWidth && !DoubleHeight) { /* Now check if the resulting pixel data has changed */ - if (GraphicsBuffer[(i * Resolution.X * 2) + (j * 2)] != PixelData) + if (GraphicsBuffer[(i * CurrResolution.X * 2) + (j * 2)] != PixelData) { /* Yes, write the new value */ - GraphicsBuffer[(i * Resolution.X * 2) + (j * 2)] = PixelData; - GraphicsBuffer[(i * Resolution.X * 2) + (j * 2 + 1)] = PixelData; + GraphicsBuffer[(i * CurrResolution.X * 2) + (j * 2)] = PixelData; + GraphicsBuffer[(i * CurrResolution.X * 2) + (j * 2 + 1)] = PixelData; /* Mark the specified pixel as changed */ VgaMarkForUpdate(i, j); @@ -1217,11 +1236,11 @@ else if (!DoubleWidth && DoubleHeight) { /* Now check if the resulting pixel data has changed */ - if (GraphicsBuffer[(i * 2 * Resolution.X) + j] != PixelData) + if (GraphicsBuffer[(i * 2 * CurrResolution.X) + j] != PixelData) { /* Yes, write the new value */ - GraphicsBuffer[(i * 2 * Resolution.X) + j] = PixelData; - GraphicsBuffer[((i * 2 + 1) * Resolution.X) + j] = PixelData; + GraphicsBuffer[(i * 2 * CurrResolution.X) + j] = PixelData; + GraphicsBuffer[((i * 2 + 1) * CurrResolution.X) + j] = PixelData; /* Mark the specified pixel as changed */ VgaMarkForUpdate(i, j); @@ -1230,10 +1249,10 @@ else // if (!DoubleWidth && !DoubleHeight) { /* Now check if the resulting pixel data has changed */ - if (GraphicsBuffer[i * Resolution.X + j] != PixelData) + if (GraphicsBuffer[i * CurrResolution.X + j] != PixelData) { /* Yes, write the new value */ - GraphicsBuffer[i * Resolution.X + j] = PixelData; + GraphicsBuffer[i * CurrResolution.X + j] = PixelData; /* Mark the specified pixel as changed */ VgaMarkForUpdate(i, j); @@ -1268,10 +1287,10 @@ CHAR_CELL CharInfo; /* Loop through the scanlines */ - for (i = 0; i < Resolution.Y; i++) + for (i = 0; i < CurrResolution.Y; i++) { /* Loop through the characters */ - for (j = 0; j < Resolution.X; j++) + for (j = 0; j < CurrResolution.X; j++) { CurrentAddr = LOWORD((Address + j) * AddressSize); @@ -1282,11 +1301,11 @@ CharInfo.Attributes = VgaMemory[CurrentAddr + VGA_BANK_SIZE]; /* Now check if the resulting character data has changed */ - if ((CharBuffer[i * Resolution.X + j].Char != CharInfo.Char) || - (CharBuffer[i * Resolution.X + j].Attributes != CharInfo.Attributes)) + if ((CharBuffer[i * CurrResolution.X + j].Char != CharInfo.Char) || + (CharBuffer[i * CurrResolution.X + j].Attributes != CharInfo.Attributes)) { /* Yes, write the new value */ - CharBuffer[i * Resolution.X + j] = CharInfo; + CharBuffer[i * CurrResolution.X + j] = CharInfo; /* Mark the specified cell as changed */ VgaMarkForUpdate(i, j); @@ -1787,7 +1806,6 @@ VOID VgaRefreshDisplay(VOID) { HANDLE ConsoleBufferHandle = NULL; - COORD Resolution; /* Set the vertical retrace flag */ InVerticalRetrace = TRUE; @@ -1802,17 +1820,14 @@ /* Change the text cursor appearance */ if (CursorChanged) VgaUpdateTextCursor(); - /* Retrieve the current resolution */ - Resolution = VgaGetDisplayResolution(); - if (PaletteChanged) { /* Trigger a full update of the screen */ NeedsUpdate = TRUE; UpdateRectangle.Left = 0; - UpdateRectangle.Top = 0; - UpdateRectangle.Right = Resolution.X; - UpdateRectangle.Bottom = Resolution.Y; + UpdateRectangle.Top = 0; + UpdateRectangle.Right = CurrResolution.X; + UpdateRectangle.Bottom = CurrResolution.Y; PaletteChanged = FALSE; }

10 years, 1 month

[hbelusca] 65423: [NTVDM]: Code formatting only!

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Nov 16 23:15:12 2014 New Revision: 65423 URL: http://svn.reactos.org/svn/reactos?rev=65423&view=rev Log: [NTVDM]: Code formatting only! Modified: trunk/reactos/subsystems/ntvdm/hardware/vga.c Modified: trunk/reactos/subsystems/ntvdm/hardware/vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/vga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/vga.c [iso-8859-1] Sun Nov 16 23:15:12 2014 @@ -214,8 +214,8 @@ C_ASSERT(sizeof(CHAR_CELL) == 2); static LPVOID ConsoleFramebuffer = NULL; // Active framebuffer, points to - // either TextFramebuffer or a valid - // graphics framebuffer. + // either TextFramebuffer or a + // valid graphics framebuffer. static HPALETTE TextPaletteHandle = NULL; static HPALETTE PaletteHandle = NULL; @@ -229,8 +229,8 @@ /* * Text mode -- we always keep a valid text mode framebuffer - * even if we are in graphics mode. This is needed in order to - * keep a consistent VGA state. + * even if we are in graphics mode. This is needed in order + * to keep a consistent VGA state. */ static CONSOLE_SCREEN_BUFFER_INFO ConsoleInfo; static COORD TextResolution = {0}; @@ -456,8 +456,8 @@ * in the two following APIs: * SrvRegisterConsoleVDM (corresponding Win32 API: RegisterConsoleVDM) * SrvVDMConsoleOperation (corresponding Win32 API: ) - * to check whether the current process is a VDM process, and fails otherwise with the - * error 0xC0000022 (). + * to check whether the current process is a VDM process, and fails otherwise + * with the error 0xC0000022 (STATUS_ACCESS_DENIED). * * It is worth it to notice that also basesrv.dll does the same only for the * BaseSrvIsFirstVDM API... @@ -735,137 +735,6 @@ 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: - case VGA_CRTC_MAX_SCAN_LINE_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 changed flag */ - CursorChanged = TRUE; - break; - } - } -} - -static VOID VgaWriteDac(BYTE Data) -{ - INT i, PaletteIndex; - PALETTEENTRY Entry; - - /* Set the value */ - VgaDacRegisters[VgaDacIndex] = Data; - - /* Find the palette index */ - PaletteIndex = VgaDacIndex / 3; - - /* Fill the entry structure */ - Entry.peRed = VGA_DAC_TO_COLOR(VgaDacRegisters[PaletteIndex * 3]); - Entry.peGreen = VGA_DAC_TO_COLOR(VgaDacRegisters[PaletteIndex * 3 + 1]); - Entry.peBlue = VGA_DAC_TO_COLOR(VgaDacRegisters[PaletteIndex * 3 + 2]); - Entry.peFlags = 0; - - /* Update the palette entry */ - SetPaletteEntries(PaletteHandle, PaletteIndex, 1, &Entry); - - /* Check which text palette entries are affected */ - for (i = 0; i <= VGA_AC_PAL_F_REG; i++) - { - if (VgaAcRegisters[i] == PaletteIndex) - { - /* Update the text palette entry */ - SetPaletteEntries(TextPaletteHandle, i, 1, &Entry); - } - } - - /* Set the palette changed flag */ - PaletteChanged = TRUE; - - /* Update the index */ - VgaDacIndex++; - VgaDacIndex %= VGA_PALETTE_SIZE; -} - -static VOID VgaWriteAc(BYTE Data) -{ - PALETTEENTRY Entry; - - ASSERT(VgaAcIndex < VGA_AC_MAX_REG); - - /* Save the value */ - if (VgaAcIndex <= VGA_AC_PAL_F_REG) - { - if (VgaAcPalDisable) return; - - // DbgPrint(" AC Palette Writing %d to index %d\n", Data, VgaAcIndex); - if (VgaAcRegisters[VgaAcIndex] != Data) - { - /* Update the AC register */ - VgaAcRegisters[VgaAcIndex] = Data; - - /* Fill the entry structure */ - Entry.peRed = VGA_DAC_TO_COLOR(VgaDacRegisters[Data * 3]); - Entry.peGreen = VGA_DAC_TO_COLOR(VgaDacRegisters[Data * 3 + 1]); - Entry.peBlue = VGA_DAC_TO_COLOR(VgaDacRegisters[Data * 3 + 2]); - Entry.peFlags = 0; - - /* Update the palette entry and set the palette change flag */ - SetPaletteEntries(TextPaletteHandle, VgaAcIndex, 1, &Entry); - PaletteChanged = TRUE; - } - } - else - { - VgaAcRegisters[VgaAcIndex] = Data; - } -} - static VOID VgaRestoreDefaultPalette(PPALETTEENTRY Entries, USHORT NumOfEntries) { USHORT i; @@ -944,6 +813,16 @@ } return Result; +} + +static VOID VgaResetPalette(VOID) +{ + PALETTEENTRY Entries[VGA_MAX_COLORS]; + + /* Restore the default palette */ + VgaRestoreDefaultPalette(Entries, VGA_MAX_COLORS); + SetPaletteEntries(PaletteHandle, 0, VGA_MAX_COLORS, Entries); + PaletteChanged = TRUE; } static VOID VgaSetActiveScreenBuffer(HANDLE ScreenBuffer) @@ -1559,6 +1438,137 @@ return 0; } +static inline VOID VgaWriteSequencer(BYTE Data) +{ + ASSERT(VgaSeqIndex < VGA_SEQ_MAX_REG); + + /* Save the value */ + VgaSeqRegisters[VgaSeqIndex] = Data; +} + +static inline 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 inline 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: + case VGA_CRTC_MAX_SCAN_LINE_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 changed flag */ + CursorChanged = TRUE; + break; + } + } +} + +static inline VOID VgaWriteDac(BYTE Data) +{ + INT i, PaletteIndex; + PALETTEENTRY Entry; + + /* Set the value */ + VgaDacRegisters[VgaDacIndex] = Data; + + /* Find the palette index */ + PaletteIndex = VgaDacIndex / 3; + + /* Fill the entry structure */ + Entry.peRed = VGA_DAC_TO_COLOR(VgaDacRegisters[PaletteIndex * 3]); + Entry.peGreen = VGA_DAC_TO_COLOR(VgaDacRegisters[PaletteIndex * 3 + 1]); + Entry.peBlue = VGA_DAC_TO_COLOR(VgaDacRegisters[PaletteIndex * 3 + 2]); + Entry.peFlags = 0; + + /* Update the palette entry */ + SetPaletteEntries(PaletteHandle, PaletteIndex, 1, &Entry); + + /* Check which text palette entries are affected */ + for (i = 0; i <= VGA_AC_PAL_F_REG; i++) + { + if (VgaAcRegisters[i] == PaletteIndex) + { + /* Update the text palette entry */ + SetPaletteEntries(TextPaletteHandle, i, 1, &Entry); + } + } + + /* Set the palette changed flag */ + PaletteChanged = TRUE; + + /* Update the index */ + VgaDacIndex++; + VgaDacIndex %= VGA_PALETTE_SIZE; +} + +static inline VOID VgaWriteAc(BYTE Data) +{ + PALETTEENTRY Entry; + + ASSERT(VgaAcIndex < VGA_AC_MAX_REG); + + /* Save the value */ + if (VgaAcIndex <= VGA_AC_PAL_F_REG) + { + if (VgaAcPalDisable) return; + + // DbgPrint(" AC Palette Writing %d to index %d\n", Data, VgaAcIndex); + if (VgaAcRegisters[VgaAcIndex] != Data) + { + /* Update the AC register */ + VgaAcRegisters[VgaAcIndex] = Data; + + /* Fill the entry structure */ + Entry.peRed = VGA_DAC_TO_COLOR(VgaDacRegisters[Data * 3]); + Entry.peGreen = VGA_DAC_TO_COLOR(VgaDacRegisters[Data * 3 + 1]); + Entry.peBlue = VGA_DAC_TO_COLOR(VgaDacRegisters[Data * 3 + 2]); + Entry.peFlags = 0; + + /* Update the palette entry and set the palette change flag */ + SetPaletteEntries(TextPaletteHandle, VgaAcIndex, 1, &Entry); + PaletteChanged = TRUE; + } + } + else + { + VgaAcRegisters[VgaAcIndex] = Data; + } +} + static VOID WINAPI VgaWritePort(USHORT Port, BYTE Data) { DPRINT("VgaWritePort: Port 0x%X, Data 0x%02X\n", Port, Data); @@ -1936,17 +1946,7 @@ RtlZeroMemory(VgaMemory, sizeof(VgaMemory)); } -VOID VgaResetPalette(VOID) -{ - PALETTEENTRY Entries[VGA_MAX_COLORS]; - - /* Restore the default palette */ - VgaRestoreDefaultPalette(Entries, VGA_MAX_COLORS); - SetPaletteEntries(PaletteHandle, 0, VGA_MAX_COLORS, Entries); - PaletteChanged = TRUE; -} - -VOID VgaWriteFont(UINT FontNumber, CONST UCHAR *FontData, UINT Height) +VOID VgaWriteFont(UINT FontNumber, CONST UCHAR* FontData, UINT Height) { UINT i, j; PUCHAR FontMemory = (PUCHAR)&VgaMemory[VGA_BANK_SIZE * VGA_FONT_BANK + (FontNumber * VGA_FONT_SIZE)];

10 years, 1 month

[hbelusca] 65422: [NTVDM] - Rename flags; - Improve VgaUpdateTextCursor a bit (and fix a bug); - Improve a DPRINT and monitor CGA ports (for debugging purposes); - Code styling.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Nov 16 22:19:32 2014 New Revision: 65422 URL: http://svn.reactos.org/svn/reactos?rev=65422&view=rev Log: [NTVDM] - Rename flags; - Improve VgaUpdateTextCursor a bit (and fix a bug); - Improve a DPRINT and monitor CGA ports (for debugging purposes); - Code styling. Modified: trunk/reactos/subsystems/ntvdm/hardware/vga.c trunk/reactos/subsystems/ntvdm/hardware/vga.h Modified: trunk/reactos/subsystems/ntvdm/hardware/vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/vga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/vga.c [iso-8859-1] Sun Nov 16 22:19:32 2014 @@ -268,19 +268,20 @@ static BYTE VgaAcIndex = VGA_AC_PAL_0_REG; static BYTE VgaAcRegisters[VGA_AC_MAX_REG]; +static BYTE VgaDacMask = 0xFF; + +static BOOLEAN VgaDacReadWrite = FALSE; +static WORD VgaDacIndex = 0; +static BYTE VgaDacRegisters[VGA_PALETTE_SIZE]; + // static VGA_REGISTERS VgaRegisters; -static BYTE VgaDacMask = 0xFF; -static WORD VgaDacIndex = 0; -static BOOLEAN VgaDacReadWrite = FALSE; -static BYTE VgaDacRegisters[VGA_PALETTE_SIZE]; - -static BOOLEAN InVerticalRetrace = FALSE; +static BOOLEAN InVerticalRetrace = FALSE; static BOOLEAN InHorizontalRetrace = FALSE; static BOOLEAN NeedsUpdate = FALSE; static BOOLEAN ModeChanged = FALSE; -static BOOLEAN CursorMoved = FALSE; +static BOOLEAN CursorChanged = FALSE; static BOOLEAN PaletteChanged = FALSE; static @@ -610,13 +611,13 @@ if (VgaSeqRegisters[VGA_SEQ_MEM_REG] & VGA_SEQ_MEM_C4) { /* The lowest two bits are the plane number */ - Plane = Offset & 3; + Plane = Offset & 0x03; Offset >>= 2; } else if (VgaGcRegisters[VGA_GC_MODE_REG] & VGA_GC_MODE_OE) { /* The LSB is the plane number */ - Plane = Offset & 1; + Plane = Offset & 0x01; Offset >>= 1; } else @@ -656,7 +657,7 @@ static inline BYTE VgaTranslateByteForWriting(BYTE Data, BYTE Plane) { - BYTE WriteMode = VgaGcRegisters[VGA_GC_MODE_REG] & 3; + BYTE WriteMode = VgaGcRegisters[VGA_GC_MODE_REG] & 0x03; BYTE BitMask = VgaGcRegisters[VGA_GC_BITMASK_REG]; if (WriteMode == 1) @@ -668,7 +669,7 @@ if (WriteMode != 2) { /* Write modes 0 and 3 rotate the data to the right first */ - BYTE RotateCount = VgaGcRegisters[VGA_GC_ROTATE_REG] & 7; + BYTE RotateCount = VgaGcRegisters[VGA_GC_ROTATE_REG] & 0x07; Data = LOBYTE(((DWORD)Data >> RotateCount) | ((DWORD)Data << (8 - RotateCount))); } else @@ -693,7 +694,7 @@ if (WriteMode != 3) { /* Write modes 0 and 2 then perform a logical operation on the data and latch */ - BYTE LogicalOperation = (VgaGcRegisters[VGA_GC_ROTATE_REG] >> 3) & 3; + BYTE LogicalOperation = (VgaGcRegisters[VGA_GC_ROTATE_REG] >> 3) & 0x03; if (LogicalOperation == 1) Data &= VgaLatchRegisters[Plane]; else if (LogicalOperation == 2) Data |= VgaLatchRegisters[Plane]; @@ -774,6 +775,7 @@ case VGA_CRTC_END_HORZ_DISP_REG: case VGA_CRTC_VERT_DISP_END_REG: case VGA_CRTC_OVERFLOW_REG: + case VGA_CRTC_MAX_SCAN_LINE_REG: { /* The video mode has changed */ ModeChanged = TRUE; @@ -785,8 +787,8 @@ case VGA_CRTC_CURSOR_START_REG: case VGA_CRTC_CURSOR_END_REG: { - /* Set the cursor moved flag */ - CursorMoved = TRUE; + /* Set the cursor changed flag */ + CursorChanged = TRUE; break; } } @@ -1244,8 +1246,8 @@ BYTE HighPlaneData = VgaMemory[(BankNumber + 2) * VGA_BANK_SIZE + LOWORD(Offset * AddressSize)]; /* Extract the two bits from each plane */ - LowPlaneData = (LowPlaneData >> (6 - ((j % 4) * 2))) & 3; - HighPlaneData = (HighPlaneData >> (6 - ((j % 4) * 2))) & 3; + LowPlaneData = (LowPlaneData >> (6 - ((j % 4) * 2))) & 0x03; + HighPlaneData = (HighPlaneData >> (6 - ((j % 4) * 2))) & 0x03; /* Combine them into the pixel */ PixelData = LowPlaneData | (HighPlaneData << 2); @@ -1422,8 +1424,11 @@ { COORD Position; CONSOLE_CURSOR_INFO CursorInfo; - BYTE CursorStart = VgaCrtcRegisters[VGA_CRTC_CURSOR_START_REG] & 0x3F; - BYTE CursorEnd = VgaCrtcRegisters[VGA_CRTC_CURSOR_END_REG] & 0x1F; + + BOOL CursorVisible = !(VgaCrtcRegisters[VGA_CRTC_CURSOR_START_REG] & 0x20); + BYTE CursorStart = VgaCrtcRegisters[VGA_CRTC_CURSOR_START_REG] & 0x1F; + BYTE CursorEnd = VgaCrtcRegisters[VGA_CRTC_CURSOR_END_REG] & 0x1F; + DWORD ScanlineSize = (DWORD)VgaCrtcRegisters[VGA_CRTC_OFFSET_REG] * 2; BYTE TextSize = 1 + (VgaCrtcRegisters[VGA_CRTC_MAX_SCAN_LINE_REG] & 0x1F); WORD Location = MAKEWORD(VgaCrtcRegisters[VGA_CRTC_CURSOR_LOC_LOW_REG], @@ -1435,18 +1440,18 @@ if (CursorStart < CursorEnd) { /* Visible cursor */ - CursorInfo.bVisible = TRUE; - CursorInfo.dwSize = (100 * (CursorEnd - CursorStart)) / TextSize; + CursorInfo.bVisible = CursorVisible; + CursorInfo.dwSize = (100 * (CursorEnd - CursorStart)) / TextSize; } else { - /* No cursor */ + /* Hidden cursor */ CursorInfo.bVisible = FALSE; - CursorInfo.dwSize = 0; + CursorInfo.dwSize = 1; // The size needs to be non-null in order SetConsoleCursorInfo to succeed. } /* Add the cursor skew to the location */ - Location += (VgaCrtcRegisters[VGA_CRTC_CURSOR_END_REG] >> 5) & 3; + Location += (VgaCrtcRegisters[VGA_CRTC_CURSOR_END_REG] >> 5) & 0x03; /* Find the coordinates of the new position */ Position.X = (SHORT)(Location % ScanlineSize); @@ -1458,8 +1463,8 @@ SetConsoleCursorInfo(TextConsoleBuffer, &CursorInfo); SetConsoleCursorPosition(TextConsoleBuffer, Position); - /* Reset the cursor move flag */ - CursorMoved = FALSE; + /* Reset the cursor changed flag */ + CursorChanged = FALSE; } static BYTE WINAPI VgaReadPort(USHORT Port) @@ -1704,7 +1709,7 @@ } default: - DPRINT1("VgaWritePort: Unknown port 0x%X\n", Port); + DPRINT1("VgaWritePort: Unknown port 0x%X, Data 0x%02X\n", Port, Data); break; } } @@ -1778,14 +1783,14 @@ InVerticalRetrace = TRUE; /* If nothing has changed, just return */ - // if (!ModeChanged && !CursorMoved && !PaletteChanged && !NeedsUpdate) + // if (!ModeChanged && !CursorChanged && !PaletteChanged && !NeedsUpdate) // return; /* Change the display mode */ if (ModeChanged) VgaChangeMode(); - /* Change the text cursor location */ - if (CursorMoved) VgaUpdateTextCursor(); + /* Change the text cursor appearance */ + if (CursorChanged) VgaUpdateTextCursor(); /* Retrieve the current resolution */ Resolution = VgaGetDisplayResolution(); @@ -1903,7 +1908,7 @@ /* Check if this is chain-4 mode */ if (VgaSeqRegisters[VGA_SEQ_MEM_REG] & VGA_SEQ_MEM_C4) { - if (((Address + i) & 3) != j) + if (((Address + i) & 0x03) != j) { /* This plane will not be accessed */ continue; @@ -1913,7 +1918,7 @@ /* Check if this is odd-even mode */ if (VgaGcRegisters[VGA_GC_MODE_REG] & VGA_GC_MODE_OE) { - if (((Address + i) & 1) != (j & 1)) + if (((Address + i) & 0x01) != (j & 1)) { /* This plane will not be accessed */ continue; @@ -2070,6 +2075,10 @@ RegisterIoPort(0x3CE, VgaReadPort, VgaWritePort); // VGA_GC_INDEX RegisterIoPort(0x3CF, VgaReadPort, VgaWritePort); // VGA_GC_DATA + /* CGA ports for compatibility, unimplemented */ + RegisterIoPort(0x3D8, VgaReadPort, VgaWritePort); // CGA_MODE_CTRL_REG + RegisterIoPort(0x3D9, VgaReadPort, VgaWritePort); // CGA_PAL_CTRL_REG + /* Return success */ return TRUE; } Modified: trunk/reactos/subsystems/ntvdm/hardware/vga.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/vga.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/vga.h [iso-8859-1] Sun Nov 16 22:19:32 2014 @@ -76,7 +76,7 @@ #define VGA_MISC_RAM_ENABLED (1 << 1) // #define VGA_MISC_CSEL1 (1 << 2) // #define VGA_MISC_CSEL2 (1 << 3) -#define VGA_MISC_OE_INVERT (1 << 5) +#define VGA_MISC_OE_PAGESEL (1 << 5) #define VGA_MISC_HSYNCP (1 << 6) #define VGA_MISC_VSYNCP (1 << 7) @@ -102,7 +102,7 @@ /* Sequencer memory register bits */ #define VGA_SEQ_MEM_EXT (1 << 1) -#define VGA_SEQ_MEM_OE (1 << 2) +#define VGA_SEQ_MEM_OE_DIS (1 << 2) #define VGA_SEQ_MEM_C4 (1 << 3) enum

10 years, 1 month

[hbelusca] 65421: [NTVDM] - Remove some old comments (and commented DPRINTs); - More support for Bda->VGAOptions; - Improve implementation of VidBiosSetCursorShape (start some cursor emulation, and...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Nov 16 16:01:09 2014 New Revision: 65421 URL: http://svn.reactos.org/svn/reactos?rev=65421&view=rev Log: [NTVDM] - Remove some old comments (and commented DPRINTs); - More support for Bda->VGAOptions; - Improve implementation of VidBiosSetCursorShape (start some cursor emulation, and add a note about it); - Implement few "Alternate Function Select" subfunctions. Modified: trunk/reactos/subsystems/ntvdm/bios/vidbios.c Modified: trunk/reactos/subsystems/ntvdm/bios/vidbios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/vidb… ============================================================================== --- trunk/reactos/subsystems/ntvdm/bios/vidbios.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/bios/vidbios.c [iso-8859-1] Sun Nov 16 16:01:09 2014 @@ -50,7 +50,7 @@ /* Sequencer Registers */ {0x00, 0x08, 0x03, 0x00, 0x02}, - /* CRTC Registers */ + /* CRTC Registers */ /* CGA-compatible: 0xC7, 0x06, 0x07 */ {0x2D, 0x27, 0x28, 0x90, 0x2B, 0xA0, 0xBF, 0x1F, 0x00, 0x4F, 0x0D, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x9C, 0x8E, 0x8F, 0x14, 0x1F, 0x96, 0xB9, 0xA3, 0xFF}, @@ -71,7 +71,7 @@ /* Sequencer Registers */ {0x00, 0x00, 0x03, 0x00, 0x02}, - /* CRTC Registers */ + /* CRTC Registers */ /* CGA-compatible: 0xC7, 0x06, 0x07 */ {0x5F, 0x4F, 0x50, 0x82, 0x55, 0x81, 0xBF, 0x1F, 0x00, 0x4F, 0x0D, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x9C, 0x8E, 0x8F, 0x28, 0x1F, 0x96, 0xB9, 0xA3, 0xFF}, @@ -2100,19 +2100,25 @@ */ Bda->CrtBasePort = (Registers->Misc & 0x01) ? VGA_CRTC_INDEX_COLOR : VGA_CRTC_INDEX_MONO; + /* Bit 1 indicates whether display is color (0) or monochrome (1) */ + Bda->VGAOptions = (Bda->VGAOptions & 0xFD) | (!(Registers->Misc & 0x01) << 1); + + /* Turn the video off */ + IOWriteB(VGA_SEQ_INDEX, VGA_SEQ_CLOCK_REG); + IOWriteB(VGA_SEQ_DATA , IOReadB(VGA_SEQ_DATA) | VGA_SEQ_CLOCK_SD); /* Write the misc register */ IOWriteB(VGA_MISC_WRITE, Registers->Misc); /* Synchronous reset on */ IOWriteB(VGA_SEQ_INDEX, VGA_SEQ_RESET_REG); - IOWriteB(VGA_SEQ_DATA , VGA_SEQ_RESET_AR); + IOWriteB(VGA_SEQ_DATA , VGA_SEQ_RESET_AR ); /* Write the sequencer registers */ for (i = 1; i < VGA_SEQ_MAX_REG; i++) { IOWriteB(VGA_SEQ_INDEX, i); - IOWriteB(VGA_SEQ_DATA, Registers->Sequencer[i]); + IOWriteB(VGA_SEQ_DATA , Registers->Sequencer[i]); } /* Synchronous reset off */ @@ -2121,9 +2127,9 @@ /* Unlock CRTC registers 0-7 */ IOWriteB(VGA_CRTC_INDEX, VGA_CRTC_END_HORZ_BLANKING_REG); - IOWriteB(VGA_CRTC_DATA, IOReadB(VGA_CRTC_DATA) | 0x80); + IOWriteB(VGA_CRTC_DATA , IOReadB(VGA_CRTC_DATA) | 0x80); IOWriteB(VGA_CRTC_INDEX, VGA_CRTC_VERT_RETRACE_END_REG); - IOWriteB(VGA_CRTC_DATA, IOReadB(VGA_CRTC_DATA) & ~0x80); + IOWriteB(VGA_CRTC_DATA , IOReadB(VGA_CRTC_DATA) & ~0x80); // Make sure they remain unlocked Registers->CRT[VGA_CRTC_END_HORZ_BLANKING_REG] |= 0x80; Registers->CRT[VGA_CRTC_VERT_RETRACE_END_REG] &= ~0x80; @@ -2132,24 +2138,21 @@ for (i = 0; i < VGA_CRTC_MAX_REG; i++) { IOWriteB(VGA_CRTC_INDEX, i); - IOWriteB(VGA_CRTC_DATA, Registers->CRT[i]); + IOWriteB(VGA_CRTC_DATA , Registers->CRT[i]); } /* Write the GC registers */ for (i = 0; i < VGA_GC_MAX_REG; i++) { IOWriteB(VGA_GC_INDEX, i); - IOWriteB(VGA_GC_DATA, Registers->Graphics[i]); + IOWriteB(VGA_GC_DATA , Registers->Graphics[i]); } /* Write the AC registers */ - // DbgPrint("\n"); for (i = 0; i < VGA_AC_MAX_REG; i++) { VgaSetSinglePaletteRegister(i, Registers->Attribute[i]); - // DbgPrint("Registers->Attribute[%d] = %d\n", i, Registers->Attribute[i]); } - // DbgPrint("\n"); /* Set the PEL mask */ IOWriteB(VGA_DAC_MASK, 0xFF); @@ -2157,6 +2160,10 @@ /* Enable screen and disable palette access */ IOReadB(VGA_INSTAT1_READ); // Put the AC register into index state IOWriteB(VGA_AC_INDEX, 0x20); + + /* Turn the video on */ + IOWriteB(VGA_SEQ_INDEX, VGA_SEQ_CLOCK_REG); + IOWriteB(VGA_SEQ_DATA , IOReadB(VGA_SEQ_DATA) & ~VGA_SEQ_CLOCK_SD); /* Enable interrupts */ setIF(1); @@ -2263,6 +2270,53 @@ } } +static VOID VidBiosSetCursorShape(WORD CursorStartEnd) +{ + /* Only valid in text-mode */ + if ((Bda->VideoMode > 0x03) && (Bda->VideoMode != 0x07)) return; + + /* Update the BDA */ + Bda->CursorStartLine = HIBYTE(CursorStartEnd) & 0x1F; + Bda->CursorEndLine = LOBYTE(CursorStartEnd) & 0x1F; + + /* + * In cursor emulation mode, we suppose the cursor scanlines + * to be in CGA mode, so that we need to adjust them + * + * WARNING!! + * ========= + * Contrary to what is mentioned in lots of literature out there, e.g. in: + * http://webpages.charter.net/danrollins/techhelp/0072.HTM + * http://www.bioscentral.com/misc/bda.htm + * and in other various places, bit 0 of Bda->VGAOptions is 0 when + * cursor emulation is ENABLED, and is 1 when it is DISABLED. + * + * The following documentation is right about this fact: + * http://www.cs.nyu.edu/~mwalfish/classes/ut/s12-cs372h/ref/hardware/vgadoc/V… + * https://sites.google.com/site/pcdosretro/biosdata + * + * A proof that it is OK is that in the following code samples it is + * explicitely mentioned that setting bit 0 disables cursor emulation: + * - Code snippets in PC Magazine vol.5 num.15 of 16/09/1986, p.291-292; + * - CardFile DOS utility (Jeff Prosise, PC Magazine vol.6 num.17 of 13/10/1987, p.403-416): + * https://ia600700.us.archive.org/1/items/srccode-00000020/cardfile.asm.txt + * (function 'show_cursor', "or ega_info,1 ;disable EGA cursor emulation") + */ + if (!(Bda->VGAOptions & 0x01)) + { + // HACK: Quick "fix" for cursor scanline adjustment. This must be reworked. + DPRINT1("HACK: Using HACK for cursor scanlines adjustment\n"); + CursorStartEnd = MAKEWORD((LOBYTE(CursorStartEnd) & 0x1F) * 2, + (HIBYTE(CursorStartEnd) & 0x1F) * 2 | (HIBYTE(CursorStartEnd) & 0xE0)); + } + + /* Modify the CRTC registers */ + IOWriteB(VGA_CRTC_INDEX, VGA_CRTC_CURSOR_START_REG); + IOWriteB(VGA_CRTC_DATA , HIBYTE(CursorStartEnd)); + IOWriteB(VGA_CRTC_INDEX, VGA_CRTC_CURSOR_END_REG); + IOWriteB(VGA_CRTC_DATA , LOBYTE(CursorStartEnd)); +} + VOID VidBiosSyncCursorPosition(VOID) { BYTE Row, Column; @@ -2340,7 +2394,7 @@ Bda->VideoPageOffset = Bda->VideoPage * Bda->VideoPageSize; /* 256 KB Video RAM; set bit 7 if we do not clear the screen */ - Bda->VGAOptions = 0x60 | (DoNotClear ? 0x80 : 0x00); + Bda->VGAOptions = 0x60 | (Bda->VGAOptions & 0x7F) | (DoNotClear ? 0x80 : 0x00); Bda->VGASwitches = 0xF9; /* High-resolution */ /* Set the start address in the CRTC */ @@ -2357,6 +2411,15 @@ Resolution = VgaGetDisplayResolution(); Bda->ScreenColumns = Resolution.X; Bda->ScreenRows = Resolution.Y - 1; + + /* + * Update the cursor shape (text-mode only). + * Use the default CGA cursor scanline values, + * see: http://vitaly_filatov.tripod.com/ng/asm/asm_023.2.html + */ + if ((ModeNumber >= 0x00 && ModeNumber <= 0x03) || (ModeNumber == 0x07)) + // FIXME: we might read the CRT registers and do the adjustment? + VidBiosSetCursorShape(MAKEWORD(0x07, 0x06)); /* Set the cursor position for each page */ for (Page = 0; Page < BIOS_MAX_PAGES; ++Page) @@ -2519,18 +2582,7 @@ /* Set Text-Mode Cursor Shape */ case 0x01: { - WORD CursorStartEnd = getCX(); - - /* Update the BDA */ - Bda->CursorStartLine = HIBYTE(CursorStartEnd) & 0x1F; - Bda->CursorEndLine = LOBYTE(CursorStartEnd) & 0x1F; - - /* Modify the CRTC registers */ - IOWriteB(VGA_CRTC_INDEX, VGA_CRTC_CURSOR_START_REG); - IOWriteB(VGA_CRTC_DATA , HIBYTE(CursorStartEnd)); - IOWriteB(VGA_CRTC_INDEX, VGA_CRTC_CURSOR_END_REG); - IOWriteB(VGA_CRTC_DATA , Bda->CursorEndLine); - + VidBiosSetCursorShape(getCX()); break; } @@ -2548,7 +2600,6 @@ if (getBH() >= BIOS_MAX_PAGES) break; /* Return the result */ - setAX(0); setCX(MAKEWORD(Bda->CursorEndLine, Bda->CursorStartLine)); setDX(Bda->CursorPosition[getBH()]); break; @@ -2650,7 +2701,7 @@ /* Set Video Colors */ case 0x0B: { - if (Bda->VideoMode < 4 || Bda->VideoMode > 6) + if (Bda->VideoMode < 0x04 || Bda->VideoMode > 0x06) { DPRINT1("BIOS Function INT 10h, AH = 0Bh, BH = 0x%02X is unsupported for non-CGA modes\n", getBH()); @@ -2673,7 +2724,7 @@ VgaSetSinglePaletteRegister(VGA_AC_OVERSCAN_REG, Index); /* Don't set any extra colors when in text mode */ - if (Bda->VideoMode <= 3) break; + if (Bda->VideoMode <= 0x03) break; VgaSetSinglePaletteRegister(0x00, Index); @@ -2704,7 +2755,7 @@ Bda->CrtColorPaletteMask = (Bda->CrtColorPaletteMask & 0xDF) | ((Index & 1) ? 0x20 : 0x00); /* Don't set any extra colors when in text mode */ - if (Bda->VideoMode <= 3) break; + if (Bda->VideoMode <= 0x03) break; Index = (Bda->CrtColorPaletteMask & 0x10) | 0x02 | Index; @@ -3051,8 +3102,71 @@ /* Alternate Function Select */ case 0x12: { - DPRINT1("BIOS Function INT 10h, AH = 12h (Alternate Function Select), BX = 0x%04X NOT IMPLEMENTED\n", - getBX()); + switch (getBL()) + { + /* Get EGA/VGA Information */ + case 0x10: + { + setBH((Bda->VGAOptions & 0x02) >> 1); /* Color (0) or monochrome (1) display */ + setBL((Bda->VGAOptions & 0x60) >> 5); /* Video RAM size */ + setCH((Bda->VGASwitches & 0xF0) >> 4); /* Features settings */ + setCL( Bda->VGASwitches & 0x0F); /* Switches settings */ + break; + } + + /* Enable/Disable Cursor Emulation */ + case 0x34: + { + BYTE State = getAL(); + + /* Check for validity */ + if (State > 1) break; + + /* + * Enable (State == 0) or disable (State == 1) cursor emulation. + * Please read the WARNING in the 'VidBiosSetCursorShape' + * function for more details. + */ + Bda->VGAOptions = (Bda->VGAOptions & 0xFE) | (State & 0x01); + + /* Return success */ + setAL(0x12); + break; + } + + /* Enable/Disable screen refresh */ + case 0x36: + { + BYTE State = getAL(); + BYTE Clocking; + + /* Check for validity */ + if (State > 1) break; + + /* Turn the video on (State == 0) or off (State == 1) */ + IOWriteB(VGA_SEQ_INDEX, VGA_SEQ_CLOCK_REG); + Clocking = IOReadB(VGA_SEQ_DATA); + + if (State == 0) + Clocking &= ~VGA_SEQ_CLOCK_SD; + else + Clocking |= VGA_SEQ_CLOCK_SD; + + IOWriteB(VGA_SEQ_DATA, Clocking); + + /* Return success */ + setAL(0x12); + break; + } + + default: + { + DPRINT1("BIOS Function INT 10h, AH = 12h (Alternate Function Select), BX = 0x%04X NOT IMPLEMENTED\n", + getBX()); + break; + } + } + break; }

10 years, 1 month

[tkreuzer] 65420: [WIN32K] Copy only the actual size of the BITMAPINFO back to usermode in NtGdiGetDIBitsInternal.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Nov 16 14:22:54 2014 New Revision: 65420 URL: http://svn.reactos.org/svn/reactos?rev=65420&view=rev Log: [WIN32K] Copy only the actual size of the BITMAPINFO back to usermode in NtGdiGetDIBitsInternal. Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dibobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] Sun Nov 16 14:22:54 2014 @@ -1101,6 +1101,7 @@ _SEH2_TRY { /* Copy the data back */ + cjMaxInfo = DIB_BitmapInfoSize(pbmi, (WORD)iUsage); ProbeForWrite(pbmiUser, cjMaxInfo, 1); RtlCopyMemory(pbmiUser, pbmi, cjMaxInfo); }

10 years, 1 month

[tkreuzer] 65419: [LIBS] Remove some explicit comparisons with TRUE and make desired explicit comparison more obvious. Patch by Love Nystrom, modified by me. Fixes a bug in RtlUpcaseUnicodeString. ...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Nov 16 14:07:37 2014 New Revision: 65419 URL: http://svn.reactos.org/svn/reactos?rev=65419&view=rev Log: [LIBS] Remove some explicit comparisons with TRUE and make desired explicit comparison more obvious. Patch by Love Nystrom, modified by me. Fixes a bug in RtlUpcaseUnicodeString. Not committed: modifications to freetype, since this is 3rd party code. CORE-8799 Modified: trunk/reactos/lib/cmlib/cmtools.c trunk/reactos/lib/drivers/hidparser/api.c trunk/reactos/lib/drivers/hidparser/hidparser.c trunk/reactos/lib/drivers/hidparser/parser.c trunk/reactos/lib/drivers/ip/network/routines.c trunk/reactos/lib/drivers/sound/mmebuddy/mmewrap.c trunk/reactos/lib/drivers/sound/mmixer/controls.c trunk/reactos/lib/rtl/debug.c trunk/reactos/lib/rtl/env.c trunk/reactos/lib/rtl/resource.c trunk/reactos/lib/rtl/time.c trunk/reactos/lib/rtl/unicode.c trunk/reactos/lib/sdk/crt/misc/lock.c Modified: trunk/reactos/lib/cmlib/cmtools.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmtools.c?rev=65… ============================================================================== --- trunk/reactos/lib/cmlib/cmtools.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmtools.c [iso-8859-1] Sun Nov 16 14:07:37 2014 @@ -44,7 +44,7 @@ { ULONG i; - if (NamePacked == TRUE) + if (NamePacked) { PUCHAR PackedName = (PUCHAR)Name; @@ -153,7 +153,7 @@ ASSERT(Name != 0); ASSERT(NameLength != 0); - if (NamePacked == TRUE) + if (NamePacked) { NameLength *= sizeof(WCHAR); CharCount = min(BufferLength, NameLength) / sizeof(WCHAR); Modified: trunk/reactos/lib/drivers/hidparser/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/hidparser/api.… ============================================================================== --- trunk/reactos/lib/drivers/hidparser/api.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/hidparser/api.c [iso-8859-1] Sun Nov 16 14:07:37 2014 @@ -184,7 +184,7 @@ // // check item type // - if (Report->Items[Index].HasData && bData == TRUE) + if (Report->Items[Index].HasData && bData) { // // found data item Modified: trunk/reactos/lib/drivers/hidparser/hidparser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/hidparser/hidp… ============================================================================== --- trunk/reactos/lib/drivers/hidparser/hidparser.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/hidparser/hidparser.c [iso-8859-1] Sun Nov 16 14:07:37 2014 @@ -139,9 +139,9 @@ DeviceDescription->ReportIDs[Index].FeatureLength = HidParser_GetReportLength((PVOID)DeviceDescription->CollectionDesc[Index].PreparsedData, HID_REPORT_TYPE_FEATURE); - DeviceDescription->ReportIDs[Index].InputLength += (HidParser_UsesReportId((PVOID)DeviceDescription->CollectionDesc[Index].PreparsedData, HID_REPORT_TYPE_INPUT) == TRUE ? 1 : 0); - DeviceDescription->ReportIDs[Index].OutputLength += (HidParser_UsesReportId((PVOID)DeviceDescription->CollectionDesc[Index].PreparsedData, HID_REPORT_TYPE_OUTPUT) == TRUE ? 1 : 0); - DeviceDescription->ReportIDs[Index].FeatureLength += (HidParser_UsesReportId((PVOID)DeviceDescription->CollectionDesc[Index].PreparsedData, HID_REPORT_TYPE_FEATURE) == TRUE ? 1 : 0); + DeviceDescription->ReportIDs[Index].InputLength += (HidParser_UsesReportId((PVOID)DeviceDescription->CollectionDesc[Index].PreparsedData, HID_REPORT_TYPE_INPUT) ? 1 : 0); + DeviceDescription->ReportIDs[Index].OutputLength += (HidParser_UsesReportId((PVOID)DeviceDescription->CollectionDesc[Index].PreparsedData, HID_REPORT_TYPE_OUTPUT) ? 1 : 0); + DeviceDescription->ReportIDs[Index].FeatureLength += (HidParser_UsesReportId((PVOID)DeviceDescription->CollectionDesc[Index].PreparsedData, HID_REPORT_TYPE_FEATURE) ? 1 : 0); // Modified: trunk/reactos/lib/drivers/hidparser/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/hidparser/pars… ============================================================================== --- trunk/reactos/lib/drivers/hidparser/parser.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/hidparser/parser.c [iso-8859-1] Sun Nov 16 14:07:37 2014 @@ -570,7 +570,7 @@ ReportItem->BitCount = GlobalItemState->ReportSize; ReportItem->HasData = (ItemData->DataConstant == FALSE); ReportItem->Array = (ItemData->ArrayVariable == 0); - ReportItem->Relative = (ItemData->Relative == TRUE); + ReportItem->Relative = (ItemData->Relative != FALSE); ReportItem->Minimum = LogicalMinimum; ReportItem->Maximum = LogicalMaximum; ReportItem->UsageMinimum = UsageMinimum; Modified: trunk/reactos/lib/drivers/ip/network/routines.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/rou… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/routines.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/routines.c [iso-8859-1] Sun Nov 16 14:07:37 2014 @@ -63,8 +63,9 @@ UINT Length; PCHAR CharBuffer; - if ((DbgQueryDebugFilterState(DPFLTR_TCPIP_ID, DEBUG_PBUFFER | DPFLTR_MASK) != TRUE) || - (DbgQueryDebugFilterState(DPFLTR_TCPIP_ID, DEBUG_IP | DPFLTR_MASK) != TRUE)) { + /* DbgQueryDebugFilterState returns (NTSTATUS)TRUE, (NTSTATUS)FALSE or a failure status code */ + if ((DbgQueryDebugFilterState(DPFLTR_TCPIP_ID, DEBUG_PBUFFER | DPFLTR_MASK) != (NTSTATUS)TRUE) || + (DbgQueryDebugFilterState(DPFLTR_TCPIP_ID, DEBUG_IP | DPFLTR_MASK) != (NTSTATUS)TRUE)) { return; } Modified: trunk/reactos/lib/drivers/sound/mmebuddy/mmewrap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmebuddy/mmewrap.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmebuddy/mmewrap.c [iso-8859-1] Sun Nov 16 14:07:37 2014 @@ -57,7 +57,7 @@ /* Store audio stream pause state */ SoundDeviceInstance->bPaused = !bStart; - if (SoundDeviceInstance->bPaused == FALSE && OldState == TRUE) + if (SoundDeviceInstance->bPaused == FALSE && OldState) { InitiateSoundStreaming(SoundDeviceInstance); } Modified: trunk/reactos/lib/drivers/sound/mmixer/controls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/c… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/controls.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/controls.c [iso-8859-1] Sun Nov 16 14:07:37 2014 @@ -1586,7 +1586,7 @@ MMixerIsTopologyPinReserved(Topology, Index, &Reserved); /* check if it has already been reserved */ - if (Reserved == TRUE) + if (Reserved) { /* pin has already been reserved */ continue; Modified: trunk/reactos/lib/rtl/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/debug.c?rev=65419&… ============================================================================== --- trunk/reactos/lib/rtl/debug.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/debug.c [iso-8859-1] Sun Nov 16 14:07:37 2014 @@ -64,7 +64,7 @@ /* Check if we should print it or not */ if ((ComponentId != MAXULONG) && - (NtQueryDebugFilterState(ComponentId, Level)) != TRUE) + (NtQueryDebugFilterState(ComponentId, Level)) != (NTSTATUS)TRUE) { /* This message is masked */ return STATUS_SUCCESS; Modified: trunk/reactos/lib/rtl/env.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/env.c?rev=65419&r1… ============================================================================== --- trunk/reactos/lib/rtl/env.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/env.c [iso-8859-1] Sun Nov 16 14:07:37 2014 @@ -535,7 +535,7 @@ } Value->Length = 0; - if (SysEnvUsed == TRUE) + if (SysEnvUsed) RtlAcquirePebLock(); wcs = Environment; @@ -573,7 +573,7 @@ Status = STATUS_BUFFER_TOO_SMALL; } - if (SysEnvUsed == TRUE) + if (SysEnvUsed) RtlReleasePebLock(); return(Status); @@ -582,7 +582,7 @@ wcs++; } - if (SysEnvUsed == TRUE) + if (SysEnvUsed) RtlReleasePebLock(); DPRINT("Return STATUS_VARIABLE_NOT_FOUND: %wZ\n", Name); Modified: trunk/reactos/lib/rtl/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/resource.c?rev=654… ============================================================================== --- trunk/reactos/lib/rtl/resource.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/resource.c [iso-8859-1] Sun Nov 16 14:07:37 2014 @@ -105,7 +105,7 @@ goto done; } wait: - if (Wait == TRUE) + if (Wait) { Resource->ExclusiveWaiters++; @@ -120,10 +120,10 @@ } else /* one or more shared locks are in progress */ { - if (Wait == TRUE) + if (Wait) goto wait; } - if (retVal == TRUE) + if (retVal) Resource->OwningThread = NtCurrentTeb()->ClientId.UniqueThread; done: RtlLeaveCriticalSection(&Resource->Lock); @@ -154,7 +154,7 @@ goto done; } - if (Wait == TRUE) + if (Wait) { Resource->SharedWaiters++; RtlLeaveCriticalSection(&Resource->Lock); Modified: trunk/reactos/lib/rtl/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/time.c?rev=65419&r… ============================================================================== --- trunk/reactos/lib/rtl/time.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/time.c [iso-8859-1] Sun Nov 16 14:07:37 2014 @@ -106,7 +106,7 @@ { /* Compute the cutover time of the first day of the current month */ AdjustedTimeFields.Year = CurrentTimeFields.Year; - if (NextYearsCutover == TRUE) + if (NextYearsCutover) AdjustedTimeFields.Year++; AdjustedTimeFields.Month = CutoverTimeFields->Month; @@ -146,8 +146,8 @@ if (!RtlTimeFieldsToTime(&AdjustedTimeFields, &CutoverSystemTime)) return FALSE; - if (ThisYearsCutoverOnly == TRUE || - NextYearsCutover == TRUE || + if (ThisYearsCutoverOnly || + NextYearsCutover || CutoverSystemTime.QuadPart >= CurrentTime->QuadPart) { break; Modified: trunk/reactos/lib/rtl/unicode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/unicode.c?rev=6541… ============================================================================== --- trunk/reactos/lib/rtl/unicode.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/unicode.c [iso-8859-1] Sun Nov 16 14:07:37 2014 @@ -1809,7 +1809,7 @@ PAGED_CODE_RTL(); - if (AllocateDestinationString == TRUE) + if (AllocateDestinationString) { UniDest->MaximumLength = UniSource->Length; UniDest->Buffer = RtlpAllocateStringMemory(UniDest->MaximumLength, TAG_USTR); @@ -2620,7 +2620,7 @@ ComputerNameOem.Length = (USHORT)ComputerNameOemNLength; ComputerNameOem.MaximumLength = (USHORT)(MAX_COMPUTERNAME_LENGTH + 1); - if (RtlpDidUnicodeToOemWork(DnsHostName, &ComputerNameOem) == TRUE) + if (RtlpDidUnicodeToOemWork(DnsHostName, &ComputerNameOem)) { /* no unmapped character so convert it back to an unicode string */ Status = RtlOemStringToUnicodeString(ComputerName, Modified: trunk/reactos/lib/sdk/crt/misc/lock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/misc/lock.c?re… ============================================================================== --- trunk/reactos/lib/sdk/crt/misc/lock.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/misc/lock.c [iso-8859-1] Sun Nov 16 14:07:37 2014 @@ -83,7 +83,7 @@ /* Uninitialize the table */ for( i=0; i < _TOTAL_LOCKS; i++ ) { - if( lock_table[ i ].bInit == TRUE ) + if( lock_table[ i ].bInit ) { msvcrt_uninitialize_mlock( i ); }

10 years, 1 month

[ekohl] 65418: [NET] Replace remaining hard coded 'padding' strings.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Nov 16 10:34:49 2014 New Revision: 65418 URL: http://svn.reactos.org/svn/reactos?rev=65418&view=rev Log: [NET] Replace remaining hard coded 'padding' strings. Modified: trunk/reactos/base/applications/network/net/cmdLocalGroup.c trunk/reactos/base/applications/network/net/cmdUser.c trunk/reactos/base/applications/network/net/main.c trunk/reactos/base/applications/network/net/net.h Modified: trunk/reactos/base/applications/network/net/cmdLocalGroup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/cmdLocalGroup.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/cmdLocalGroup.c [iso-8859-1] Sun Nov 16 10:34:49 2014 @@ -41,7 +41,8 @@ PrintToConsole(L"\n"); PrintResourceString(IDS_LOCALGROUP_ALIASES, pServer->sv100_name); PrintToConsole(L"\n\n"); - PrintToConsole(L"------------------------------------------\n"); + PrintPadding(L'-', 79); + PrintToConsole(L"\n"); NetApiBufferFree(pServer); @@ -62,7 +63,7 @@ for (i = 0; i < dwRead; i++) { - if (pBuffer[i].lgrpi0_name) + if (pBuffer[i].lgrpi0_name) PrintToConsole(L"*%s\n", pBuffer[i].lgrpi0_name); } @@ -141,7 +142,8 @@ PrintResourceString(IDS_LOCALGROUP_MEMBERS); PrintToConsole(L"\n\n"); - PrintToConsole(L"------------------------------------------\n"); + PrintPadding(L'-', 79); + PrintToConsole(L"\n"); for (i = 0; i < dwRead; i++) { Modified: trunk/reactos/base/applications/network/net/cmdUser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/cmdUser.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/cmdUser.c [iso-8859-1] Sun Nov 16 10:34:49 2014 @@ -40,7 +40,8 @@ PrintToConsole(L"\n"); PrintResourceString(IDS_USER_ACCOUNTS, pServer->sv100_name); PrintToConsole(L"\n\n"); - PrintToConsole(L"------------------------------------------\n"); + PrintPadding(L'-', 79); + PrintToConsole(L"\n"); NetApiBufferFree(pServer); @@ -263,7 +264,7 @@ for (i = 0; i < dwLocalGroupTotal; i++) { if (i != 0) - PrintToConsole(L" "); + PrintPadding(L' ', nPaddedLength); PrintToConsole(L"*%s\n", pLocalGroupInfo[i].lgrui0_name); } } @@ -278,7 +279,7 @@ for (i = 0; i < dwGroupTotal; i++) { if (i != 0) - PrintToConsole(L" "); + PrintPadding(L' ', nPaddedLength); PrintToConsole(L"*%s\n", pGroupInfo[i].grui0_name); } } Modified: trunk/reactos/base/applications/network/net/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/main.c [iso-8859-1] Sun Nov 16 10:34:49 2014 @@ -85,6 +85,22 @@ VOID +PrintPadding( + WCHAR chr, + INT nPaddedLength) +{ + WCHAR szMsgBuffer[MAX_BUFFER_SIZE]; + INT i; + + for (i = 0; i < nPaddedLength; i++) + szMsgBuffer[i] = chr; + szMsgBuffer[nPaddedLength] = UNICODE_NULL; + + WriteToConsole(szMsgBuffer); +} + + +VOID PrintToConsole( LPWSTR lpFormat, ...) Modified: trunk/reactos/base/applications/network/net/net.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/net.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/net.h [iso-8859-1] Sun Nov 16 10:34:49 2014 @@ -36,6 +36,11 @@ INT nPaddedLength); VOID +PrintPadding( + WCHAR chr, + INT nPaddedLength); + +VOID PrintToConsole( LPWSTR lpFormat, ...);

10 years, 1 month

[spetreolle] 65417: [EXPLORER-NEW] Fix includes casing.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Sat Nov 15 23:12:06 2014 New Revision: 65417 URL: http://svn.reactos.org/svn/reactos?rev=65417&view=rev Log: [EXPLORER-NEW] Fix includes casing. Modified: branches/shell-experiments/base/shell/explorer-new/taskswnd.cpp branches/shell-experiments/base/shell/explorer-new/traywnd.cpp Modified: branches/shell-experiments/base/shell/explorer-new/taskswnd.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/taskswnd.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/taskswnd.cpp [iso-8859-1] Sat Nov 15 23:12:06 2014 @@ -19,7 +19,7 @@ */ #include "precomp.h" -#include <CommonControls.h> +#include <commoncontrols.h> #define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp)) #define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp)) Modified: branches/shell-experiments/base/shell/explorer-new/traywnd.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/traywnd.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/traywnd.cpp [iso-8859-1] Sat Nov 15 23:12:06 2014 @@ -19,7 +19,7 @@ */ #include "precomp.h" -#include <CommonControls.h> +#include <commoncontrols.h> extern HRESULT InitShellServices(HDPA * phdpa); extern HRESULT ShutdownShellServices(HDPA hdpa);

10 years, 1 month

[tkreuzer] 65416: [NTOSKRNL] Remove explicit comparisons with TRUE Patch by Love Nystrom, adjusted by me CORE-8799

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Nov 15 22:47:51 2014 New Revision: 65416 URL: http://svn.reactos.org/svn/reactos?rev=65416&view=rev Log: [NTOSKRNL] Remove explicit comparisons with TRUE Patch by Love Nystrom, adjusted by me CORE-8799 Modified: trunk/reactos/ntoskrnl/cc/pin.c trunk/reactos/ntoskrnl/config/cmapi.c trunk/reactos/ntoskrnl/fsrtl/fastio.c trunk/reactos/ntoskrnl/fstub/disksup.c trunk/reactos/ntoskrnl/include/internal/ke_x.h trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/io/iomgr/file.c trunk/reactos/ntoskrnl/kd64/kdapi.c trunk/reactos/ntoskrnl/ke/amd64/except.c trunk/reactos/ntoskrnl/ke/arm/exp.c trunk/reactos/ntoskrnl/ke/bug.c trunk/reactos/ntoskrnl/ke/i386/exp.c trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c trunk/reactos/ntoskrnl/mm/ARM3/session.c trunk/reactos/ntoskrnl/se/priv.c Modified: trunk/reactos/ntoskrnl/cc/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/pin.c?rev=6541… ============================================================================== --- trunk/reactos/ntoskrnl/cc/pin.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/pin.c [iso-8859-1] Sat Nov 15 22:47:51 2014 @@ -165,7 +165,7 @@ /* * FIXME: This is function is similar to CcPinRead, but doesn't * read the data if they're not present. Instead it should just - * prepare the VACBs and zero them out if Zero == TRUE. + * prepare the VACBs and zero them out if Zero != FALSE. * * For now calling CcPinRead is better than returning error or * just having UNIMPLEMENTED here. Modified: trunk/reactos/ntoskrnl/config/cmapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] Sat Nov 15 22:47:51 2014 @@ -2188,7 +2188,7 @@ /* Count the current hash entry if it is in use */ SubKeys++; } - else if ((CachedKcb->RefCount == 0) && (RemoveEmptyCacheEntries == TRUE)) + else if ((CachedKcb->RefCount == 0) && (RemoveEmptyCacheEntries != FALSE)) { /* Remove the current key from the delayed close list */ CmpRemoveFromDelayedClose(CachedKcb); Modified: trunk/reactos/ntoskrnl/fsrtl/fastio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/fastio.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/fastio.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/fastio.c [iso-8859-1] Sat Nov 15 22:47:51 2014 @@ -218,7 +218,7 @@ /* File was accessed */ FileObject->Flags |= FO_FILE_FAST_IO_READ; - if (Result == TRUE) + if (Result != FALSE) { ASSERT((IoStatus->Status == STATUS_END_OF_FILE) || (((ULONGLONG)FileOffset->QuadPart + IoStatus->Information) <= @@ -227,7 +227,7 @@ } /* Update the current file offset */ - if (Result == TRUE) + if (Result != FALSE) { FileObject->CurrentByteOffset.QuadPart = FileOffset->QuadPart + IoStatus->Information; } @@ -343,7 +343,7 @@ * If we append, use the file size as offset. * Also, check that we aren't crossing the 4GB boundary. */ - if (FileOffsetAppend == TRUE) + if (FileOffsetAppend != FALSE) { Offset.LowPart = FcbHeader->FileSize.LowPart; NewSize.LowPart = FcbHeader->FileSize.LowPart + Length; @@ -381,7 +381,7 @@ /* Then we need to acquire the resource exclusive */ ExReleaseResourceLite(FcbHeader->Resource); ExAcquireResourceExclusiveLite(FcbHeader->Resource, TRUE); - if (FileOffsetAppend == TRUE) + if (FileOffsetAppend != FALSE) { Offset.LowPart = FcbHeader->FileSize.LowPart; // ?? NewSize.LowPart = FcbHeader->FileSize.LowPart + Length; @@ -483,7 +483,7 @@ PsGetCurrentThread()->TopLevelIrp = 0; /* Did the operation succeed? */ - if (Result == TRUE) + if (Result != FALSE) { /* Update the valid file size if necessary */ if (NewSize.LowPart > FcbHeader->ValidDataLength.LowPart) @@ -568,7 +568,7 @@ } /* Check if we are appending */ - if (FileOffsetAppend == TRUE) + if (FileOffsetAppend != FALSE) { Offset.QuadPart = FcbHeader->FileSize.QuadPart; NewSize.QuadPart = FcbHeader->FileSize.QuadPart + Length; @@ -1338,7 +1338,7 @@ } /* Check if we are appending */ - if (FileOffsetAppend == TRUE) + if (FileOffsetAppend != FALSE) { Offset.QuadPart = FcbHeader->FileSize.QuadPart; NewSize.QuadPart = FcbHeader->FileSize.QuadPart + Length; Modified: trunk/reactos/ntoskrnl/fstub/disksup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/disksup.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/fstub/disksup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fstub/disksup.c [iso-8859-1] Sat Nov 15 22:47:51 2014 @@ -672,7 +672,7 @@ /* Search for bootable partition */ for (j = 0; j < NUM_PARTITION_TABLE_ENTRIES && j < LayoutArray[DiskNumber]->PartitionCount; j++) { - if ((LayoutArray[DiskNumber]->PartitionEntry[j].BootIndicator == TRUE) && + if ((LayoutArray[DiskNumber]->PartitionEntry[j].BootIndicator != FALSE) && IsRecognizedPartition(LayoutArray[DiskNumber]->PartitionEntry[j].PartitionType)) { if (LayoutArray[DiskNumber]->PartitionEntry[j].RewritePartition == FALSE) Modified: trunk/reactos/ntoskrnl/include/internal/ke_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke_x.h [iso-8859-1] Sat Nov 15 22:47:51 2014 @@ -514,7 +514,7 @@ Value = InterlockedExchange((PLONG)&Thread->ThreadLock, Value); /* Return the lock state */ - return (Value == TRUE); + return (Value == 1); } FORCEINLINE Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Sat Nov 15 22:47:51 2014 @@ -127,7 +127,7 @@ DriverName.Length = 0; DriverName.MaximumLength = sizeof(NameBuffer); - if (FileSystem == TRUE) + if (FileSystem != FALSE) RtlAppendUnicodeToString(&DriverName, FILESYSTEM_ROOT_NAME); else RtlAppendUnicodeToString(&DriverName, DRIVER_ROOT_NAME); @@ -494,7 +494,7 @@ /* Create ModuleName string */ if (ServiceName && ServiceName->Length > 0) { - if (FileSystemDriver == TRUE) + if (FileSystemDriver != FALSE) wcscpy(NameBuffer, FILESYSTEM_ROOT_NAME); else wcscpy(NameBuffer, DRIVER_ROOT_NAME); Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] Sat Nov 15 22:47:51 2014 @@ -2104,7 +2104,7 @@ } /* Check if we were 100% successful */ - if ((OpenPacket->ParseCheck == TRUE) && (OpenPacket->FileObject)) + if ((OpenPacket->ParseCheck != FALSE) && (OpenPacket->FileObject)) { /* Dereference the File Object */ ObDereferenceObject(OpenPacket->FileObject); @@ -2375,7 +2375,7 @@ DesiredAccess, &OpenPacket, &Handle); - if (OpenPacket.ParseCheck != TRUE) + if (OpenPacket.ParseCheck == FALSE) { /* Parse failed */ IoStatus->Status = Status; @@ -3188,7 +3188,7 @@ DELETE, &OpenPacket, &Handle); - if (OpenPacket.ParseCheck != TRUE) return Status; + if (OpenPacket.ParseCheck == FALSE) return Status; /* Retrn the Io status */ return OpenPacket.FinalStatus; Modified: trunk/reactos/ntoskrnl/kd64/kdapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdapi.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kdapi.c [iso-8859-1] Sat Nov 15 22:47:51 2014 @@ -721,7 +721,7 @@ ASSERT(Data->Length == sizeof(CONTEXT)); /* Make sure that this is a valid request */ - if ((State->Processor < KeNumberProcessors) && (KdpContextSent == TRUE)) + if ((State->Processor < KeNumberProcessors) && (KdpContextSent != FALSE)) { /* Check if the request is for this CPU */ if (State->Processor == KeGetCurrentPrcb()->Number) Modified: trunk/reactos/ntoskrnl/ke/amd64/except.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/amd64/except.c… ============================================================================== --- trunk/reactos/ntoskrnl/ke/amd64/except.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/amd64/except.c [iso-8859-1] Sat Nov 15 22:47:51 2014 @@ -277,7 +277,7 @@ if (PreviousMode == KernelMode) { /* Check if this is a first-chance exception */ - if (FirstChance == TRUE) + if (FirstChance) { /* Break into the debugger for the first time */ if (KiDebugRoutine(TrapFrame, Modified: trunk/reactos/ntoskrnl/ke/arm/exp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/exp.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/exp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/exp.c [iso-8859-1] Sat Nov 15 22:47:51 2014 @@ -218,7 +218,7 @@ if (PreviousMode == KernelMode) { /* Check if this is a first-chance exception */ - if (FirstChance == TRUE) + if (FirstChance != FALSE) { /* Break into the debugger for the first time */ if (KiDebugRoutine(TrapFrame, Modified: trunk/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=6541… ============================================================================== --- trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] Sat Nov 15 22:47:51 2014 @@ -67,7 +67,7 @@ i++; /* Check if this is a kernel entry and we only want drivers */ - if ((i <= 2) && (DriversOnly == TRUE)) + if ((i <= 2) && (DriversOnly != FALSE)) { /* Skip it */ NextEntry = NextEntry->Flink; Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/exp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/exp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/exp.c [iso-8859-1] Sat Nov 15 22:47:51 2014 @@ -898,7 +898,7 @@ if (PreviousMode == KernelMode) { /* Check if this is a first-chance exception */ - if (FirstChance == TRUE) + if (FirstChance != FALSE) { /* Break into the debugger for the first time */ if (KiDebugRoutine(TrapFrame, Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] Sat Nov 15 22:47:51 2014 @@ -1183,7 +1183,7 @@ if (Pfn1->u3.e2.ReferenceCount == 1) { /* Is there still a PFN for this page? */ - if (MI_IS_PFN_DELETED(Pfn1) == TRUE) + if (MI_IS_PFN_DELETED(Pfn1)) { /* Clear the last reference */ Pfn1->u3.e2.ReferenceCount = 0; Modified: trunk/reactos/ntoskrnl/mm/ARM3/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/session.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/session.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/session.c [iso-8859-1] Sat Nov 15 22:47:51 2014 @@ -519,7 +519,7 @@ OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); /* Check if we need a page table */ - if (AllocatedPageTable == TRUE) + if (AllocatedPageTable != FALSE) { /* Get a zeroed colored zero page */ Color = MI_GET_NEXT_COLOR(); Modified: trunk/reactos/ntoskrnl/se/priv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/priv.c?rev=654… ============================================================================== --- trunk/reactos/ntoskrnl/se/priv.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/priv.c [iso-8859-1] Sat Nov 15 22:47:51 2014 @@ -446,7 +446,7 @@ PrivilegeSet->PrivilegeCount += Privileges->PrivilegeCount; /* Free the old privilege set if it was allocated */ - if (AccessState->PrivilegesAllocated == TRUE) + if (AccessState->PrivilegesAllocated != FALSE) ExFreePool(AuxData->PrivilegeSet); /* Now we are using an allocated privilege set */

10 years, 1 month

← Newer
1
...
9
10
11
12
13
14
15
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2014