Ros-diffs December 2019

ros-diffs@reactos.org

18 participants
225 discussions

[reactos] 03/05: [BOOTVID] Code style fixes; Replace some 'do-while' loops by 'for' loops when it makes the code simpler.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4f76cffb5927bab29dfa6… commit 4f76cffb5927bab29dfa6dffc8be430a342eda32 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Dec 22 14:48:57 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Dec 23 21:06:57 2019 +0100 [BOOTVID] Code style fixes; Replace some 'do-while' loops by 'for' loops when it makes the code simpler. + Fix a potential bug in BitBlt() "4bpp blitting" in case Top == Bottom (i.e. Height == 0). --- drivers/base/bootvid/arm/bootvid.c | 68 +++++--------- drivers/base/bootvid/i386/vga.c | 182 +++++++++++++++---------------------- 2 files changed, 97 insertions(+), 153 deletions(-) diff --git a/drivers/base/bootvid/arm/bootvid.c b/drivers/base/bootvid/arm/bootvid.c index 5d6722fbf42..7a259885921 100644 --- a/drivers/base/bootvid/arm/bootvid.c +++ b/drivers/base/bootvid/arm/bootvid.c @@ -66,42 +66,33 @@ VGA_COLOR VidpVga8To16BitTransform[16] = /* PRIVATE FUNCTIONS *********************************************************/ -USHORT FORCEINLINE +USHORT VidpBuildColor(IN UCHAR Color) { UCHAR Red, Green, Blue; - // - // Extract color components - // - Red = VidpVga8To16BitTransform[Color].Red; + /* Extract color components */ + Red = VidpVga8To16BitTransform[Color].Red; Green = VidpVga8To16BitTransform[Color].Green; - Blue = VidpVga8To16BitTransform[Color].Blue; + Blue = VidpVga8To16BitTransform[Color].Blue; - // - // Build the 16-bit color mask - // + /* Build the 16-bit color mask */ return ((Red & 0x1F) << 11) | ((Green & 0x1F) << 6) | ((Blue & 0x1F)); } - -VOID FORCEINLINE +VOID VidpSetPixel(IN ULONG Left, IN ULONG Top, IN UCHAR Color) { PUSHORT PixelPosition; - // - // Calculate the pixel position - // + /* Calculate the pixel position */ PixelPosition = &VgaArmBase[Left + (Top * SCREEN_WIDTH)]; - // - // Set our color - // + /* Set our color */ WRITE_REGISTER_USHORT(PixelPosition, VidpBuildColor(Color)); } @@ -111,7 +102,7 @@ DisplayCharacter(IN CHAR Character, IN ULONG Left, IN ULONG Top, IN ULONG TextColor, - IN ULONG BackTextColor) + IN ULONG BackColor) { PUCHAR FontChar; ULONG i, j, XOffset; @@ -120,13 +111,11 @@ DisplayCharacter(IN CHAR Character, FontChar = &FontData[Character * BOOTCHAR_HEIGHT - Top]; /* Loop each pixel height */ - i = BOOTCHAR_HEIGHT; - do + for (i = BOOTCHAR_HEIGHT; i > 0; --i) { /* Loop each pixel width */ - j = 128; XOffset = Left; - do + for (j = (1 << 7); j > 0; j >>= 1) { /* Check if we should draw this pixel */ if (FontChar[Top] & (UCHAR)j) @@ -134,20 +123,22 @@ DisplayCharacter(IN CHAR Character, /* We do, use the given Text Color */ VidpSetPixel(XOffset, Top, (UCHAR)TextColor); } - else if (BackTextColor < 16) + else if (BackColor < 16) { - /* This is a background pixel. We're drawing it unless it's */ - /* transparent. */ - VidpSetPixel(XOffset, Top, (UCHAR)BackTextColor); + /* + * This is a background pixel. We're drawing it + * unless it's transparent. + */ + VidpSetPixel(XOffset, Top, (UCHAR)BackColor); } /* Increase X Offset */ XOffset++; - } while (j >>= 1); + } /* Move to the next Y ordinate */ Top++; - } while (--i); + } } VOID @@ -162,12 +153,8 @@ VgaScroll(IN ULONG Scroll) SourceOffset = &VgaArmBase[(VidpScrollRegion[1] * (SCREEN_WIDTH / 8)) + (VidpScrollRegion[0] >> 3)]; DestOffset = &SourceOffset[Scroll * (SCREEN_WIDTH / 8)]; - /* Save top and check if it's above the bottom */ - Top = VidpScrollRegion[1]; - if (Top > VidpScrollRegion[3]) return; - /* Start loop */ - do + for (Top = VidpScrollRegion[1]; Top <= VidpScrollRegion[3]; ++Top) { /* Set number of bytes to loop and start offset */ Offset = VidpScrollRegion[0] >> 3; @@ -198,12 +185,7 @@ VgaScroll(IN ULONG Scroll) /* Move to the next line */ SourceOffset += (SCREEN_WIDTH / 8); DestOffset += (SCREEN_WIDTH / 8); - - /* Increase top */ - Top++; - - /* Make sure we don't go past the scroll region */ - } while (Top <= VidpScrollRegion[3]); + } } VOID @@ -216,15 +198,14 @@ PreserveRow(IN ULONG CurrentTop, ULONG Count; /* Check which way we're preserving */ + /* Calculate the position in memory for the row */ if (Direction) { - /* Calculate the position in memory for the row */ Position1 = &VgaArmBase[CurrentTop * (SCREEN_WIDTH / 8)]; Position2 = &VgaArmBase[SCREEN_HEIGHT * (SCREEN_WIDTH / 8)]; } else { - /* Calculate the position in memory for the row */ Position1 = &VgaArmBase[SCREEN_HEIGHT * (SCREEN_WIDTH / 8)]; Position2 = &VgaArmBase[CurrentTop * (SCREEN_WIDTH / 8)]; } @@ -427,7 +408,7 @@ VidDisplayString(IN PUCHAR String) ULONG TopDelta = BOOTCHAR_HEIGHT + 1; /* Start looping the string */ - while (*String) + for (; *String; ++String) { /* Treat new-line separately */ if (*String == '\n') @@ -495,9 +476,6 @@ VidDisplayString(IN PUCHAR String) VidpCurrentX = VidpScrollRegion[0]; } } - - /* Get the next character */ - String++; } } diff --git a/drivers/base/bootvid/i386/vga.c b/drivers/base/bootvid/i386/vga.c index c2398ac40eb..1c17c806cc1 100644 --- a/drivers/base/bootvid/i386/vga.c +++ b/drivers/base/bootvid/i386/vga.c @@ -23,14 +23,13 @@ static UCHAR lMaskTable[8] = static UCHAR rMaskTable[8] = { (1 << 7), - (1 << 7)+ (1 << 6), - (1 << 7)+ (1 << 6) + (1 << 5), - (1 << 7)+ (1 << 6) + (1 << 5) + (1 << 4), - (1 << 7)+ (1 << 6) + (1 << 5) + (1 << 4) + (1 << 3), - (1 << 7)+ (1 << 6) + (1 << 5) + (1 << 4) + (1 << 3) + (1 << 2), - (1 << 7)+ (1 << 6) + (1 << 5) + (1 << 4) + (1 << 3) + (1 << 2) + (1 << 1), - (1 << 7)+ (1 << 6) + (1 << 5) + (1 << 4) + (1 << 3) + (1 << 2) + (1 << 1) + - (1 << 0), + (1 << 7) + (1 << 6), + (1 << 7) + (1 << 6) + (1 << 5), + (1 << 7) + (1 << 6) + (1 << 5) + (1 << 4), + (1 << 7) + (1 << 6) + (1 << 5) + (1 << 4) + (1 << 3), + (1 << 7) + (1 << 6) + (1 << 5) + (1 << 4) + (1 << 3) + (1 << 2), + (1 << 7) + (1 << 6) + (1 << 5) + (1 << 4) + (1 << 3) + (1 << 2) + (1 << 1), + (1 << 7) + (1 << 6) + (1 << 5) + (1 << 4) + (1 << 3) + (1 << 2) + (1 << 1) + (1 << 0), }; UCHAR PixelMask[8] = { @@ -96,15 +95,14 @@ SetPixel(IN ULONG Left, { PUCHAR PixelPosition; - /* Calculate the pixel position. */ + /* 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); + WRITE_REGISTER_UCHAR(PixelPosition, READ_REGISTER_UCHAR(PixelPosition) & Color); } #define SET_PIXELS(_PixelPtr, _PixelMask, _TextColor) \ @@ -152,13 +150,12 @@ DisplayCharacter(IN CHAR Character, PixelPtr = (PUCHAR)(VgaBase + (Left >> 3) + (Top * (SCREEN_WIDTH / 8))); /* Loop all pixel rows */ - Height = BOOTCHAR_HEIGHT; - do + for (Height = BOOTCHAR_HEIGHT; Height > 0; --Height) { SET_PIXELS(PixelPtr, *FontChar >> Shift, TextColor); PixelPtr += (SCREEN_WIDTH / 8); FontChar += FONT_PTR_DELTA; - } while (--Height); + } /* Check if we need to update neighbor bytes */ if (Shift) @@ -171,13 +168,12 @@ DisplayCharacter(IN CHAR Character, PixelPtr = (PUCHAR)(VgaBase + (Left >> 3) + (Top * (SCREEN_WIDTH / 8)) + 1); /* Loop all pixel rows */ - Height = BOOTCHAR_HEIGHT; - do + for (Height = BOOTCHAR_HEIGHT; Height > 0; --Height) { SET_PIXELS(PixelPtr, *FontChar << Shift, TextColor); PixelPtr += (SCREEN_WIDTH / 8); FontChar += FONT_PTR_DELTA; - } while (--Height); + } } /* Check if the background color is transparent */ @@ -195,13 +191,12 @@ DisplayCharacter(IN CHAR Character, PixelPtr = (PUCHAR)(VgaBase + (Left >> 3) + (Top * (SCREEN_WIDTH / 8))); /* Loop all pixel rows */ - Height = BOOTCHAR_HEIGHT; - do + for (Height = BOOTCHAR_HEIGHT; Height > 0; --Height) { SET_PIXELS(PixelPtr, ~*FontChar >> Shift, BackColor); PixelPtr += (SCREEN_WIDTH / 8); FontChar += FONT_PTR_DELTA; - } while (--Height); + } /* Check if we need to update neighbor bytes */ if (Shift) @@ -214,13 +209,12 @@ DisplayCharacter(IN CHAR Character, PixelPtr = (PUCHAR)(VgaBase + (Left >> 3) + (Top * (SCREEN_WIDTH / 8)) + 1); /* Loop all pixel rows */ - Height = BOOTCHAR_HEIGHT; - do + for (Height = BOOTCHAR_HEIGHT; Height > 0; --Height) { SET_PIXELS(PixelPtr, ~*FontChar << Shift, BackColor); PixelPtr += (SCREEN_WIDTH / 8); FontChar += FONT_PTR_DELTA; - } while (--Height); + } } } @@ -232,15 +226,11 @@ DisplayStringXY(IN PUCHAR String, IN ULONG TextColor, IN ULONG BackColor) { - /* Loop every character */ - while (*String) + /* Loop every character and adjust the position */ + for (; *String; ++String, Left += 8) { /* Display a character */ DisplayCharacter(*String, Left, Top, TextColor, BackColor); - - /* Move to next character and next position */ - String++; - Left += 8; } } @@ -374,15 +364,14 @@ PreserveRow(IN ULONG CurrentTop, ReadWriteMode(1); /* Check which way we're preserving */ + /* Calculate the position in memory for the row */ if (Direction) { - /* Calculate the position in memory for the row */ Position1 = (PUCHAR)(VgaBase + CurrentTop * (SCREEN_WIDTH / 8)); Position2 = (PUCHAR)(VgaBase + SCREEN_HEIGHT * (SCREEN_WIDTH / 8)); } else { - /* Calculate the position in memory for the row */ Position1 = (PUCHAR)(VgaBase + SCREEN_HEIGHT * (SCREEN_WIDTH / 8)); Position2 = (PUCHAR)(VgaBase + CurrentTop * (SCREEN_WIDTH / 8)); } @@ -448,8 +437,7 @@ BitBlt(IN ULONG Left, __outpw(VGA_BASE_IO_PORT + GRAPH_ADDRESS_PORT, 7); /* 4bpp blitting */ - dy = Top; - do + for (dy = Top; dy < Bottom; ++dy) { sx = 0; do @@ -467,8 +455,7 @@ BitBlt(IN ULONG Left, sx++; } while (dx < Right); offset += Delta; - dy++; - } while (dy < Bottom); + } } static VOID @@ -536,8 +523,7 @@ RleBitBlt(IN ULONG Left, if (RleValue > 1) { /* Set loop variables */ - i = (RleValue - 2) / 2 + 1; - do + for (i = (RleValue - 2) / 2 + 1; i > 0; --i) { /* Set the pixels */ SetPixel(x, YDelta, (UCHAR)Color); @@ -547,7 +533,7 @@ RleBitBlt(IN ULONG Left, /* Decrease pixel value */ RleValue -= 2; - } while (--i); + } } /* Check if there is any value at all */ @@ -623,8 +609,7 @@ RleBitBlt(IN ULONG Left, if (RleValue > 1) { /* Set loop variables */ - j = (RleValue - 2) / 2 + 1; - do + for (j = (RleValue - 2) / 2 + 1; j > 0; --j) { /* Get the new value */ NewRleValue = *Buffer; @@ -644,7 +629,7 @@ RleBitBlt(IN ULONG Left, /* Decrease pixel value */ RleValue -= 2; - } while (--j); + } } /* Check if there is any value at all */ @@ -776,7 +761,7 @@ VidDisplayString(IN PUCHAR String) ULONG TopDelta = BOOTCHAR_HEIGHT + 1; /* Start looping the string */ - while (*String) + for (; *String; ++String) { /* Treat new-line separately */ if (*String == '\n') @@ -844,9 +829,6 @@ VidDisplayString(IN PUCHAR String) curr_x = ScrollRegion[0]; } } - - /* Get the next character */ - String++; } } @@ -954,9 +936,6 @@ VidScreenToBufferBlt(IN PUCHAR Buffer, /* Calculate total distance to copy on X */ XDistance = Left + Width - 1; - /* Start at plane 0 */ - Plane = 0; - /* Calculate the 8-byte left and right deltas */ LeftDelta = Left & 7; RightDelta = 8 - LeftDelta; @@ -969,7 +948,7 @@ VidScreenToBufferBlt(IN PUCHAR Buffer, XDistance >>= 3; /* Loop the 4 planes */ - do + for (Plane = 0; Plane < 4; ++Plane) { /* Set the current pixel position and reset buffer loop variable */ PixelPosition = (PUCHAR)(VgaBase + PixelOffset); @@ -981,58 +960,52 @@ VidScreenToBufferBlt(IN PUCHAR Buffer, /* Set the current plane */ __outpw(VGA_BASE_IO_PORT + GRAPH_ADDRESS_PORT, (Plane << 8) | IND_READ_MAP); - /* Make sure we have a height */ - if (Height > 0) + /* Start the outer Y height loop */ + for (y = Height; y > 0; --y) { - /* Start the outer Y loop */ - y = Height; - do - { - /* Read the current value */ - m = (PULONG)i; - Value = READ_REGISTER_UCHAR(PixelPosition); + /* Read the current value */ + m = (PULONG)i; + Value = READ_REGISTER_UCHAR(PixelPosition); - /* Set Pixel Position loop variable */ - k = PixelPosition + 1; + /* Set Pixel Position loop variable */ + k = PixelPosition + 1; - /* Check if we're still within bounds */ - if (Left <= XDistance) + /* Check if we're still within bounds */ + if (Left <= XDistance) + { + /* Start the X inner loop */ + for (x = (XDistance - Left) + 1; x > 0; --x) { - /* Start X Inner loop */ - x = (XDistance - Left) + 1; - do - { - /* Read the current value */ - Value2 = READ_REGISTER_UCHAR(k); + /* Read the current value */ + Value2 = READ_REGISTER_UCHAR(k); - /* Increase pixel position */ - k++; + /* Increase pixel position */ + k++; - /* Do the blt */ - a = Value2 >> (UCHAR)RightDelta; - a |= Value << (UCHAR)LeftDelta; - b = lookup[a & 0xF]; - a >>= 4; - b <<= 16; - b |= lookup[a]; + /* Do the blt */ + a = Value2 >> (UCHAR)RightDelta; + a |= Value << (UCHAR)LeftDelta; + b = lookup[a & 0xF]; + a >>= 4; + b <<= 16; + b |= lookup[a]; - /* Save new value to buffer */ - *m |= (b << Plane); + /* Save new value to buffer */ + *m |= (b << Plane); - /* Move to next destination location */ - m++; + /* Move to next destination location */ + m++; - /* Write new value */ - Value = Value2; - } while (--x); + /* Write new value */ + Value = Value2; } + } - /* Update pixel position */ - PixelPosition += (SCREEN_WIDTH / 8); - i += Delta; - } while (--y); + /* Update pixel position */ + PixelPosition += (SCREEN_WIDTH / 8); + i += Delta; } - } while (++Plane < 4); + } } /* @@ -1080,19 +1053,18 @@ VidSolidColorFill(IN ULONG Left, if (Top <= Bottom) { /* Start looping each line */ - i = (Bottom - Top) + 1; - do + for (i = (Bottom - Top) + 1; i > 0; --i) { /* Read the previous value and add our color */ WRITE_REGISTER_UCHAR(Offset, READ_REGISTER_UCHAR(Offset) & Color); /* Move to the next line */ Offset += (SCREEN_WIDTH / 8); - } while (--i); + } } /* Check if we have a delta */ - if (Distance) + if (Distance > 0) { /* Calculate new pixel position */ Offset = (PUCHAR)(VgaBase + (Top * (SCREEN_WIDTH / 8)) + RightOffset); @@ -1105,20 +1077,18 @@ VidSolidColorFill(IN ULONG Left, if (Top <= Bottom) { /* Start looping each line */ - i = (Bottom - Top) + 1; - do + for (i = (Bottom - Top) + 1; i > 0; --i) { /* Read the previous value and add our color */ - WRITE_REGISTER_UCHAR(Offset, - READ_REGISTER_UCHAR(Offset) & Color); + WRITE_REGISTER_UCHAR(Offset, READ_REGISTER_UCHAR(Offset) & Color); /* Move to the next line */ Offset += (SCREEN_WIDTH / 8); - } while (--i); + } } /* Check if we still have a delta */ - if (Distance) + if (Distance > 0) { /* Calculate new pixel position */ Offset = (PUCHAR)(VgaBase + (Top * (SCREEN_WIDTH / 8)) + LeftOffset + 1); @@ -1130,22 +1100,18 @@ VidSolidColorFill(IN ULONG Left, if (Top <= Bottom) { /* Start looping each line */ - i = (Bottom - Top) + 1; - do + for (i = (Bottom - Top) + 1; i > 0; --i) { /* Loop the shift delta */ - if (Distance > 0) + for (j = Distance; j > 0; Offset++, --j) { - for (j = Distance; j; Offset++, j--) - { - /* Write the color */ - WRITE_REGISTER_UCHAR(Offset, Color); - } + /* Write the color */ + WRITE_REGISTER_UCHAR(Offset, Color); } /* Update position in memory */ Offset += ((SCREEN_WIDTH / 8) - Distance); - } while (--i); + } } } }

5 years

[reactos] 02/05: [BOOTVID] Replace hardcoded screen and font size numbers by #define-d values.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1d2b0fbcd1e933ad403cb… commit 1d2b0fbcd1e933ad403cb1e0a85c2758bc0c7c73 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Dec 22 14:09:43 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Dec 23 21:06:57 2019 +0100 [BOOTVID] Replace hardcoded screen and font size numbers by #define-d values. --- drivers/base/bootvid/arm/bootvid.c | 36 +++++++++++------------ drivers/base/bootvid/i386/bootvid.c | 2 +- drivers/base/bootvid/i386/vga.c | 57 ++++++++++++++++++------------------- drivers/base/bootvid/precomp.h | 9 +++++- 4 files changed, 55 insertions(+), 49 deletions(-) diff --git a/drivers/base/bootvid/arm/bootvid.c b/drivers/base/bootvid/arm/bootvid.c index 16ba24c6a7a..5d6722fbf42 100644 --- a/drivers/base/bootvid/arm/bootvid.c +++ b/drivers/base/bootvid/arm/bootvid.c @@ -33,8 +33,8 @@ ULONG VidpScrollRegion[4] = { 0, 0, - 640 - 1, - 480 - 1 + SCREEN_WIDTH - 1, + SCREEN_HEIGHT - 1 }; typedef struct _VGA_COLOR @@ -97,7 +97,7 @@ VidpSetPixel(IN ULONG Left, // // Calculate the pixel position // - PixelPosition = &VgaArmBase[Left + (Top * 640)]; + PixelPosition = &VgaArmBase[Left + (Top * SCREEN_WIDTH)]; // // Set our color @@ -117,10 +117,10 @@ DisplayCharacter(IN CHAR Character, ULONG i, j, XOffset; /* Get the font line for this character */ - FontChar = &FontData[Character * 13 - Top]; + FontChar = &FontData[Character * BOOTCHAR_HEIGHT - Top]; /* Loop each pixel height */ - i = 13; + i = BOOTCHAR_HEIGHT; do { /* Loop each pixel width */ @@ -159,8 +159,8 @@ VgaScroll(IN ULONG Scroll) PUSHORT i, j; /* Set memory positions of the scroll */ - SourceOffset = &VgaArmBase[(VidpScrollRegion[1] * 80) + (VidpScrollRegion[0] >> 3)]; - DestOffset = &SourceOffset[Scroll * 80]; + SourceOffset = &VgaArmBase[(VidpScrollRegion[1] * (SCREEN_WIDTH / 8)) + (VidpScrollRegion[0] >> 3)]; + DestOffset = &SourceOffset[Scroll * (SCREEN_WIDTH / 8)]; /* Save top and check if it's above the bottom */ Top = VidpScrollRegion[1]; @@ -196,8 +196,8 @@ VgaScroll(IN ULONG Scroll) } /* Move to the next line */ - SourceOffset += 80; - DestOffset += 80; + SourceOffset += (SCREEN_WIDTH / 8); + DestOffset += (SCREEN_WIDTH / 8); /* Increase top */ Top++; @@ -219,18 +219,18 @@ PreserveRow(IN ULONG CurrentTop, if (Direction) { /* Calculate the position in memory for the row */ - Position1 = &VgaArmBase[CurrentTop * 80]; - Position2 = &VgaArmBase[0x9600]; + Position1 = &VgaArmBase[CurrentTop * (SCREEN_WIDTH / 8)]; + Position2 = &VgaArmBase[SCREEN_HEIGHT * (SCREEN_WIDTH / 8)]; } else { /* Calculate the position in memory for the row */ - Position1 = &VgaArmBase[0x9600]; - Position2 = &VgaArmBase[CurrentTop * 80]; + Position1 = &VgaArmBase[SCREEN_HEIGHT * (SCREEN_WIDTH / 8)]; + Position2 = &VgaArmBase[CurrentTop * (SCREEN_WIDTH / 8)]; } /* Set the count and loop every pixel */ - Count = TopDelta * 80; + Count = TopDelta * (SCREEN_WIDTH / 8); while (Count--) { /* Write the data back on the other position */ @@ -255,8 +255,8 @@ VidpInitializeDisplay(VOID) // // Initialize timings to 640x480 // - WRITE_REGISTER_ULONG(PL110_LCDTIMING0, LCDTIMING0_PPL(640)); - WRITE_REGISTER_ULONG(PL110_LCDTIMING1, LCDTIMING1_LPP(480)); + WRITE_REGISTER_ULONG(PL110_LCDTIMING0, LCDTIMING0_PPL(SCREEN_WIDTH)); + WRITE_REGISTER_ULONG(PL110_LCDTIMING1, LCDTIMING1_LPP(SCREEN_HEIGHT)); // // Enable the LCD Display @@ -327,7 +327,7 @@ VidResetDisplay(IN BOOLEAN HalReset) // Re-initialize the palette and fill the screen black // //InitializePalette(); - VidSolidColorFill(0, 0, 639, 479, 0); + VidSolidColorFill(0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1, 0); } /* @@ -424,7 +424,7 @@ VOID NTAPI VidDisplayString(IN PUCHAR String) { - ULONG TopDelta = 14; + ULONG TopDelta = BOOTCHAR_HEIGHT + 1; /* Start looping the string */ while (*String) diff --git a/drivers/base/bootvid/i386/bootvid.c b/drivers/base/bootvid/i386/bootvid.c index db81548a1ba..afc3553e344 100644 --- a/drivers/base/bootvid/i386/bootvid.c +++ b/drivers/base/bootvid/i386/bootvid.c @@ -485,5 +485,5 @@ VidResetDisplay(IN BOOLEAN HalReset) /* Re-initialize the palette and fill the screen black */ InitializePalette(); - VidSolidColorFill(0, 0, 639, 479, 0); + VidSolidColorFill(0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1, 0); } diff --git a/drivers/base/bootvid/i386/vga.c b/drivers/base/bootvid/i386/vga.c index 382e825d7ac..c2398ac40eb 100644 --- a/drivers/base/bootvid/i386/vga.c +++ b/drivers/base/bootvid/i386/vga.c @@ -6,8 +6,8 @@ static ULONG ScrollRegion[4] = { 0, 0, - 640 - 1, - 480 - 1 + SCREEN_WIDTH - 1, + SCREEN_HEIGHT - 1 }; static UCHAR lMaskTable[8] = { @@ -97,7 +97,7 @@ SetPixel(IN ULONG Left, PUCHAR PixelPosition; /* Calculate the pixel position. */ - PixelPosition = (PUCHAR)(VgaBase + (Left >> 3) + (Top * 80)); + 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); @@ -149,14 +149,14 @@ DisplayCharacter(IN CHAR Character, /* Get the font and pixel pointer */ FontChar = GetFontPtr(Character); - PixelPtr = (PUCHAR)(VgaBase + (Left >> 3) + (Top * 80)); + PixelPtr = (PUCHAR)(VgaBase + (Left >> 3) + (Top * (SCREEN_WIDTH / 8))); /* Loop all pixel rows */ Height = BOOTCHAR_HEIGHT; do { SET_PIXELS(PixelPtr, *FontChar >> Shift, TextColor); - PixelPtr += 80; + PixelPtr += (SCREEN_WIDTH / 8); FontChar += FONT_PTR_DELTA; } while (--Height); @@ -168,14 +168,14 @@ DisplayCharacter(IN CHAR Character, /* Get the font and pixel pointer (2nd byte) */ FontChar = GetFontPtr(Character); - PixelPtr = (PUCHAR)(VgaBase + (Left >> 3) + (Top * 80) + 1); + PixelPtr = (PUCHAR)(VgaBase + (Left >> 3) + (Top * (SCREEN_WIDTH / 8)) + 1); /* Loop all pixel rows */ Height = BOOTCHAR_HEIGHT; do { SET_PIXELS(PixelPtr, *FontChar << Shift, TextColor); - PixelPtr += 80; + PixelPtr += (SCREEN_WIDTH / 8); FontChar += FONT_PTR_DELTA; } while (--Height); } @@ -192,14 +192,14 @@ DisplayCharacter(IN CHAR Character, /* Get the font and pixel pointer */ FontChar = GetFontPtr(Character); - PixelPtr = (PUCHAR)(VgaBase + (Left >> 3) + (Top * 80)); + PixelPtr = (PUCHAR)(VgaBase + (Left >> 3) + (Top * (SCREEN_WIDTH / 8))); /* Loop all pixel rows */ Height = BOOTCHAR_HEIGHT; do { SET_PIXELS(PixelPtr, ~*FontChar >> Shift, BackColor); - PixelPtr += 80; + PixelPtr += (SCREEN_WIDTH / 8); FontChar += FONT_PTR_DELTA; } while (--Height); @@ -211,14 +211,14 @@ DisplayCharacter(IN CHAR Character, /* Get the font and pixel pointer (2nd byte) */ FontChar = GetFontPtr(Character); - PixelPtr = (PUCHAR)(VgaBase + (Left >> 3) + (Top * 80) + 1); + PixelPtr = (PUCHAR)(VgaBase + (Left >> 3) + (Top * (SCREEN_WIDTH / 8)) + 1); /* Loop all pixel rows */ Height = BOOTCHAR_HEIGHT; do { SET_PIXELS(PixelPtr, ~*FontChar << Shift, BackColor); - PixelPtr += 80; + PixelPtr += (SCREEN_WIDTH / 8); FontChar += FONT_PTR_DELTA; } while (--Height); } @@ -335,8 +335,8 @@ VgaScroll(IN ULONG Scroll) RowSize = (ScrollRegion[2] - ScrollRegion[0] + 1) / 8; /* Calculate the position in memory for the row */ - OldPosition = (PUCHAR)(VgaBase + (ScrollRegion[1] + Scroll) * 80 + ScrollRegion[0] / 8); - NewPosition = (PUCHAR)(VgaBase + ScrollRegion[1] * 80 + ScrollRegion[0] / 8); + OldPosition = (PUCHAR)(VgaBase + (ScrollRegion[1] + Scroll) * (SCREEN_WIDTH / 8) + ScrollRegion[0] / 8); + NewPosition = (PUCHAR)(VgaBase + ScrollRegion[1] * (SCREEN_WIDTH / 8) + ScrollRegion[0] / 8); /* Start loop */ for (Top = ScrollRegion[1]; Top <= ScrollRegion[3]; ++Top) @@ -350,8 +350,8 @@ VgaScroll(IN ULONG Scroll) for (i = 0; i < RowSize; ++i) WRITE_REGISTER_UCHAR(NewPosition + i, READ_REGISTER_UCHAR(OldPosition + i)); #endif - OldPosition += 80; - NewPosition += 80; + OldPosition += (SCREEN_WIDTH / 8); + NewPosition += (SCREEN_WIDTH / 8); } } @@ -377,19 +377,18 @@ PreserveRow(IN ULONG CurrentTop, if (Direction) { /* Calculate the position in memory for the row */ - Position1 = (PUCHAR)(VgaBase + CurrentTop * 80); - Position2 = (PUCHAR)(VgaBase + 0x9600); + Position1 = (PUCHAR)(VgaBase + CurrentTop * (SCREEN_WIDTH / 8)); + Position2 = (PUCHAR)(VgaBase + SCREEN_HEIGHT * (SCREEN_WIDTH / 8)); } else { /* Calculate the position in memory for the row */ - Position1 = (PUCHAR)(VgaBase + 0x9600); - Position2 = (PUCHAR)(VgaBase + CurrentTop * 80); + Position1 = (PUCHAR)(VgaBase + SCREEN_HEIGHT * (SCREEN_WIDTH / 8)); + Position2 = (PUCHAR)(VgaBase + CurrentTop * (SCREEN_WIDTH / 8)); } /* Set the count and loop every pixel */ - Count = TopDelta * 80; - + Count = TopDelta * (SCREEN_WIDTH / 8); #if defined(_M_IX86) || defined(_M_AMD64) __movsb(Position1, Position2, Count); #else @@ -966,7 +965,7 @@ VidScreenToBufferBlt(IN PUCHAR Buffer, RtlZeroMemory(Buffer, Delta * Height); /* Calculate the pixel offset and convert the X distance into byte form */ - PixelOffset = Top * 80 + (Left >> 3); + PixelOffset = Top * (SCREEN_WIDTH / 8) + (Left >> 3); XDistance >>= 3; /* Loop the 4 planes */ @@ -1029,7 +1028,7 @@ VidScreenToBufferBlt(IN PUCHAR Buffer, } /* Update pixel position */ - PixelPosition += 80; + PixelPosition += (SCREEN_WIDTH / 8); i += Delta; } while (--y); } @@ -1072,7 +1071,7 @@ VidSolidColorFill(IN ULONG Left, __outpw(VGA_BASE_IO_PORT + GRAPH_ADDRESS_PORT, 7); /* Calculate pixel position for the read */ - Offset = (PUCHAR)(VgaBase + (Top * 80) + LeftOffset); + Offset = (PUCHAR)(VgaBase + (Top * (SCREEN_WIDTH / 8)) + LeftOffset); /* Select the bitmask register and write the mask */ __outpw(VGA_BASE_IO_PORT + GRAPH_ADDRESS_PORT, (USHORT)lMask); @@ -1088,7 +1087,7 @@ VidSolidColorFill(IN ULONG Left, WRITE_REGISTER_UCHAR(Offset, READ_REGISTER_UCHAR(Offset) & Color); /* Move to the next line */ - Offset += 80; + Offset += (SCREEN_WIDTH / 8); } while (--i); } @@ -1096,7 +1095,7 @@ VidSolidColorFill(IN ULONG Left, if (Distance) { /* Calculate new pixel position */ - Offset = (PUCHAR)(VgaBase + (Top * 80) + RightOffset); + Offset = (PUCHAR)(VgaBase + (Top * (SCREEN_WIDTH / 8)) + RightOffset); Distance--; /* Select the bitmask register and write the mask */ @@ -1114,7 +1113,7 @@ VidSolidColorFill(IN ULONG Left, READ_REGISTER_UCHAR(Offset) & Color); /* Move to the next line */ - Offset += 80; + Offset += (SCREEN_WIDTH / 8); } while (--i); } @@ -1122,7 +1121,7 @@ VidSolidColorFill(IN ULONG Left, if (Distance) { /* Calculate new pixel position */ - Offset = (PUCHAR)(VgaBase + (Top * 80) + LeftOffset + 1); + Offset = (PUCHAR)(VgaBase + (Top * (SCREEN_WIDTH / 8)) + LeftOffset + 1); /* Set the bitmask to 0xFF for all 4 planes */ __outpw(VGA_BASE_IO_PORT + GRAPH_ADDRESS_PORT, 0xFF08); @@ -1145,7 +1144,7 @@ VidSolidColorFill(IN ULONG Left, } /* Update position in memory */ - Offset += (80 - Distance); + Offset += ((SCREEN_WIDTH / 8) - Distance); } while (--i); } } diff --git a/drivers/base/bootvid/precomp.h b/drivers/base/bootvid/precomp.h index 407447e762b..18bc611a99a 100644 --- a/drivers/base/bootvid/precomp.h +++ b/drivers/base/bootvid/precomp.h @@ -8,7 +8,14 @@ /* Define if FontData has upside down characters */ #undef CHAR_GEN_UPSIDE_DOWN -#define BOOTCHAR_HEIGHT 13 +#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"

5 years

[reactos] 01/05: [FREELDR] Support setting up the EBP register on INT386() entry only if EBP != 0, otherwise use it only as output.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ff722ac72e98f320f27a0… commit ff722ac72e98f320f27a0e57b4a5fb78753a2320 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Dec 22 13:53:17 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Dec 23 21:06:40 2019 +0100 [FREELDR] Support setting up the EBP register on INT386() entry only if EBP != 0, otherwise use it only as output. --- boot/freeldr/freeldr/arch/amd64/int386.S | 1 - boot/freeldr/freeldr/arch/i386/int386.S | 1 + boot/freeldr/freeldr/arch/realmode/int386.inc | 9 ++++++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/boot/freeldr/freeldr/arch/amd64/int386.S b/boot/freeldr/freeldr/arch/amd64/int386.S index f3bd65a4da7..4e0dfa72d1b 100644 --- a/boot/freeldr/freeldr/arch/amd64/int386.S +++ b/boot/freeldr/freeldr/arch/amd64/int386.S @@ -45,7 +45,6 @@ Int386: sub rsp, 40 //.ENDPROLOG -int386_2: /* Copy the int vector to shared memory */ mov dword ptr [BSS_IntVector], ecx diff --git a/boot/freeldr/freeldr/arch/i386/int386.S b/boot/freeldr/freeldr/arch/i386/int386.S index e1c371956d5..295c47cc109 100644 --- a/boot/freeldr/freeldr/arch/i386/int386.S +++ b/boot/freeldr/freeldr/arch/i386/int386.S @@ -73,6 +73,7 @@ Int386_return: mov ecx, REGS_SIZE / 4 rep movsd + /* Restore all registers + segment registers */ popa pop gs pop fs diff --git a/boot/freeldr/freeldr/arch/realmode/int386.inc b/boot/freeldr/freeldr/arch/realmode/int386.inc index 49a63eb9e37..ea3a822424d 100644 --- a/boot/freeldr/freeldr/arch/realmode/int386.inc +++ b/boot/freeldr/freeldr/arch/realmode/int386.inc @@ -37,13 +37,19 @@ Int386: mov ax, word ptr cs:[BSS_RegisterSet + REGS_GS] mov gs, ax + /* Setup ebp only if EBP != 0, otherwise use it only as output */ + mov eax, dword ptr cs:[BSS_RegisterSet + REGS_EBP] + test eax, eax + jz Int386_set_registers + mov ebp, eax + +Int386_set_registers: mov eax, dword ptr cs:[BSS_RegisterSet + REGS_EAX] mov ebx, dword ptr cs:[BSS_RegisterSet + REGS_EBX] mov ecx, dword ptr cs:[BSS_RegisterSet + REGS_ECX] mov edx, dword ptr cs:[BSS_RegisterSet + REGS_EDX] mov esi, dword ptr cs:[BSS_RegisterSet + REGS_ESI] mov edi, dword ptr cs:[BSS_RegisterSet + REGS_EDI] - // Don't setup ebp, we only use it as output! /* Call the interrupt vector */ /*int Int386_vector*/ @@ -72,6 +78,7 @@ Int386_vector_opcode: pushfd pop dword ptr cs:[BSS_RegisterSet + REGS_EFLAGS] + /* Restore all registers + segment registers */ popad pop gs pop fs

5 years

[reactos] 01/01: [MSPAINT] Refactor updateCanvasAndScrollbars

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cf64f121f251b32dc6563… commit cf64f121f251b32dc65638117b0f4c2ae1f4891b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Dec 24 04:30:25 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Dec 24 04:30:25 2019 +0900 [MSPAINT] Refactor updateCanvasAndScrollbars --- base/applications/mspaint/imgarea.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/base/applications/mspaint/imgarea.cpp b/base/applications/mspaint/imgarea.cpp index 74bf84414f3..b31f7642c74 100644 --- a/base/applications/mspaint/imgarea.cpp +++ b/base/applications/mspaint/imgarea.cpp @@ -20,7 +20,11 @@ void updateCanvasAndScrollbars() { selectionWindow.ShowWindow(SW_HIDE); - imageArea.MoveWindow(3, 3, imageModel.GetWidth() * toolsModel.GetZoom() / 1000, imageModel.GetHeight() * toolsModel.GetZoom() / 1000, FALSE); + + int zoomedWidth = imageModel.GetWidth() * toolsModel.GetZoom() / 1000; + int zoomedHeight = imageModel.GetHeight() * toolsModel.GetZoom() / 1000; + imageArea.MoveWindow(3, 3, zoomedWidth, zoomedHeight, FALSE); + scrollboxWindow.Invalidate(TRUE); imageArea.Invalidate(FALSE);

5 years

[reactos] 01/01: [MSPAINT] Simplify choosecolor initialization

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a32212d96ac61be5f2132… commit a32212d96ac61be5f2132a806d8591f8b390c9b3 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Dec 24 04:18:40 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Dec 24 04:18:40 2019 +0900 [MSPAINT] Simplify choosecolor initialization --- base/applications/mspaint/main.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/base/applications/mspaint/main.cpp b/base/applications/mspaint/main.cpp index 57857b37954..2b89afe9417 100644 --- a/base/applications/mspaint/main.cpp +++ b/base/applications/mspaint/main.cpp @@ -162,6 +162,7 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument /* init font for text tool */ ZeroMemory(&lfTextFont, sizeof(lfTextFont)); + lfTextFont.lfHeight = 0; lfTextFont.lfWeight = FW_NORMAL; lfTextFont.lfCharSet = DEFAULT_CHARSET; hfontTextFont = CreateFontIndirect(&lfTextFont); @@ -315,15 +316,11 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument } /* initializing the CHOOSECOLOR structure for use with ChooseColor */ + ZeroMemory(&choosecolor, sizeof(choosecolor)); choosecolor.lStructSize = sizeof(CHOOSECOLOR); choosecolor.hwndOwner = hwnd; - choosecolor.hInstance = NULL; choosecolor.rgbResult = 0x00ffffff; choosecolor.lpCustColors = custColors; - choosecolor.Flags = 0; - choosecolor.lCustData = 0; - choosecolor.lpfnHook = NULL; - choosecolor.lpTemplateName = NULL; /* initializing the OPENFILENAME structure for use with GetOpenFileName and GetSaveFileName */ CopyMemory(ofnFilename, filepathname, sizeof(filepathname));

5 years

[reactos] 01/01: [MSPAINT] Simplify lfTextFont initialization

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3a8c25d7f36d87655314f… commit 3a8c25d7f36d87655314f5e77d97892901080f2e Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Dec 24 04:16:44 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Dec 24 04:17:02 2019 +0900 [MSPAINT] Simplify lfTextFont initialization --- base/applications/mspaint/main.cpp | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/base/applications/mspaint/main.cpp b/base/applications/mspaint/main.cpp index 2bc690ef1a5..57857b37954 100644 --- a/base/applications/mspaint/main.cpp +++ b/base/applications/mspaint/main.cpp @@ -161,20 +161,9 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument }; /* init font for text tool */ - lfTextFont.lfHeight = 0; - lfTextFont.lfWidth = 0; - lfTextFont.lfEscapement = 0; - lfTextFont.lfOrientation = 0; + ZeroMemory(&lfTextFont, sizeof(lfTextFont)); lfTextFont.lfWeight = FW_NORMAL; - lfTextFont.lfItalic = FALSE; - lfTextFont.lfUnderline = FALSE; - lfTextFont.lfStrikeOut = FALSE; lfTextFont.lfCharSet = DEFAULT_CHARSET; - lfTextFont.lfOutPrecision = OUT_DEFAULT_PRECIS; - lfTextFont.lfClipPrecision = CLIP_DEFAULT_PRECIS; - lfTextFont.lfQuality = DEFAULT_QUALITY; - lfTextFont.lfPitchAndFamily = DEFAULT_PITCH | FF_DONTCARE; - lstrcpy(lfTextFont.lfFaceName, _T("")); hfontTextFont = CreateFontIndirect(&lfTextFont); hProgInstance = hThisInstance;

