From 03386fe9f4ee82b5846c994f6c47edd851dd02f1 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Wed, 17 Oct 2018 16:43:37 +0000 Subject: [PATCH] kernel: fix regression r5164 which broke blitter in 24bpp mode git-svn-id: svn://kolibrios.org@7474 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/common/settings/app_plus.ini | 2 +- kernel/trunk/video/blitter.inc | 4 ++-- programs/cmm/txtread/txtread.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data/common/settings/app_plus.ini b/data/common/settings/app_plus.ini index 44a2cab8c8..6d0a2bb7b2 100644 --- a/data/common/settings/app_plus.ini +++ b/data/common/settings/app_plus.ini @@ -22,7 +22,7 @@ Calc+=/kolibrios/utils/calcplus,4 TinyBasic=/kolibrios/develop/TinyBasic/TinyBasic,91 Notes=/sys/notes,117 FtpClient=/sys/network/ftpc,45 -VncViewer=/sys/network/ftpc,77 +VncViewer=/sys/network/vncc,77 Timer=/sys/demos/timer,119 ASCII View=/sys/asciivju,118 diff --git a/kernel/trunk/video/blitter.inc b/kernel/trunk/video/blitter.inc index b543220137..2fe1f93382 100644 --- a/kernel/trunk/video/blitter.inc +++ b/kernel/trunk/video/blitter.inc @@ -457,12 +457,12 @@ align 4 ;-------------------------------------- align 4 .skip_1: + mov edi, [esp+.extra_var1] inc ecx dec edx jnz .inner24 add esi, [esp+BLITTER.stride] - mov edi, [esp+.extra_var1] add edi, [_display.lfb_pitch] add ebp, [_display.width] @@ -519,12 +519,12 @@ align 4 pop eax ;-------------------------------------- .skip_2: + mov edi, [esp+.extra_var1] inc ecx dec edx jnz .inner16 add esi, [esp+BLITTER.stride] - mov edi, [esp+.extra_var1] add edi, [_display.lfb_pitch] add ebp, [_display.width] diff --git a/programs/cmm/txtread/txtread.c b/programs/cmm/txtread/txtread.c index 5c41bc7b97..1ad677ac21 100644 --- a/programs/cmm/txtread/txtread.c +++ b/programs/cmm/txtread/txtread.c @@ -51,7 +51,7 @@ dword color_schemes[] = { 0xF0F0F0, 0, 0xE9E5DA, 0, 0xF0F0C7, 0, -0xFCF0DA, 0x574531, +0xFCF0DA, 0x171501, 0xFDF6E3, 0x101A21, 0x282C34, 0xABB2BF, 0x282923, 0xD8D8D2