diff --git a/kernel/trunk/default.skn b/kernel/trunk/default.skn new file mode 100644 index 0000000000..035a133a4f Binary files /dev/null and b/kernel/trunk/default.skn differ diff --git a/kernel/trunk/gui/skincode.inc b/kernel/trunk/gui/skincode.inc index 28ac5a1db0..babc1fccaf 100644 --- a/kernel/trunk/gui/skincode.inc +++ b/kernel/trunk/gui/skincode.inc @@ -22,8 +22,8 @@ read_skin_file: jnz .noskin xchg eax, [skin_data] - test eax, eax - jz @f + cmp eax, _skin_file_default + je @f stdcall kernel_free, eax @@: @@ -86,9 +86,7 @@ ends align 4 load_default_skin: mov [_skinh], 22 - mov ebx, _skin_file_default - call read_skin_file - ret + mov [skin_data], _skin_file_default ;------------------------------------------------------------------------------ align 4 parse_skin_data: diff --git a/kernel/trunk/gui/skindata.inc b/kernel/trunk/gui/skindata.inc index 29ccc51aeb..99349f2ad5 100644 --- a/kernel/trunk/gui/skindata.inc +++ b/kernel/trunk/gui/skindata.inc @@ -13,7 +13,7 @@ $Revision$ ; iglobal - _skin_file_default db '/sys/DEFAULT.SKN',0 + _skin_file_default file "default.skn" endg struct SKIN_DATA diff --git a/kernel/trunk/kernel.asm b/kernel/trunk/kernel.asm index e63baf6250..61c9b4699f 100644 --- a/kernel/trunk/kernel.asm +++ b/kernel/trunk/kernel.asm @@ -1085,7 +1085,7 @@ include "detect/vortex86.inc" ; Vortex86 SoC detection code call load_default_skin -;protect io permission map +; Protect I/O permission map mov esi, [default_io_map] stdcall map_page, esi, [SLOT_BASE+256+APPDATA.io_map], PG_READ