From 806d141a511086d85235d857d8759f7f18b49d66 Mon Sep 17 00:00:00 2001
From: "Evgeny Grechnikov (Diamond)" <diamondz@land.ru>
Date: Fri, 26 Mar 2010 22:19:27 +0000
Subject: [PATCH] fasm: fixed window minimization broken in rev. 1361

git-svn-id: svn://kolibrios.org@1443 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 programs/develop/fasm/trunk/fasm.asm   | 16 ++++++++--------
 programs/develop/fasm/trunk/system.inc | 14 +++++++++++---
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/programs/develop/fasm/trunk/fasm.asm b/programs/develop/fasm/trunk/fasm.asm
index a6eb244098..34ccc33af1 100644
--- a/programs/develop/fasm/trunk/fasm.asm
+++ b/programs/develop/fasm/trunk/fasm.asm
@@ -32,14 +32,12 @@ use32
   dd params,cur_dir_path  ; parameters,icon
 
 include 'lang.inc'
-include '..\..\..\macros.inc'
+include '../../../macros.inc'
 purge add,sub	 ; macros.inc does incorrect substitution
 include 'fasm.inc'
 
-include '..\..\..\develop\libraries\box_lib\trunk\box_lib.mac'
-;include '..\..\..\develop\libraries\box_lib\trunk\editbox.mac'
-;include '..\..\..\develop\libraries\box_lib\trunk\checkbox.mac'
-include '..\..\..\develop\libraries\box_lib\load_lib.mac'
+include '../../../develop/libraries/box_lib/trunk/box_lib.mac'
+include '../../../develop/libraries/box_lib/load_lib.mac'
   @use_library
 
 
@@ -118,9 +116,7 @@ still:
     pop eax 
     mcall
     cmp al,6
-    jne @f
-      call mouse
-    @@:
+    je  call_mouse
     dec eax 
     je	red	     ; Redraw request
     dec eax 
@@ -139,6 +135,10 @@ key:		     ; Key
 
     jmp  still
 
+call_mouse:
+    call mouse
+    jmp  still
+
 button:    ; Button in Window
 
     mov  al,17
diff --git a/programs/develop/fasm/trunk/system.inc b/programs/develop/fasm/trunk/system.inc
index 4f7b4c1b50..6cda27ac03 100644
--- a/programs/develop/fasm/trunk/system.inc
+++ b/programs/develop/fasm/trunk/system.inc
@@ -57,13 +57,21 @@ filepos 	 dd 0x0
 
 init_memory:
 
-        mov ecx, 16*1024*1024
-
- allocate_memory:
+;        mov ecx, 16*1024*1024
+;
+; allocate_memory:
+	mcall	18, 16
+	cmp	eax, 0x38000000 shr 9
+	jbe	@f
+	mov	eax, 0x38000000 shr 9
+@@:
+	shl	eax, 9
+	xchg	eax, ecx
 	mov	[memory_setting],ecx
 	mcall	68, 12
 	or	eax,eax
 	jz	out_of_memory
+	mov	[memblock], eax
 	mov	[additional_memory],eax
 	add	eax,[memory_setting]
 	mov	[memory_end],eax