KolibriOS/umka
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Wrap is_region_userspace with a macro, update logs.

Browse Source
This commit is contained in:
Ivan B
2021-04-02 04:22:22 +03:00
parent cdd733ef3d
commit f87fcd87dc
6 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README
View File

@@ -53,7 +53,7 @@ lfbviewx
BUILD BUILD
----- -----
$ KOLIBRI=/path/to/kolibrios make $ KOLIBRIOS=/path/to/kolibrios make
/path/to/kolibrios is where you checked out 'svn co svn://kolibrios.org'. /path/to/kolibrios is where you checked out 'svn co svn://kolibrios.org'.

6
makefile
View File

@@ -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 $(CC) $(LDFLAGS_32) $^ -o $@ -static -T umka.ld
umka.o umka.fas: umka.asm 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 $(FASM) $< umka.o -s umka.fas -m 1234567
shell.o: shell.c shell.o: shell.c
@@ -44,10 +44,10 @@ pci.o: linux/pci.c
lodepng.o: lodepng.c lodepng.h lodepng.o: lodepng.c lodepng.h
$(CC) $(CFLAGS_32) -c $< $(CC) $(CFLAGS_32) -c $<
default.skn: $(KOLIBRI)/skins/Leency/Shkvorka/default.asm default.skn: $(KOLIBRIOS)/skins/Leency/Shkvorka/default.asm
$(FASM) $< $@ $(FASM) $< $@
skin.skn: $(KOLIBRI)/skins/Leency/Octo_flat/default.asm skin.skn: $(KOLIBRIOS)/skins/Leency/Octo_flat/default.asm
$(FASM) $< $@ $(FASM) $< $@
umka.prp: umka.fas umka.prp: umka.fas

1
shell.c
View File

@@ -783,6 +783,7 @@ shell_get_window_colors(int argc, char **argv) {
} }
(void)argv; (void)argv;
system_colors_t colors; system_colors_t colors;
memset(&colors, 0xaa, sizeof(colors));
COVERAGE_ON(); COVERAGE_ON();
umka_sys_get_window_colors(&colors); umka_sys_get_window_colors(&colors);
COVERAGE_OFF(); COVERAGE_OFF();

4
test/016_#f01_#draw_all.ref.log
View File

@@ -32,8 +32,8 @@ font smoothing: 0 - off
/> get_window_colors /> get_window_colors
0x00586786 frame 0x00586786 frame
0x00fefefe grab 0x00fefefe grab
0x00aea6a6 work_3d_dark 0x00c5bdb9 work_3d_dark
0x00fbfbfb work_3d_light 0x00ece9e5 work_3d_light
0x00333333 grab_text 0x00333333 grab_text
0x00ddd7cf work 0x00ddd7cf work
0x007887a6 work_button 0x007887a6 work_button

BIN
test/016_#f01_#draw_all.ref.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

18
umka.asm
View File

@@ -171,6 +171,15 @@ macro add r, v {
end if 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 'system.inc'
include 'fdo.inc' include 'fdo.inc'
@@ -671,13 +680,6 @@ map_memEx:
sys_msg_board equ __pex0 sys_msg_board equ __pex0
delay_ms equ __pex1 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 include fix pew
macro pew x {} macro pew x {}
@@ -741,7 +743,7 @@ BTN_ADDR dd ?
MEM_AMOUNT rd 0x1d MEM_AMOUNT rd 0x1d
SYS_SHUTDOWN db ? SYS_SHUTDOWN db ?
sys_proc rd 0x800 sys_proc rd 0x800
rb 0xb242 ; align SLOT_BASE on 0x10000 rb 0xb202 ; align SLOT_BASE on 0x10000
SLOT_BASE: rd 0x8000 SLOT_BASE: rd 0x8000
VGABasePtr rb 640*480 VGABasePtr rb 640*480
;rb 0x582 ; align HEAP_BASE on page boundary ;rb 0x582 ; align HEAP_BASE on page boundary