From e32f2c8d1fd149d27f1439e07e31bf5721d0780f Mon Sep 17 00:00:00 2001
From: "Andrey Halyavin (halyavin)" <halyavin@land.ru>
Date: Wed, 11 Jan 2006 10:18:52 +0000
Subject: [PATCH] fixed bug with windows active/inactive caption (aw_yes
 variable converted to parameter).

git-svn-id: svn://kolibrios.org@35 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 kernel/trunk/gui/skincode.inc | 26 ++++++++++----------------
 kernel/trunk/kernel.asm       | 10 +++-------
 2 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/kernel/trunk/gui/skincode.inc b/kernel/trunk/gui/skincode.inc
index 66047e45bd..50bf4be0c6 100644
--- a/kernel/trunk/gui/skincode.inc
+++ b/kernel/trunk/gui/skincode.inc
@@ -241,6 +241,7 @@ load_default_skin_1:
     ret
 
 drawwindow_IV:
+;param1 - aw_yes
 
         pusha
 
@@ -290,14 +291,11 @@ drawwindow_IV:
         shl   ecx,16
         add   ecx,[_skinh]
 
-        cmp   [aw_yes],1
-;        cmp   [esp+32+4+2], word 1
+        cmp   byte [esp+32+4+4],1
+        mov   ebx, [_refleft_1]
         jne   @f
         mov   ebx,[_refleft]
-        jmp   no_aw_3
      @@:
-        mov   ebx,[_refleft_1]
-      no_aw_3:
         call  sys_putimage
 
         mov   esi,[esp]
@@ -312,14 +310,12 @@ drawwindow_IV:
 
         inc   eax
 
-        cmp   [aw_yes],1
-;        cmp   [esp+32+4+2], word 1
+        cmp   byte [esp+32+4+4], 1
+        mov   ebx,[_refbase_1]
         jne   @f
         mov   ebx,[_refbase]
-        jmp   no_aw_2
      @@:
-        mov   ebx,[_refbase_1]
-      no_aw_2:
+
         mov   ecx,[_skinbasew]
         shl   ecx,16
         add   ecx,[_skinh]
@@ -344,14 +340,12 @@ drawwindow_IV:
         sub   edx,[_skinoperw]
         inc   edx
         shl   edx,16
-        cmp   [aw_yes],1
-;        cmp   [esp+32+4+2], word 1
+        cmp   byte [esp+32+4+4], 1
+        mov   ebx,[_refoper_1]
         jne   @f
         mov   ebx,[_refoper]
-        jmp   no_aw_1
      @@:
-        mov   ebx,[_refoper_1]
-      no_aw_1:
+
         mov   ecx,[_skinoperw]
         shl   ecx,16
         add   ecx,[_skinh]
@@ -454,6 +448,6 @@ drawwindow_IV:
         add   esp,4
         popa
 
-        ret
+        ret  4
 
 
diff --git a/kernel/trunk/kernel.asm b/kernel/trunk/kernel.asm
index fb44e2dfc7..9d6e0b94fa 100644
--- a/kernel/trunk/kernel.asm
+++ b/kernel/trunk/kernel.asm
@@ -2827,19 +2827,16 @@ sys_drawwindow:
     sub   edi,0x3000
     shr   edi,5
     cmp   edi,[active_process]
+    push  0
     jne   @f
-    mov   [aw_yes],1 
-    jmp   aw_yes_end
-  @@:
-    mov   [aw_yes],0 
-  aw_yes_end:
+    mov   byte [esp],1
+  @@:             ; parameter for drawwindow_IV
     sti
 
     inc   [mouse_pause]
     call  sys_set_window
     call  drawwindow_IV 
     dec   [mouse_pause]
-    mov   [aw_yes],0     
     ret
   nosyswIV:
 
@@ -4887,7 +4884,6 @@ uglobal
 ;* start code - get  process (3) - Mario79
 active_process      dd   0
 active_process_flag db   0
-aw_yes              db   0
 deleted_process     dd   0
 mouse_pause         dd   0
 ps2_mouse_detected  db   0