From f87fcd87dcb23bfc2342af2c9b13f3fd9e4e07b5 Mon Sep 17 00:00:00 2001
From: Ivan Baravy <dunkaist@gmail.com>
Date: Fri, 2 Apr 2021 04:22:22 +0300
Subject: [PATCH] Wrap is_region_userspace with a macro, update logs.

---
 README                          |   2 +-
 makefile                        |   6 +++---
 shell.c                         |   1 +
 test/016_#f01_#draw_all.ref.log |   4 ++--
 test/016_#f01_#draw_all.ref.png | Bin 2370 -> 2326 bytes
 umka.asm                        |  18 ++++++++++--------
 6 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/README b/README
index 1e56510..e13f8ff 100644
--- a/README
+++ b/README
@@ -53,7 +53,7 @@ lfbviewx
 BUILD
 -----
 
-$ KOLIBRI=/path/to/kolibrios make
+$ KOLIBRIOS=/path/to/kolibrios make
 
 /path/to/kolibrios is where you checked out 'svn co svn://kolibrios.org'.
 
diff --git a/makefile b/makefile
index 89b7c65..927f167 100644
--- a/makefile
+++ b/makefile
@@ -29,7 +29,7 @@ umka_os: umka_os.o umka.o shell.o lodepng.o vdisk.o vnet.o trace.o trace_lbr.o \
 	$(CC) $(LDFLAGS_32) $^ -o $@ -static -T umka.ld
 
 umka.o umka.fas: umka.asm
-	INCLUDE="$(KOLIBRI)/kernel/trunk;$(KOLIBRI)/programs/develop/libraries/libcrash/trunk" \
+	INCLUDE="$(KOLIBRIOS)/kernel/trunk;$(KOLIBRIOS)/programs/develop/libraries/libcrash/trunk" \
             $(FASM) $< umka.o -s umka.fas -m 1234567
 
 shell.o: shell.c
@@ -44,10 +44,10 @@ pci.o: linux/pci.c
 lodepng.o: lodepng.c lodepng.h
 	$(CC) $(CFLAGS_32) -c $<
 
-default.skn: $(KOLIBRI)/skins/Leency/Shkvorka/default.asm
+default.skn: $(KOLIBRIOS)/skins/Leency/Shkvorka/default.asm
 	$(FASM) $< $@
 
-skin.skn: $(KOLIBRI)/skins/Leency/Octo_flat/default.asm
+skin.skn: $(KOLIBRIOS)/skins/Leency/Octo_flat/default.asm
 	$(FASM) $< $@
 
 umka.prp: umka.fas
diff --git a/shell.c b/shell.c
index 9ba38e2..ad19a4a 100644
--- a/shell.c
+++ b/shell.c
@@ -783,6 +783,7 @@ shell_get_window_colors(int argc, char **argv) {
     }
     (void)argv;
     system_colors_t colors;
+    memset(&colors, 0xaa, sizeof(colors));
     COVERAGE_ON();
     umka_sys_get_window_colors(&colors);
     COVERAGE_OFF();
diff --git a/test/016_#f01_#draw_all.ref.log b/test/016_#f01_#draw_all.ref.log
index 08fac13..8ae72f2 100644
--- a/test/016_#f01_#draw_all.ref.log
+++ b/test/016_#f01_#draw_all.ref.log
@@ -32,8 +32,8 @@ font smoothing: 0 - off
 /> get_window_colors
 0x00586786 frame
 0x00fefefe grab
-0x00aea6a6 work_3d_dark
-0x00fbfbfb work_3d_light
+0x00c5bdb9 work_3d_dark
+0x00ece9e5 work_3d_light
 0x00333333 grab_text
 0x00ddd7cf work
 0x007887a6 work_button
diff --git a/test/016_#f01_#draw_all.ref.png b/test/016_#f01_#draw_all.ref.png
index 573c89df7c606ee6d7aaec7b426169310d5d0bc6..66511b2ff2aa716afedebb248b95367e7fcc19fb 100644
GIT binary patch
delta 2063
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

delta 2138
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
Gj`csp{n1ze

diff --git a/umka.asm b/umka.asm
index dcb5443..ed946d7 100644
--- a/umka.asm
+++ b/umka.asm
@@ -171,6 +171,15 @@ macro add r, v {
   end if
 }
 
+macro stdcall target, [args] {
+common
+  if target eq is_region_userspace
+        test    esp, esp        ; clear zf
+  else
+        stdcall target, args
+  end if
+}
+
 include 'system.inc'
 include 'fdo.inc'
 
@@ -671,13 +680,6 @@ map_memEx:
 
 sys_msg_board equ __pex0
 delay_ms equ __pex1
-macro stdcall target, [args] {
-  if target eq is_region_userspace
-        test    esp, esp        ; clear zf
-  else
-        stdcall target, args
-  end if
-}
 
 include fix pew
 macro pew x {}
@@ -741,7 +743,7 @@ BTN_ADDR        dd ?
 MEM_AMOUNT      rd 0x1d
 SYS_SHUTDOWN    db ?
 sys_proc        rd 0x800
-rb 0xb242       ; align SLOT_BASE on 0x10000
+rb 0xb202       ; align SLOT_BASE on 0x10000
 SLOT_BASE:      rd 0x8000
 VGABasePtr      rb 640*480
 ;rb 0x582        ; align HEAP_BASE on page boundary