Ros-diffs February 2022

ros-diffs@reactos.org

17 participants
108 discussions

[reactos] 03/05: Restore the original inbv.c

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8fd64d636d59ef8fea153… commit 8fd64d636d59ef8fea153ac331260bcd4f8b91ed Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 13 21:18:51 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 13 21:18:51 2022 +0100 Restore the original inbv.c --- ntoskrnl/inbv/inbv.c | 1464 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 1464 insertions(+) diff --git a/ntoskrnl/inbv/inbv.c b/ntoskrnl/inbv/inbv.c new file mode 100644 index 00000000000..4f6a8df1e0f --- /dev/null +++ b/ntoskrnl/inbv/inbv.c @@ -0,0 +1,1464 @@ +/* INCLUDES ******************************************************************/ + +#include <ntoskrnl.h> + +#define NDEBUG +#include <debug.h> + +#include "inbv/logo.h" + +/* See also mm/ARM3/miarm.h */ +#define MM_READONLY 1 // PAGE_READONLY +#define MM_READWRITE 4 // PAGE_WRITECOPY + +/* GLOBALS *******************************************************************/ + +/* + * Enable this define if you want Inbv to use coloured headless mode. + */ +// #define INBV_HEADLESS_COLORS + +/* + * ReactOS uses the same boot screen for all the products. + */ + +/* + * Enable this define when ReactOS will have different SKUs + * (Workstation, Server, Storage Server, Cluster Server, etc...). + */ +// #define REACTOS_SKUS + +typedef struct _INBV_PROGRESS_STATE +{ + ULONG Floor; + ULONG Ceiling; + ULONG Bias; +} INBV_PROGRESS_STATE; + +typedef struct _BT_PROGRESS_INDICATOR +{ + ULONG Count; + ULONG Expected; + ULONG Percentage; +} BT_PROGRESS_INDICATOR, *PBT_PROGRESS_INDICATOR; + +typedef enum _ROT_BAR_TYPE +{ + RB_UNSPECIFIED, + RB_SQUARE_CELLS, + RB_PROGRESS_BAR +} ROT_BAR_TYPE; + +/* + * BitBltAligned() alignments + */ +typedef enum _BBLT_VERT_ALIGNMENT +{ + AL_VERTICAL_TOP = 0, + AL_VERTICAL_CENTER, + AL_VERTICAL_BOTTOM +} BBLT_VERT_ALIGNMENT; + +typedef enum _BBLT_HORZ_ALIGNMENT +{ + AL_HORIZONTAL_LEFT = 0, + AL_HORIZONTAL_CENTER, + AL_HORIZONTAL_RIGHT +} BBLT_HORZ_ALIGNMENT; + +/* + * Enable this define when Inbv will support rotating progress bar. + */ +#define INBV_ROTBAR_IMPLEMENTED + +static KSPIN_LOCK BootDriverLock; +static KIRQL InbvOldIrql; +static INBV_DISPLAY_STATE InbvDisplayState = INBV_DISPLAY_STATE_DISABLED; +BOOLEAN InbvBootDriverInstalled = FALSE; +static BOOLEAN InbvDisplayDebugStrings = FALSE; +static INBV_DISPLAY_STRING_FILTER InbvDisplayFilter = NULL; +static ULONG ProgressBarLeft = 0, ProgressBarTop = 0; +static ULONG ProgressBarWidth = 0, ProgressBarHeight = 0; +static BOOLEAN ShowProgressBar = FALSE; +static INBV_PROGRESS_STATE InbvProgressState; +static BT_PROGRESS_INDICATOR InbvProgressIndicator = {0, 25, 0}; +static INBV_RESET_DISPLAY_PARAMETERS InbvResetDisplayParameters = NULL; +static ULONG ResourceCount = 0; +static PUCHAR ResourceList[1 + IDB_MAX_RESOURCE]; // First entry == NULL, followed by 'ResourceCount' entries. + +#ifdef INBV_ROTBAR_IMPLEMENTED +/* + * Change this to modify progress bar behaviour + */ +#define ROT_BAR_DEFAULT_MODE RB_PROGRESS_BAR + +/* + * Values for PltRotBarStatus: + * - PltRotBarStatus == 1, do palette fading-in (done elsewhere in ReactOS); + * - PltRotBarStatus == 2, do rotation bar animation; + * - PltRotBarStatus == 3, stop the animation thread. + * - Any other value is ignored and the animation thread continues to run. + */ +typedef enum _ROT_BAR_STATUS +{ + RBS_FADEIN = 1, + RBS_ANIMATE, + RBS_STOP_ANIMATE, + RBS_STATUS_MAX +} ROT_BAR_STATUS; + +static BOOLEAN RotBarThreadActive = FALSE; +static ROT_BAR_TYPE RotBarSelection = RB_UNSPECIFIED; +static ROT_BAR_STATUS PltRotBarStatus = 0; +static UCHAR RotBarBuffer[24 * 9]; +static UCHAR RotLineBuffer[SCREEN_WIDTH * 6]; +#endif + + +/* + * Headless terminal text colors + */ + +#ifdef INBV_HEADLESS_COLORS + +// Conversion table CGA to ANSI color index +static const UCHAR CGA_TO_ANSI_COLOR_TABLE[16] = +{ + 0, // Black + 4, // Blue + 2, // Green + 6, // Cyan + 1, // Red + 5, // Magenta + 3, // Brown/Yellow + 7, // Grey/White + + 60, // Bright Black + 64, // Bright Blue + 62, // Bright Green + 66, // Bright Cyan + 61, // Bright Red + 65, // Bright Magenta + 63, // Bright Yellow + 67 // Bright Grey (White) +}; + +#define CGA_TO_ANSI_COLOR(CgaColor) \ + CGA_TO_ANSI_COLOR_TABLE[CgaColor & 0x0F] + +#endif + +// Default colors: text in white, background in black +static ULONG InbvTerminalTextColor = 37; +static ULONG InbvTerminalBkgdColor = 40; + + +/* FADING FUNCTION ***********************************************************/ + +/** From include/psdk/wingdi.h **/ +typedef struct tagRGBQUAD +{ + UCHAR rgbBlue; + UCHAR rgbGreen; + UCHAR rgbRed; + UCHAR rgbReserved; +} RGBQUAD,*LPRGBQUAD; +/*******************************/ + +static RGBQUAD MainPalette[16]; + +#define PALETTE_FADE_STEPS 12 +#define PALETTE_FADE_TIME (15 * 1000) /* 15 ms */ + +/** From bootvid/precomp.h **/ +// +// Bitmap Header +// +typedef struct tagBITMAPINFOHEADER +{ + ULONG biSize; + LONG biWidth; + LONG biHeight; + USHORT biPlanes; + USHORT biBitCount; + ULONG biCompression; + ULONG biSizeImage; + LONG biXPelsPerMeter; + LONG biYPelsPerMeter; + ULONG biClrUsed; + ULONG biClrImportant; +} BITMAPINFOHEADER, *PBITMAPINFOHEADER; +/****************************/ + +// +// Needed prototypes +// +VOID NTAPI InbvAcquireLock(VOID); +VOID NTAPI InbvReleaseLock(VOID); + +static VOID +BootLogoFadeIn(VOID) +{ + UCHAR PaletteBitmapBuffer[sizeof(BITMAPINFOHEADER) + sizeof(MainPalette)]; + PBITMAPINFOHEADER PaletteBitmap = (PBITMAPINFOHEADER)PaletteBitmapBuffer; + LPRGBQUAD Palette = (LPRGBQUAD)(PaletteBitmapBuffer + sizeof(BITMAPINFOHEADER)); + ULONG Iteration, Index, ClrUsed; + + LARGE_INTEGER Delay; + Delay.QuadPart = -(PALETTE_FADE_TIME * 10); + + /* Check if we are installed and we own the display */ + if (!InbvBootDriverInstalled || + (InbvDisplayState != INBV_DISPLAY_STATE_OWNED)) + { + return; + } + + /* + * Build a bitmap containing the fade-in palette. The palette entries + * are then processed in a loop and set using VidBitBlt function. + */ + ClrUsed = RTL_NUMBER_OF(MainPalette); + RtlZeroMemory(PaletteBitmap, sizeof(BITMAPINFOHEADER)); + PaletteBitmap->biSize = sizeof(BITMAPINFOHEADER); + PaletteBitmap->biBitCount = 4; + PaletteBitmap->biClrUsed = ClrUsed; + + /* + * Main animation loop. + */ + for (Iteration = 0; Iteration <= PALETTE_FADE_STEPS; ++Iteration) + { + for (Index = 0; Index < ClrUsed; Index++) + { + Palette[Index].rgbRed = (UCHAR) + (MainPalette[Index].rgbRed * Iteration / PALETTE_FADE_STEPS); + Palette[Index].rgbGreen = (UCHAR) + (MainPalette[Index].rgbGreen * Iteration / PALETTE_FADE_STEPS); + Palette[Index].rgbBlue = (UCHAR) + (MainPalette[Index].rgbBlue * Iteration / PALETTE_FADE_STEPS); + } + + /* Do the animation */ + InbvAcquireLock(); + VidBitBlt(PaletteBitmapBuffer, 0, 0); + InbvReleaseLock(); + + /* Wait for a bit */ + KeDelayExecutionThread(KernelMode, FALSE, &Delay); + } +} + +static VOID +BitBltPalette( + IN PVOID Image, + IN BOOLEAN NoPalette, + IN ULONG X, + IN ULONG Y) +{ + LPRGBQUAD Palette; + RGBQUAD OrigPalette[RTL_NUMBER_OF(MainPalette)]; + + /* If requested, remove the palette from the image */ + if (NoPalette) + { + /* Get bitmap header and palette */ + PBITMAPINFOHEADER BitmapInfoHeader = Image; + Palette = (LPRGBQUAD)((PUCHAR)Image + BitmapInfoHeader->biSize); + + /* Save the image original palette and remove palette information */ + RtlCopyMemory(OrigPalette, Palette, sizeof(OrigPalette)); + RtlZeroMemory(Palette, sizeof(OrigPalette)); + } + + /* Draw the image */ + InbvBitBlt(Image, X, Y); + + /* Restore the image original palette */ + if (NoPalette) + { + RtlCopyMemory(Palette, OrigPalette, sizeof(OrigPalette)); + } +} + +static VOID +BitBltAligned( + IN PVOID Image, + IN BOOLEAN NoPalette, + IN BBLT_HORZ_ALIGNMENT HorizontalAlignment, + IN BBLT_VERT_ALIGNMENT VerticalAlignment, + IN ULONG MarginLeft, + IN ULONG MarginTop, + IN ULONG MarginRight, + IN ULONG MarginBottom) +{ + PBITMAPINFOHEADER BitmapInfoHeader = Image; + ULONG X, Y; + + /* Calculate X */ + switch (HorizontalAlignment) + { + case AL_HORIZONTAL_LEFT: + X = MarginLeft - MarginRight; + break; + + case AL_HORIZONTAL_CENTER: + X = MarginLeft - MarginRight + (SCREEN_WIDTH - BitmapInfoHeader->biWidth + 1) / 2; + break; + + case AL_HORIZONTAL_RIGHT: + X = MarginLeft - MarginRight + SCREEN_WIDTH - BitmapInfoHeader->biWidth; + break; + + default: + /* Unknown */ + return; + } + + /* Calculate Y */ + switch (VerticalAlignment) + { + case AL_VERTICAL_TOP: + Y = MarginTop - MarginBottom; + break; + + case AL_VERTICAL_CENTER: + Y = MarginTop - MarginBottom + (SCREEN_HEIGHT - BitmapInfoHeader->biHeight + 1) / 2; + break; + + case AL_VERTICAL_BOTTOM: + Y = MarginTop - MarginBottom + SCREEN_HEIGHT - BitmapInfoHeader->biHeight; + break; + + default: + /* Unknown */ + return; + } + + /* Finally draw the image */ + BitBltPalette(Image, NoPalette, X, Y); +} + +/* FUNCTIONS *****************************************************************/ + +CODE_SEG("INIT") +PVOID +NTAPI +FindBitmapResource(IN PLOADER_PARAMETER_BLOCK LoaderBlock, + IN ULONG ResourceId) +{ + UNICODE_STRING UpString = RTL_CONSTANT_STRING(L"ntoskrnl.exe"); + UNICODE_STRING MpString = RTL_CONSTANT_STRING(L"ntkrnlmp.exe"); + PLIST_ENTRY NextEntry, ListHead; + PLDR_DATA_TABLE_ENTRY LdrEntry; + PIMAGE_RESOURCE_DATA_ENTRY ResourceDataEntry; + LDR_RESOURCE_INFO ResourceInfo; + NTSTATUS Status; + PVOID Data = NULL; + + /* Loop the driver list */ + ListHead = &LoaderBlock->LoadOrderListHead; + NextEntry = ListHead->Flink; + while (NextEntry != ListHead) + { + /* Get the entry */ + LdrEntry = CONTAINING_RECORD(NextEntry, + LDR_DATA_TABLE_ENTRY, + InLoadOrderLinks); + + /* Check for a match */ + if (RtlEqualUnicodeString(&LdrEntry->BaseDllName, &UpString, TRUE) || + RtlEqualUnicodeString(&LdrEntry->BaseDllName, &MpString, TRUE)) + { + /* Break out */ + break; + } + } + + /* Check if we found it */ + if (NextEntry != ListHead) + { + /* Try to find the resource */ + ResourceInfo.Type = 2; // RT_BITMAP; + ResourceInfo.Name = ResourceId; + ResourceInfo.Language = 0; + Status = LdrFindResource_U(LdrEntry->DllBase, + &ResourceInfo, + RESOURCE_DATA_LEVEL, + &ResourceDataEntry); + if (NT_SUCCESS(Status)) + { + /* Access the resource */ + ULONG Size = 0; + Status = LdrAccessResource(LdrEntry->DllBase, + ResourceDataEntry, + &Data, + &Size); + if ((Data) && (ResourceId < 3)) + { + KiBugCheckData[4] ^= RtlComputeCrc32(0, Data, Size); + } + if (!NT_SUCCESS(Status)) Data = NULL; + } + } + + /* Return the pointer */ + return Data; +} + +CODE_SEG("INIT") +BOOLEAN +NTAPI +InbvDriverInitialize(IN PLOADER_PARAMETER_BLOCK LoaderBlock, + IN ULONG Count) +{ + PCHAR CommandLine; + BOOLEAN ResetMode = FALSE; // By default do not reset the video mode + ULONG i; + + /* Quit if we're already installed */ + if (InbvBootDriverInstalled) return TRUE; + + /* Initialize the lock and check the current display state */ + KeInitializeSpinLock(&BootDriverLock); + if (InbvDisplayState == INBV_DISPLAY_STATE_OWNED) + { + /* Reset the video mode in case we do not have a custom boot logo */ + CommandLine = (LoaderBlock->LoadOptions ? _strupr(LoaderBlock->LoadOptions) : NULL); + ResetMode = (CommandLine == NULL) || (strstr(CommandLine, "BOOTLOGO") == NULL); + } + + /* Initialize the video */ + InbvBootDriverInstalled = VidInitialize(ResetMode); + if (InbvBootDriverInstalled) + { + /* Find bitmap resources in the kernel */ + ResourceCount = min(Count, RTL_NUMBER_OF(ResourceList) - 1); + for (i = 1; i <= ResourceCount; i++) + { + /* Do the lookup */ + ResourceList[i] = FindBitmapResource(LoaderBlock, i); + } + + /* Set the progress bar ranges */ + InbvSetProgressBarSubset(0, 100); + } + + /* Return install state */ + return InbvBootDriverInstalled; +} + +VOID +NTAPI +InbvAcquireLock(VOID) +{ + KIRQL OldIrql; + + /* Check if we're at dispatch level or lower */ + OldIrql = KeGetCurrentIrql(); + if (OldIrql <= DISPATCH_LEVEL) + { + /* Loop until the lock is free */ + while (!KeTestSpinLock(&BootDriverLock)); + + /* Raise IRQL to dispatch level */ + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); + } + + /* Acquire the lock */ + KiAcquireSpinLock(&BootDriverLock); + InbvOldIrql = OldIrql; +} + +VOID +NTAPI +InbvReleaseLock(VOID) +{ + KIRQL OldIrql; + + /* Capture the old IRQL */ + OldIrql = InbvOldIrql; + + /* Release the driver lock */ + KiReleaseSpinLock(&BootDriverLock); + + /* If we were at dispatch level or lower, restore the old IRQL */ + if (InbvOldIrql <= DISPATCH_LEVEL) KeLowerIrql(OldIrql); +} + +VOID +NTAPI +InbvEnableBootDriver(IN BOOLEAN Enable) +{ + /* Check if we're installed */ + if (InbvBootDriverInstalled) + { + /* Check for lost state */ + if (InbvDisplayState >= INBV_DISPLAY_STATE_LOST) return; + + /* Acquire the lock */ + InbvAcquireLock(); + + /* Cleanup the screen if we own it */ + if (InbvDisplayState == INBV_DISPLAY_STATE_OWNED) VidCleanUp(); + + /* Set the new display state */ + InbvDisplayState = Enable ? INBV_DISPLAY_STATE_OWNED : + INBV_DISPLAY_STATE_DISABLED; + + /* Release the lock */ + InbvReleaseLock(); + } + else + { + /* Set the new display state */ + InbvDisplayState = Enable ? INBV_DISPLAY_STATE_OWNED : + INBV_DISPLAY_STATE_DISABLED; + } +} + +VOID +NTAPI +InbvAcquireDisplayOwnership(VOID) +{ + /* Check if we have a callback and we're just acquiring it now */ + if ((InbvResetDisplayParameters) && + (InbvDisplayState == INBV_DISPLAY_STATE_LOST)) + { + /* Call the callback */ + InbvResetDisplayParameters(80, 50); + } + + /* Acquire the display */ + InbvDisplayState = INBV_DISPLAY_STATE_OWNED; +} + +VOID +NTAPI +InbvSetDisplayOwnership(IN BOOLEAN DisplayOwned) +{ + /* Set the new display state */ + InbvDisplayState = DisplayOwned ? INBV_DISPLAY_STATE_OWNED : + INBV_DISPLAY_STATE_LOST; +} + +BOOLEAN +NTAPI +InbvCheckDisplayOwnership(VOID) +{ + /* Return if we own it or not */ + return InbvDisplayState != INBV_DISPLAY_STATE_LOST; +} + +INBV_DISPLAY_STATE +NTAPI +InbvGetDisplayState(VOID) +{ + /* Return the actual state */ + return InbvDisplayState; +} + +BOOLEAN +NTAPI +InbvDisplayString(IN PCHAR String) +{ + /* Make sure we own the display */ + if (InbvDisplayState == INBV_DISPLAY_STATE_OWNED) + { + /* If we're not allowed, return success anyway */ + if (!InbvDisplayDebugStrings) return TRUE; + + /* Check if a filter is installed */ + if (InbvDisplayFilter) InbvDisplayFilter(&String); + + /* Acquire the lock */ + InbvAcquireLock(); + + /* Make sure we're installed and display the string */ + if (InbvBootDriverInstalled) VidDisplayString((PUCHAR)String); + + /* Print the string on the EMS port */ + HeadlessDispatch(HeadlessCmdPutString, + String, + strlen(String) + sizeof(ANSI_NULL), + NULL, + NULL); + + /* Release the lock */ + InbvReleaseLock(); + + /* All done */ + return TRUE; + } + + /* We don't own it, fail */ + return FALSE; +} + +BOOLEAN +NTAPI +InbvEnableDisplayString(IN BOOLEAN Enable) +{ + BOOLEAN OldSetting; + + /* Get the old setting */ + OldSetting = InbvDisplayDebugStrings; + + /* Update it */ + InbvDisplayDebugStrings = Enable; + + /* Return the old setting */ + return OldSetting; +} + +VOID +NTAPI +InbvInstallDisplayStringFilter(IN INBV_DISPLAY_STRING_FILTER Filter) +{ + /* Save the filter */ + InbvDisplayFilter = Filter; +} + +BOOLEAN +NTAPI +InbvIsBootDriverInstalled(VOID) +{ + /* Return driver state */ + return InbvBootDriverInstalled; +} + +VOID +NTAPI +InbvNotifyDisplayOwnershipLost(IN INBV_RESET_DISPLAY_PARAMETERS Callback) +{ + /* Check if we're installed */ + if (InbvBootDriverInstalled) + { + /* Acquire the lock and cleanup if we own the screen */ + InbvAcquireLock(); + if (InbvDisplayState != INBV_DISPLAY_STATE_LOST) VidCleanUp(); + + /* Set the reset callback and display state */ + InbvResetDisplayParameters = Callback; + InbvDisplayState = INBV_DISPLAY_STATE_LOST; + + /* Release the lock */ + InbvReleaseLock(); + } + else + { + /* Set the reset callback and display state */ + InbvResetDisplayParameters = Callback; + InbvDisplayState = INBV_DISPLAY_STATE_LOST; + } +} + +BOOLEAN +NTAPI +InbvResetDisplay(VOID) +{ + /* Check if we're installed and we own it */ + if (InbvBootDriverInstalled && + (InbvDisplayState == INBV_DISPLAY_STATE_OWNED)) + { + /* Do the reset */ + VidResetDisplay(TRUE); + return TRUE; + } + + /* Nothing to reset */ + return FALSE; +} + +VOID +NTAPI +InbvSetScrollRegion(IN ULONG Left, + IN ULONG Top, + IN ULONG Right, + IN ULONG Bottom) +{ + /* Just call bootvid */ + VidSetScrollRegion(Left, Top, Right, Bottom); +} + +VOID +NTAPI +InbvSetTextColor(IN ULONG Color) +{ + HEADLESS_CMD_SET_COLOR HeadlessSetColor; + + /* Set color for EMS port */ +#ifdef INBV_HEADLESS_COLORS + InbvTerminalTextColor = 30 + CGA_TO_ANSI_COLOR(Color); +#else + InbvTerminalTextColor = 37; +#endif + HeadlessSetColor.TextColor = InbvTerminalTextColor; + HeadlessSetColor.BkgdColor = InbvTerminalBkgdColor; + HeadlessDispatch(HeadlessCmdSetColor, + &HeadlessSetColor, + sizeof(HeadlessSetColor), + NULL, + NULL); + + /* Update the text color */ + VidSetTextColor(Color); +} + +VOID +NTAPI +InbvSolidColorFill(IN ULONG Left, + IN ULONG Top, + IN ULONG Right, + IN ULONG Bottom, + IN ULONG Color) +{ + HEADLESS_CMD_SET_COLOR HeadlessSetColor; + + /* Make sure we own it */ + if (InbvDisplayState == INBV_DISPLAY_STATE_OWNED) + { + /* Acquire the lock */ + InbvAcquireLock(); + + /* Check if we're installed */ + if (InbvBootDriverInstalled) + { + /* Call bootvid */ + VidSolidColorFill(Left, Top, Right, Bottom, (UCHAR)Color); + } + + /* Set color for EMS port and clear display */ +#ifdef INBV_HEADLESS_COLORS + InbvTerminalBkgdColor = 40 + CGA_TO_ANSI_COLOR(Color); +#else + InbvTerminalBkgdColor = 40; +#endif + HeadlessSetColor.TextColor = InbvTerminalTextColor; + HeadlessSetColor.BkgdColor = InbvTerminalBkgdColor; + HeadlessDispatch(HeadlessCmdSetColor, + &HeadlessSetColor, + sizeof(HeadlessSetColor), + NULL, + NULL); + HeadlessDispatch(HeadlessCmdClearDisplay, + NULL, 0, + NULL, NULL); + + /* Release the lock */ + InbvReleaseLock(); + } +} + +/** + * @brief + * Updates the progress bar percentage, relative to the current + * percentage sub-range previously set by InbvSetProgressBarSubset(). + * + * @param[in] Percentage + * The progress percentage, relative to the current sub-range. + * + * @return None. + **/ +CODE_SEG("INIT") +VOID +NTAPI +InbvUpdateProgressBar( + _In_ ULONG Percentage) +{ + ULONG TotalProgress, FillCount; + + /* Make sure the progress bar is enabled, that we own and are installed */ + if (ShowProgressBar && + InbvBootDriverInstalled && + (InbvDisplayState == INBV_DISPLAY_STATE_OWNED)) + { + /* Compute fill count */ + TotalProgress = InbvProgressState.Floor + (Percentage * InbvProgressState.Bias); + FillCount = ProgressBarWidth * TotalProgress / (100 * 100); + + /* Acquire the lock */ + InbvAcquireLock(); + + /* Fill the progress bar */ + VidSolidColorFill(ProgressBarLeft, + ProgressBarTop, + ProgressBarLeft + FillCount, + ProgressBarTop + ProgressBarHeight, + BV_COLOR_WHITE); + + /* Release the lock */ + InbvReleaseLock(); + } +} + +VOID +NTAPI +InbvBufferToScreenBlt(IN PUCHAR Buffer, + IN ULONG X, + IN ULONG Y, + IN ULONG Width, + IN ULONG Height, + IN ULONG Delta) +{ + /* Check if we're installed and we own it */ + if (InbvBootDriverInstalled && + (InbvDisplayState == INBV_DISPLAY_STATE_OWNED)) + { + /* Do the blit */ + VidBufferToScreenBlt(Buffer, X, Y, Width, Height, Delta); + } +} + +VOID +NTAPI +InbvBitBlt(IN PUCHAR Buffer, + IN ULONG X, + IN ULONG Y) +{ + /* Check if we're installed and we own it */ + if (InbvBootDriverInstalled && + (InbvDisplayState == INBV_DISPLAY_STATE_OWNED)) + { + /* Acquire the lock */ + InbvAcquireLock(); + + /* Do the blit */ + VidBitBlt(Buffer, X, Y); + + /* Release the lock */ + InbvReleaseLock(); + } +} + +VOID +NTAPI +InbvScreenToBufferBlt(OUT PUCHAR Buffer, + IN ULONG X, + IN ULONG Y, + IN ULONG Width, + IN ULONG Height, + IN ULONG Delta) +{ + /* Check if we're installed and we own it */ + if (InbvBootDriverInstalled && + (InbvDisplayState == INBV_DISPLAY_STATE_OWNED)) + { + /* Do the blit */ + VidScreenToBufferBlt(Buffer, X, Y, Width, Height, Delta); + } +} + +/** + * @brief + * Sets the screen coordinates of the loading progress bar and enable it. + * + * @param[in] Left + * @param[in] Top + * The left/top coordinates. + * + * (ReactOS-specific) + * @param[in] Width + * @param[in] Height + * The width/height of the progress bar. + * + * @return None. + **/ +CODE_SEG("INIT") +VOID +NTAPI +InbvSetProgressBarCoordinates( + _In_ ULONG Left, + _In_ ULONG Top, + _In_ ULONG Width, + _In_ ULONG Height) +{ + /* Update the coordinates */ + ProgressBarLeft = Left; + ProgressBarTop = Top; + ProgressBarWidth = Width; + ProgressBarHeight = Height; + + /* Enable the progress bar */ + ShowProgressBar = TRUE; +} + +/** + * @brief + * Specifies a progress percentage sub-range. + * Further calls to InbvIndicateProgress() or InbvUpdateProgressBar() + * will update the progress percentage relative to this sub-range. + * In particular, the percentage provided to InbvUpdateProgressBar() + * is relative to this sub-range. + * + * @param[in] Floor + * The lower bound percentage of the sub-range (default: 0). + * + * @param[in] Ceiling + * The upper bound percentage of the sub-range (default: 100). + * + * @return None. + **/ +CODE_SEG("INIT") +VOID +NTAPI +InbvSetProgressBarSubset( + _In_ ULONG Floor, + _In_ ULONG Ceiling) +{ + /* Sanity checks */ + ASSERT(Floor < Ceiling); + ASSERT(Ceiling <= 100); + + /* Update the progress bar state */ + InbvProgressState.Floor = Floor * 100; + InbvProgressState.Ceiling = Ceiling * 100; + InbvProgressState.Bias = Ceiling - Floor; +} + +/** + * @brief + * Gives some progress feedback, without specifying any explicit number + * of progress steps or percentage. + * The corresponding percentage is derived from the progress indicator's + * current count, capped to the number of expected calls to be made to + * this function (default: 25, see @b InbvProgressIndicator.Expected). + * + * @return None. + **/ +CODE_SEG("INIT") +VOID +NTAPI +InbvIndicateProgress(VOID) +{ + ULONG Percentage; + + /* Increase progress */ + InbvProgressIndicator.Count++; + + /* Compute the new percentage - Don't go over 100% */ + Percentage = 100 * InbvProgressIndicator.Count / + InbvProgressIndicator.Expected; + Percentage = min(Percentage, 99); + + if (Percentage != InbvProgressIndicator.Percentage) + { + /* Percentage has changed, update the progress bar */ + InbvProgressIndicator.Percentage = Percentage; + InbvUpdateProgressBar(Percentage); + } +} + +PUCHAR +NTAPI +InbvGetResourceAddress(IN ULONG ResourceNumber) +{ + /* Validate the resource number */ + if (ResourceNumber > ResourceCount) return NULL; + + /* Return the address */ + return ResourceList[ResourceNumber]; +} + +NTSTATUS +NTAPI +NtDisplayString(IN PUNICODE_STRING DisplayString) +{ + NTSTATUS Status; + UNICODE_STRING CapturedString; + OEM_STRING OemString; + ULONG OemLength; + KPROCESSOR_MODE PreviousMode; + + PAGED_CODE(); + + PreviousMode = ExGetPreviousMode(); + + /* We require the TCB privilege */ + if (!SeSinglePrivilegeCheck(SeTcbPrivilege, PreviousMode)) + return STATUS_PRIVILEGE_NOT_HELD; + + /* Capture the string */ + Status = ProbeAndCaptureUnicodeString(&CapturedString, PreviousMode, DisplayString); + if (!NT_SUCCESS(Status)) + return Status; + + /* Do not display the string if it is empty */ + if (CapturedString.Length == 0 || CapturedString.Buffer == NULL) + { + Status = STATUS_SUCCESS; + goto Quit; + } + + /* + * Convert the string since INBV understands only ANSI/OEM. Allocate the + * string buffer in non-paged pool because INBV passes it down to BOOTVID. + * We cannot perform the allocation using RtlUnicodeStringToOemString() + * since its allocator uses PagedPool. + */ + OemLength = RtlUnicodeStringToOemSize(&CapturedString); + if (OemLength > MAXUSHORT) + { + Status = STATUS_BUFFER_OVERFLOW; + goto Quit; + } + RtlInitEmptyAnsiString((PANSI_STRING)&OemString, NULL, (USHORT)OemLength); + OemString.Buffer = ExAllocatePoolWithTag(NonPagedPool, OemLength, TAG_OSTR); + if (OemString.Buffer == NULL) + { + Status = STATUS_NO_MEMORY; + goto Quit; + } + Status = RtlUnicodeStringToOemString(&OemString, &CapturedString, FALSE); + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(OemString.Buffer, TAG_OSTR); + goto Quit; + } + + /* Display the string */ + InbvDisplayString(OemString.Buffer); + + /* Free the string buffer */ + ExFreePoolWithTag(OemString.Buffer, TAG_OSTR); + + Status = STATUS_SUCCESS; + +Quit: + /* Free the captured string */ + ReleaseCapturedUnicodeString(&CapturedString, PreviousMode); + + return Status; +} + +#ifdef INBV_ROTBAR_IMPLEMENTED +static +VOID +NTAPI +InbvRotationThread( + _In_ PVOID Context) +{ + ULONG X, Y, Index, Total; + LARGE_INTEGER Delay = {{0}}; + + InbvAcquireLock(); + if (RotBarSelection == RB_SQUARE_CELLS) + { + Index = 0; + } + else + { + Index = 32; + } + X = ProgressBarLeft + 2; + Y = ProgressBarTop + 2; + InbvReleaseLock(); + + while (InbvDisplayState == INBV_DISPLAY_STATE_OWNED) + { + /* Wait for a bit */ + KeDelayExecutionThread(KernelMode, FALSE, &Delay); + + InbvAcquireLock(); + + /* Unknown unexpected command */ + ASSERT(PltRotBarStatus < RBS_STATUS_MAX); + + if (PltRotBarStatus == RBS_STOP_ANIMATE) + { + /* Stop the thread */ + InbvReleaseLock(); + break; + } + + if (RotBarSelection == RB_SQUARE_CELLS) + { + Delay.QuadPart = -800000; // 80 ms + Total = 18; + Index %= Total; + + if (Index >= 3) + { + /* Fill previous bar position */ + VidSolidColorFill(X + ((Index - 3) * 8), Y, (X + ((Index - 3) * 8)) + 8 - 1, Y + 9 - 1, BV_COLOR_BLACK); + } + if (Index < Total - 1) + { + /* Draw the progress bar bit */ + if (Index < 2) + { + /* Appearing from the left */ + VidBufferToScreenBlt(RotBarBuffer + 8 * (2 - Index) / 2, X, Y, 22 - 8 * (2 - Index), 9, 24); + } + else if (Index >= Total - 3) + { + /* Hiding to the right */ + VidBufferToScreenBlt(RotBarBuffer, X + ((Index - 2) * 8), Y, 22 - 8 * (4 - (Total - Index)), 9, 24); + } + else + { + VidBufferToScreenBlt(RotBarBuffer, X + ((Index - 2) * 8), Y, 22, 9, 24); + } + } + Index++; + } + else if (RotBarSelection == RB_PROGRESS_BAR) + { + Delay.QuadPart = -600000; // 60 ms + Total = SCREEN_WIDTH; + Index %= Total; + + /* Right part */ + VidBufferToScreenBlt(RotLineBuffer, Index, SCREEN_HEIGHT-6, SCREEN_WIDTH - Index, 6, SCREEN_WIDTH); + if (Index > 0) + { + /* Left part */ + VidBufferToScreenBlt(RotLineBuffer + (SCREEN_WIDTH - Index) / 2, 0, SCREEN_HEIGHT-6, Index - 2, 6, SCREEN_WIDTH); + } + Index += 32; + } + + InbvReleaseLock(); + } + + PsTerminateSystemThread(STATUS_SUCCESS); +} + +CODE_SEG("INIT") +VOID +NTAPI +InbvRotBarInit(VOID) +{ + PltRotBarStatus = RBS_FADEIN; + /* Perform other initialization if needed */ +} +#endif + +CODE_SEG("INIT") +VOID +NTAPI +DisplayBootBitmap(IN BOOLEAN TextMode) +{ + PVOID BootCopy = NULL, BootProgress = NULL, BootLogo = NULL, Header = NULL, Footer = NULL; + +#ifdef INBV_ROTBAR_IMPLEMENTED + UCHAR Buffer[24 * 9]; + PVOID Bar = NULL, LineBmp = NULL; + ROT_BAR_TYPE TempRotBarSelection = RB_UNSPECIFIED; + NTSTATUS Status; + HANDLE ThreadHandle = NULL; +#endif + +#ifdef REACTOS_SKUS + PVOID Text = NULL; +#endif + +#ifdef INBV_ROTBAR_IMPLEMENTED + /* Check if the animation thread has already been created */ + if (RotBarThreadActive) + { + /* Yes, just reset the progress bar but keep the thread alive */ + InbvAcquireLock(); + RotBarSelection = RB_UNSPECIFIED; + InbvReleaseLock(); + } +#endif + + ShowProgressBar = FALSE; + + /* Check if this is text mode */ + if (TextMode) + { + /* + * Make the kernel resource section temporarily writable, + * as we are going to change the bitmaps' palette in place. + */ + MmChangeKernelResourceSectionProtection(MM_READWRITE); + + /* Check the type of the OS: workstation or server */ + if (SharedUserData->NtProductType == NtProductWinNt) + { + /* Workstation; set colors */ + InbvSetTextColor(BV_COLOR_WHITE); + InbvSolidColorFill(0, 0, SCREEN_WIDTH-1, SCREEN_HEIGHT-1, BV_COLOR_DARK_GRAY); + InbvSolidColorFill(0, VID_FOOTER_BG_TOP, SCREEN_WIDTH-1, SCREEN_HEIGHT-1, BV_COLOR_RED); + + /* Get resources */ + Header = InbvGetResourceAddress(IDB_WKSTA_HEADER); + Footer = InbvGetResourceAddress(IDB_WKSTA_FOOTER); + } + else + { + /* Server; set colors */ + InbvSetTextColor(BV_COLOR_LIGHT_CYAN); + InbvSolidColorFill(0, 0, SCREEN_WIDTH-1, SCREEN_HEIGHT-1, BV_COLOR_CYAN); + InbvSolidColorFill(0, VID_FOOTER_BG_TOP, SCREEN_WIDTH-1, SCREEN_HEIGHT-1, BV_COLOR_RED); + + /* Get resources */ + Header = InbvGetResourceAddress(IDB_SERVER_HEADER); + Footer = InbvGetResourceAddress(IDB_SERVER_FOOTER); + } + + /* Set the scrolling region */ + 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) + { + /* BitBlt them on the screen */ + BitBltAligned(Footer, + TRUE, + AL_HORIZONTAL_CENTER, + AL_VERTICAL_BOTTOM, + 0, 0, 0, 59); + BitBltAligned(Header, + FALSE, + AL_HORIZONTAL_CENTER, + AL_VERTICAL_TOP, + 0, 0, 0, 0); + } + + /* Restore the kernel resource section protection to be read-only */ + MmChangeKernelResourceSectionProtection(MM_READONLY); + } + else + { + /* Is the boot driver installed? */ + if (!InbvBootDriverInstalled) return; + + /* + * Make the kernel resource section temporarily writable, + * as we are going to change the bitmaps' palette in place. + */ + MmChangeKernelResourceSectionProtection(MM_READWRITE); + + /* Load boot screen logo */ + BootLogo = InbvGetResourceAddress(IDB_LOGO_DEFAULT); + +#ifdef REACTOS_SKUS + Text = NULL; + if (SharedUserData->NtProductType == NtProductWinNt) + { +#ifdef INBV_ROTBAR_IMPLEMENTED + /* Workstation product, use appropriate status bar color */ + Bar = InbvGetResourceAddress(IDB_BAR_WKSTA); +#endif + } + else + { + /* Display correct branding based on server suite */ + if (ExVerifySuite(StorageServer)) + { + /* Storage Server Edition */ + Text = InbvGetResourceAddress(IDB_STORAGE_SERVER); + } + else if (ExVerifySuite(ComputeServer)) + { + /* Compute Cluster Edition */ + Text = InbvGetResourceAddress(IDB_CLUSTER_SERVER); + } + else + { + /* Normal edition */ + Text = InbvGetResourceAddress(IDB_SERVER_LOGO); + } + +#ifdef INBV_ROTBAR_IMPLEMENTED + /* Server product, use appropriate status bar color */ + Bar = InbvGetResourceAddress(IDB_BAR_DEFAULT); +#endif + } +#else + /* Use default status bar */ + Bar = InbvGetResourceAddress(IDB_BAR_WKSTA); +#endif + + /* Make sure we have a logo */ + if (BootLogo) + { + /* Save the main image palette for implementing the fade-in effect */ + PBITMAPINFOHEADER BitmapInfoHeader = BootLogo; + LPRGBQUAD Palette = (LPRGBQUAD)((PUCHAR)BootLogo + BitmapInfoHeader->biSize); + RtlCopyMemory(MainPalette, Palette, sizeof(MainPalette)); + + /* Draw the logo at the center of the screen */ + BitBltAligned(BootLogo, + TRUE, + AL_HORIZONTAL_CENTER, + AL_VERTICAL_CENTER, + 0, 0, 0, 34); + +#ifdef INBV_ROTBAR_IMPLEMENTED + /* Choose progress bar */ + TempRotBarSelection = ROT_BAR_DEFAULT_MODE; +#endif + + /* Set progress bar coordinates and display it */ + InbvSetProgressBarCoordinates(VID_PROGRESS_BAR_LEFT, + VID_PROGRESS_BAR_TOP, + VID_PROGRESS_BAR_WIDTH, + VID_PROGRESS_BAR_HEIGHT); + +#ifdef REACTOS_SKUS + /* Check for non-workstation products */ + if (SharedUserData->NtProductType != NtProductWinNt) + { + /* Overwrite part of the logo for a server product */ + 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, BV_COLOR_BLACK); + 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; + } +#endif + } + + /* Load and draw progress bar bitmap */ + BootProgress = InbvGetResourceAddress(IDB_PROGRESS_BAR); + BitBltAligned(BootProgress, + TRUE, + AL_HORIZONTAL_CENTER, + AL_VERTICAL_CENTER, + 0, 118, 0, 0); + + /* Load and draw copyright text bitmap */ + BootCopy = InbvGetResourceAddress(IDB_COPYRIGHT); + BitBltAligned(BootCopy, + TRUE, + AL_HORIZONTAL_LEFT, + AL_VERTICAL_BOTTOM, + 22, 0, 0, 20); + +#ifdef REACTOS_SKUS + /* Draw the SKU text if it exits */ + if (Text) + BitBltPalette(Text, TRUE, VID_SKU_TEXT_LEFT, VID_SKU_TEXT_TOP); +#endif + +#ifdef INBV_ROTBAR_IMPLEMENTED + if ((TempRotBarSelection == RB_SQUARE_CELLS) && Bar) + { + /* Save previous screen pixels to buffer */ + InbvScreenToBufferBlt(Buffer, 0, 0, 22, 9, 24); + /* Draw the progress bar bit */ + BitBltPalette(Bar, TRUE, 0, 0); + /* Store it in global buffer */ + InbvScreenToBufferBlt(RotBarBuffer, 0, 0, 22, 9, 24); + /* Restore screen pixels */ + InbvBufferToScreenBlt(Buffer, 0, 0, 22, 9, 24); + } + + /* + * Add a rotating bottom horizontal bar when using a progress bar, + * to show that ReactOS can be still alive when the bar does not + * appear to progress. + */ + if (TempRotBarSelection == RB_PROGRESS_BAR) + { + LineBmp = InbvGetResourceAddress(IDB_ROTATING_LINE); + if (LineBmp) + { + /* Draw the line and store it in global buffer */ + BitBltPalette(LineBmp, TRUE, 0, SCREEN_HEIGHT-6); + InbvScreenToBufferBlt(RotLineBuffer, 0, SCREEN_HEIGHT-6, SCREEN_WIDTH, 6, SCREEN_WIDTH); + } + } + else + { + /* Hide the simple progress bar if not used */ + ShowProgressBar = FALSE; + } +#endif + + /* Restore the kernel resource section protection to be read-only */ + MmChangeKernelResourceSectionProtection(MM_READONLY); + + /* Display the boot logo and fade it in */ + BootLogoFadeIn(); + +#ifdef INBV_ROTBAR_IMPLEMENTED + if (!RotBarThreadActive && TempRotBarSelection != RB_UNSPECIFIED) + { + /* Start the animation thread */ + Status = PsCreateSystemThread(&ThreadHandle, + 0, + NULL, + NULL, + NULL, + InbvRotationThread, + NULL); + if (NT_SUCCESS(Status)) + { + /* The thread has started, close the handle as we don't need it */ + RotBarThreadActive = TRUE; + ObCloseHandle(ThreadHandle, KernelMode); + } + } +#endif + + /* Set filter which will draw text display if needed */ + InbvInstallDisplayStringFilter(DisplayFilter); + } + +#ifdef INBV_ROTBAR_IMPLEMENTED + /* Do we have the animation thread? */ + if (RotBarThreadActive) + { + /* We do, initialize the progress bar */ + InbvAcquireLock(); + RotBarSelection = TempRotBarSelection; + InbvRotBarInit(); + InbvReleaseLock(); + } +#endif +} + +CODE_SEG("INIT") +VOID +NTAPI +DisplayFilter(PCHAR *String) +{ + /* Windows hack to skip first dots */ + static BOOLEAN DotHack = TRUE; + + /* If "." is given set *String to empty string */ + if (DotHack && strcmp(*String, ".") == 0) + *String = ""; + + if (**String) + { + /* Remove the filter */ + InbvInstallDisplayStringFilter(NULL); + + DotHack = FALSE; + + /* Draw text screen */ + DisplayBootBitmap(TRUE); + } +} + +CODE_SEG("INIT") +VOID +NTAPI +FinalizeBootLogo(VOID) +{ + /* Acquire lock and check the display state */ + InbvAcquireLock(); + if (InbvGetDisplayState() == INBV_DISPLAY_STATE_OWNED) + { + /* Clear the screen */ + VidSolidColorFill(0, 0, SCREEN_WIDTH-1, SCREEN_HEIGHT-1, BV_COLOR_BLACK); + } + + /* Reset progress bar and lock */ +#ifdef INBV_ROTBAR_IMPLEMENTED + PltRotBarStatus = RBS_STOP_ANIMATE; + RotBarThreadActive = FALSE; +#endif + InbvReleaseLock(); +}