5 years

[reactos] 01/01: [MSPAINT] Use hProgInstance for LoadImage

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2acc689c580a1bf269be5… commit 2acc689c580a1bf269be5b1cc6b12ed96a1f2b2f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Dec 24 04:13:43 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Dec 24 04:13:43 2019 +0900 [MSPAINT] Use hProgInstance for LoadImage --- base/applications/mspaint/toolbox.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base/applications/mspaint/toolbox.cpp b/base/applications/mspaint/toolbox.cpp index 6bf67b88493..adfc282cdc9 100644 --- a/base/applications/mspaint/toolbox.cpp +++ b/base/applications/mspaint/toolbox.cpp @@ -29,7 +29,7 @@ LRESULT CToolBox::OnCreate(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandl WS_CHILD | WS_VISIBLE | CCS_NOPARENTALIGN | CCS_VERT | CCS_NORESIZE | TBSTYLE_TOOLTIPS); hImageList = ImageList_Create(16, 16, ILC_COLOR24 | ILC_MASK, 16, 0); toolbar.SendMessage(TB_SETIMAGELIST, 0, (LPARAM) hImageList); - tempBm = (HBITMAP) LoadImage((HINSTANCE)GetWindowLongPtr(GWLP_HINSTANCE), MAKEINTRESOURCE(IDB_TOOLBARICONS), IMAGE_BITMAP, 256, 16, 0); + tempBm = (HBITMAP) LoadImage(hProgInstance, MAKEINTRESOURCE(IDB_TOOLBARICONS), IMAGE_BITMAP, 256, 16, 0); ImageList_AddMasked(hImageList, tempBm, 0xff00ff); DeleteObject(tempBm); toolbar.SendMessage(TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0); @@ -42,7 +42,7 @@ LRESULT CToolBox::OnCreate(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandl if (i % 2 == 1) wrapnow = TBSTATE_WRAP; - LoadString((HINSTANCE)GetWindowLongPtr(GWLP_HINSTANCE), IDS_TOOLTIP1 + i, tooltips[i], 30); + LoadString(hProgInstance, IDS_TOOLTIP1 + i, tooltips[i], 30); ZeroMemory(&tbbutton, sizeof(TBBUTTON)); tbbutton.iString = (INT_PTR) tooltips[i]; tbbutton.fsStyle = TBSTYLE_CHECKGROUP;

5 years

[reactos] 01/01: [MSPAINT] Use correct type for custColors

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9879776950ac23ba2d092… commit 9879776950ac23ba2d092c014d6d5bb8d076d61e Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Dec 24 04:11:33 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Dec 24 04:11:33 2019 +0900 [MSPAINT] Use correct type for custColors --- base/applications/mspaint/main.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/base/applications/mspaint/main.cpp b/base/applications/mspaint/main.cpp index 381b193158b..2bc690ef1a5 100644 --- a/base/applications/mspaint/main.cpp +++ b/base/applications/mspaint/main.cpp @@ -155,7 +155,8 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument TCHAR ofnFilename[1000]; TCHAR ofnFiletitle[256]; TCHAR miniaturetitle[100]; - static int custColors[16] = { 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, + static COLORREF custColors[16] = { + 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff }; @@ -329,7 +330,7 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument choosecolor.hwndOwner = hwnd; choosecolor.hInstance = NULL; choosecolor.rgbResult = 0x00ffffff; - choosecolor.lpCustColors = (COLORREF*) &custColors; + choosecolor.lpCustColors = custColors; choosecolor.Flags = 0; choosecolor.lCustData = 0; choosecolor.lpfnHook = NULL;

5 years

[reactos] 01/01: [APISETS] Appease regression CORE-16563 for another function

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6f93f2cf104fd92233b31… commit 6f93f2cf104fd92233b31bff4578fe1c5db7bf28 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Mon Dec 23 15:07:06 2019 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Mon Dec 23 15:07:06 2019 +0100 [APISETS] Appease regression CORE-16563 for another function Symptom: "Far Manager main app unhandled exception when exiting" The issue started to show with 0.4.13-dev-986-g 029b8f2cf9912b148f3e60be0472652f26a1adb9 Thanks to Mark Jansen for providing this 2nd patch. I intend to port this back into 0.4.13RC. --- dll/apisets/api-ms-win-appmodel-runtime-l1-1-2.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/apisets/api-ms-win-appmodel-runtime-l1-1-2.spec b/dll/apisets/api-ms-win-appmodel-runtime-l1-1-2.spec index ead1400bb94..ef73c23e067 100644 --- a/dll/apisets/api-ms-win-appmodel-runtime-l1-1-2.spec +++ b/dll/apisets/api-ms-win-appmodel-runtime-l1-1-2.spec @@ -5,7 +5,7 @@ @ stub AppPolicyGetCreateFileAccess @ stub AppPolicyGetLifecycleManagement @ stub AppPolicyGetMediaFoundationCodecLoading -@ stub AppPolicyGetProcessTerminationMethod +@ stdcall -stub AppPolicyGetProcessTerminationMethod(long ptr) @ stub AppPolicyGetShowDeveloperDiagnostic @ stdcall -stub AppPolicyGetThreadInitializationType(long ptr) @ stub AppPolicyGetWindowingModel

5 years

[reactos] 01/01: [APISETS] Appease regression CORE-16563

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cabf1208330f4ee9add18… commit cabf1208330f4ee9add1805d40eb17097d5a14d5 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Mon Dec 23 13:26:42 2019 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Mon Dec 23 13:26:42 2019 +0100 [APISETS] Appease regression CORE-16563 Symptom: "Far Manager main app does not longer start up" The issue started to show with 0.4.13-dev-986-g 029b8f2cf9912b148f3e60be0472652f26a1adb9 Thanks to Mark Jansen for providing this first patch. I intend to port this back into 0.4.13RC, but we are not completely done with this ticket. --- dll/apisets/api-ms-win-appmodel-runtime-l1-1-2.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/apisets/api-ms-win-appmodel-runtime-l1-1-2.spec b/dll/apisets/api-ms-win-appmodel-runtime-l1-1-2.spec index b5699a9add0..ead1400bb94 100644 --- a/dll/apisets/api-ms-win-appmodel-runtime-l1-1-2.spec +++ b/dll/apisets/api-ms-win-appmodel-runtime-l1-1-2.spec @@ -7,7 +7,7 @@ @ stub AppPolicyGetMediaFoundationCodecLoading @ stub AppPolicyGetProcessTerminationMethod @ stub AppPolicyGetShowDeveloperDiagnostic -@ stub AppPolicyGetThreadInitializationType +@ stdcall -stub AppPolicyGetThreadInitializationType(long ptr) @ stub AppPolicyGetWindowingModel @ stub GetApplicationUserModelIdFromToken @ stub GetPackageFamilyNameFromToken

5 years

← Newer
1
...
6
7
8
9
10
11
12
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2019