Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 02/02: [SDK:SUBSYS] conmsg.h: Some DWORDs -> ULONGs.
by Hermès Bélusca-Maïto 09 Apr '20

09 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=21362c8e86b39b8da2e36… commit 21362c8e86b39b8da2e36f31047b0ec45b56c9a8 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Apr 9 14:24:52 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Apr 9 16:05:27 2020 +0200 [SDK:SUBSYS] conmsg.h: Some DWORDs -> ULONGs. --- sdk/include/reactos/subsys/win/conmsg.h | 54 ++++++++++++++++----------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/sdk/include/reactos/subsys/win/conmsg.h b/sdk/include/reactos/subsys/win/conmsg.h index 2b01ac9bf7e..b96441dd9aa 100644 --- a/sdk/include/reactos/subsys/win/conmsg.h +++ b/sdk/include/reactos/subsys/win/conmsg.h @@ -220,8 +220,8 @@ typedef struct _CONSOLE_GETPROCESSLIST typedef struct _CONSOLE_GENERATECTRLEVENT { HANDLE ConsoleHandle; - DWORD CtrlEvent; - DWORD ProcessGroupId; + ULONG CtrlEvent; + ULONG ProcessGroupId; } CONSOLE_GENERATECTRLEVENT, *PCONSOLE_GENERATECTRLEVENT; typedef struct _CONSOLE_NOTIFYLASTCLOSE @@ -292,7 +292,7 @@ typedef struct _CONSOLE_ATTACHCONSOLE * If ProcessId == ATTACH_PARENT_PROCESS == -1, then attach * the current process to its parent process console. */ - DWORD ProcessId; + ULONG ProcessId; PCONSOLE_START_INFO ConsoleStartInfo; @@ -345,7 +345,7 @@ typedef struct _CONSOLE_GETSETCURSORINFO HANDLE OutputHandle; CONSOLE_CURSOR_INFO Info; /* - DWORD Size; + ULONG Size; BOOLEAN Visible; */ } CONSOLE_GETSETCURSORINFO, *PCONSOLE_GETSETCURSORINFO; @@ -367,20 +367,20 @@ typedef struct _CONSOLE_GETSETCONSOLEMODE { HANDLE ConsoleHandle; HANDLE Handle; - DWORD Mode; + ULONG Mode; } CONSOLE_GETSETCONSOLEMODE, *PCONSOLE_GETSETCONSOLEMODE; typedef struct _CONSOLE_GETDISPLAYMODE { HANDLE ConsoleHandle; - DWORD DisplayMode; // ModeFlags + ULONG DisplayMode; // ModeFlags } CONSOLE_GETDISPLAYMODE, *PCONSOLE_GETDISPLAYMODE; typedef struct _CONSOLE_SETDISPLAYMODE { HANDLE ConsoleHandle; HANDLE OutputHandle; - DWORD DisplayMode; // ModeFlags + ULONG DisplayMode; // ModeFlags COORD NewSBDim; HANDLE EventHandle; } CONSOLE_SETDISPLAYMODE, *PCONSOLE_SETDISPLAYMODE; @@ -395,15 +395,15 @@ typedef struct _CONSOLE_GETSETHWSTATE { HANDLE ConsoleHandle; HANDLE OutputHandle; - DWORD Flags; - DWORD State; + ULONG Flags; + ULONG State; } CONSOLE_GETSETHWSTATE, *PCONSOLE_GETSETHWSTATE; typedef struct _CONSOLE_GETNUMFONTS { HANDLE ConsoleHandle; - DWORD NumFonts; + ULONG NumFonts; } CONSOLE_GETNUMFONTS, *PCONSOLE_GETNUMFONTS; typedef struct _CONSOLE_GETFONTINFO @@ -412,14 +412,14 @@ typedef struct _CONSOLE_GETFONTINFO HANDLE OutputHandle; BOOLEAN MaximumWindow; PCONSOLE_FONT_INFO FontInfo; - DWORD NumFonts; + ULONG NumFonts; } CONSOLE_GETFONTINFO, *PCONSOLE_GETFONTINFO; typedef struct _CONSOLE_GETFONTSIZE { HANDLE ConsoleHandle; HANDLE OutputHandle; - DWORD FontIndex; + ULONG FontIndex; COORD FontSize; } CONSOLE_GETFONTSIZE, *PCONSOLE_GETFONTSIZE; @@ -428,7 +428,7 @@ typedef struct _CONSOLE_GETCURRENTFONT HANDLE ConsoleHandle; HANDLE OutputHandle; BOOLEAN MaximumWindow; - DWORD FontIndex; + ULONG FontIndex; COORD FontSize; } CONSOLE_GETCURRENTFONT, *PCONSOLE_GETCURRENTFONT; @@ -436,7 +436,7 @@ typedef struct _CONSOLE_SETFONT { HANDLE ConsoleHandle; HANDLE OutputHandle; - DWORD FontIndex; + ULONG FontIndex; } CONSOLE_SETFONT, *PCONSOLE_SETFONT; @@ -444,11 +444,11 @@ typedef struct _CONSOLE_SETFONT typedef struct _CONSOLE_CREATESCREENBUFFER { HANDLE ConsoleHandle; - DWORD DesiredAccess; + ULONG DesiredAccess; // ACCESS_MASK BOOL InheritHandle; - DWORD ShareMode; + ULONG ShareMode; /* Type of the screen buffer: CONSOLE_TEXTMODE_BUFFER or CONSOLE_GRAPHICS_BUFFER */ - DWORD ScreenBufferType; + ULONG ScreenBufferType; /* * This structure holds the initialization information * for graphics screen buffers. @@ -638,9 +638,9 @@ typedef struct _CONSOLE_DUPLICATEHANDLE { HANDLE ConsoleHandle; HANDLE SourceHandle; - DWORD DesiredAccess; + ULONG DesiredAccess; // ACCESS_MASK BOOLEAN InheritHandle; - DWORD Options; + ULONG Options; HANDLE TargetHandle; } CONSOLE_DUPLICATEHANDLE, *PCONSOLE_DUPLICATEHANDLE; @@ -648,15 +648,15 @@ typedef struct _CONSOLE_GETHANDLEINFO { HANDLE ConsoleHandle; HANDLE Handle; - DWORD Flags; + ULONG Flags; } CONSOLE_GETHANDLEINFO, *PCONSOLE_GETHANDLEINFO; typedef struct _CONSOLE_SETHANDLEINFO { HANDLE ConsoleHandle; HANDLE Handle; - DWORD Mask; - DWORD Flags; + ULONG Mask; + ULONG Flags; } CONSOLE_SETHANDLEINFO, *PCONSOLE_SETHANDLEINFO; /* @@ -672,9 +672,9 @@ typedef struct _CONSOLE_OPENCONSOLE { HANDLE ConsoleHandle; CONSOLE_HANDLE_TYPE HandleType; - DWORD DesiredAccess; + ULONG DesiredAccess; // ACCESS_MASK BOOL InheritHandle; - DWORD ShareMode; + ULONG ShareMode; HANDLE Handle; } CONSOLE_OPENCONSOLE, *PCONSOLE_OPENCONSOLE; @@ -691,8 +691,8 @@ typedef struct _CONSOLE_MENUCONTROL { HANDLE ConsoleHandle; HANDLE OutputHandle; - DWORD CmdIdLow; - DWORD CmdIdHigh; + ULONG CmdIdLow; + ULONG CmdIdHigh; HMENU MenuHandle; } CONSOLE_MENUCONTROL, *PCONSOLE_MENUCONTROL; @@ -810,7 +810,7 @@ typedef struct _CONSOLE_GETSETHISTORYINFO { UINT HistoryBufferSize; UINT NumberOfHistoryBuffers; - DWORD dwFlags; + ULONG dwFlags; } CONSOLE_GETSETHISTORYINFO, *PCONSOLE_GETSETHISTORYINFO; typedef struct _CONSOLE_SETHISTORYNUMBERCOMMANDS

1 0

[reactos] 01/02: [FLTMGR][NDK] Fix typos.
by Hermès Bélusca-Maïto 09 Apr '20

09 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7e0927a39f7f462ff6d72… commit 7e0927a39f7f462ff6d728840ba763c917ff6be9 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Apr 9 14:23:27 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Apr 9 16:05:26 2020 +0200 [FLTMGR][NDK] Fix typos. --- drivers/filters/fltmgr/fltmgrint.h | 2 +- sdk/include/ndk/extypes.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/filters/fltmgr/fltmgrint.h b/drivers/filters/fltmgr/fltmgrint.h index 64065be7638..f9eea36e32c 100644 --- a/drivers/filters/fltmgr/fltmgrint.h +++ b/drivers/filters/fltmgr/fltmgrint.h @@ -124,7 +124,7 @@ typedef struct _FLT_FILTER // size = 0x120 } FLT_FILTER, *PFLT_FILTER; -typedef enum _FLT_yINSTANCE_FLAGS +typedef enum _FLT_INSTANCE_FLAGS { INSFL_CAN_BE_DETACHED = 0x01, INSFL_DELETING = 0x02, diff --git a/sdk/include/ndk/extypes.h b/sdk/include/ndk/extypes.h index 5c3ba036595..7751241d114 100644 --- a/sdk/include/ndk/extypes.h +++ b/sdk/include/ndk/extypes.h @@ -582,7 +582,7 @@ typedef struct _HANDLE_TRACE_DEBUG_INFO LONG RefCount; ULONG TableSize; ULONG BitMaskFlags; - FAST_MUTEX CloseCompatcionLock; + FAST_MUTEX CloseCompactionLock; ULONG CurrentStackIndex; HANDLE_TRACE_DB_ENTRY TraceDb[1]; } HANDLE_TRACE_DEBUG_INFO, *PHANDLE_TRACE_DEBUG_INFO;

1 0

[reactos] 02/02: [BOOTVID] Code refactoring. (#2510)
by Dmitry Borisov 09 Apr '20

09 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5f2ca473dc4fb46463393… commit 5f2ca473dc4fb464633936c406fd9f49f39f9562 Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Wed Apr 8 11:42:05 2020 +0600 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Apr 9 15:56:16 2020 +0200 [BOOTVID] Code refactoring. (#2510) - Abstract the VGA and LCD code. - Create a common file for all platforms. --- drivers/base/bootvid/CMakeLists.txt | 1 + drivers/base/bootvid/arm/arm.h | 75 ++++ drivers/base/bootvid/arm/bootvid.c | 172 +-------- drivers/base/bootvid/common.c | 412 +++++++++++++++++++++ drivers/base/bootvid/i386/pc/bootvid.c | 8 +- drivers/base/bootvid/i386/pc/pc.h | 39 ++ drivers/base/bootvid/i386/pc/vga.c | 506 ++------------------------ drivers/base/bootvid/precomp.h | 64 ++-- sdk/include/reactos/drivers/bootvid/bootvid.h | 2 +- 9 files changed, 622 insertions(+), 657 deletions(-) diff --git a/drivers/base/bootvid/CMakeLists.txt b/drivers/base/bootvid/CMakeLists.txt index e344d53fc14..10052eb2128 100644 --- a/drivers/base/bootvid/CMakeLists.txt +++ b/drivers/base/bootvid/CMakeLists.txt @@ -12,6 +12,7 @@ elseif(ARCH STREQUAL "arm") endif() list(APPEND SOURCE + common.c fontdata.c precomp.h) diff --git a/drivers/base/bootvid/arm/arm.h b/drivers/base/bootvid/arm/arm.h new file mode 100644 index 00000000000..2f46aa8fff6 --- /dev/null +++ b/drivers/base/bootvid/arm/arm.h @@ -0,0 +1,75 @@ + +#pragma once + +extern PUSHORT VgaArmBase; + +#define LCDTIMING0_PPL(x) ((((x) / 16 - 1) & 0x3f) << 2) +#define LCDTIMING1_LPP(x) (((x) & 0x3ff) - 1) +#define LCDCONTROL_LCDPWR (1 << 11) +#define LCDCONTROL_LCDEN (1) +#define LCDCONTROL_LCDBPP(x) (((x) & 7) << 1) +#define LCDCONTROL_LCDTFT (1 << 5) + +#define PL110_LCDTIMING0 (PVOID)0xE0020000 +#define PL110_LCDTIMING1 (PVOID)0xE0020004 +#define PL110_LCDTIMING2 (PVOID)0xE0020008 +#define PL110_LCDUPBASE (PVOID)0xE0020010 +#define PL110_LCDLPBASE (PVOID)0xE0020014 +#define PL110_LCDCONTROL (PVOID)0xE0020018 + +#define READ_REGISTER_ULONG(r) (*(volatile ULONG * const)(r)) +#define WRITE_REGISTER_ULONG(r, v) (*(volatile ULONG *)(r) = (v)) + +#define READ_REGISTER_USHORT(r) (*(volatile USHORT * const)(r)) +#define WRITE_REGISTER_USHORT(r, v) (*(volatile USHORT *)(r) = (v)) + +PALETTE_ENTRY VidpVga8To16BitTransform[16] = +{ + {0x00, 0x00, 0x00}, // Black + {0x00, 0x00, 0x08}, // Blue + {0x00, 0x08, 0x00}, // Green + {0x00, 0x08, 0x08}, // Cyan + {0x08, 0x00, 0x00}, // Red + {0x08, 0x00, 0x08}, // Magenta + {0x0B, 0x0D, 0x0F}, // Brown + {0x10, 0x10, 0x10}, // Light Gray + {0x08, 0x08, 0x08}, // Dark Gray + {0x00, 0x00, 0x1F}, // Light Blue + {0x00, 0x1F, 0x00}, // Light Green + {0x00, 0x1F, 0x1F}, // Light Cyan + {0x1F, 0x00, 0x00}, // Light Red + {0x1F, 0x00, 0x1F}, // Light Magenta + {0x1F, 0x1F, 0x00}, // Yellow + {0x1F, 0x1F, 0x1F}, // White +}; + +FORCEINLINE +USHORT +VidpBuildColor(_In_ UCHAR Color) +{ + UCHAR Red, Green, Blue; + + /* Extract color components */ + Red = VidpVga8To16BitTransform[Color].Red; + Green = VidpVga8To16BitTransform[Color].Green; + Blue = VidpVga8To16BitTransform[Color].Blue; + + /* Build the 16-bit color mask */ + return ((Red & 0x1F) << 11) | ((Green & 0x1F) << 6) | ((Blue & 0x1F)); +} + +FORCEINLINE +VOID +SetPixel( + _In_ ULONG Left, + _In_ ULONG Top, + _In_ UCHAR Color) +{ + PUSHORT PixelPosition; + + /* Calculate the pixel position */ + PixelPosition = &VgaArmBase[Left + (Top * SCREEN_WIDTH)]; + + /* Set our color */ + WRITE_REGISTER_USHORT(PixelPosition, VidpBuildColor(Color)); +} diff --git a/drivers/base/bootvid/arm/bootvid.c b/drivers/base/bootvid/arm/bootvid.c index 27e0e20af25..c21ec620c9b 100644 --- a/drivers/base/bootvid/arm/bootvid.c +++ b/drivers/base/bootvid/arm/bootvid.c @@ -3,99 +3,12 @@ #define NDEBUG #include <debug.h> -#define LCDTIMING0_PPL(x) ((((x) / 16 - 1) & 0x3f) << 2) -#define LCDTIMING1_LPP(x) (((x) & 0x3ff) - 1) -#define LCDCONTROL_LCDPWR (1 << 11) -#define LCDCONTROL_LCDEN (1) -#define LCDCONTROL_LCDBPP(x) (((x) & 7) << 1) -#define LCDCONTROL_LCDTFT (1 << 5) - -#define PL110_LCDTIMING0 (PVOID)0xE0020000 -#define PL110_LCDTIMING1 (PVOID)0xE0020004 -#define PL110_LCDTIMING2 (PVOID)0xE0020008 -#define PL110_LCDUPBASE (PVOID)0xE0020010 -#define PL110_LCDLPBASE (PVOID)0xE0020014 -#define PL110_LCDCONTROL (PVOID)0xE0020018 - -#define READ_REGISTER_ULONG(r) (*(volatile ULONG * const)(r)) -#define WRITE_REGISTER_ULONG(r, v) (*(volatile ULONG *)(r) = (v)) - -#define READ_REGISTER_USHORT(r) (*(volatile USHORT * const)(r)) -#define WRITE_REGISTER_USHORT(r, v) (*(volatile USHORT *)(r) = (v)) - PUSHORT VgaArmBase; PHYSICAL_ADDRESS VgaPhysical; BOOLEAN ClearRow = FALSE; -UCHAR VidpTextColor = 0xF; -ULONG VidpCurrentX = 0; -ULONG VidpCurrentY = 0; -ULONG VidpScrollRegion[4] = -{ - 0, - 0, - SCREEN_WIDTH - 1, - SCREEN_HEIGHT - 1 -}; - -typedef struct _VGA_COLOR -{ - UCHAR Red; - UCHAR Green; - UCHAR Blue; -} VGA_COLOR; - -VGA_COLOR VidpVga8To16BitTransform[16] = -{ - {0x00, 0x00, 0x00}, // Black - {0x00, 0x00, 0x08}, // Blue - {0x00, 0x08, 0x00}, // Green - {0x00, 0x08, 0x08}, // Cyan - {0x08, 0x00, 0x00}, // Red - {0x08, 0x00, 0x08}, // Magenta - {0x0B, 0x0D, 0x0F}, // Brown - {0x10, 0x10, 0x10}, // Light Gray - {0x08, 0x08, 0x08}, // Dark Gray - {0x00, 0x00, 0x1F}, // Light Blue - {0x00, 0x1F, 0x00}, // Light Green - {0x00, 0x1F, 0x1F}, // Light Cyan - {0x1F, 0x00, 0x00}, // Light Red - {0x1F, 0x00, 0x1F}, // Light Magenta - {0x1F, 0x1F, 0x00}, // Yellow - {0x1F, 0x1F, 0x1F}, // White -}; /* PRIVATE FUNCTIONS *********************************************************/ -FORCEINLINE -USHORT -VidpBuildColor(IN UCHAR Color) -{ - UCHAR Red, Green, Blue; - - /* Extract color components */ - Red = VidpVga8To16BitTransform[Color].Red; - Green = VidpVga8To16BitTransform[Color].Green; - Blue = VidpVga8To16BitTransform[Color].Blue; - - /* Build the 16-bit color mask */ - return ((Red & 0x1F) << 11) | ((Green & 0x1F) << 6) | ((Blue & 0x1F)); -} - -FORCEINLINE -VOID -VidpSetPixel(IN ULONG Left, - IN ULONG Top, - IN UCHAR Color) -{ - PUSHORT PixelPosition; - - /* Calculate the pixel position */ - PixelPosition = &VgaArmBase[Left + (Top * SCREEN_WIDTH)]; - - /* Set our color */ - WRITE_REGISTER_USHORT(PixelPosition, VidpBuildColor(Color)); -} - VOID NTAPI DisplayCharacter(IN CHAR Character, @@ -121,7 +34,7 @@ DisplayCharacter(IN CHAR Character, if (FontChar[Top] & (UCHAR)j) { /* We do, use the given Text Color */ - VidpSetPixel(XOffset, Top, (UCHAR)TextColor); + SetPixel(XOffset, Top, (UCHAR)TextColor); } else if (BackColor < 16) { @@ -129,7 +42,7 @@ DisplayCharacter(IN CHAR Character, * This is a background pixel. We're drawing it * unless it's transparent. */ - VidpSetPixel(XOffset, Top, (UCHAR)BackColor); + SetPixel(XOffset, Top, (UCHAR)BackColor); } /* Increase X Offset */ @@ -250,6 +163,15 @@ VidpInitializeDisplay(VOID) LCDCONTROL_LCDBPP(4)); } +VOID +NTAPI +InitPaletteWithTable( + _In_ PULONG Table, + _In_ ULONG Count) +{ + UNIMPLEMENTED; +} + /* PUBLIC FUNCTIONS **********************************************************/ /* @@ -333,45 +255,6 @@ VidSetTextColor(IN ULONG Color) return OldColor; } -/* - * @implemented - */ -VOID -NTAPI -VidDisplayStringXY(IN PUCHAR String, - IN ULONG Left, - IN ULONG Top, - IN BOOLEAN Transparent) -{ - UNIMPLEMENTED; - while (TRUE); -} - -/* - * @implemented - */ -VOID -NTAPI -VidSetScrollRegion(IN ULONG Left, - IN ULONG Top, - IN ULONG Right, - IN ULONG Bottom) -{ - /* Assert alignment */ - ASSERT((Left & 0x7) == 0); - ASSERT((Right & 0x7) == 7); - - /* Set Scroll Region */ - VidpScrollRegion[0] = Left; - VidpScrollRegion[1] = Top; - VidpScrollRegion[2] = Right; - VidpScrollRegion[3] = Bottom; - - /* Set current X and Y */ - VidpCurrentX = Left; - VidpCurrentY = Top; -} - /* * @implemented */ @@ -383,22 +266,6 @@ VidCleanUp(VOID) while (TRUE); } -/* - * @implemented - */ -VOID -NTAPI -VidBufferToScreenBlt(IN PUCHAR Buffer, - IN ULONG Left, - IN ULONG Top, - IN ULONG Width, - IN ULONG Height, - IN ULONG Delta) -{ - UNIMPLEMENTED; - while (TRUE); -} - /* * @implemented */ @@ -490,20 +357,7 @@ VidDisplayString(IN PUCHAR String) */ VOID NTAPI -VidBitBlt(IN PUCHAR Buffer, - IN ULONG Left, - IN ULONG Top) -{ - UNIMPLEMENTED; - //while (TRUE); -} - -/* - * @implemented - */ -VOID -NTAPI -VidScreenToBufferBlt(IN PUCHAR Buffer, +VidScreenToBufferBlt(OUT PUCHAR Buffer, IN ULONG Left, IN ULONG Top, IN ULONG Width, @@ -540,7 +394,7 @@ VidSolidColorFill(IN ULONG Left, // // Draw the pixel // - VidpSetPixel(x, y, Color); + SetPixel(x, y, Color); } } } diff --git a/drivers/base/bootvid/common.c b/drivers/base/bootvid/common.c new file mode 100644 index 00000000000..c82f8dd1bd1 --- /dev/null +++ b/drivers/base/bootvid/common.c @@ -0,0 +1,412 @@ + +/* GLOBALS ********************************************************************/ + +UCHAR VidpTextColor = 0x0F; + +ULONG VidpCurrentX = 0; +ULONG VidpCurrentY = 0; + +ULONG VidpScrollRegion[4] = +{ + 0, + 0, + SCREEN_WIDTH - 1, + SCREEN_HEIGHT - 1 +}; + +/* PRIVATE FUNCTIONS **********************************************************/ + +static VOID +NTAPI +BitBlt( + _In_ ULONG Left, + _In_ ULONG Top, + _In_ ULONG Width, + _In_ ULONG Height, + _In_ PUCHAR Buffer, + _In_ ULONG BitsPerPixel, + _In_ ULONG Delta) +{ + ULONG sx, dx, dy; + UCHAR color; + ULONG offset = 0; + const ULONG Bottom = Top + Height; + const ULONG Right = Left + Width; + + /* Check if the buffer isn't 4bpp */ + if (BitsPerPixel != 4) + { + /* FIXME: TODO */ + DbgPrint("Unhandled BitBlt\n" + "%lux%lu @ (%lu|%lu)\n" + "Bits Per Pixel %lu\n" + "Buffer: %p. Delta: %lu\n", + Width, + Height, + Left, + Top, + BitsPerPixel, + Buffer, + Delta); + return; + } + + PrepareForSetPixel(); + + /* 4bpp blitting */ + for (dy = Top; dy < Bottom; ++dy) + { + sx = 0; + do + { + /* Extract color */ + color = Buffer[offset + sx]; + + /* Calc destination x */ + dx = Left + (sx << 1); + + /* Set two pixels */ + SetPixel(dx, dy, color >> 4); + SetPixel(dx + 1, dy, color & 0x0F); + + sx++; + } while (dx < Right); + offset += Delta; + } +} + +static VOID +NTAPI +RleBitBlt( + _In_ ULONG Left, + _In_ ULONG Top, + _In_ ULONG Width, + _In_ ULONG Height, + _In_ PUCHAR Buffer) +{ + ULONG YDelta; + ULONG x; + ULONG RleValue, NewRleValue; + ULONG Color, Color2; + ULONG i, j; + ULONG Code; + + PrepareForSetPixel(); + + /* Set Y height and current X value and start loop */ + YDelta = Top + Height - 1; + x = Left; + for (;;) + { + /* Get the current value and advance in the buffer */ + RleValue = *Buffer; + Buffer++; + if (RleValue) + { + /* Check if we've gone past the edge */ + if ((x + RleValue) > (Width + Left)) + { + /* Fixup the pixel value */ + RleValue = Left - x + Width; + } + + /* Get the new value */ + NewRleValue = *Buffer; + + /* Get the two colors */ + Color = NewRleValue >> 4; + Color2 = NewRleValue & 0xF; + + /* Increase buffer position */ + Buffer++; + + /* Check if we need to do a fill */ + if (Color == Color2) + { + /* Do a fill and continue the loop */ + RleValue += x; + VidSolidColorFill(x, YDelta, RleValue - 1, YDelta, (UCHAR)Color); + x = RleValue; + continue; + } + + /* Check if the pixel value is 1 or below */ + if (RleValue > 1) + { + /* Set loop variables */ + for (i = (RleValue - 2) / 2 + 1; i > 0; --i) + { + /* Set the pixels */ + SetPixel(x, YDelta, (UCHAR)Color); + x++; + SetPixel(x, YDelta, (UCHAR)Color2); + x++; + + /* Decrease pixel value */ + RleValue -= 2; + } + } + + /* Check if there is any value at all */ + if (RleValue) + { + /* Set the pixel and increase position */ + SetPixel(x, YDelta, (UCHAR)Color); + x++; + } + + /* Start over */ + continue; + } + + /* Get the current pixel value */ + RleValue = *Buffer; + Code = RleValue; + switch (Code) + { + /* Case 0 */ + case 0: + { + /* Set new x value, decrease distance and restart */ + x = Left; + YDelta--; + Buffer++; + continue; + } + + /* Case 1 */ + case 1: + { + /* Done */ + return; + } + + /* Case 2 */ + case 2: + { + /* Set new x value, decrease distance and restart */ + Buffer++; + x += *Buffer; + Buffer++; + YDelta -= *Buffer; + Buffer++; + continue; + } + + /* Other values */ + default: + { + Buffer++; + break; + } + } + + /* Check if we've gone past the edge */ + if ((x + RleValue) > (Width + Left)) + { + /* Set fixed up loop count */ + i = RleValue - Left - Width + x; + + /* Fixup pixel value */ + RleValue -= i; + } + else + { + /* Clear loop count */ + i = 0; + } + + /* Check the value now */ + if (RleValue > 1) + { + /* Set loop variables */ + for (j = (RleValue - 2) / 2 + 1; j > 0; --j) + { + /* Get the new value */ + NewRleValue = *Buffer; + + /* Get the two colors */ + Color = NewRleValue >> 4; + Color2 = NewRleValue & 0xF; + + /* Increase buffer position */ + Buffer++; + + /* Set the pixels */ + SetPixel(x, YDelta, (UCHAR)Color); + x++; + SetPixel(x, YDelta, (UCHAR)Color2); + x++; + + /* Decrease pixel value */ + RleValue -= 2; + } + } + + /* Check if there is any value at all */ + if (RleValue) + { + /* Set the pixel and increase position */ + Color = *Buffer >> 4; + Buffer++; + SetPixel(x, YDelta, (UCHAR)Color); + x++; + i--; + } + + /* Check loop count now */ + if ((LONG)i > 0) + { + /* Decrease it */ + i--; + + /* Set new position */ + Buffer = Buffer + (i / 2) + 1; + } + + /* Check if we need to increase the buffer */ + if ((ULONG_PTR)Buffer & 1) Buffer++; + } +} + +/* PUBLIC FUNCTIONS ***********************************************************/ + +VOID +NTAPI +VidDisplayStringXY( + _In_ PUCHAR String, + _In_ ULONG Left, + _In_ ULONG Top, + _In_ BOOLEAN Transparent) +{ + ULONG BackColor; + + /* + * If the caller wanted transparent, then send the special value (16), + * else use our default and call the helper routine. + */ + BackColor = Transparent ? 16 : 14; + + /* Loop every character and adjust the position */ + for (; *String; ++String, Left += 8) + { + /* Display a character */ + DisplayCharacter(*String, Left, Top, 12, BackColor); + } +} + +VOID +NTAPI +VidSetScrollRegion( + _In_ ULONG Left, + _In_ ULONG Top, + _In_ ULONG Right, + _In_ ULONG Bottom) +{ + /* Assert alignment */ + ASSERT((Left & 0x7) == 0); + ASSERT((Right & 0x7) == 7); + + /* Set Scroll Region */ + VidpScrollRegion[0] = Left; + VidpScrollRegion[1] = Top; + VidpScrollRegion[2] = Right; + VidpScrollRegion[3] = Bottom; + + /* Set current X and Y */ + VidpCurrentX = Left; + VidpCurrentY = Top; +} + +VOID +NTAPI +VidBufferToScreenBlt( + _In_ PUCHAR Buffer, + _In_ ULONG Left, + _In_ ULONG Top, + _In_ ULONG Width, + _In_ ULONG Height, + _In_ ULONG Delta) +{ + /* Make sure we have a width and height */ + if (!Width || !Height) + return; + + /* Call the helper function */ + BitBlt(Left, Top, Width, Height, Buffer, 4, Delta); +} + +VOID +NTAPI +VidBitBlt( + _In_ PUCHAR Buffer, + _In_ ULONG Left, + _In_ ULONG Top) +{ + PBITMAPINFOHEADER BitmapInfoHeader; + LONG Delta; + PUCHAR BitmapOffset; + + /* Get the Bitmap Header */ + BitmapInfoHeader = (PBITMAPINFOHEADER)Buffer; + + /* Initialize the palette */ + InitPaletteWithTable((PULONG)(Buffer + BitmapInfoHeader->biSize), + (BitmapInfoHeader->biClrUsed) ? + BitmapInfoHeader->biClrUsed : 16); + + /* Make sure we can support this bitmap */ + ASSERT((BitmapInfoHeader->biBitCount * BitmapInfoHeader->biPlanes) <= 4); + + /* + * Calculate the delta and align it on 32-bytes, then calculate + * the actual start of the bitmap data. + */ + Delta = (BitmapInfoHeader->biBitCount * BitmapInfoHeader->biWidth) + 31; + Delta >>= 3; + Delta &= ~3; + BitmapOffset = Buffer + sizeof(BITMAPINFOHEADER) + 16 * sizeof(ULONG); + + /* Check the compression of the bitmap */ + if (BitmapInfoHeader->biCompression == BI_RLE4) + { + /* Make sure we have a width and a height */ + if ((BitmapInfoHeader->biWidth) && (BitmapInfoHeader->biHeight)) + { + /* We can use RLE Bit Blt */ + RleBitBlt(Left, + Top, + BitmapInfoHeader->biWidth, + BitmapInfoHeader->biHeight, + BitmapOffset); + } + } + else + { + /* Check if the height is negative */ + if (BitmapInfoHeader->biHeight < 0) + { + /* Make it positive in the header */ + BitmapInfoHeader->biHeight *= -1; + } + else + { + /* Update buffer offset */ + BitmapOffset += ((BitmapInfoHeader->biHeight - 1) * Delta); + Delta *= -1; + } + + /* Make sure we have a width and a height */ + if ((BitmapInfoHeader->biWidth) && (BitmapInfoHeader->biHeight)) + { + /* Do the BitBlt */ + BitBlt(Left, + Top, + BitmapInfoHeader->biWidth, + BitmapInfoHeader->biHeight, + BitmapOffset, + BitmapInfoHeader->biBitCount, + Delta); + } + } +} diff --git a/drivers/base/bootvid/i386/pc/bootvid.c b/drivers/base/bootvid/i386/pc/bootvid.c index afc3553e344..c80911d1aba 100644 --- a/drivers/base/bootvid/i386/pc/bootvid.c +++ b/drivers/base/bootvid/i386/pc/bootvid.c @@ -439,8 +439,8 @@ VidInitialize(IN BOOLEAN SetMode) if (SetMode) { /* Clear the current position */ - curr_x = 0; - curr_y = 0; + VidpCurrentX = 0; + VidpCurrentY = 0; /* Reset the display and initialize it */ if (HalResetDisplay()) @@ -467,8 +467,8 @@ NTAPI VidResetDisplay(IN BOOLEAN HalReset) { /* Clear the current position */ - curr_x = 0; - curr_y = 0; + VidpCurrentX = 0; + VidpCurrentY = 0; /* Clear the screen with HAL if we were asked to */ if (HalReset) diff --git a/drivers/base/bootvid/i386/pc/pc.h b/drivers/base/bootvid/i386/pc/pc.h new file mode 100644 index 00000000000..fef2324f8b4 --- /dev/null +++ b/drivers/base/bootvid/i386/pc/pc.h @@ -0,0 +1,39 @@ + +#pragma once + +extern ULONG_PTR VgaRegisterBase; +extern ULONG_PTR VgaBase; +extern USHORT AT_Initialization[]; +extern USHORT VGA_640x480[]; +extern UCHAR PixelMask[8]; + +#define __inpb(Port) \ + READ_PORT_UCHAR((PUCHAR)(VgaRegisterBase + (Port))) + +#define __inpw(Port) \ + READ_PORT_USHORT((PUSHORT)(VgaRegisterBase + (Port))) + +#define __outpb(Port, Value) \ + WRITE_PORT_UCHAR((PUCHAR)(VgaRegisterBase + (Port)), (UCHAR)(Value)) + +#define __outpw(Port, Value) \ + WRITE_PORT_USHORT((PUSHORT)(VgaRegisterBase + (Port)), (USHORT)(Value)) + +FORCEINLINE +VOID +SetPixel( + _In_ ULONG Left, + _In_ ULONG Top, + _In_ UCHAR Color) +{ + PUCHAR PixelPosition; + + /* Calculate the pixel position */ + PixelPosition = (PUCHAR)(VgaBase + (Left >> 3) + (Top * (SCREEN_WIDTH / 8))); + + /* Select the bitmask register and write the mask */ + __outpw(VGA_BASE_IO_PORT + GRAPH_ADDRESS_PORT, (PixelMask[Left & 7] << 8) | IND_BIT_MASK); + + /* Read the current pixel value and add our color */ + WRITE_REGISTER_UCHAR(PixelPosition, READ_REGISTER_UCHAR(PixelPosition) & Color); +} diff --git a/drivers/base/bootvid/i386/pc/vga.c b/drivers/base/bootvid/i386/pc/vga.c index 99cd0dc7a9f..b2d003657ee 100644 --- a/drivers/base/bootvid/i386/pc/vga.c +++ b/drivers/base/bootvid/i386/pc/vga.c @@ -2,13 +2,6 @@ /* GLOBALS *******************************************************************/ -static ULONG ScrollRegion[4] = -{ - 0, - 0, - SCREEN_WIDTH - 1, - SCREEN_HEIGHT - 1 -}; static UCHAR lMaskTable[8] = { (1 << 8) - (1 << 0), @@ -64,9 +57,6 @@ static ULONG lookup[16] = ULONG_PTR VgaRegisterBase = 0; ULONG_PTR VgaBase = 0; -ULONG curr_x = 0; -ULONG curr_y = 0; -static ULONG VidTextColor = 0xF; static BOOLEAN ClearRow = FALSE; /* PRIVATE FUNCTIONS *********************************************************/ @@ -87,7 +77,7 @@ ReadWriteMode(IN UCHAR Mode) __outpb(VGA_BASE_IO_PORT + GRAPH_DATA_PORT, Mode | Value); } -static VOID +VOID PrepareForSetPixel(VOID) { /* Switch to mode 10 */ @@ -100,24 +90,6 @@ PrepareForSetPixel(VOID) __outpw(VGA_BASE_IO_PORT + GRAPH_ADDRESS_PORT, 7); } -FORCEINLINE -VOID -SetPixel(IN ULONG Left, - IN ULONG Top, - IN UCHAR Color) -{ - PUCHAR PixelPosition; - - /* Calculate the pixel position */ - PixelPosition = (PUCHAR)(VgaBase + (Left >> 3) + (Top * (SCREEN_WIDTH / 8))); - - /* Select the bitmask register and write the mask */ - __outpw(VGA_BASE_IO_PORT + GRAPH_ADDRESS_PORT, (PixelMask[Left & 7] << 8) | IND_BIT_MASK); - - /* Read the current pixel value and add our color */ - WRITE_REGISTER_UCHAR(PixelPosition, READ_REGISTER_UCHAR(PixelPosition) & Color); -} - #define SET_PIXELS(_PixelPtr, _PixelMask, _TextColor) \ do { \ /* Select the bitmask register and write the mask */ \ @@ -134,13 +106,14 @@ do { \ # define FONT_PTR_DELTA (1) #endif -static VOID +VOID NTAPI -DisplayCharacter(IN CHAR Character, - IN ULONG Left, - IN ULONG Top, - IN ULONG TextColor, - IN ULONG BackColor) +DisplayCharacter( + _In_ CHAR Character, + _In_ ULONG Left, + _In_ ULONG Top, + _In_ ULONG TextColor, + _In_ ULONG BackColor) { PUCHAR FontChar, PixelPtr; ULONG Height; @@ -224,22 +197,6 @@ DisplayCharacter(IN CHAR Character, } } -static VOID -NTAPI -DisplayStringXY(IN PUCHAR String, - IN ULONG Left, - IN ULONG Top, - IN ULONG TextColor, - IN ULONG BackColor) -{ - /* Loop every character and adjust the position */ - for (; *String; ++String, Left += 8) - { - /* Display a character */ - DisplayCharacter(*String, Left, Top, TextColor, BackColor); - } -} - static VOID NTAPI SetPaletteEntryRGB(IN ULONG Id, @@ -256,10 +213,11 @@ SetPaletteEntryRGB(IN ULONG Id, __outpb(VGA_BASE_IO_PORT + DAC_DATA_REG_PORT, Colors[0] >> 2); } -static VOID +VOID NTAPI -InitPaletteWithTable(IN PULONG Table, - IN ULONG Count) +InitPaletteWithTable( + _In_ PULONG Table, + _In_ ULONG Count) { ULONG i; PULONG Entry = Table; @@ -328,14 +286,14 @@ VgaScroll(IN ULONG Scroll) /* Set Mode 1 */ ReadWriteMode(1); - RowSize = (ScrollRegion[2] - ScrollRegion[0] + 1) / 8; + RowSize = (VidpScrollRegion[2] - VidpScrollRegion[0] + 1) / 8; /* Calculate the position in memory for the row */ - OldPosition = (PUCHAR)(VgaBase + (ScrollRegion[1] + Scroll) * (SCREEN_WIDTH / 8) + ScrollRegion[0] / 8); - NewPosition = (PUCHAR)(VgaBase + ScrollRegion[1] * (SCREEN_WIDTH / 8) + ScrollRegion[0] / 8); + OldPosition = (PUCHAR)(VgaBase + (VidpScrollRegion[1] + Scroll) * (SCREEN_WIDTH / 8) + VidpScrollRegion[0] / 8); + NewPosition = (PUCHAR)(VgaBase + VidpScrollRegion[1] * (SCREEN_WIDTH / 8) + VidpScrollRegion[0] / 8); /* Start loop */ - for (Top = ScrollRegion[1]; Top <= ScrollRegion[3]; ++Top) + for (Top = VidpScrollRegion[1]; Top <= VidpScrollRegion[3]; ++Top) { #if defined(_M_IX86) || defined(_M_AMD64) __movsb(NewPosition, OldPosition, RowSize); @@ -400,257 +358,6 @@ PreserveRow(IN ULONG CurrentTop, #endif } -static VOID -NTAPI -BitBlt(IN ULONG Left, - IN ULONG Top, - IN ULONG Width, - IN ULONG Height, - IN PUCHAR Buffer, - IN ULONG BitsPerPixel, - IN ULONG Delta) -{ - ULONG sx, dx, dy; - UCHAR color; - ULONG offset = 0; - const ULONG Bottom = Top + Height; - const ULONG Right = Left + Width; - - /* Check if the buffer isn't 4bpp */ - if (BitsPerPixel != 4) - { - /* FIXME: TODO */ - DbgPrint("Unhandled BitBlt\n" - "%lux%lu @ (%lu|%lu)\n" - "Bits Per Pixel %lu\n" - "Buffer: %p. Delta: %lu\n", - Width, - Height, - Left, - Top, - BitsPerPixel, - Buffer, - Delta); - return; - } - - PrepareForSetPixel(); - - /* 4bpp blitting */ - for (dy = Top; dy < Bottom; ++dy) - { - sx = 0; - do - { - /* Extract color */ - color = Buffer[offset + sx]; - - /* Calc destination x */ - dx = Left + (sx << 1); - - /* Set two pixels */ - SetPixel(dx, dy, color >> 4); - SetPixel(dx + 1, dy, color & 0x0F); - - sx++; - } while (dx < Right); - offset += Delta; - } -} - -static VOID -NTAPI -RleBitBlt(IN ULONG Left, - IN ULONG Top, - IN ULONG Width, - IN ULONG Height, - IN PUCHAR Buffer) -{ - ULONG YDelta; - ULONG x; - ULONG RleValue, NewRleValue; - ULONG Color, Color2; - ULONG i, j; - ULONG Code; - - PrepareForSetPixel(); - - /* Set Y height and current X value and start loop */ - YDelta = Top + Height - 1; - x = Left; - for (;;) - { - /* Get the current value and advance in the buffer */ - RleValue = *Buffer; - Buffer++; - if (RleValue) - { - /* Check if we've gone past the edge */ - if ((x + RleValue) > (Width + Left)) - { - /* Fixup the pixel value */ - RleValue = Left - x + Width; - } - - /* Get the new value */ - NewRleValue = *Buffer; - - /* Get the two colors */ - Color = NewRleValue >> 4; - Color2 = NewRleValue & 0xF; - - /* Increase buffer position */ - Buffer++; - - /* Check if we need to do a fill */ - if (Color == Color2) - { - /* Do a fill and continue the loop */ - RleValue += x; - VidSolidColorFill(x, YDelta, RleValue - 1, YDelta, (UCHAR)Color); - x = RleValue; - continue; - } - - /* Check if the pixel value is 1 or below */ - if (RleValue > 1) - { - /* Set loop variables */ - for (i = (RleValue - 2) / 2 + 1; i > 0; --i) - { - /* Set the pixels */ - SetPixel(x, YDelta, (UCHAR)Color); - x++; - SetPixel(x, YDelta, (UCHAR)Color2); - x++; - - /* Decrease pixel value */ - RleValue -= 2; - } - } - - /* Check if there is any value at all */ - if (RleValue) - { - /* Set the pixel and increase position */ - SetPixel(x, YDelta, (UCHAR)Color); - x++; - } - - /* Start over */ - continue; - } - - /* Get the current pixel value */ - RleValue = *Buffer; - Code = RleValue; - switch (Code) - { - /* Case 0 */ - case 0: - { - /* Set new x value, decrease distance and restart */ - x = Left; - YDelta--; - Buffer++; - continue; - } - - /* Case 1 */ - case 1: - { - /* Done */ - return; - } - - /* Case 2 */ - case 2: - { - /* Set new x value, decrease distance and restart */ - Buffer++; - x += *Buffer; - Buffer++; - YDelta -= *Buffer; - Buffer++; - continue; - } - - /* Other values */ - default: - { - Buffer++; - break; - } - } - - /* Check if we've gone past the edge */ - if ((x + RleValue) > (Width + Left)) - { - /* Set fixed up loop count */ - i = RleValue - Left - Width + x; - - /* Fixup pixel value */ - RleValue -= i; - } - else - { - /* Clear loop count */ - i = 0; - } - - /* Check the value now */ - if (RleValue > 1) - { - /* Set loop variables */ - for (j = (RleValue - 2) / 2 + 1; j > 0; --j) - { - /* Get the new value */ - NewRleValue = *Buffer; - - /* Get the two colors */ - Color = NewRleValue >> 4; - Color2 = NewRleValue & 0xF; - - /* Increase buffer position */ - Buffer++; - - /* Set the pixels */ - SetPixel(x, YDelta, (UCHAR)Color); - x++; - SetPixel(x, YDelta, (UCHAR)Color2); - x++; - - /* Decrease pixel value */ - RleValue -= 2; - } - } - - /* Check if there is any value at all */ - if (RleValue) - { - /* Set the pixel and increase position */ - Color = *Buffer >> 4; - Buffer++; - SetPixel(x, YDelta, (UCHAR)Color); - x++; - i--; - } - - /* Check loop count now */ - if ((LONG)i > 0) - { - /* Decrease it */ - i--; - - /* Set new position */ - Buffer = Buffer + (i / 2) + 1; - } - - /* Check if we need to increase the buffer */ - if ((ULONG_PTR)Buffer & 1) Buffer++; - } -} - /* PUBLIC FUNCTIONS **********************************************************/ /* @@ -663,56 +370,11 @@ VidSetTextColor(IN ULONG Color) ULONG OldColor; /* Save the old color and set the new one */ - OldColor = VidTextColor; - VidTextColor = Color; + OldColor = VidpTextColor; + VidpTextColor = Color; return OldColor; } -/* - * @implemented - */ -VOID -NTAPI -VidDisplayStringXY(IN PUCHAR String, - IN ULONG Left, - IN ULONG Top, - IN BOOLEAN Transparent) -{ - ULONG BackColor; - - /* - * If the caller wanted transparent, then send the special value (16), - * else use our default and call the helper routine. - */ - BackColor = Transparent ? 16 : 14; - DisplayStringXY(String, Left, Top, 12, BackColor); -} - -/* - * @implemented - */ -VOID -NTAPI -VidSetScrollRegion(IN ULONG Left, - IN ULONG Top, - IN ULONG Right, - IN ULONG Bottom) -{ - /* Assert alignment */ - ASSERT((Left & 0x7) == 0); - ASSERT((Right & 0x7) == 7); - - /* Set Scroll Region */ - ScrollRegion[0] = Left; - ScrollRegion[1] = Top; - ScrollRegion[2] = Right; - ScrollRegion[3] = Bottom; - - /* Set current X and Y */ - curr_x = Left; - curr_y = Top; -} - /* * @implemented */ @@ -725,25 +387,6 @@ VidCleanUp(VOID) __outpb(VGA_BASE_IO_PORT + GRAPH_DATA_PORT, BIT_MASK_DEFAULT); } -/* - * @implemented - */ -VOID -NTAPI -VidBufferToScreenBlt(IN PUCHAR Buffer, - IN ULONG Left, - IN ULONG Top, - IN ULONG Width, - IN ULONG Height, - IN ULONG Delta) -{ - /* Make sure we have a width and height */ - if (!Width || !Height) return; - - /* Call the helper function */ - BitBlt(Left, Top, Width, Height, Buffer, 4, Delta); -} - /* * @implemented */ @@ -760,22 +403,22 @@ VidDisplayString(IN PUCHAR String) if (*String == '\n') { /* Modify Y position */ - curr_y += TopDelta; - if (curr_y + TopDelta - 1 > ScrollRegion[3]) + VidpCurrentY += TopDelta; + if (VidpCurrentY + TopDelta - 1 > VidpScrollRegion[3]) { /* Scroll the view and clear the current row */ VgaScroll(TopDelta); - curr_y -= TopDelta; - PreserveRow(curr_y, TopDelta, TRUE); + VidpCurrentY -= TopDelta; + PreserveRow(VidpCurrentY, TopDelta, TRUE); } else { /* Preserve the current row */ - PreserveRow(curr_y, TopDelta, FALSE); + PreserveRow(VidpCurrentY, TopDelta, FALSE); } /* Update current X */ - curr_x = ScrollRegion[0]; + VidpCurrentX = VidpScrollRegion[0]; /* No need to clear this row */ ClearRow = FALSE; @@ -783,7 +426,7 @@ VidDisplayString(IN PUCHAR String) else if (*String == '\r') { /* Update current X */ - curr_x = ScrollRegion[0]; + VidpCurrentX = VidpScrollRegion[0]; /* If a new-line does not follow we will clear the current row */ if (String[1] != '\n') ClearRow = TRUE; @@ -793,34 +436,34 @@ VidDisplayString(IN PUCHAR String) /* Clear the current row if we had a return-carriage without a new-line */ if (ClearRow) { - PreserveRow(curr_y, TopDelta, TRUE); + PreserveRow(VidpCurrentY, TopDelta, TRUE); ClearRow = FALSE; } /* Display this character */ - DisplayCharacter(*String, curr_x, curr_y, VidTextColor, 16); - curr_x += 8; + DisplayCharacter(*String, VidpCurrentX, VidpCurrentY, VidpTextColor, 16); + VidpCurrentX += 8; /* Check if we should scroll */ - if (curr_x + 7 > ScrollRegion[2]) + if (VidpCurrentX + 7 > VidpScrollRegion[2]) { /* Update Y position and check if we should scroll it */ - curr_y += TopDelta; - if (curr_y + TopDelta - 1 > ScrollRegion[3]) + VidpCurrentY += TopDelta; + if (VidpCurrentY + TopDelta - 1 > VidpScrollRegion[3]) { /* Scroll the view and clear the current row */ VgaScroll(TopDelta); - curr_y -= TopDelta; - PreserveRow(curr_y, TopDelta, TRUE); + VidpCurrentY -= TopDelta; + PreserveRow(VidpCurrentY, TopDelta, TRUE); } else { /* Preserve the current row */ - PreserveRow(curr_y, TopDelta, FALSE); + PreserveRow(VidpCurrentY, TopDelta, FALSE); } /* Update current X */ - curr_x = ScrollRegion[0]; + VidpCurrentX = VidpScrollRegion[0]; } } } @@ -831,84 +474,7 @@ VidDisplayString(IN PUCHAR String) */ VOID NTAPI -VidBitBlt(IN PUCHAR Buffer, - IN ULONG Left, - IN ULONG Top) -{ - PBITMAPINFOHEADER BitmapInfoHeader; - LONG Delta; - PUCHAR BitmapOffset; - - /* Get the Bitmap Header */ - BitmapInfoHeader = (PBITMAPINFOHEADER)Buffer; - - /* Initialize the palette */ - InitPaletteWithTable((PULONG)(Buffer + BitmapInfoHeader->biSize), - (BitmapInfoHeader->biClrUsed) ? - BitmapInfoHeader->biClrUsed : 16); - - /* Make sure we can support this bitmap */ - ASSERT((BitmapInfoHeader->biBitCount * BitmapInfoHeader->biPlanes) <= 4); - - /* - * Calculate the delta and align it on 32-bytes, then calculate - * the actual start of the bitmap data. - */ - Delta = (BitmapInfoHeader->biBitCount * BitmapInfoHeader->biWidth) + 31; - Delta >>= 3; - Delta &= ~3; - BitmapOffset = Buffer + sizeof(BITMAPINFOHEADER) + 16 * sizeof(ULONG); - - /* Check the compression of the bitmap */ - if (BitmapInfoHeader->biCompression == BI_RLE4) - { - /* Make sure we have a width and a height */ - if ((BitmapInfoHeader->biWidth) && (BitmapInfoHeader->biHeight)) - { - /* We can use RLE Bit Blt */ - RleBitBlt(Left, - Top, - BitmapInfoHeader->biWidth, - BitmapInfoHeader->biHeight, - BitmapOffset); - } - } - else - { - /* Check if the height is negative */ - if (BitmapInfoHeader->biHeight < 0) - { - /* Make it positive in the header */ - BitmapInfoHeader->biHeight *= -1; - } - else - { - /* Update buffer offset */ - BitmapOffset += ((BitmapInfoHeader->biHeight - 1) * Delta); - Delta *= -1; - } - - /* Make sure we have a width and a height */ - if ((BitmapInfoHeader->biWidth) && (BitmapInfoHeader->biHeight)) - { - /* Do the BitBlt */ - BitBlt(Left, - Top, - BitmapInfoHeader->biWidth, - BitmapInfoHeader->biHeight, - BitmapOffset, - BitmapInfoHeader->biBitCount, - Delta); - } - } -} - -/* - * @implemented - */ -VOID -NTAPI -VidScreenToBufferBlt(IN PUCHAR Buffer, +VidScreenToBufferBlt(OUT PUCHAR Buffer, IN ULONG Left, IN ULONG Top, IN ULONG Width, diff --git a/drivers/base/bootvid/precomp.h b/drivers/base/bootvid/precomp.h index 0a55332643f..d89e93d359e 100644 --- a/drivers/base/bootvid/precomp.h +++ b/drivers/base/bootvid/precomp.h @@ -5,16 +5,22 @@ #include <ndk/halfuncs.h> #include <drivers/bootvid/bootvid.h> +/* Arch specific includes */ +#if defined(_M_IX86) || defined(_M_AMD64) +#include "i386/pc/vga.h" +#include "i386/pc/pc.h" +#elif defined(_M_ARM) +#include "arm/arm.h" +#else +#error Unknown architecture +#endif + /* Define if FontData has upside down characters */ #undef CHAR_GEN_UPSIDE_DOWN #define BOOTCHAR_HEIGHT 13 #define BOOTCHAR_WIDTH 8 // Each character line is encoded in a UCHAR. -#ifndef _M_ARM -#include "i386/pc/vga.h" -#endif /* _M_ARM */ - /* Bitmap Header */ typedef struct tagBITMAPINFOHEADER { @@ -35,31 +41,43 @@ typedef struct tagBITMAPINFOHEADER #define BI_RGB 0 #define BI_RLE4 2 +typedef struct _PALETTE_ENTRY +{ + UCHAR Red; + UCHAR Green; + UCHAR Blue; +} PALETTE_ENTRY, *PPALETTE_ENTRY; + VOID NTAPI InitializePalette(VOID); -/* Globals */ -#ifndef _M_ARM -extern ULONG curr_x; -extern ULONG curr_y; -extern ULONG_PTR VgaRegisterBase; -extern ULONG_PTR VgaBase; -extern USHORT AT_Initialization[]; -extern USHORT VGA_640x480[]; -#endif /* _M_ARM */ -extern UCHAR FontData[256 * BOOTCHAR_HEIGHT]; - -#define __inpb(Port) \ - READ_PORT_UCHAR((PUCHAR)(VgaRegisterBase + (Port))) +VOID +NTAPI +DisplayCharacter( + _In_ CHAR Character, + _In_ ULONG Left, + _In_ ULONG Top, + _In_ ULONG TextColor, + _In_ ULONG BackColor +); -#define __inpw(Port) \ - READ_PORT_USHORT((PUSHORT)(VgaRegisterBase + (Port))) +VOID +PrepareForSetPixel(VOID); -#define __outpb(Port, Value) \ - WRITE_PORT_UCHAR((PUCHAR)(VgaRegisterBase + (Port)), (UCHAR)(Value)) +VOID +NTAPI +InitPaletteWithTable( + _In_ PULONG Table, + _In_ ULONG Count); -#define __outpw(Port, Value) \ - WRITE_PORT_USHORT((PUSHORT)(VgaRegisterBase + (Port)), (USHORT)(Value)) +/* + * Globals + */ +extern UCHAR VidpTextColor; +extern ULONG VidpCurrentX; +extern ULONG VidpCurrentY; +extern ULONG VidpScrollRegion[4]; +extern UCHAR FontData[256 * BOOTCHAR_HEIGHT]; #endif /* _BOOTVID_PCH_ */ diff --git a/sdk/include/reactos/drivers/bootvid/bootvid.h b/sdk/include/reactos/drivers/bootvid/bootvid.h index 80f0a485913..23971957f4d 100644 --- a/sdk/include/reactos/drivers/bootvid/bootvid.h +++ b/sdk/include/reactos/drivers/bootvid/bootvid.h @@ -63,7 +63,7 @@ VidBitBlt(IN PUCHAR Buffer, VOID NTAPI -VidScreenToBufferBlt(IN PUCHAR Buffer, +VidScreenToBufferBlt(OUT PUCHAR Buffer, IN ULONG Left, IN ULONG Top, IN ULONG Width,

1 0

[reactos] 01/02: [BOOTVID] Move the VGA code into the PC directory. (#2510)
by Dmitry Borisov 09 Apr '20

09 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=df23bb779ed1c011dc687… commit df23bb779ed1c011dc68733539c1644fee2a4f85 Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Wed Apr 8 11:25:11 2020 +0600 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Apr 9 15:33:58 2020 +0200 [BOOTVID] Move the VGA code into the PC directory. (#2510) --- drivers/base/bootvid/CMakeLists.txt | 6 +++--- drivers/base/bootvid/i386/{ => pc}/bootdata.c | 0 drivers/base/bootvid/i386/{ => pc}/bootvid.c | 0 drivers/base/bootvid/{ => i386/pc}/cmdcnst.h | 0 drivers/base/bootvid/i386/{ => pc}/vga.c | 0 drivers/base/bootvid/{ => i386/pc}/vga.h | 0 drivers/base/bootvid/precomp.h | 2 +- 7 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/base/bootvid/CMakeLists.txt b/drivers/base/bootvid/CMakeLists.txt index 285dd007d6f..e344d53fc14 100644 --- a/drivers/base/bootvid/CMakeLists.txt +++ b/drivers/base/bootvid/CMakeLists.txt @@ -3,9 +3,9 @@ spec2def(bootvid.dll bootvid.spec ADD_IMPORTLIB) if((ARCH STREQUAL "i386") OR (ARCH STREQUAL "amd64")) list(APPEND SOURCE - i386/bootvid.c - i386/bootdata.c - i386/vga.c) + i386/pc/bootvid.c + i386/pc/bootdata.c + i386/pc/vga.c) elseif(ARCH STREQUAL "arm") list(APPEND SOURCE arm/bootvid.c) diff --git a/drivers/base/bootvid/i386/bootdata.c b/drivers/base/bootvid/i386/pc/bootdata.c similarity index 100% rename from drivers/base/bootvid/i386/bootdata.c rename to drivers/base/bootvid/i386/pc/bootdata.c diff --git a/drivers/base/bootvid/i386/bootvid.c b/drivers/base/bootvid/i386/pc/bootvid.c similarity index 100% rename from drivers/base/bootvid/i386/bootvid.c rename to drivers/base/bootvid/i386/pc/bootvid.c diff --git a/drivers/base/bootvid/cmdcnst.h b/drivers/base/bootvid/i386/pc/cmdcnst.h similarity index 100% rename from drivers/base/bootvid/cmdcnst.h rename to drivers/base/bootvid/i386/pc/cmdcnst.h diff --git a/drivers/base/bootvid/i386/vga.c b/drivers/base/bootvid/i386/pc/vga.c similarity index 100% rename from drivers/base/bootvid/i386/vga.c rename to drivers/base/bootvid/i386/pc/vga.c diff --git a/drivers/base/bootvid/vga.h b/drivers/base/bootvid/i386/pc/vga.h similarity index 100% rename from drivers/base/bootvid/vga.h rename to drivers/base/bootvid/i386/pc/vga.h diff --git a/drivers/base/bootvid/precomp.h b/drivers/base/bootvid/precomp.h index 8fcc753b662..0a55332643f 100644 --- a/drivers/base/bootvid/precomp.h +++ b/drivers/base/bootvid/precomp.h @@ -12,7 +12,7 @@ #define BOOTCHAR_WIDTH 8 // Each character line is encoded in a UCHAR. #ifndef _M_ARM -#include "vga.h" +#include "i386/pc/vga.h" #endif /* _M_ARM */ /* Bitmap Header */

1 0

[reactos] 01/01: [BOOTVID][NTOSKRNL][HALX86] Move hardcoded coordinates of bootvid into one place. (#2504)
by Dmitry Borisov 09 Apr '20

09 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1610367fe2b3ece7fac11… commit 1610367fe2b3ece7fac11cb693e43f68f8f39e41 Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Tue Apr 7 03:48:01 2020 +0600 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Apr 9 15:17:48 2020 +0200 [BOOTVID][NTOSKRNL][HALX86] Move hardcoded coordinates of bootvid into one place. (#2504) Co-Authored-By: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> --- drivers/base/bootvid/precomp.h | 6 ----- hal/halx86/generic/misc.c | 6 +++-- ntoskrnl/inbv/inbv.c | 31 +++++++++++++------------- ntoskrnl/inbv/logo.h | 32 +++++++++++++++++++++++++++ ntoskrnl/include/internal/inbv.h | 3 +++ ntoskrnl/kd/kdio.c | 5 +++-- ntoskrnl/ke/bug.c | 5 +++-- ntoskrnl/po/poshtdwn.c | 12 +++++----- sdk/include/reactos/drivers/bootvid/bootvid.h | 13 ++++++++++- sdk/include/reactos/drivers/bootvid/display.h | 12 ++++++++++ 10 files changed, 92 insertions(+), 33 deletions(-) diff --git a/drivers/base/bootvid/precomp.h b/drivers/base/bootvid/precomp.h index 18bc611a99a..8fcc753b662 100644 --- a/drivers/base/bootvid/precomp.h +++ b/drivers/base/bootvid/precomp.h @@ -11,12 +11,6 @@ #define BOOTCHAR_HEIGHT 13 #define BOOTCHAR_WIDTH 8 // Each character line is encoded in a UCHAR. -/* - * Screen resolution (for default VGA) - */ -#define SCREEN_WIDTH 640 -#define SCREEN_HEIGHT 480 - #ifndef _M_ARM #include "vga.h" #endif /* _M_ARM */ diff --git a/hal/halx86/generic/misc.c b/hal/halx86/generic/misc.c index 866b4591069..407f1e6047a 100644 --- a/hal/halx86/generic/misc.c +++ b/hal/halx86/generic/misc.c @@ -9,6 +9,8 @@ /* INCLUDES *******************************************************************/ #include <hal.h> +#include <drivers/bootvid/display.h> + #define NDEBUG #include <debug.h> @@ -255,8 +257,8 @@ HalHandleNMI(IN PVOID NmiInfo) // // Fill the screen // - InbvSolidColorFill(0, 0, 639, 479, 1); - InbvSetScrollRegion(0, 0, 639, 479); + InbvSolidColorFill(0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1, 1); + InbvSetScrollRegion(0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1); // // Enable text diff --git a/ntoskrnl/inbv/inbv.c b/ntoskrnl/inbv/inbv.c index c93d0e66482..5617e8577e2 100644 --- a/ntoskrnl/inbv/inbv.c +++ b/ntoskrnl/inbv/inbv.c @@ -1,9 +1,11 @@ /* INCLUDES ******************************************************************/ #include <ntoskrnl.h> + #define NDEBUG #include <debug.h> -#include "bootvid/bootvid.h" + +#include "inbv/logo.h" /* See also mm/ARM3/miarm.h */ #define MM_READONLY 1 // PAGE_READONLY @@ -53,12 +55,6 @@ typedef enum _ROT_BAR_TYPE RB_PROGRESS_BAR } ROT_BAR_TYPE; -/* - * Screen resolution (for default VGA) - */ -#define SCREEN_WIDTH 640 -#define SCREEN_HEIGHT 480 - /* * BitBltAligned() alignments */ @@ -1126,7 +1122,7 @@ DisplayBootBitmap(IN BOOLEAN TextMode) /* Workstation; set colors */ InbvSetTextColor(15); InbvSolidColorFill(0, 0, SCREEN_WIDTH-1, SCREEN_HEIGHT-1, 7); - InbvSolidColorFill(0, 421, SCREEN_WIDTH-1, SCREEN_HEIGHT-1, 1); + InbvSolidColorFill(0, VID_FOOTER_BG_TOP, SCREEN_WIDTH-1, SCREEN_HEIGHT-1, 1); /* Get resources */ Header = InbvGetResourceAddress(IDB_WKSTA_HEADER); @@ -1137,7 +1133,7 @@ DisplayBootBitmap(IN BOOLEAN TextMode) /* Server; set colors */ InbvSetTextColor(14); InbvSolidColorFill(0, 0, SCREEN_WIDTH-1, SCREEN_HEIGHT-1, 6); - InbvSolidColorFill(0, 421, SCREEN_WIDTH-1, SCREEN_HEIGHT-1, 1); + InbvSolidColorFill(0, VID_FOOTER_BG_TOP, SCREEN_WIDTH-1, SCREEN_HEIGHT-1, 1); /* Get resources */ Header = InbvGetResourceAddress(IDB_SERVER_HEADER); @@ -1145,7 +1141,8 @@ DisplayBootBitmap(IN BOOLEAN TextMode) } /* Set the scrolling region */ - InbvSetScrollRegion(32, 80, 631, 400); + InbvSetScrollRegion(VID_SCROLL_AREA_LEFT, VID_SCROLL_AREA_TOP, + VID_SCROLL_AREA_RIGHT, VID_SCROLL_AREA_BOTTOM); /* Make sure we have resources */ if (Header && Footer) @@ -1239,16 +1236,19 @@ DisplayBootBitmap(IN BOOLEAN TextMode) #endif /* Set progress bar coordinates and display it */ - InbvSetProgressBarCoordinates(259, 352); + InbvSetProgressBarCoordinates(VID_PROGRESS_BAR_LEFT, VID_PROGRESS_BAR_TOP); #ifdef REACTOS_SKUS /* Check for non-workstation products */ if (SharedUserData->NtProductType != NtProductWinNt) { /* Overwrite part of the logo for a server product */ - InbvScreenToBufferBlt(Buffer, 413, 237, 7, 7, 8); - InbvSolidColorFill(418, 230, 454, 256, 0); - InbvBufferToScreenBlt(Buffer, 413, 237, 7, 7, 8); + InbvScreenToBufferBlt(Buffer, VID_SKU_SAVE_AREA_LEFT, + VID_SKU_SAVE_AREA_TOP, 7, 7, 8); + InbvSolidColorFill(VID_SKU_AREA_LEFT, VID_SKU_AREA_TOP, + VID_SKU_AREA_RIGHT, VID_SKU_AREA_BOTTOM, 0); + InbvBufferToScreenBlt(Buffer, VID_SKU_SAVE_AREA_LEFT, + VID_SKU_SAVE_AREA_TOP, 7, 7, 8); /* In setup mode, you haven't selected a SKU yet */ if (ExpInTextModeSetup) Text = NULL; @@ -1274,7 +1274,8 @@ DisplayBootBitmap(IN BOOLEAN TextMode) #ifdef REACTOS_SKUS /* Draw the SKU text if it exits */ - if (Text) BitBltPalette(Text, TRUE, 180, 121); + if (Text) + BitBltPalette(Text, TRUE, VID_SKU_TEXT_LEFT, VID_SKU_TEXT_TOP); #endif #ifdef INBV_ROTBAR_IMPLEMENTED diff --git a/ntoskrnl/inbv/logo.h b/ntoskrnl/inbv/logo.h new file mode 100644 index 00000000000..c18d1efeea7 --- /dev/null +++ b/ntoskrnl/inbv/logo.h @@ -0,0 +1,32 @@ +#pragma once + +// +// Positions of areas and images +// + +#define VID_SCROLL_AREA_LEFT 32 +#define VID_SCROLL_AREA_TOP 80 +#define VID_SCROLL_AREA_RIGHT 631 +#define VID_SCROLL_AREA_BOTTOM 400 + +#define VID_PROGRESS_BAR_LEFT 259 +#define VID_PROGRESS_BAR_TOP 352 + +/* 16px space between shutdown logo and message */ +#define VID_SHUTDOWN_LOGO_LEFT 225 +#define VID_SHUTDOWN_LOGO_TOP 114 +#define VID_SHUTDOWN_MSG_LEFT 213 +#define VID_SHUTDOWN_MSG_TOP 354 + +#define VID_SKU_AREA_LEFT 418 +#define VID_SKU_AREA_TOP 230 +#define VID_SKU_AREA_RIGHT 454 +#define VID_SKU_AREA_BOTTOM 256 + +#define VID_SKU_SAVE_AREA_LEFT 413 +#define VID_SKU_SAVE_AREA_TOP 237 + +#define VID_SKU_TEXT_LEFT 180 +#define VID_SKU_TEXT_TOP 121 + +#define VID_FOOTER_BG_TOP (SCREEN_HEIGHT - 59) diff --git a/ntoskrnl/include/internal/inbv.h b/ntoskrnl/include/internal/inbv.h index 80a6c83a481..148c112d367 100644 --- a/ntoskrnl/include/internal/inbv.h +++ b/ntoskrnl/include/internal/inbv.h @@ -1,5 +1,8 @@ #pragma once +// Native definitions from BOOTVID (Boot Video Driver). +#include "bootvid/bootvid.h" + // // Driver Initialization // diff --git a/ntoskrnl/kd/kdio.c b/ntoskrnl/kd/kdio.c index 52dd45b7ccd..89ca1685f74 100644 --- a/ntoskrnl/kd/kdio.c +++ b/ntoskrnl/kd/kdio.c @@ -11,6 +11,7 @@ #include <ntoskrnl.h> #include <reactos/buildno.h> + #define NDEBUG #include <debug.h> @@ -417,11 +418,11 @@ KdpScreenAcquire(VOID) /* Acquire ownership and reset the display */ InbvAcquireDisplayOwnership(); InbvResetDisplay(); - InbvSolidColorFill(0, 0, 639, 479, 0); + InbvSolidColorFill(0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1, 0); InbvSetTextColor(15); InbvInstallDisplayStringFilter(NULL); InbvEnableDisplayString(TRUE); - InbvSetScrollRegion(0, 0, 639, 479); + InbvSetScrollRegion(0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1); } } diff --git a/ntoskrnl/ke/bug.c b/ntoskrnl/ke/bug.c index 47b1f4b5ca3..0601855d359 100644 --- a/ntoskrnl/ke/bug.c +++ b/ntoskrnl/ke/bug.c @@ -9,6 +9,7 @@ /* INCLUDES ******************************************************************/ #include <ntoskrnl.h> + #define NDEBUG #include <debug.h> @@ -625,11 +626,11 @@ KiDisplayBlueScreen(IN ULONG MessageId, InbvResetDisplay(); /* Display blue screen */ - InbvSolidColorFill(0, 0, 639, 479, 4); + InbvSolidColorFill(0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1, 4); InbvSetTextColor(15); InbvInstallDisplayStringFilter(NULL); InbvEnableDisplayString(TRUE); - InbvSetScrollRegion(0, 0, 639, 479); + InbvSetScrollRegion(0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1); } /* Check if this is a hard error */ diff --git a/ntoskrnl/po/poshtdwn.c b/ntoskrnl/po/poshtdwn.c index 23071faad28..31a1165e33f 100644 --- a/ntoskrnl/po/poshtdwn.c +++ b/ntoskrnl/po/poshtdwn.c @@ -12,9 +12,12 @@ #ifdef NEWCC #include <cache/newcc.h> #endif + #define NDEBUG #include <debug.h> +#include "inbv/logo.h" + /* GLOBALS *******************************************************************/ ULONG PopShutdownPowerOffPolicy; @@ -159,18 +162,17 @@ PopShutdownHandler(VOID) /* Yes we do, cleanup for shutdown screen */ if (!InbvCheckDisplayOwnership()) InbvAcquireDisplayOwnership(); InbvResetDisplay(); - InbvSolidColorFill(0, 0, 639, 479, 0); + InbvSolidColorFill(0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1, 0); InbvEnableDisplayString(TRUE); - InbvSetScrollRegion(0, 0, 639, 479); + InbvSetScrollRegion(0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1); /* Display shutdown logo and message */ Logo1 = InbvGetResourceAddress(IDB_SHUTDOWN_MSG); Logo2 = InbvGetResourceAddress(IDB_LOGO_DEFAULT); if ((Logo1) && (Logo2)) { - /* 16px space between logo and message */ - InbvBitBlt(Logo1, 213, 354); - InbvBitBlt(Logo2, 225, 114); + InbvBitBlt(Logo1, VID_SHUTDOWN_MSG_LEFT, VID_SHUTDOWN_MSG_TOP); + InbvBitBlt(Logo2, VID_SHUTDOWN_LOGO_LEFT, VID_SHUTDOWN_LOGO_TOP); } } else diff --git a/sdk/include/reactos/drivers/bootvid/bootvid.h b/sdk/include/reactos/drivers/bootvid/bootvid.h index 8e9bd9d8792..80f0a485913 100644 --- a/sdk/include/reactos/drivers/bootvid/bootvid.h +++ b/sdk/include/reactos/drivers/bootvid/bootvid.h @@ -1,6 +1,17 @@ +/* + * PROJECT: ReactOS Boot Video Driver + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Main BOOTVID header. + * COPYRIGHT: Copyright 2007-2020 Alex Ionescu (alex.ionescu(a)reactos.org) + */ + #ifndef _BOOTVID_ #define _BOOTVID_ +#pragma once + +#include "display.h" + BOOLEAN NTAPI VidInitialize(IN BOOLEAN SetMode); @@ -67,4 +78,4 @@ VidSolidColorFill(IN ULONG Left, IN ULONG Bottom, IN UCHAR Color); -#endif +#endif // _BOOTVID_ diff --git a/sdk/include/reactos/drivers/bootvid/display.h b/sdk/include/reactos/drivers/bootvid/display.h new file mode 100644 index 00000000000..af9178153ad --- /dev/null +++ b/sdk/include/reactos/drivers/bootvid/display.h @@ -0,0 +1,12 @@ +/* + * PROJECT: ReactOS Boot Video Driver + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Provides display settings for BOOTVID, HAL and NTOSKRNL. + * COPYRIGHT: Copyright 2020 Dmitry Borisov (di.sean(a)protonmail.com) + */ + +#pragma once + +/* For default VGA */ +#define SCREEN_WIDTH 640 +#define SCREEN_HEIGHT 480

1 0

[reactos] 01/01: [SHELL32] Watch for common desktop and SHCNE_CREATE for IShellLink::Save (#2515)
by Katayama Hirofumi MZ 09 Apr '20

09 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1c706d7483b321bde3e1e… commit 1c706d7483b321bde3e1e43476eb92b6e2e4ca40 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Apr 9 16:56:54 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Apr 9 16:56:54 2020 +0900 [SHELL32] Watch for common desktop and SHCNE_CREATE for IShellLink::Save (#2515) - On desktop view, we have to watch both the common desktop and the private desktop. - In Windows, IShellLink::Save (shortcut creation) sends SHCNE_CREATE or SHCNE_UPDATEITEM notification. - Simplify CChangeNotify::ShouldNotify. CORE-10391 --- dll/win32/shell32/CDefView.cpp | 33 +++++++++++++-- dll/win32/shell32/CShellLink.cpp | 11 +++++ dll/win32/shell32/shelldesktop/CChangeNotify.cpp | 51 +++++------------------- 3 files changed, 50 insertions(+), 45 deletions(-) diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index ff3ce600c38..48591cc3c71 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -1157,11 +1157,36 @@ LRESULT CDefView::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandl SetShellWindowEx(hwndSB, m_ListView); } - SHChangeNotifyEntry ntreg; - ntreg.fRecursive = TRUE; - ntreg.pidl = m_pidlParent; + INT nRegCount; + SHChangeNotifyEntry ntreg[3]; + PIDLIST_ABSOLUTE pidls[3]; + if (_ILIsDesktop(m_pidlParent)) + { + nRegCount = 3; + SHGetSpecialFolderLocation(m_hWnd, CSIDL_DESKTOPDIRECTORY, &pidls[0]); + SHGetSpecialFolderLocation(m_hWnd, CSIDL_COMMON_DESKTOPDIRECTORY, &pidls[1]); + SHGetSpecialFolderLocation(m_hWnd, CSIDL_BITBUCKET, &pidls[2]); + ntreg[0].fRecursive = FALSE; + ntreg[0].pidl = pidls[0]; + ntreg[1].fRecursive = FALSE; + ntreg[1].pidl = pidls[1]; + ntreg[2].fRecursive = FALSE; + ntreg[2].pidl = pidls[2]; + } + else + { + nRegCount = 1; + ntreg[0].fRecursive = FALSE; + ntreg[0].pidl = m_pidlParent; + } m_hNotify = SHChangeNotifyRegister(m_hWnd, SHCNRF_NewDelivery | SHCNRF_ShellLevel, - SHCNE_ALLEVENTS, SHV_CHANGE_NOTIFY, 1, &ntreg); + SHCNE_ALLEVENTS, SHV_CHANGE_NOTIFY, nRegCount, ntreg); + if (nRegCount == 3) + { + ILFree(pidls[0]); + ILFree(pidls[1]); + ILFree(pidls[2]); + } /* _DoFolderViewCB(SFVM_GETNOTIFY, ?? ??) */ diff --git a/dll/win32/shell32/CShellLink.cpp b/dll/win32/shell32/CShellLink.cpp index 047813cfaab..2800510990a 100644 --- a/dll/win32/shell32/CShellLink.cpp +++ b/dll/win32/shell32/CShellLink.cpp @@ -344,11 +344,16 @@ HRESULT STDMETHODCALLTYPE CShellLink::Load(LPCOLESTR pszFileName, DWORD dwMode) HRESULT STDMETHODCALLTYPE CShellLink::Save(LPCOLESTR pszFileName, BOOL fRemember) { + BOOL bAlreadyExists; + WCHAR szFullPath[MAX_PATH]; + TRACE("(%p)->(%s)\n", this, debugstr_w(pszFileName)); if (!pszFileName) return E_FAIL; + bAlreadyExists = PathFileExistsW(pszFileName); + CComPtr<IStream> stm; HRESULT hr = SHCreateStreamOnFileW(pszFileName, STGM_READWRITE | STGM_CREATE | STGM_SHARE_EXCLUSIVE, &stm); if (SUCCEEDED(hr)) @@ -357,6 +362,12 @@ HRESULT STDMETHODCALLTYPE CShellLink::Save(LPCOLESTR pszFileName, BOOL fRemember if (SUCCEEDED(hr)) { + GetFullPathNameW(pszFileName, _countof(szFullPath), szFullPath, NULL); + if (bAlreadyExists) + SHChangeNotify(SHCNE_UPDATEITEM, SHCNF_PATHW, szFullPath, NULL); + else + SHChangeNotify(SHCNE_CREATE, SHCNF_PATHW, szFullPath, NULL); + if (m_sLinkPath) HeapFree(GetProcessHeap(), 0, m_sLinkPath); diff --git a/dll/win32/shell32/shelldesktop/CChangeNotify.cpp b/dll/win32/shell32/shelldesktop/CChangeNotify.cpp index 8048a847ad6..32d00cb1e6f 100644 --- a/dll/win32/shell32/shelldesktop/CChangeNotify.cpp +++ b/dll/win32/shell32/shelldesktop/CChangeNotify.cpp @@ -536,58 +536,27 @@ BOOL CChangeNotify::DoDelivery(HANDLE hTicket, DWORD dwOwnerPID) BOOL CChangeNotify::ShouldNotify(LPDELITICKET pTicket, LPNOTIFSHARE pShared) { - BOOL ret = FALSE; - LPITEMIDLIST pidl = NULL, pidl1 = NULL, pidl2 = NULL; - WCHAR szPath[MAX_PATH], szPath1[MAX_PATH], szPath2[MAX_PATH]; - INT cch, cch1, cch2; + BOOL ret; + LPITEMIDLIST pidl, pidl1, pidl2; - szPath[0] = szPath1[0] = szPath2[0] = 0; + if (!pShared->ibPidl) + return TRUE; - if (pShared->ibPidl) - { - pidl = (LPITEMIDLIST)((LPBYTE)pShared + pShared->ibPidl); - SHGetPathFromIDListW(pidl, szPath); - PathAddBackslashW(szPath); - } + ret = FALSE; + pidl = (LPITEMIDLIST)((LPBYTE)pShared + pShared->ibPidl); - if (pTicket->ibOffset1) + if (!ret && pTicket->ibOffset1) { pidl1 = (LPITEMIDLIST)((LPBYTE)pTicket + pTicket->ibOffset1); - if (ILIsEqual(pidl, pidl1)) + if (ILIsEqual(pidl, pidl1) || ILIsParent(pidl, pidl1, !pShared->fRecursive)) ret = TRUE; - SHGetPathFromIDListW(pidl1, szPath1); - PathAddBackslashW(szPath1); } - if (pTicket->ibOffset2) + if (!ret && pTicket->ibOffset2) { pidl2 = (LPITEMIDLIST)((LPBYTE)pTicket + pTicket->ibOffset2); - if (ILIsEqual(pidl, pidl2)) + if (ILIsEqual(pidl, pidl2) || ILIsParent(pidl, pidl2, !pShared->fRecursive)) ret = TRUE; - SHGetPathFromIDListW(pidl2, szPath2); - PathAddBackslashW(szPath2); - } - - if (pShared->fRecursive) - { - if (szPath1[0] == 0) - ret = TRUE; - - cch = lstrlenW(szPath); - cch1 = lstrlenW(szPath1); - cch2 = lstrlenW(szPath2); - if (cch < cch1) - { - szPath1[cch] = 0; - if (lstrcmpiW(szPath, szPath1) == 0) - ret = TRUE; - } - if (cch < cch2) - { - szPath2[cch] = 0; - if (lstrcmpiW(szPath, szPath2) == 0) - ret = TRUE; - } } return ret;

1 0

[reactos] 01/01: [CMAKE] Add --gc-sections flag to GCC linker. This returns C++ binaries size to normal (on GCC 8.4). I don't see any noticable effect of this on GCC 4.7.2
by Victor Perevertkin 09 Apr '20

09 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0d187f7d561ba23054ffa… commit 0d187f7d561ba23054ffaeef9b032695c2a9baec Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Thu Apr 9 04:02:06 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Thu Apr 9 04:02:06 2020 +0300 [CMAKE] Add --gc-sections flag to GCC linker. This returns C++ binaries size to normal (on GCC 8.4). I don't see any noticable effect of this on GCC 4.7.2 CORE-16670 --- sdk/cmake/gcc.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/cmake/gcc.cmake b/sdk/cmake/gcc.cmake index d37d1c06553..c6bfb95d41a 100644 --- a/sdk/cmake/gcc.cmake +++ b/sdk/cmake/gcc.cmake @@ -252,7 +252,7 @@ set(CMAKE_C_CREATE_SHARED_MODULE ${CMAKE_C_CREATE_SHARED_LIBRARY}) set(CMAKE_CXX_CREATE_SHARED_MODULE ${CMAKE_CXX_CREATE_SHARED_LIBRARY}) set(CMAKE_RC_CREATE_SHARED_MODULE ${CMAKE_RC_CREATE_SHARED_LIBRARY}) -set(CMAKE_EXE_LINKER_FLAGS "-nostdlib -Wl,--enable-auto-image-base,--disable-auto-import,--disable-stdcall-fixup") +set(CMAKE_EXE_LINKER_FLAGS "-nostdlib -Wl,--enable-auto-image-base,--disable-auto-import,--disable-stdcall-fixup,--gc-sections") set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS_INIT} -Wl,--disable-stdcall-fixup") set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS_INIT} -Wl,--disable-stdcall-fixup")

1 0

[reactos] 01/01: [ROSAUTOTEST] Revert 9ff3adb. This fixes MSVC build.
by Victor Perevertkin 09 Apr '20

09 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a12d029ec0bb9b33c4e71… commit a12d029ec0bb9b33c4e7198a18e43a03d677a0ad Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Thu Apr 9 03:04:44 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Thu Apr 9 03:04:44 2020 +0300 [ROSAUTOTEST] Revert 9ff3adb. This fixes MSVC build. This reverts commit 9ff3adb7d7c6636a1d040d8e53f7203e9d1815a3. --- modules/rostests/rosautotest/CMakeLists.txt | 1 - modules/rostests/rosautotest/CProcess.cpp | 6 +-- modules/rostests/rosautotest/CWebService.cpp | 30 ++++++------- modules/rostests/rosautotest/auto_array_ptr.h | 64 +++++++++++++++++++++++++++ modules/rostests/rosautotest/precomp.h | 2 +- 5 files changed, 83 insertions(+), 20 deletions(-) diff --git a/modules/rostests/rosautotest/CMakeLists.txt b/modules/rostests/rosautotest/CMakeLists.txt index f6b29583f6d..21f0cdd5e23 100644 --- a/modules/rostests/rosautotest/CMakeLists.txt +++ b/modules/rostests/rosautotest/CMakeLists.txt @@ -21,7 +21,6 @@ list(APPEND SOURCE precomp.h) add_executable(rosautotest ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/rosautotestmsg.rc) -set_property(TARGET rosautotest PROPERTY CXX_STANDARD 11) set_module_type(rosautotest win32cui UNICODE) add_importlibs(rosautotest advapi32 shell32 user32 wininet msvcrt kernel32 ntdll) add_pch(rosautotest precomp.h SOURCE) diff --git a/modules/rostests/rosautotest/CProcess.cpp b/modules/rostests/rosautotest/CProcess.cpp index b7ca0603817..e462456564c 100644 --- a/modules/rostests/rosautotest/CProcess.cpp +++ b/modules/rostests/rosautotest/CProcess.cpp @@ -18,11 +18,11 @@ */ CProcess::CProcess(const wstring& CommandLine, LPSTARTUPINFOW StartupInfo) { - unique_ptr<WCHAR[]> CommandLinePtr(new WCHAR[CommandLine.size() + 1]); + auto_array_ptr<WCHAR> CommandLinePtr(new WCHAR[CommandLine.size() + 1]); - wcscpy(CommandLinePtr.get(), CommandLine.c_str()); + wcscpy(CommandLinePtr, CommandLine.c_str()); - if(!CreateProcessW(NULL, CommandLinePtr.get(), NULL, NULL, TRUE, NORMAL_PRIORITY_CLASS, NULL, NULL, StartupInfo, &m_ProcessInfo)) + if(!CreateProcessW(NULL, CommandLinePtr, NULL, NULL, TRUE, NORMAL_PRIORITY_CLASS, NULL, NULL, StartupInfo, &m_ProcessInfo)) TESTEXCEPTION("CreateProcessW failed\n"); } diff --git a/modules/rostests/rosautotest/CWebService.cpp b/modules/rostests/rosautotest/CWebService.cpp index 59d856a52d1..85ead6d9135 100644 --- a/modules/rostests/rosautotest/CWebService.cpp +++ b/modules/rostests/rosautotest/CWebService.cpp @@ -66,7 +66,7 @@ CWebService::DoRequest(const string& InputData) { const WCHAR szHeaders[] = L"Content-Type: application/x-www-form-urlencoded"; - unique_ptr<char[]> Data; + auto_array_ptr<char> Data; DWORD DataLength; /* Post our test results to the web service */ @@ -76,9 +76,9 @@ CWebService::DoRequest(const string& InputData) FATAL("HttpOpenRequestW failed\n"); Data.reset(new char[InputData.size() + 1]); - strcpy(Data.get(), InputData.c_str()); + strcpy(Data, InputData.c_str()); - if(!HttpSendRequestW(m_hHTTPRequest, szHeaders, lstrlenW(szHeaders), Data.get(), (DWORD)InputData.size())) + if(!HttpSendRequestW(m_hHTTPRequest, szHeaders, lstrlenW(szHeaders), Data, (DWORD)InputData.size())) FATAL("HttpSendRequestW failed\n"); /* Get the response */ @@ -87,7 +87,7 @@ CWebService::DoRequest(const string& InputData) Data.reset(new char[DataLength + 1]); - if(!InternetReadFile(m_hHTTPRequest, Data.get(), DataLength, &DataLength)) + if(!InternetReadFile(m_hHTTPRequest, Data, DataLength, &DataLength)) FATAL("InternetReadFile failed\n"); Data[DataLength] = 0; @@ -104,7 +104,7 @@ CWebService::DoRequest(const string& InputData) void CWebService::Finish(const char* TestType) { - unique_ptr<char[]> Response; + auto_array_ptr<char> Response; string Data; stringstream ss; @@ -120,9 +120,9 @@ CWebService::Finish(const char* TestType) Response.reset(DoRequest(Data)); - if (strcmp(Response.get(), "OK")) + if (strcmp(Response, "OK")) { - ss << "When finishing the test run, the server responded:" << endl << Response.get() << endl; + ss << "When finishing the test run, the server responded:" << endl << Response << endl; SSEXCEPTION; } } @@ -178,7 +178,7 @@ CWebService::GetTestID(const char* TestType) PCHAR CWebService::GetSuiteID(const char* TestType, CTestInfo* TestInfo) { - unique_ptr<char[]> SuiteID; + auto_array_ptr<char> SuiteID; string Data; Data = "action=getsuiteid"; @@ -193,11 +193,11 @@ CWebService::GetSuiteID(const char* TestType, CTestInfo* TestInfo) SuiteID.reset(DoRequest(Data)); /* Verify that this is really a number */ - if(!IsNumber(SuiteID.get())) + if(!IsNumber(SuiteID)) { stringstream ss; - ss << "Expected Suite ID, but received:" << endl << SuiteID.get() << endl; + ss << "Expected Suite ID, but received:" << endl << SuiteID << endl; SSEXCEPTION; } @@ -216,8 +216,8 @@ CWebService::GetSuiteID(const char* TestType, CTestInfo* TestInfo) void CWebService::Submit(const char* TestType, CTestInfo* TestInfo) { - unique_ptr<char[]> Response; - unique_ptr<char[]> SuiteID; + auto_array_ptr<char> Response; + auto_array_ptr<char> SuiteID; string Data; stringstream ss; @@ -233,15 +233,15 @@ CWebService::Submit(const char* TestType, CTestInfo* TestInfo) Data += "&testid="; Data += m_TestID; Data += "&suiteid="; - Data += SuiteID.get(); + Data += SuiteID; Data += "&log="; Data += EscapeString(TestInfo->Log); Response.reset(DoRequest(Data)); - if (strcmp(Response.get(), "OK")) + if (strcmp(Response, "OK")) { - ss << "When submitting the result, the server responded:" << endl << Response.get() << endl; + ss << "When submitting the result, the server responded:" << endl << Response << endl; SSEXCEPTION; } } diff --git a/modules/rostests/rosautotest/auto_array_ptr.h b/modules/rostests/rosautotest/auto_array_ptr.h new file mode 100644 index 00000000000..f53c3b04552 --- /dev/null +++ b/modules/rostests/rosautotest/auto_array_ptr.h @@ -0,0 +1,64 @@ +/* + * PROJECT: ReactOS Automatic Testing Utility + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Template similar to std::auto_ptr for arrays + * COPYRIGHT: Copyright 2009 Colin Finck (colin(a)reactos.org) + */ + +template<typename Type> +class auto_array_ptr +{ +private: + Type* m_Ptr; + +public: + typedef Type element_type; + + /* Construct an auto_array_ptr from a pointer */ + explicit auto_array_ptr(Type* Ptr = 0) throw() + : m_Ptr(Ptr) + { + } + + /* Construct an auto_array_ptr from an existing auto_array_ptr */ + auto_array_ptr(auto_array_ptr<Type>& Right) throw() + : m_Ptr(Right.release()) + { + } + + /* Destruct the auto_array_ptr and remove the corresponding array from memory */ + ~auto_array_ptr() throw() + { + delete[] m_Ptr; + } + + /* Get the pointer address */ + Type* get() const throw() + { + return m_Ptr; + } + + /* Release the pointer */ + Type* release() throw() + { + Type* Tmp = m_Ptr; + m_Ptr = 0; + + return Tmp; + } + + /* Reset to a new pointer */ + void reset(Type* Ptr = 0) throw() + { + if(Ptr != m_Ptr) + delete[] m_Ptr; + + m_Ptr = Ptr; + } + + /* Simulate all the functionality of real arrays by casting the auto_array_ptr to Type* on demand */ + operator Type*() const throw() + { + return m_Ptr; + } +}; diff --git a/modules/rostests/rosautotest/precomp.h b/modules/rostests/rosautotest/precomp.h index 0f46388a5e2..5e0f05b5794 100644 --- a/modules/rostests/rosautotest/precomp.h +++ b/modules/rostests/rosautotest/precomp.h @@ -33,7 +33,7 @@ using namespace std; #include <reactos/buildno.h> /* Class includes */ -// #include "auto_array_ptr.h" +#include "auto_array_ptr.h" #include "CConfiguration.h" #include "CFatalException.h" #include "CInvalidParameterException.h"

1 0

[reactos] 01/01: [SHELL32] Follow-up of #2432
by Katayama Hirofumi MZ 08 Apr '20

08 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0903c645a27e6ac55f580… commit 0903c645a27e6ac55f58068fa74183fb67512355 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Apr 9 08:19:47 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Apr 9 08:19:47 2020 +0900 [SHELL32] Follow-up of #2432 Fixed hang of FireFox. --- dll/win32/shell32/shelldesktop/CChangeNotify.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/shell32/shelldesktop/CChangeNotify.cpp b/dll/win32/shell32/shelldesktop/CChangeNotify.cpp index 83cb010eac7..8048a847ad6 100644 --- a/dll/win32/shell32/shelldesktop/CChangeNotify.cpp +++ b/dll/win32/shell32/shelldesktop/CChangeNotify.cpp @@ -7,7 +7,6 @@ #include "shelldesktop.h" #include "shlwapi_undoc.h" #include <atlsimpcoll.h> -#include <assert.h> WINE_DEFAULT_DEBUG_CHANNEL(shcn); @@ -295,7 +294,8 @@ CWorker::WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) BOOL CWorker::CreateWorker(HWND hwndParent, DWORD dwExStyle, DWORD dwStyle) { - assert(m_hWnd == NULL); + if (::IsWindow(m_hWnd)) + ::DestroyWindow(m_hWnd); m_hWnd = SHCreateWorkerWindowW(WindowProc, hwndParent, dwExStyle, dwStyle, NULL, (LONG_PTR)this); return m_hWnd != NULL;

1 0

[reactos] 01/01: [ROSAUTOTEST] Change custom auto_array_ptr to std::unique_ptr
by Victor Perevertkin 08 Apr '20

08 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9ff3adb7d7c6636a1d040… commit 9ff3adb7d7c6636a1d040d8e53f7203e9d1815a3 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Thu Apr 9 02:08:10 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Thu Apr 9 02:08:10 2020 +0300 [ROSAUTOTEST] Change custom auto_array_ptr to std::unique_ptr --- modules/rostests/rosautotest/CMakeLists.txt | 1 + modules/rostests/rosautotest/CProcess.cpp | 6 +-- modules/rostests/rosautotest/CWebService.cpp | 30 ++++++------- modules/rostests/rosautotest/auto_array_ptr.h | 64 --------------------------- modules/rostests/rosautotest/precomp.h | 2 +- 5 files changed, 20 insertions(+), 83 deletions(-) diff --git a/modules/rostests/rosautotest/CMakeLists.txt b/modules/rostests/rosautotest/CMakeLists.txt index 21f0cdd5e23..f6b29583f6d 100644 --- a/modules/rostests/rosautotest/CMakeLists.txt +++ b/modules/rostests/rosautotest/CMakeLists.txt @@ -21,6 +21,7 @@ list(APPEND SOURCE precomp.h) add_executable(rosautotest ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/rosautotestmsg.rc) +set_property(TARGET rosautotest PROPERTY CXX_STANDARD 11) set_module_type(rosautotest win32cui UNICODE) add_importlibs(rosautotest advapi32 shell32 user32 wininet msvcrt kernel32 ntdll) add_pch(rosautotest precomp.h SOURCE) diff --git a/modules/rostests/rosautotest/CProcess.cpp b/modules/rostests/rosautotest/CProcess.cpp index e462456564c..b7ca0603817 100644 --- a/modules/rostests/rosautotest/CProcess.cpp +++ b/modules/rostests/rosautotest/CProcess.cpp @@ -18,11 +18,11 @@ */ CProcess::CProcess(const wstring& CommandLine, LPSTARTUPINFOW StartupInfo) { - auto_array_ptr<WCHAR> CommandLinePtr(new WCHAR[CommandLine.size() + 1]); + unique_ptr<WCHAR[]> CommandLinePtr(new WCHAR[CommandLine.size() + 1]); - wcscpy(CommandLinePtr, CommandLine.c_str()); + wcscpy(CommandLinePtr.get(), CommandLine.c_str()); - if(!CreateProcessW(NULL, CommandLinePtr, NULL, NULL, TRUE, NORMAL_PRIORITY_CLASS, NULL, NULL, StartupInfo, &m_ProcessInfo)) + if(!CreateProcessW(NULL, CommandLinePtr.get(), NULL, NULL, TRUE, NORMAL_PRIORITY_CLASS, NULL, NULL, StartupInfo, &m_ProcessInfo)) TESTEXCEPTION("CreateProcessW failed\n"); } diff --git a/modules/rostests/rosautotest/CWebService.cpp b/modules/rostests/rosautotest/CWebService.cpp index 85ead6d9135..59d856a52d1 100644 --- a/modules/rostests/rosautotest/CWebService.cpp +++ b/modules/rostests/rosautotest/CWebService.cpp @@ -66,7 +66,7 @@ CWebService::DoRequest(const string& InputData) { const WCHAR szHeaders[] = L"Content-Type: application/x-www-form-urlencoded"; - auto_array_ptr<char> Data; + unique_ptr<char[]> Data; DWORD DataLength; /* Post our test results to the web service */ @@ -76,9 +76,9 @@ CWebService::DoRequest(const string& InputData) FATAL("HttpOpenRequestW failed\n"); Data.reset(new char[InputData.size() + 1]); - strcpy(Data, InputData.c_str()); + strcpy(Data.get(), InputData.c_str()); - if(!HttpSendRequestW(m_hHTTPRequest, szHeaders, lstrlenW(szHeaders), Data, (DWORD)InputData.size())) + if(!HttpSendRequestW(m_hHTTPRequest, szHeaders, lstrlenW(szHeaders), Data.get(), (DWORD)InputData.size())) FATAL("HttpSendRequestW failed\n"); /* Get the response */ @@ -87,7 +87,7 @@ CWebService::DoRequest(const string& InputData) Data.reset(new char[DataLength + 1]); - if(!InternetReadFile(m_hHTTPRequest, Data, DataLength, &DataLength)) + if(!InternetReadFile(m_hHTTPRequest, Data.get(), DataLength, &DataLength)) FATAL("InternetReadFile failed\n"); Data[DataLength] = 0; @@ -104,7 +104,7 @@ CWebService::DoRequest(const string& InputData) void CWebService::Finish(const char* TestType) { - auto_array_ptr<char> Response; + unique_ptr<char[]> Response; string Data; stringstream ss; @@ -120,9 +120,9 @@ CWebService::Finish(const char* TestType) Response.reset(DoRequest(Data)); - if (strcmp(Response, "OK")) + if (strcmp(Response.get(), "OK")) { - ss << "When finishing the test run, the server responded:" << endl << Response << endl; + ss << "When finishing the test run, the server responded:" << endl << Response.get() << endl; SSEXCEPTION; } } @@ -178,7 +178,7 @@ CWebService::GetTestID(const char* TestType) PCHAR CWebService::GetSuiteID(const char* TestType, CTestInfo* TestInfo) { - auto_array_ptr<char> SuiteID; + unique_ptr<char[]> SuiteID; string Data; Data = "action=getsuiteid"; @@ -193,11 +193,11 @@ CWebService::GetSuiteID(const char* TestType, CTestInfo* TestInfo) SuiteID.reset(DoRequest(Data)); /* Verify that this is really a number */ - if(!IsNumber(SuiteID)) + if(!IsNumber(SuiteID.get())) { stringstream ss; - ss << "Expected Suite ID, but received:" << endl << SuiteID << endl; + ss << "Expected Suite ID, but received:" << endl << SuiteID.get() << endl; SSEXCEPTION; } @@ -216,8 +216,8 @@ CWebService::GetSuiteID(const char* TestType, CTestInfo* TestInfo) void CWebService::Submit(const char* TestType, CTestInfo* TestInfo) { - auto_array_ptr<char> Response; - auto_array_ptr<char> SuiteID; + unique_ptr<char[]> Response; + unique_ptr<char[]> SuiteID; string Data; stringstream ss; @@ -233,15 +233,15 @@ CWebService::Submit(const char* TestType, CTestInfo* TestInfo) Data += "&testid="; Data += m_TestID; Data += "&suiteid="; - Data += SuiteID; + Data += SuiteID.get(); Data += "&log="; Data += EscapeString(TestInfo->Log); Response.reset(DoRequest(Data)); - if (strcmp(Response, "OK")) + if (strcmp(Response.get(), "OK")) { - ss << "When submitting the result, the server responded:" << endl << Response << endl; + ss << "When submitting the result, the server responded:" << endl << Response.get() << endl; SSEXCEPTION; } } diff --git a/modules/rostests/rosautotest/auto_array_ptr.h b/modules/rostests/rosautotest/auto_array_ptr.h deleted file mode 100644 index f53c3b04552..00000000000 --- a/modules/rostests/rosautotest/auto_array_ptr.h +++ /dev/null @@ -1,64 +0,0 @@ -/* - * PROJECT: ReactOS Automatic Testing Utility - * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) - * PURPOSE: Template similar to std::auto_ptr for arrays - * COPYRIGHT: Copyright 2009 Colin Finck (colin(a)reactos.org) - */ - -template<typename Type> -class auto_array_ptr -{ -private: - Type* m_Ptr; - -public: - typedef Type element_type; - - /* Construct an auto_array_ptr from a pointer */ - explicit auto_array_ptr(Type* Ptr = 0) throw() - : m_Ptr(Ptr) - { - } - - /* Construct an auto_array_ptr from an existing auto_array_ptr */ - auto_array_ptr(auto_array_ptr<Type>& Right) throw() - : m_Ptr(Right.release()) - { - } - - /* Destruct the auto_array_ptr and remove the corresponding array from memory */ - ~auto_array_ptr() throw() - { - delete[] m_Ptr; - } - - /* Get the pointer address */ - Type* get() const throw() - { - return m_Ptr; - } - - /* Release the pointer */ - Type* release() throw() - { - Type* Tmp = m_Ptr; - m_Ptr = 0; - - return Tmp; - } - - /* Reset to a new pointer */ - void reset(Type* Ptr = 0) throw() - { - if(Ptr != m_Ptr) - delete[] m_Ptr; - - m_Ptr = Ptr; - } - - /* Simulate all the functionality of real arrays by casting the auto_array_ptr to Type* on demand */ - operator Type*() const throw() - { - return m_Ptr; - } -}; diff --git a/modules/rostests/rosautotest/precomp.h b/modules/rostests/rosautotest/precomp.h index 5e0f05b5794..0f46388a5e2 100644 --- a/modules/rostests/rosautotest/precomp.h +++ b/modules/rostests/rosautotest/precomp.h @@ -33,7 +33,7 @@ using namespace std; #include <reactos/buildno.h> /* Class includes */ -#include "auto_array_ptr.h" +// #include "auto_array_ptr.h" #include "CConfiguration.h" #include "CFatalException.h" #include "CInvalidParameterException.h"

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