2 years, 10 months

[reactos] 02/05: [NTOS:INBV] Duplicate inbv.c to bootanim.c -- the Git way >_>

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=93c5e2b7c0973523c45be… commit 93c5e2b7c0973523c45beb0750df48714728d65b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 13 21:18:12 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 13 21:18:22 2022 +0100 [NTOS:INBV] Duplicate inbv.c to bootanim.c -- the Git way >_> This will preserve the history in the copied file. --- ntoskrnl/inbv/{inbv.c => bootanim.c} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/ntoskrnl/inbv/inbv.c b/ntoskrnl/inbv/bootanim.c similarity index 100% rename from ntoskrnl/inbv/inbv.c rename to ntoskrnl/inbv/bootanim.c

2 years, 10 months

[reactos] 01/05: [NTOS:INBV] Add documentation to the progress-bar helpers. And fix a bug in them.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e17f7d6994ea675cd5288… commit e17f7d6994ea675cd5288458b456c05ddc386c4d Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 13 16:33:20 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 13 21:16:52 2022 +0100 [NTOS:INBV] Add documentation to the progress-bar helpers. And fix a bug in them. In particular, the progress percentage specified to InbvUpdateProgressBar(), or the progress feedback made with InbvIndicateProgress() calls, is **relative** to the progress sub-range specified with a previous call to InbvSetProgressBarSubset() (by default, the range is 0...100%). This functionality is used e.g. when the number of progress steps is unknown prior, for example when loading drivers: in this case progress is made within a given percentage range. This bug has always been with us since 2010. --- ntoskrnl/inbv/inbv.c | 89 ++++++++++++++++++++++++++++++++-------- ntoskrnl/include/internal/inbv.h | 6 +-- 2 files changed, 73 insertions(+), 22 deletions(-) diff --git a/ntoskrnl/inbv/inbv.c b/ntoskrnl/inbv/inbv.c index 049ff230555..4f6a8df1e0f 100644 --- a/ntoskrnl/inbv/inbv.c +++ b/ntoskrnl/inbv/inbv.c @@ -20,8 +20,6 @@ /* * ReactOS uses the same boot screen for all the products. - * Also it doesn't use a parallel system thread for the - * rotating "progress" bar. */ /* @@ -752,12 +750,23 @@ InbvSolidColorFill(IN ULONG Left, } } +/** + * @brief + * Updates the progress bar percentage, relative to the current + * percentage sub-range previously set by InbvSetProgressBarSubset(). + * + * @param[in] Percentage + * The progress percentage, relative to the current sub-range. + * + * @return None. + **/ CODE_SEG("INIT") VOID NTAPI -InbvUpdateProgressBar(IN ULONG Progress) +InbvUpdateProgressBar( + _In_ ULONG Percentage) { - ULONG FillCount, BoundedProgress; + ULONG TotalProgress, FillCount; /* Make sure the progress bar is enabled, that we own and are installed */ if (ShowProgressBar && @@ -765,8 +774,8 @@ InbvUpdateProgressBar(IN ULONG Progress) (InbvDisplayState == INBV_DISPLAY_STATE_OWNED)) { /* Compute fill count */ - BoundedProgress = (InbvProgressState.Floor / 100) + Progress; - FillCount = ProgressBarWidth * (InbvProgressState.Bias * BoundedProgress) / 1000000; + TotalProgress = InbvProgressState.Floor + (Percentage * InbvProgressState.Bias); + FillCount = ProgressBarWidth * TotalProgress / (100 * 100); /* Acquire the lock */ InbvAcquireLock(); @@ -840,13 +849,29 @@ InbvScreenToBufferBlt(OUT PUCHAR Buffer, } } +/** + * @brief + * Sets the screen coordinates of the loading progress bar and enable it. + * + * @param[in] Left + * @param[in] Top + * The left/top coordinates. + * + * (ReactOS-specific) + * @param[in] Width + * @param[in] Height + * The width/height of the progress bar. + * + * @return None. + **/ CODE_SEG("INIT") VOID NTAPI -InbvSetProgressBarCoordinates(IN ULONG Left, - IN ULONG Top, - IN ULONG Width, - IN ULONG Height) +InbvSetProgressBarCoordinates( + _In_ ULONG Left, + _In_ ULONG Top, + _In_ ULONG Width, + _In_ ULONG Height) { /* Update the coordinates */ ProgressBarLeft = Left; @@ -858,11 +883,28 @@ InbvSetProgressBarCoordinates(IN ULONG Left, ShowProgressBar = TRUE; } +/** + * @brief + * Specifies a progress percentage sub-range. + * Further calls to InbvIndicateProgress() or InbvUpdateProgressBar() + * will update the progress percentage relative to this sub-range. + * In particular, the percentage provided to InbvUpdateProgressBar() + * is relative to this sub-range. + * + * @param[in] Floor + * The lower bound percentage of the sub-range (default: 0). + * + * @param[in] Ceiling + * The upper bound percentage of the sub-range (default: 100). + * + * @return None. + **/ CODE_SEG("INIT") VOID NTAPI -InbvSetProgressBarSubset(IN ULONG Floor, - IN ULONG Ceiling) +InbvSetProgressBarSubset( + _In_ ULONG Floor, + _In_ ULONG Ceiling) { /* Sanity checks */ ASSERT(Floor < Ceiling); @@ -871,9 +913,19 @@ InbvSetProgressBarSubset(IN ULONG Floor, /* Update the progress bar state */ InbvProgressState.Floor = Floor * 100; InbvProgressState.Ceiling = Ceiling * 100; - InbvProgressState.Bias = (Ceiling * 100) - Floor; + InbvProgressState.Bias = Ceiling - Floor; } +/** + * @brief + * Gives some progress feedback, without specifying any explicit number + * of progress steps or percentage. + * The corresponding percentage is derived from the progress indicator's + * current count, capped to the number of expected calls to be made to + * this function (default: 25, see @b InbvProgressIndicator.Expected). + * + * @return None. + **/ CODE_SEG("INIT") VOID NTAPI @@ -884,13 +936,14 @@ InbvIndicateProgress(VOID) /* Increase progress */ InbvProgressIndicator.Count++; - /* Compute new percentage */ - Percentage = min(100 * InbvProgressIndicator.Count / - InbvProgressIndicator.Expected, - 99); + /* Compute the new percentage - Don't go over 100% */ + Percentage = 100 * InbvProgressIndicator.Count / + InbvProgressIndicator.Expected; + Percentage = min(Percentage, 99); + if (Percentage != InbvProgressIndicator.Percentage) { - /* Percentage has moved, update the progress bar */ + /* Percentage has changed, update the progress bar */ InbvProgressIndicator.Percentage = Percentage; InbvUpdateProgressBar(Percentage); } diff --git a/ntoskrnl/include/internal/inbv.h b/ntoskrnl/include/internal/inbv.h index 3dbc8d9896d..0fb7042c71c 100644 --- a/ntoskrnl/include/internal/inbv.h +++ b/ntoskrnl/include/internal/inbv.h @@ -36,9 +36,7 @@ InbvBitBlt( CODE_SEG("INIT") VOID NTAPI -InbvIndicateProgress( - VOID -); +InbvIndicateProgress(VOID); CODE_SEG("INIT") VOID @@ -52,7 +50,7 @@ CODE_SEG("INIT") VOID NTAPI InbvUpdateProgressBar( - IN ULONG Progress + _In_ ULONG Percentage ); //

2 years, 10 months

[reactos] 01/01: [PSDK] Add missing flags for CreateProcessWithLogon

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3f6721281241f16ac1494… commit 3f6721281241f16ac14946a163e7b6857a9d9860 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Feb 13 15:41:49 2022 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Feb 13 15:41:49 2022 +0100 [PSDK] Add missing flags for CreateProcessWithLogon --- sdk/include/psdk/winbase.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sdk/include/psdk/winbase.h b/sdk/include/psdk/winbase.h index 2db990d47c2..2bfe52eac7d 100644 --- a/sdk/include/psdk/winbase.h +++ b/sdk/include/psdk/winbase.h @@ -613,6 +613,9 @@ extern "C" { #define PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION 0x00000002 #endif +#define LOGON_WITH_PROFILE 0x00000001 +#define LOGON_NETCREDENTIALS_ONLY 0x00000002 + #ifndef RC_INVOKED #ifndef _FILETIME_

2 years, 10 months

[reactos] 01/01: [SHELL32_APITEST] Try to fix Test Win2003_x64 again

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=60b89da383dbe74b3ac85… commit 60b89da383dbe74b3ac850e0d1611eb376a7a470 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Feb 13 17:45:08 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Feb 13 17:45:08 2022 +0900 [SHELL32_APITEST] Try to fix Test Win2003_x64 again --- .../rostests/apitests/shell32/FindExecutable.cpp | 3 +++ .../rostests/apitests/shell32/SHChangeNotify.cpp | 29 ++-------------------- .../rostests/apitests/shell32/ShellExecCmdLine.cpp | 4 +++ .../rostests/apitests/shell32/ShellExecuteEx.cpp | 4 +++ .../apitests/shell32/shell32_apitest_sub.cpp | 2 +- .../{SHChangeNotify.h => shell32_apitest_sub.h} | 27 +++++++++++++++++++- 6 files changed, 40 insertions(+), 29 deletions(-) diff --git a/modules/rostests/apitests/shell32/FindExecutable.cpp b/modules/rostests/apitests/shell32/FindExecutable.cpp index 07a673af8bd..132c9589e65 100644 --- a/modules/rostests/apitests/shell32/FindExecutable.cpp +++ b/modules/rostests/apitests/shell32/FindExecutable.cpp @@ -8,6 +8,7 @@ #include "shelltest.h" #include <stdio.h> #include <shlwapi.h> +#include "shell32_apitest_sub.h" static char s_sub_program[MAX_PATH]; @@ -268,4 +269,6 @@ START_TEST(FindExecutable) DeleteFileA(s_sys_bat_file); DeleteFileA(s_win_txt_file); DeleteFileA(s_sys_txt_file); + + DoWaitForWindow(CLASSNAME, CLASSNAME, TRUE, TRUE); } diff --git a/modules/rostests/apitests/shell32/SHChangeNotify.cpp b/modules/rostests/apitests/shell32/SHChangeNotify.cpp index e1edb4a5376..7a95fc470f6 100644 --- a/modules/rostests/apitests/shell32/SHChangeNotify.cpp +++ b/modules/rostests/apitests/shell32/SHChangeNotify.cpp @@ -8,7 +8,7 @@ // NOTE: This test program closes the Explorer windows before tests. #include "shelltest.h" -#include "SHChangeNotify.h" +#include "shell32_apitest_sub.h" #include <time.h> #include <process.h> #include <versionhelpers.h> @@ -32,31 +32,6 @@ static WCHAR s_szSubProgram[MAX_PATH]; static HANDLE s_hThread = NULL; static HANDLE s_hEvent = NULL; -static HWND DoWaitForWindow(LPCWSTR clsname, LPCWSTR text, BOOL bClosing, BOOL bForce) -{ - HWND hwnd = NULL; - for (INT i = 0; i < 50; ++i) - { - hwnd = FindWindowW(clsname, text); - if (bClosing) - { - if (!hwnd) - break; - - if (bForce) - PostMessage(hwnd, WM_CLOSE, 0, 0); - } - else - { - if (hwnd) - break; - } - - Sleep(1); - } - return hwnd; -} - static BOOL DoCreateEmptyFile(LPCWSTR pszFileName) { FILE *fp = _wfopen(pszFileName, L"wb"); @@ -964,5 +939,5 @@ START_TEST(SHChangeNotify) #endif DoWaitForWindow(CLASSNAME, CLASSNAME, TRUE, TRUE); - Sleep(500); + Sleep(100); } diff --git a/modules/rostests/apitests/shell32/ShellExecCmdLine.cpp b/modules/rostests/apitests/shell32/ShellExecCmdLine.cpp index ce53cd45968..699def5e114 100644 --- a/modules/rostests/apitests/shell32/ShellExecCmdLine.cpp +++ b/modules/rostests/apitests/shell32/ShellExecCmdLine.cpp @@ -8,6 +8,7 @@ #include <shlwapi.h> #include <strsafe.h> #include <versionhelpers.h> +#include "shell32_apitest_sub.h" #define NDEBUG #include <debug.h> @@ -738,4 +739,7 @@ START_TEST(ShellExecCmdLine) ok(DeleteFileA("Test File 1.txt"), "failed to delete the test file\n"); ok(DeleteFileA("Test File 2.bat"), "failed to delete the test file\n"); free(s_wi0.phwnd); + + DoWaitForWindow(CLASSNAME, CLASSNAME, TRUE, TRUE); + Sleep(100); } diff --git a/modules/rostests/apitests/shell32/ShellExecuteEx.cpp b/modules/rostests/apitests/shell32/ShellExecuteEx.cpp index 3e33c075d10..70f33ca4021 100644 --- a/modules/rostests/apitests/shell32/ShellExecuteEx.cpp +++ b/modules/rostests/apitests/shell32/ShellExecuteEx.cpp @@ -9,6 +9,7 @@ #include "shelltest.h" #include <shlwapi.h> #include <stdio.h> +#include "shell32_apitest_sub.h" #define ok_ShellExecuteEx (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : TestShellExecuteEx @@ -465,4 +466,7 @@ START_TEST(ShellExecuteEx) DoAppPathTest(); DoTestEntries(); test_properties(); + + DoWaitForWindow(CLASSNAME, CLASSNAME, TRUE, TRUE); + Sleep(100); } diff --git a/modules/rostests/apitests/shell32/shell32_apitest_sub.cpp b/modules/rostests/apitests/shell32/shell32_apitest_sub.cpp index 1b90c7ae39a..5a56b08aefb 100644 --- a/modules/rostests/apitests/shell32/shell32_apitest_sub.cpp +++ b/modules/rostests/apitests/shell32/shell32_apitest_sub.cpp @@ -6,7 +6,7 @@ */ #include "shelltest.h" -#include "SHChangeNotify.h" +#include "shell32_apitest_sub.h" static HWND s_hwnd = NULL; static UINT s_uRegID = 0; diff --git a/modules/rostests/apitests/shell32/SHChangeNotify.h b/modules/rostests/apitests/shell32/shell32_apitest_sub.h similarity index 74% rename from modules/rostests/apitests/shell32/SHChangeNotify.h rename to modules/rostests/apitests/shell32/shell32_apitest_sub.h index e20b6b7a74c..bff2e174683 100644 --- a/modules/rostests/apitests/shell32/SHChangeNotify.h +++ b/modules/rostests/apitests/shell32/shell32_apitest_sub.h @@ -59,7 +59,7 @@ inline LPITEMIDLIST DoGetPidl(DIRTYPE iDir) return ret; } -inline LPWSTR DoGetDir(DIRTYPE iDir) +static inline LPWSTR DoGetDir(DIRTYPE iDir) { static size_t s_index = 0; static WCHAR s_pathes[3][MAX_PATH]; @@ -71,3 +71,28 @@ inline LPWSTR DoGetDir(DIRTYPE iDir) s_index = (s_index + 1) % _countof(s_pathes); return psz; } + +static inline HWND DoWaitForWindow(LPCWSTR clsname, LPCWSTR text, BOOL bClosing, BOOL bForce) +{ + HWND hwnd = NULL; + for (INT i = 0; i < 50; ++i) + { + hwnd = FindWindowW(clsname, text); + if (bClosing) + { + if (!hwnd) + break; + + if (bForce) + PostMessage(hwnd, WM_CLOSE, 0, 0); + } + else + { + if (hwnd) + break; + } + + Sleep(1); + } + return hwnd; +}

2 years, 10 months

[reactos] 01/01: [NTUSER][IMM32] Use Imm32CurrentPti and pool (#4356)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=45a4e53fa454f5ad4e8b9… commit 45a4e53fa454f5ad4e8b96ddf04c30ad77b1af2a Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Feb 13 15:51:53 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Feb 13 15:51:53 2022 +0900 [NTUSER][IMM32] Use Imm32CurrentPti and pool (#4356) - Use newly-defined Imm32CurrentPti() instead of NtCurrentTeb()->Win32ThreadInfo. - THREADSTATE_GETTHREADINFO is same as THREADSTATE_UNKNOWN18. - Use the paged pool to allocate HIMC rather than heap. - Fix and improve ImmDestroyContext function. CORE-11700 --- dll/win32/imm32/imm.c | 69 +++++++++++++++++++++------------------------- dll/win32/imm32/keymsg.c | 2 +- dll/win32/imm32/precomp.h | 7 +++++ dll/win32/imm32/utils.c | 2 +- win32ss/include/ntuser.h | 5 ++-- win32ss/user/ntuser/ime.c | 37 +++++++++++++------------ win32ss/user/ntuser/misc.c | 7 ++--- 7 files changed, 64 insertions(+), 65 deletions(-) diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index d0ecbd2103c..1d80bf28232 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -638,50 +638,49 @@ BOOL APIENTRY Imm32CleanupContext(HIMC hIMC, HKL hKL, BOOL bKeep) PIMC pIMC; if (!IS_IMM_MODE() || hIMC == NULL) + { + ERR("invalid HIMC\n"); return FALSE; + } pIMC = ValidateHandleNoErr(hIMC, TYPE_INPUTCONTEXT); - if (!pIMC || pIMC->head.pti != NtCurrentTeb()->Win32ThreadInfo) + if (!pIMC || pIMC->head.pti != Imm32CurrentPti()) + { + ERR("invalid pIMC: %p\n", pIMC); return FALSE; + } pClientImc = (PCLIENTIMC)pIMC->dwClientImcData; if (!pClientImc) - return FALSE; + goto Finish; - if (pClientImc->hInputContext == NULL) + if ((pClientImc->dwFlags & CLIENTIMC_UNKNOWN2) && !bKeep) { - pClientImc->dwFlags |= CLIENTIMC_UNKNOWN1; - ImmUnlockClientImc(pClientImc); - if (!bKeep) - return NtUserDestroyInputContext(hIMC); - return TRUE; + ERR("CLIENTIMC_UNKNOWN2\n"); + return FALSE; } + if (pClientImc->dwFlags & CLIENTIMC_UNKNOWN1) + return TRUE; + + InterlockedIncrement(&pClientImc->cLockObj); + + if (!pClientImc->hInputContext) + goto Quit; + pIC = (LPINPUTCONTEXTDX)ImmLockIMC(hIMC); - if (pIC == NULL) + if (!pIC) { ImmUnlockClientImc(pClientImc); + ERR("!pIC\n"); return FALSE; } - FIXME("We have do something to do here\n"); - - if (pClientImc->hKL == hKL) + pImeDpi = ImmLockImeDpi(hKL); + if (pImeDpi) { - pImeDpi = ImmLockImeDpi(hKL); - if (pImeDpi != NULL) - { - if (IS_IME_HKL(hKL)) - { - pImeDpi->ImeSelect(hIMC, FALSE); - } - else if (Imm32IsCiceroMode() && pImeDpi->CtfImeSelectEx) - { - pImeDpi->CtfImeSelectEx(hIMC, FALSE, hKL); - } - ImmUnlockImeDpi(pImeDpi); - } - pClientImc->hKL = NULL; + pImeDpi->ImeSelect(hIMC, FALSE); + ImmUnlockImeDpi(pImeDpi); } pIC->hPrivate = ImmDestroyIMCC(pIC->hPrivate); @@ -689,18 +688,17 @@ BOOL APIENTRY Imm32CleanupContext(HIMC hIMC, HKL hKL, BOOL bKeep) pIC->hGuideLine = ImmDestroyIMCC(pIC->hGuideLine); pIC->hCandInfo = ImmDestroyIMCC(pIC->hCandInfo); pIC->hCompStr = ImmDestroyIMCC(pIC->hCompStr); - Imm32FreeImeStates(pIC); - ImmUnlockIMC(hIMC); +Quit: pClientImc->dwFlags |= CLIENTIMC_UNKNOWN1; ImmUnlockClientImc(pClientImc); - if (!bKeep) - return NtUserDestroyInputContext(hIMC); - - return TRUE; +Finish: + if (bKeep) + return TRUE; + return NtUserDestroyInputContext(hIMC); } BOOL APIENTRY @@ -1256,7 +1254,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpReserved) { HKL hKL; HIMC hIMC; - PTEB pTeb; TRACE("(%p, 0x%X, %p)\n", hinstDLL, fdwReason, lpReserved); @@ -1279,11 +1276,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpReserved) break; case DLL_THREAD_DETACH: - if (!IS_IMM_MODE()) - return TRUE; - - pTeb = NtCurrentTeb(); - if (pTeb->Win32ThreadInfo == NULL) + if (!IS_IMM_MODE() || NtCurrentTeb()->Win32ThreadInfo == NULL) return TRUE; hKL = GetKeyboardLayout(0); diff --git a/dll/win32/imm32/keymsg.c b/dll/win32/imm32/keymsg.c index a8fa1d84b83..0b5baaf7e88 100644 --- a/dll/win32/imm32/keymsg.c +++ b/dll/win32/imm32/keymsg.c @@ -574,7 +574,7 @@ LRESULT APIENTRY Imm32RequestMessageAW(HIMC hIMC, WPARAM wParam, LPARAM lParam, if (hWnd) pWnd = ValidateHwndNoErr(hWnd); - if (pWnd && pWnd->head.pti == NtCurrentTeb()->Win32ThreadInfo) + if (pWnd && pWnd->head.pti == Imm32CurrentPti()) ret = Imm32ProcessRequest(hIMC, pWnd, (DWORD)wParam, (LPVOID)lParam, bAnsi); ImmUnlockIMC(hIMC); diff --git a/dll/win32/imm32/precomp.h b/dll/win32/imm32/precomp.h index 1d5319dc340..3de40f0cbc0 100644 --- a/dll/win32/imm32/precomp.h +++ b/dll/win32/imm32/precomp.h @@ -156,3 +156,10 @@ UINT APIENTRY Imm32GetRegImes(PREG_IME pLayouts, UINT cLayouts); BOOL APIENTRY Imm32WriteRegIme(HKL hKL, LPCWSTR pchFilePart, LPCWSTR pszLayout); HKL APIENTRY Imm32GetNextHKL(UINT cKLs, const REG_IME *pLayouts, WORD wLangID); BOOL APIENTRY Imm32CopyFile(LPWSTR pszOldFile, LPCWSTR pszNewFile); + +static inline PTHREADINFO FASTCALL Imm32CurrentPti(VOID) +{ + if (NtCurrentTeb()->Win32ThreadInfo == NULL) + NtUserGetThreadState(THREADSTATE_GETTHREADINFO); + return NtCurrentTeb()->Win32ThreadInfo; +} diff --git a/dll/win32/imm32/utils.c b/dll/win32/imm32/utils.c index 86be064c251..8c3d8ad3c11 100644 --- a/dll/win32/imm32/utils.c +++ b/dll/win32/imm32/utils.c @@ -190,7 +190,7 @@ BOOL APIENTRY Imm32CheckImcProcess(PIMC pIMC) { HIMC hIMC; DWORD dwProcessID; - if (pIMC->head.pti == NtCurrentTeb()->Win32ThreadInfo) + if (pIMC->head.pti == Imm32CurrentPti()) return TRUE; hIMC = pIMC->head.h; diff --git a/win32ss/include/ntuser.h b/win32ss/include/ntuser.h index 95bd2db0a67..326bc9aefbe 100644 --- a/win32ss/include/ntuser.h +++ b/win32ss/include/ntuser.h @@ -1215,7 +1215,7 @@ typedef struct tagIMEUI /* Window Extra data container. */ typedef struct _IMEWND { - WND; + WND wnd; PIMEUI pimeui; } IMEWND, *PIMEWND; @@ -2570,8 +2570,7 @@ enum ThreadStateRoutines THREADSTATE_ISWINLOGON, THREADSTATE_ISWINLOGON2, THREADSTATE_UNKNOWN17, - THREADSTATE_UNKNOWN18, - THREADSTATE_GETTHREADINFO = 100, /* FIXME: Delete this HACK */ + THREADSTATE_GETTHREADINFO, THREADSTATE_PROGMANWINDOW, /* FIXME: Delete this HACK */ THREADSTATE_TASKMANWINDOW, /* FIXME: Delete this HACK */ }; diff --git a/win32ss/user/ntuser/ime.c b/win32ss/user/ntuser/ime.c index f7c67164c4e..14771e828ac 100644 --- a/win32ss/user/ntuser/ime.c +++ b/win32ss/user/ntuser/ime.c @@ -1200,7 +1200,7 @@ AllocInputContextObject(PDESKTOP pDesk, ASSERT(Size > sizeof(*ObjHead)); ASSERT(pti != NULL); - ObjHead = UserHeapAlloc(Size); + ObjHead = ExAllocatePoolWithTag(PagedPool, Size, USERTAG_IME); if (!ObjHead) return NULL; @@ -1218,7 +1218,7 @@ AllocInputContextObject(PDESKTOP pDesk, VOID UserFreeInputContext(PVOID Object) { - PIMC pIMC = Object, pImc0; + PIMC pIMC = Object; PTHREADINFO pti; if (!pIMC) @@ -1226,7 +1226,24 @@ VOID UserFreeInputContext(PVOID Object) pti = pIMC->head.pti; + ExFreePoolWithTag(pIMC, USERTAG_IME); + + pti->ppi->UserHandleCount--; + IntDereferenceThreadInfo(pti); +} + +BOOLEAN UserDestroyInputContext(PVOID Object) +{ + PIMC pIMC = Object, pImc0; + PTHREADINFO pti; + + if (!pIMC) + return TRUE; + + UserMarkObjectDestroy(pIMC); + /* Find the IMC in the list and remove it */ + pti = pIMC->head.pti; for (pImc0 = pti->spDefaultImc; pImc0; pImc0 = pImc0->pImcNext) { if (pImc0->pImcNext == pIMC) @@ -1236,21 +1253,7 @@ VOID UserFreeInputContext(PVOID Object) } } - UserHeapFree(pIMC); - - pti->ppi->UserHandleCount--; - IntDereferenceThreadInfo(pti); -} - -BOOLEAN UserDestroyInputContext(PVOID Object) -{ - PIMC pIMC = Object; - if (pIMC) - { - UserMarkObjectDestroy(pIMC); - UserDeleteObject(pIMC->head.h, TYPE_INPUTCONTEXT); - } - return TRUE; + return UserDeleteObject(pIMC->head.h, TYPE_INPUTCONTEXT); } BOOL NTAPI NtUserDestroyInputContext(HIMC hIMC) diff --git a/win32ss/user/ntuser/misc.c b/win32ss/user/ntuser/misc.c index 8fa8b0edb4d..970d1b6c46d 100644 --- a/win32ss/user/ntuser/misc.c +++ b/win32ss/user/ntuser/misc.c @@ -248,8 +248,8 @@ NtUserGetThreadState( switch (Routine) { - case THREADSTATE_GETTHREADINFO: /* FIXME: Delete this HACK */ - GetW32ThreadInfo(); + case THREADSTATE_GETTHREADINFO: + ret = TRUE; break; case THREADSTATE_FOCUSWINDOW: ret = (DWORD_PTR)IntGetThreadFocusWindow(); @@ -337,9 +337,6 @@ NtUserGetThreadState( case THREADSTATE_UNKNOWN17: /* FIXME */ break; - case THREADSTATE_UNKNOWN18: - ret = TRUE; - break; } TRACE("Leave NtUserGetThreadState, ret=%lu\n", ret);

2 years, 10 months

[reactos] 02/02: [CMIDRIVER] Remove useless Visual Studio resource editor file.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=78a7d7dc324ab4597de81… commit 78a7d7dc324ab4597de81ec470c70058d9b6c083 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Feb 11 14:31:49 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Feb 12 16:21:32 2022 +0100 [CMIDRIVER] Remove useless Visual Studio resource editor file. --- drivers/wdm/audio/drivers/CMIDriver/cmicontrol/window.aps | Bin 440 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/window.aps b/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/window.aps deleted file mode 100644 index e596df04b52..00000000000 Binary files a/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/window.aps and /dev/null differ

2 years, 10 months

[reactos] 01/02: [FDEBUG][CMIDRIVER] Add missing psdk dependency for user-mode code.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f73c0e08e2459354f1bed… commit f73c0e08e2459354f1bed192db4c5469ff5bdafa Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Feb 11 14:33:02 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Feb 12 16:21:30 2022 +0100 [FDEBUG][CMIDRIVER] Add missing psdk dependency for user-mode code. --- boot/freeldr/fdebug/CMakeLists.txt | 1 + drivers/wdm/audio/drivers/CMIDriver/cmicontrol/CMakeLists.txt | 2 ++ drivers/wdm/audio/drivers/CMIDriver/cpl/CMakeLists.txt | 1 + 3 files changed, 4 insertions(+) diff --git a/boot/freeldr/fdebug/CMakeLists.txt b/boot/freeldr/fdebug/CMakeLists.txt index ad446182f13..568a5e5cd74 100644 --- a/boot/freeldr/fdebug/CMakeLists.txt +++ b/boot/freeldr/fdebug/CMakeLists.txt @@ -1,5 +1,6 @@ add_executable(fdebug fdebug.c rs232.c fdebug.rc) +add_dependencies(fdebug psdk) set_module_type(fdebug win32gui UNICODE) add_importlibs(fdebug comdlg32 user32 gdi32 msvcrt kernel32) add_cd_file(TARGET fdebug DESTINATION loader NO_CAB NOT_IN_HYBRIDCD FOR bootcd livecd hybridcd) diff --git a/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/CMakeLists.txt b/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/CMakeLists.txt index 8574b420629..61cf0185783 100644 --- a/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/CMakeLists.txt +++ b/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/CMakeLists.txt @@ -7,6 +7,8 @@ if(NOT MSVC) set_source_files_properties(main.cpp PROPERTIES COMPILE_FLAGS "-Wno-write-strings") endif() +add_dependencies(cmicontrol psdk) + add_importlibs(cmicontrol user32 gdi32 ole32 advapi32 comctl32 shell32 dsound setupapi winmm msvcrt kernel32) set_module_type(cmicontrol win32gui) add_cd_file(TARGET cmicontrol DESTINATION reactos/system32/drivers FOR all) diff --git a/drivers/wdm/audio/drivers/CMIDriver/cpl/CMakeLists.txt b/drivers/wdm/audio/drivers/CMIDriver/cpl/CMakeLists.txt index 95c5a7fb7ae..a426ccb6015 100644 --- a/drivers/wdm/audio/drivers/CMIDriver/cpl/CMakeLists.txt +++ b/drivers/wdm/audio/drivers/CMIDriver/cpl/CMakeLists.txt @@ -4,6 +4,7 @@ add_library(cmicpl MODULE cmicpl.cpp cmicpl.rc) +add_dependencies(cmicpl psdk) set_module_type(cmicpl cpl UNICODE) add_importlibs(cmicpl shell32 msvcrt kernel32) add_cd_file(TARGET cmicpl DESTINATION reactos/system32/drivers FOR all)

2 years, 10 months

[reactos] 01/01: [NTUSER][USER32] Implement IntImmProcessKey (#4353)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b5c9d532e83c7a2d0d108… commit b5c9d532e83c7a2d0d10863b26e2592c6f74bcce Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Feb 12 08:32:13 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Feb 12 08:32:13 2022 +0900 [NTUSER][USER32] Implement IntImmProcessKey (#4353) - Establish the trampoline callback USER32_CALLBACK_IMMPROCESSKEY for imm32!ImmProcessKey function, between NTUSER and IMM32. - Add IntGetImeCompatFlags helper function. - Implement co_IntImmProcessKey and IntImmProcessKey functions. CORE-11700 --- win32ss/include/callback.h | 14 ++- win32ss/user/ntuser/callback.c | 24 +++++ win32ss/user/ntuser/callback.h | 4 + win32ss/user/ntuser/ime.c | 197 ++++++++++++++++++++++++++++++++----- win32ss/user/user32/misc/dllmain.c | 15 ++- 5 files changed, 226 insertions(+), 28 deletions(-) diff --git a/win32ss/include/callback.h b/win32ss/include/callback.h index 7eef1d6c278..a75a6de3803 100644 --- a/win32ss/include/callback.h +++ b/win32ss/include/callback.h @@ -19,7 +19,8 @@ #define USER32_CALLBACK_SETOBM (15) #define USER32_CALLBACK_LPK (16) #define USER32_CALLBACK_UMPD (17) -#define USER32_CALLBACK_MAXIMUM (17) +#define USER32_CALLBACK_IMMPROCESSKEY (18) +#define USER32_CALLBACK_MAXIMUM (18) typedef struct _WINDOWPROC_CALLBACK_ARGUMENTS { @@ -168,6 +169,15 @@ typedef struct _LPK_CALLBACK_ARGUMENTS BOOL bRect; } LPK_CALLBACK_ARGUMENTS, *PLPK_CALLBACK_ARGUMENTS; +typedef struct _IMMPROCESSKEY_CALLBACK_ARGUMENTS +{ + HWND hWnd; + HKL hKL; + UINT vKey; + LPARAM lParam; + DWORD dwHotKeyID; +} IMMPROCESSKEY_CALLBACK_ARGUMENTS, *PIMMPROCESSKEY_CALLBACK_ARGUMENTS; + NTSTATUS WINAPI User32CallCopyImageFromKernel(PVOID Arguments, ULONG ArgumentLength); NTSTATUS WINAPI @@ -204,4 +214,6 @@ NTSTATUS WINAPI User32CallLPKFromKernel(PVOID Arguments, ULONG ArgumentLength); NTSTATUS WINAPI User32CallUMPDFromKernel(PVOID Arguments, ULONG ArgumentLength); +NTSTATUS WINAPI +User32CallImmProcessKeyFromKernel(PVOID Arguments, ULONG ArgumentLength); #endif /* __INCLUDE_USER32_CALLBACK_H */ diff --git a/win32ss/user/ntuser/callback.c b/win32ss/user/ntuser/callback.c index 25e6eee5dd7..9b5ac56965a 100644 --- a/win32ss/user/ntuser/callback.c +++ b/win32ss/user/ntuser/callback.c @@ -1247,4 +1247,28 @@ co_UserCBClientPrinterThunk( PVOID pkt, INT InSize, PVOID pvOutData, INT OutSize return 0; } +DWORD +APIENTRY +co_IntImmProcessKey(HWND hWnd, HKL hKL, UINT vKey, LPARAM lParam, DWORD dwHotKeyID) +{ + DWORD ret = 0; + NTSTATUS Status; + ULONG ResultLength = sizeof(DWORD); + PVOID ResultPointer = NULL; + IMMPROCESSKEY_CALLBACK_ARGUMENTS Common = { hWnd, hKL, vKey, lParam, dwHotKeyID }; + + UserLeaveCo(); + Status = KeUserModeCallback(USER32_CALLBACK_IMMPROCESSKEY, + &Common, + sizeof(Common), + &ResultPointer, + &ResultLength); + UserEnterCo(); + + if (NT_SUCCESS(Status)) + ret = *(LPDWORD)ResultPointer; + + return ret; +} + /* EOF */ diff --git a/win32ss/user/ntuser/callback.h b/win32ss/user/ntuser/callback.h index c83be89a976..79217f86425 100644 --- a/win32ss/user/ntuser/callback.h +++ b/win32ss/user/ntuser/callback.h @@ -76,3 +76,7 @@ BOOL FASTCALL co_IntSetWndIcons(VOID); VOID FASTCALL co_IntDeliverUserAPC(VOID); VOID FASTCALL co_IntSetupOBM(VOID); BOOL FASTCALL IntMsgCreateStructW(PWND,CREATESTRUCTW*,CREATESTRUCTW*,PVOID*,PVOID*); + +DWORD +APIENTRY +co_IntImmProcessKey(HWND hWnd, HKL hKL, UINT vKey, LPARAM lParam, DWORD dwHotKeyID); diff --git a/win32ss/user/ntuser/ime.c b/win32ss/user/ntuser/ime.c index 1ea65ef512b..f7c67164c4e 100644 --- a/win32ss/user/ntuser/ime.c +++ b/win32ss/user/ntuser/ime.c @@ -58,6 +58,14 @@ typedef struct tagIMEHOTKEY PIMEHOTKEY gpImeHotKeyList = NULL; LCID glcid = 0; +DWORD FASTCALL IntGetImeCompatFlags(PTHREADINFO pti) +{ + if (!pti) + pti = PsGetCurrentThreadWin32Thread(); + + return pti->ppi->dwImeCompatFlags; +} + UINT FASTCALL IntGetImeHotKeyLanguageScore(HKL hKL, LANGID HotKeyLangId) { LCID lcid; @@ -343,7 +351,10 @@ IntSetImeHotKey(DWORD dwHotKeyId, UINT uModifiers, UINT uVirtualKey, HKL hKL, DW case SETIMEHOTKEY_DELETE: pNode = IntGetImeHotKeyById(gpImeHotKeyList, dwHotKeyId); if (!pNode) + { + ERR("dwHotKeyId: 0x%lX\n", dwHotKeyId); return FALSE; + } IntDeleteImeHotKey(&gpImeHotKeyList, pNode); return TRUE; @@ -550,29 +561,122 @@ DWORD FASTCALL UserBuildHimcList(PTHREADINFO pti, DWORD dwCount, HIMC *phList) } UINT FASTCALL -IntImmProcessKey(PUSER_MESSAGE_QUEUE MessageQueue, PWND pWnd, UINT Msg, WPARAM wParam, LPARAM lParam) +IntImmProcessKey(PUSER_MESSAGE_QUEUE MessageQueue, PWND pWnd, UINT uMsg, + WPARAM wParam, LPARAM lParam) { - PKL pKbdLayout; + UINT uVirtualKey, ret = 0; + DWORD dwHotKeyId; + PKL pKL; + PIMC pIMC = NULL; + PIMEHOTKEY pImeHotKey; + HKL hKL; + HWND hWnd; ASSERT_REFS_CO(pWnd); - if ( Msg == WM_KEYDOWN || - Msg == WM_SYSKEYDOWN || - Msg == WM_KEYUP || - Msg == WM_SYSKEYUP ) - { - //Vk = wParam & 0xff; - pKbdLayout = pWnd->head.pti->KeyboardLayout; - if (pKbdLayout == NULL) return 0; - // - if (!(gpsi->dwSRVIFlags & SRVINFO_IMM32)) return 0; - // need ime.h! - } - // Call User32: - // Anything but BOOL! - //ImmRet = co_IntImmProcessKey(UserHMGetHandle(pWnd), pKbdLayout->hkl, Vk, lParam, HotKey); - FIXME(" is UNIMPLEMENTED.\n"); - return 0; + switch (uMsg) + { + case WM_KEYDOWN: + case WM_KEYUP: + case WM_SYSKEYDOWN: + case WM_SYSKEYUP: + break; + + default: + return 0; + } + + hWnd = UserHMGetHandle(pWnd); + pKL = pWnd->head.pti->KeyboardLayout; + if (!pKL) + return 0; + + uVirtualKey = LOBYTE(wParam); + pImeHotKey = IntCheckImeHotKey(MessageQueue, uVirtualKey, lParam); + if (pImeHotKey) + { + dwHotKeyId = pImeHotKey->dwHotKeyId; + hKL = pImeHotKey->hKL; + } + else + { + dwHotKeyId = INVALID_HOTKEY; + hKL = NULL; + } + + if (IME_HOTKEY_DSWITCH_FIRST <= dwHotKeyId && dwHotKeyId <= IME_HOTKEY_DSWITCH_LAST) + { + if (pKL->hkl != hKL) + { + UserPostMessage(hWnd, WM_INPUTLANGCHANGEREQUEST, + ((pKL->dwFontSigs & gSystemFS) ? INPUTLANGCHANGE_SYSCHARSET : 0), + (LPARAM)hKL); + } + + if (IntGetImeCompatFlags(pWnd->head.pti) & 0x800000) + return 0; + + return IPHK_HOTKEY; + } + + if (!IS_IMM_MODE()) + return 0; + + if (dwHotKeyId == INVALID_HOTKEY) + { + if (!pKL->piiex) + return 0; + + if (pWnd->hImc) + pIMC = UserGetObject(gHandleTable, pWnd->hImc, TYPE_INPUTCONTEXT); + if (!pIMC) + return 0; + + if ((lParam & 0x80000000) && + (pKL->piiex->ImeInfo.fdwProperty & IME_PROP_IGNORE_UPKEYS)) + { + return 0; + } + + switch (uVirtualKey) + { + case VK_DBE_CODEINPUT: + case VK_DBE_ENTERCONFIGMODE: + case VK_DBE_ENTERWORDREGISTERMODE: + case VK_DBE_HIRAGANA: + case VK_DBE_KATAKANA: + case VK_DBE_NOCODEINPUT: + case VK_DBE_NOROMAN: + case VK_DBE_ROMAN: + break; + + default: + { + if (uMsg == WM_SYSKEYDOWN || uMsg == WM_SYSKEYUP) + { + if (uVirtualKey != VK_MENU && uVirtualKey != VK_F10) + return 0; + } + + if (!(pKL->piiex->ImeInfo.fdwProperty & IME_PROP_NEED_ALTKEY)) + { + if (uVirtualKey == VK_MENU || (lParam & 0x20000000)) + return 0; + } + break; + } + } + } + + if (LOBYTE(uVirtualKey) == VK_PACKET) + uVirtualKey = MAKELONG(wParam, GetW32ThreadInfo()->wchInjected); + + ret = co_IntImmProcessKey(hWnd, pKL->hkl, uVirtualKey, lParam, dwHotKeyId); + + if (IntGetImeCompatFlags(pWnd->head.pti) & 0x800000) + ret &= ~IPHK_HOTKEY; + + return ret; } NTSTATUS @@ -587,6 +691,7 @@ NtUserBuildHimcList(DWORD dwThreadId, DWORD dwCount, HIMC *phList, LPDWORD pdwCo if (!IS_IMM_MODE()) { + ERR("!IS_IMM_MODE()\n"); EngSetLastError(ERROR_CALL_NOT_IMPLEMENTED); goto Quit; } @@ -695,8 +800,14 @@ NtUserNotifyIMEStatus(HWND hwnd, BOOL fOpen, DWORD dwConversion) UserEnterExclusive(); + if (!IS_IMM_MODE()) + { + ERR("!IS_IMM_MODE()\n"); + goto Quit; + } + pwnd = ValidateHwndNoErr(hwnd); - if (!pwnd || !IS_IMM_MODE()) + if (!pwnd) goto Quit; pti = pwnd->head.pti; @@ -741,6 +852,7 @@ NtUserDisableThreadIme( if (!IS_IMM_MODE()) { + ERR("!IS_IMM_MODE()\n"); EngSetLastError(ERROR_CALL_NOT_IMPLEMENTED); goto Quit; } @@ -812,6 +924,7 @@ NtUserGetAppImeLevel(HWND hWnd) if (!IS_IMM_MODE()) { + ERR("!IS_IMM_MODE()\n"); EngSetLastError(ERROR_CALL_NOT_IMPLEMENTED); goto Quit; } @@ -886,7 +999,10 @@ NtUserGetImeInfoEx( UserEnterShared(); if (!IS_IMM_MODE()) + { + ERR("!IS_IMM_MODE()\n"); goto Quit; + } _SEH2_TRY { @@ -928,16 +1044,17 @@ NtUserSetAppImeLevel(HWND hWnd, DWORD dwLevel) UserEnterExclusive(); - pWnd = ValidateHwndNoErr(hWnd); - if (!pWnd) - goto Quit; - if (!IS_IMM_MODE()) { + ERR("!IS_IMM_MODE()\n"); EngSetLastError(ERROR_CALL_NOT_IMPLEMENTED); goto Quit; } + pWnd = ValidateHwndNoErr(hWnd); + if (!pWnd) + goto Quit; + pti = PsGetCurrentThreadWin32Thread(); if (pWnd->head.pti->ppi == pti->ppi) ret = UserSetProp(pWnd, AtomImeLevel, (HANDLE)(ULONG_PTR)dwLevel, TRUE); @@ -983,7 +1100,10 @@ NtUserSetImeInfoEx(PIMEINFOEX pImeInfoEx) UserEnterExclusive(); if (!IS_IMM_MODE()) + { + ERR("!IS_IMM_MODE()\n"); goto Quit; + } _SEH2_TRY { @@ -1012,8 +1132,14 @@ NtUserSetImeOwnerWindow(HWND hImeWnd, HWND hwndFocus) UserEnterExclusive(); + if (!IS_IMM_MODE()) + { + ERR("!IS_IMM_MODE()\n"); + goto Quit; + } + pImeWnd = ValidateHwndNoErr(hImeWnd); - if (!IS_IMM_MODE() || !pImeWnd || pImeWnd->fnid != FNID_IME) + if (!pImeWnd || pImeWnd->fnid != FNID_IME) goto Quit; pwndFocus = ValidateHwndNoErr(hwndFocus); @@ -1140,6 +1266,7 @@ BOOL NTAPI NtUserDestroyInputContext(HIMC hIMC) if (!IS_IMM_MODE()) { + ERR("!IS_IMM_MODE()\n"); EngSetLastError(ERROR_CALL_NOT_IMPLEMENTED); goto Quit; } @@ -1185,7 +1312,10 @@ PIMC FASTCALL UserCreateInputContext(ULONG_PTR dwClientImcData) PDESKTOP pdesk = pti->rpdesk; if (!IS_IMM_MODE() || (pti->TIF_flags & TIF_DISABLEIME)) // Disabled? + { + ERR("IME is disabled\n"); return NULL; + } if (!pdesk) // No desktop? return NULL; @@ -1232,7 +1362,10 @@ NtUserCreateInputContext(ULONG_PTR dwClientImcData) UserEnterExclusive(); if (!IS_IMM_MODE()) + { + ERR("!IS_IMM_MODE()\n"); goto Quit; + } pIMC = UserCreateInputContext(dwClientImcData); if (pIMC) @@ -1317,8 +1450,14 @@ NtUserAssociateInputContext(HWND hWnd, HIMC hIMC, DWORD dwFlags) UserEnterExclusive(); + if (!IS_IMM_MODE()) + { + ERR("!IS_IMM_MODE()\n"); + goto Quit; + } + pWnd = ValidateHwndNoErr(hWnd); - if (!pWnd || !IS_IMM_MODE()) + if (!pWnd) goto Quit; pIMC = (hIMC ? UserGetObjectNoErr(gHandleTable, hIMC, TYPE_INPUTCONTEXT) : NULL); @@ -1373,7 +1512,10 @@ NtUserUpdateInputContext( UserEnterExclusive(); if (!IS_IMM_MODE()) + { + ERR("!IS_IMM_MODE()\n"); goto Quit; + } pIMC = UserGetObject(gHandleTable, hIMC, TYPE_INPUTCONTEXT); if (!pIMC) @@ -1397,7 +1539,10 @@ NtUserQueryInputContext(HIMC hIMC, DWORD dwType) UserEnterExclusive(); if (!IS_IMM_MODE()) + { + ERR("!IS_IMM_MODE()\n"); goto Quit; + } pIMC = UserGetObject(gHandleTable, hIMC, TYPE_INPUTCONTEXT); if (!pIMC) diff --git a/win32ss/user/user32/misc/dllmain.c b/win32ss/user/user32/misc/dllmain.c index 72f82aa1b43..ab5e6fcf825 100644 --- a/win32ss/user/user32/misc/dllmain.c +++ b/win32ss/user/user32/misc/dllmain.c @@ -223,10 +223,10 @@ PVOID apfnDispatch[USER32_CALLBACK_MAXIMUM + 1] = User32CallOBMFromKernel, User32CallLPKFromKernel, User32CallUMPDFromKernel, + User32CallImmProcessKeyFromKernel, }; - VOID WINAPI GdiProcessSetup(VOID); @@ -712,3 +712,16 @@ NTSTATUS WINAPI User32CallUMPDFromKernel(PVOID Arguments, ULONG ArgumentLength) } return ZwCallbackReturn( pktOut, cbSize, Status ); } + +NTSTATUS WINAPI +User32CallImmProcessKeyFromKernel(PVOID Arguments, ULONG ArgumentLength) +{ + PIMMPROCESSKEY_CALLBACK_ARGUMENTS Common = Arguments; + DWORD Result = IMM_FN(ImmProcessKey)(Common->hWnd, + Common->hKL, + Common->vKey, + Common->lParam, + Common->dwHotKeyID); + + return ZwCallbackReturn(&Result, sizeof(DWORD), STATUS_SUCCESS); +}

2 years, 10 months

[reactos] 01/01: [NOTEPAD] Fix hr-Hr.rc compiler warning 'unrecognized escape sequence' CORE-18043

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=27d73cd78b5a5370e3752… commit 27d73cd78b5a5370e37526ca40740197790e2b29 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Fri Feb 11 12:42:03 2022 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Fri Feb 11 12:42:03 2022 +0100 [NOTEPAD] Fix hr-Hr.rc compiler warning 'unrecognized escape sequence' CORE-18043 It regressed by 0.4.15-dev-3810-g e0fc48d6e29c65488966116dd9b5eb10ed4e504a (#4338) No release was ever affected therefore. The diff looks massive in tgit-diffview, strange, but I actually replaced just a '\' with '\n' at line 168. My local diff tool does properly display it as a one-line-change only. --- base/applications/notepad/lang/hr-Hr.rc | 344 ++++++++++++++++---------------- 1 file changed, 172 insertions(+), 172 deletions(-) diff --git a/base/applications/notepad/lang/hr-Hr.rc b/base/applications/notepad/lang/hr-Hr.rc index 97bc5abda3a..cee444019a1 100644 --- a/base/applications/notepad/lang/hr-Hr.rc +++ b/base/applications/notepad/lang/hr-Hr.rc @@ -1,172 +1,172 @@ -LANGUAGE LANG_CROATIAN, SUBLANG_DEFAULT - - -ID_ACCEL ACCELERATORS -BEGIN - "^A", CMD_SELECT_ALL - "^C", CMD_COPY - "^F", CMD_SEARCH - "^G", CMD_GOTO - "H", CMD_REPLACE, VIRTKEY, CONTROL - "^N", CMD_NEW - "N", CMD_NEW_WINDOW, VIRTKEY,CONTROL , SHIFT - "^O", CMD_OPEN - "^P", CMD_PRINT - "^S", CMD_SAVE - "^V", CMD_PASTE - "^X", CMD_CUT - "^Z", CMD_UNDO - VK_F3, CMD_SEARCH_NEXT, VIRTKEY - VK_F5, CMD_TIME_DATE, VIRTKEY -END - -MAIN_MENU MENU -BEGIN - POPUP "&Datoteka" - BEGIN - MENUITEM "&Novo\tCtrl+N", CMD_NEW - MENUITEM "Novi &prozor\tCtrl+Shift+N", CMD_NEW_WINDOW - MENUITEM "&Otvori...\tCtrl+O", CMD_OPEN - MENUITEM "&Spremi\tCtrl+S", CMD_SAVE - MENUITEM "Spremi &kao...", CMD_SAVE_AS - MENUITEM SEPARATOR - MENUITEM "Postavljanje st&ranice...", CMD_PAGE_SETUP - MENUITEM "&Ispiši...\tCtrl+P", CMD_PRINT - MENUITEM SEPARATOR - MENUITEM "I&zađi", CMD_EXIT - END - POPUP "&Uređivanje" - BEGIN - MENUITEM "&Poništi\tCtrl+Z", CMD_UNDO - MENUITEM SEPARATOR - MENUITEM "&Izreži\tCtrl+X", CMD_CUT - MENUITEM "&Kopiraj\tCtrl+C", CMD_COPY - MENUITEM "Z&alijepi\tCtrl+V", CMD_PASTE - MENUITEM "Iz&briši\tDel", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "&Traži...\tCtrl+F", CMD_SEARCH - MENUITEM "Pronađi s&ljedeće\tF3", CMD_SEARCH_NEXT - MENUITEM "&Zamijeni...\tCtrl+H", CMD_REPLACE - MENUITEM "Idi &na...\tCtrl+G", CMD_GOTO - MENUITEM SEPARATOR - MENUITEM "Odaberi &sve\tCtrl+A", CMD_SELECT_ALL - MENUITEM "Vrijeme/&Datum\tF5", CMD_TIME_DATE - END - POPUP "&Oblikovanje" - BEGIN - MENUITEM "Prelo&mi riječi", CMD_WRAP - MENUITEM "&Font...", CMD_FONT - END - POPUP "Pri&kaz" - BEGIN - MENUITEM "T&raka stanja", CMD_STATUSBAR - END - POPUP "&Pomoć" - BEGIN - MENUITEM "&Prikaži pomoć", CMD_HELP_CONTENTS - MENUITEM SEPARATOR - MENUITEM "&O programu Blok za pisanje", CMD_HELP_ABOUT_NOTEPAD - END -END - -/* Dialog 'Page setup' */ -DIALOG_PAGESETUP DIALOGEX 0, 0, 365, 193 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP -FONT 8, "MS Shell Dlg" -CAPTION "Postavljanje stranice" -BEGIN - GROUPBOX "Pretpregled", 0, 240, 6, 120, 153, BS_GROUPBOX - CONTROL "", rct1, "Static", SS_WHITERECT, 260, 42, 80, 80 - CONTROL "", rct2, "Static", SS_GRAYRECT, 340, 46, 4, 80 - CONTROL "", rct3, "Static", SS_GRAYRECT, 264, 122, 80, 4 - GROUPBOX "Papir", grp2, 8, 6, 224, 56, BS_GROUPBOX - LTEXT "Ve&ličina:", stc2, 16, 22, 36, 8 - COMBOBOX cmb2, 64, 20, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL - LTEXT "L&adica:", stc3, 16, 42, 36, 8 - COMBOBOX cmb3, 64, 40, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL - GROUPBOX "Orijentacija", grp1, 8, 66, 64, 56, BS_GROUPBOX - AUTORADIOBUTTON "P&ortret", rad1, 16, 80, 52, 12, BS_AUTORADIOBUTTON - AUTORADIOBUTTON "P&ejzaž", rad2, 16, 100, 52, 12, BS_AUTORADIOBUTTON - GROUPBOX "Granice", grp4, 80, 66, 152, 56, BS_GROUPBOX - LTEXT "&Lijevo:", stc15, 88, 82, 30, 8 - EDITTEXT edt4, 119, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER - LTEXT "&Desno:", stc16, 159, 82, 30, 8 - EDITTEXT edt6, 190, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER - LTEXT "&Vrh:", stc17, 88, 102, 30, 8 - EDITTEXT edt5, 119, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER - LTEXT "&D&no:", stc18, 159, 102, 30, 8 - EDITTEXT edt7, 190, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER - LTEXT "&Zaglavlje:", 0x140, 8, 132, 40, 15 - EDITTEXT 0x141, 58, 130, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Podnožje:", 0x142, 8, 149, 40, 15 - EDITTEXT 0x143, 58, 147, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL - PUSHBUTTON "Pomoć", IDHELP, 8, 170, 50, 14 - DEFPUSHBUTTON "U redu", IDOK, 198, 170, 50, 14, BS_PUSHBUTTON - PUSHBUTTON "Odustani", IDCANCEL, 254, 170, 50, 14 - PUSHBUTTON "P&isač...", psh3, 310, 170, 50, 14 -END - -/* Dialog 'Encoding' */ -DIALOG_ENCODING DIALOGEX 0, 0, 256, 44 -STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_CAPTION | WS_SYSMENU -FONT 8, "MS Shell Dlg" -CAPTION "Kodiranje" -BEGIN - COMBOBOX ID_ENCODING, 124, 0, 125, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Kodiranje:", 0x155, 65, 2, 41, 12 - COMBOBOX ID_EOLN, 124, 18, 125, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Krajnje linije:", 0x156, 65, 20, 41, 12 -END - -/* Dialog 'Go To' */ -DIALOG_GOTO DIALOGEX 0, 0, 165, 50 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -FONT 8, "MS Shell Dlg" -CAPTION "Idi na liniju" -BEGIN - EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, WS_CHILD | WS_BORDER | WS_TABSTOP - LTEXT "Broj linije:", 0x155, 5, 12, 41, 12, WS_CHILD | WS_TABSTOP | ES_NUMBER - DEFPUSHBUTTON "U redu", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP - PUSHBUTTON "Odustani", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP -END - -STRINGTABLE -BEGIN - STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ - STRING_PAGESETUP_FOOTERVALUE "Stranica &s" /* FIXME */ - STRING_PAGESETUP_LEFTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_RIGHTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_TOPVALUE "25 mm" /* FIXME */ - STRING_PAGESETUP_BOTTOMVALUE "25 mm" /* FIXME */ - STRING_NOTEPAD "Blok za pisanje" - STRING_ERROR "Greška" - STRING_WARNING "Upozorenje" - STRING_INFO "Informacija" - STRING_UNTITLED "Bez naslova" - STRING_ALL_FILES "Sve datoteke (*.*)" - STRING_TEXT_FILES_TXT "Tekstne datoteke (*.txt)" - STRING_TOOLARGE "Datoteka '%s' je prevelik za program Blok za pisanje.\n\ -Molimo Vas da koristite drugu aplikaciju." - STRING_NOTEXT "Niste unijeli tekst. \ -\nMolimo Vas da nešto unesete i ponovo pokušate." - STRING_DOESNOTEXIST "Datoteka '%s'\nne postoji\n\n\ -Želite li stvoriti novu datoteku ?" - STRING_NOTSAVED "Datoteka '%s'\nje bila promijenjena\n\n\ -Želite li spremiti te promjene ?" - STRING_NOTFOUND "'%s' ne može biti pronađena." - STRING_OUT_OF_MEMORY "Nema dovoljno memorije da se dovrši \ -zadatak.\nZatvorite jednu ili više aplikacija da povećate\nslobodnu memoriju." - STRING_CANNOTFIND "Ne mogu pronaći '%s'" - STRING_ANSI "ANSI" - STRING_UNICODE "Unicode" - STRING_UNICODE_BE "Unicode (big endian)" - STRING_UTF8 "UTF-8" - STRING_CRLF "Windows (CR + LF)" - STRING_LF "Unix (LF)" - STRING_CR "Mac (CR)" - STRING_LINE_COLUMN "Linija %d, Stupac %d" - STRING_PRINTERROR "Ne mogu ispisati datoteku '%s'.\n\Provjerite je li pisač uključen i je li pravilno konfiguiran." - - STRING_TEXT_DOCUMENT "Tekstni dokument" - STRING_NOTEPAD_AUTHORS "Copyright 1997, 98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" -END +LANGUAGE LANG_CROATIAN, SUBLANG_DEFAULT + + +ID_ACCEL ACCELERATORS +BEGIN + "^A", CMD_SELECT_ALL + "^C", CMD_COPY + "^F", CMD_SEARCH + "^G", CMD_GOTO + "H", CMD_REPLACE, VIRTKEY, CONTROL + "^N", CMD_NEW + "N", CMD_NEW_WINDOW, VIRTKEY,CONTROL , SHIFT + "^O", CMD_OPEN + "^P", CMD_PRINT + "^S", CMD_SAVE + "^V", CMD_PASTE + "^X", CMD_CUT + "^Z", CMD_UNDO + VK_F3, CMD_SEARCH_NEXT, VIRTKEY + VK_F5, CMD_TIME_DATE, VIRTKEY +END + +MAIN_MENU MENU +BEGIN + POPUP "&Datoteka" + BEGIN + MENUITEM "&Novo\tCtrl+N", CMD_NEW + MENUITEM "Novi &prozor\tCtrl+Shift+N", CMD_NEW_WINDOW + MENUITEM "&Otvori...\tCtrl+O", CMD_OPEN + MENUITEM "&Spremi\tCtrl+S", CMD_SAVE + MENUITEM "Spremi &kao...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "Postavljanje st&ranice...", CMD_PAGE_SETUP + MENUITEM "&Ispiši...\tCtrl+P", CMD_PRINT + MENUITEM SEPARATOR + MENUITEM "I&zađi", CMD_EXIT + END + POPUP "&Uređivanje" + BEGIN + MENUITEM "&Poništi\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "&Izreži\tCtrl+X", CMD_CUT + MENUITEM "&Kopiraj\tCtrl+C", CMD_COPY + MENUITEM "Z&alijepi\tCtrl+V", CMD_PASTE + MENUITEM "Iz&briši\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "&Traži...\tCtrl+F", CMD_SEARCH + MENUITEM "Pronađi s&ljedeće\tF3", CMD_SEARCH_NEXT + MENUITEM "&Zamijeni...\tCtrl+H", CMD_REPLACE + MENUITEM "Idi &na...\tCtrl+G", CMD_GOTO + MENUITEM SEPARATOR + MENUITEM "Odaberi &sve\tCtrl+A", CMD_SELECT_ALL + MENUITEM "Vrijeme/&Datum\tF5", CMD_TIME_DATE + END + POPUP "&Oblikovanje" + BEGIN + MENUITEM "Prelo&mi riječi", CMD_WRAP + MENUITEM "&Font...", CMD_FONT + END + POPUP "Pri&kaz" + BEGIN + MENUITEM "T&raka stanja", CMD_STATUSBAR + END + POPUP "&Pomoć" + BEGIN + MENUITEM "&Prikaži pomoć", CMD_HELP_CONTENTS + MENUITEM SEPARATOR + MENUITEM "&O programu Blok za pisanje", CMD_HELP_ABOUT_NOTEPAD + END +END + +/* Dialog 'Page setup' */ +DIALOG_PAGESETUP DIALOGEX 0, 0, 365, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP +FONT 8, "MS Shell Dlg" +CAPTION "Postavljanje stranice" +BEGIN + GROUPBOX "Pretpregled", 0, 240, 6, 120, 153, BS_GROUPBOX + CONTROL "", rct1, "Static", SS_WHITERECT, 260, 42, 80, 80 + CONTROL "", rct2, "Static", SS_GRAYRECT, 340, 46, 4, 80 + CONTROL "", rct3, "Static", SS_GRAYRECT, 264, 122, 80, 4 + GROUPBOX "Papir", grp2, 8, 6, 224, 56, BS_GROUPBOX + LTEXT "Ve&ličina:", stc2, 16, 22, 36, 8 + COMBOBOX cmb2, 64, 20, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL + LTEXT "L&adica:", stc3, 16, 42, 36, 8 + COMBOBOX cmb3, 64, 40, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL + GROUPBOX "Orijentacija", grp1, 8, 66, 64, 56, BS_GROUPBOX + AUTORADIOBUTTON "P&ortret", rad1, 16, 80, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "P&ejzaž", rad2, 16, 100, 52, 12, BS_AUTORADIOBUTTON + GROUPBOX "Granice", grp4, 80, 66, 152, 56, BS_GROUPBOX + LTEXT "&Lijevo:", stc15, 88, 82, 30, 8 + EDITTEXT edt4, 119, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER + LTEXT "&Desno:", stc16, 159, 82, 30, 8 + EDITTEXT edt6, 190, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER + LTEXT "&Vrh:", stc17, 88, 102, 30, 8 + EDITTEXT edt5, 119, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER + LTEXT "&D&no:", stc18, 159, 102, 30, 8 + EDITTEXT edt7, 190, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER + LTEXT "&Zaglavlje:", 0x140, 8, 132, 40, 15 + EDITTEXT 0x141, 58, 130, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Podnožje:", 0x142, 8, 149, 40, 15 + EDITTEXT 0x143, 58, 147, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL + PUSHBUTTON "Pomoć", IDHELP, 8, 170, 50, 14 + DEFPUSHBUTTON "U redu", IDOK, 198, 170, 50, 14, BS_PUSHBUTTON + PUSHBUTTON "Odustani", IDCANCEL, 254, 170, 50, 14 + PUSHBUTTON "P&isač...", psh3, 310, 170, 50, 14 +END + +/* Dialog 'Encoding' */ +DIALOG_ENCODING DIALOGEX 0, 0, 256, 44 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Kodiranje" +BEGIN + COMBOBOX ID_ENCODING, 124, 0, 125, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "Kodiranje:", 0x155, 65, 2, 41, 12 + COMBOBOX ID_EOLN, 124, 18, 125, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Krajnje linije:", 0x156, 65, 20, 41, 12 +END + +/* Dialog 'Go To' */ +DIALOG_GOTO DIALOGEX 0, 0, 165, 50 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Idi na liniju" +BEGIN + EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, WS_CHILD | WS_BORDER | WS_TABSTOP + LTEXT "Broj linije:", 0x155, 5, 12, 41, 12, WS_CHILD | WS_TABSTOP | ES_NUMBER + DEFPUSHBUTTON "U redu", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP + PUSHBUTTON "Odustani", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP +END + +STRINGTABLE +BEGIN + STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ + STRING_PAGESETUP_FOOTERVALUE "Stranica &s" /* FIXME */ + STRING_PAGESETUP_LEFTVALUE "20 mm" /* FIXME */ + STRING_PAGESETUP_RIGHTVALUE "20 mm" /* FIXME */ + STRING_PAGESETUP_TOPVALUE "25 mm" /* FIXME */ + STRING_PAGESETUP_BOTTOMVALUE "25 mm" /* FIXME */ + STRING_NOTEPAD "Blok za pisanje" + STRING_ERROR "Greška" + STRING_WARNING "Upozorenje" + STRING_INFO "Informacija" + STRING_UNTITLED "Bez naslova" + STRING_ALL_FILES "Sve datoteke (*.*)" + STRING_TEXT_FILES_TXT "Tekstne datoteke (*.txt)" + STRING_TOOLARGE "Datoteka '%s' je prevelik za program Blok za pisanje.\n\ +Molimo Vas da koristite drugu aplikaciju." + STRING_NOTEXT "Niste unijeli tekst. \ +\nMolimo Vas da nešto unesete i ponovo pokušate." + STRING_DOESNOTEXIST "Datoteka '%s'\nne postoji\n\n\ +Želite li stvoriti novu datoteku ?" + STRING_NOTSAVED "Datoteka '%s'\nje bila promijenjena\n\n\ +Želite li spremiti te promjene ?" + STRING_NOTFOUND "'%s' ne može biti pronađena." + STRING_OUT_OF_MEMORY "Nema dovoljno memorije da se dovrši \ +zadatak.\nZatvorite jednu ili više aplikacija da povećate\nslobodnu memoriju." + STRING_CANNOTFIND "Ne mogu pronaći '%s'" + STRING_ANSI "ANSI" + STRING_UNICODE "Unicode" + STRING_UNICODE_BE "Unicode (big endian)" + STRING_UTF8 "UTF-8" + STRING_CRLF "Windows (CR + LF)" + STRING_LF "Unix (LF)" + STRING_CR "Mac (CR)" + STRING_LINE_COLUMN "Linija %d, Stupac %d" + STRING_PRINTERROR "Ne mogu ispisati datoteku '%s'.\n\nProvjerite je li pisač uključen i je li pravilno konfiguiran." + + STRING_TEXT_DOCUMENT "Tekstni dokument" + STRING_NOTEPAD_AUTHORS "Copyright 1997, 98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" +END

2 years, 10 months

← Newer
1
2
3
4
5
6
7
8
9
10
11
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2022