From b43c39f2f1877f1a11c926c0111fb883b037c5b0 Mon Sep 17 00:00:00 2001
From: hidnplayr <hidnplayr@kolibrios.org>
Date: Fri, 31 Jul 2015 13:32:01 +0000
Subject: [PATCH] Embedded default skin in kernel.mnt - little faster boot
 time. - no more problems when default.skn cannot be found.

git-svn-id: svn://kolibrios.org@5635 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 kernel/trunk/default.skn      | Bin 0 -> 5115 bytes
 kernel/trunk/gui/skincode.inc |   8 +++-----
 kernel/trunk/gui/skindata.inc |   2 +-
 kernel/trunk/kernel.asm       |   2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)
 create mode 100644 kernel/trunk/default.skn

diff --git a/kernel/trunk/default.skn b/kernel/trunk/default.skn
new file mode 100644
index 0000000000000000000000000000000000000000..035a133a4f4777072f1503968032922007138ad3
GIT binary patch
literal 5115
zcmchbO=x3P6vyw(;Kqd;6<l^K1H;%(aUpJIqbmo+jhlj&GPafq4&6u>wUpU7TeEN>
z2tqfmick;*iJ{drnKqpgCrLZa_sh$78q?HvS_f(U-FH%`d9OkSZvQ<w@7&XK&$(ak
z+>?Cp?(O$4DWzWG^ADd_XuQnxHT9gj#GjQbs*i8?Da*1Pd47K0k(aQE$Kxs*-B4Rw
zTk81uSPcygIX10EOTB&TO)Qk!_~C2mOMmUh>5otCcVc3~(S7*VEvK#fYx}21PnFhb
zKl-!u&9quvTvR{ZA63=usCwh|L3MI+;@Ca;>xuK!HVX?2PJbPHbad1i&+2N}8HX3s
z^WHhRqF&(dGIFXTYg;|{_b|{laoA;~k1*19!RM8_Li@89^;4-Id1~nY>9xD_PM^@x
z(GkMo;UWCs-~hhAzYpKr+k@}!?!sHG7QESP!W)eSyk4)vtJNyJQmMd8r4qbYEW!(g
z0z9A3!*jVDJd?@5Q>hgElkst%?{pljwP3H^Mz}~$IG^v;?)6}R=IC$3kj-R6j6x1e
z*)ZfVa;%I(4m$_dDCA}0h3FN2|D(RX@BIFl3=ct?o_^$I<yGqySFe6QFp%o+Ukv;j
zgAiz<^z<XifL9r$&p<T)!~Op48#m&EgSl(heufZe1_DXXE|P4%`t;7XcgMR3WipxE
zJ_nrqKp@5VZ{93J2!TKvrKh<hvtRCg9=`uY7onsJ*M=vU_wv%#*(l4)k5PIWOR{7K
z$&Ot>xw*N?CFP0VmLIbhEY!e28bY8M{5|PuEXg>LNZ_ywC}XkMqjMm;&t3$Bg_V^8
zg6zJhIV(wej7Fn>xPa0VVi*e9*RO}ep`yIb55gsyaL+E-5M`rxaNAG?0HzE?M(OE^
zy&y`&FxX<EtQrOhfhb|akjs3<Fi1PhC1@C=9imW-m?on5eEpp|qf_mee;BSbw0kMm
z$Zn=_8mLyUn<WWUGmmEuM3yJ1WwTj0G9bUuv~3&NJ#Y!+81}|+7z%}khlk<FT}`*I
zPM}Jq+9NUek&%&^nVGS%u?JzUgfIe4l=)oF?M(t%Rz8zS|Cch^Y$lh>vLKa8*-hw4
z!qd~!v$L~&tpf-&BayXY(RSNQpiDYFIXQXP1(e($<x<H_m2$ag+gvNm;+_M9_4Rd>
z{L5`GfmnyRxw$W0K)JKC<L)II_9e2mb~X@kOXmzs0_hUOw&~6$)@wDK|JiI(JGR?x
zsxJDv3FGxhgnePfhy@U6ZajR*jNJB}K(<Ywo`@mIVPIdV8z?~#2#1nd&F$)$1J$Zk
zN}{Q$Das;bC=rj-+)O0MX6FU63x!?@S1d9s+&FcMz-mj=?M-G>uq@Mb!GWxN-ZaUK
zNE)W;f&-Z^7CI4pKA-+AN&h~??_k{URQpcCDv>*>Fe%Kan&fK{-$8ggsop8ANjYRz
tYEKG7sy6)t&#50g<HsowI+v5aI`FIWhR&TN4|&^o739csOk@M;`!8Z2?X&;@

literal 0
HcmV?d00001

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