keXa/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

fasm: fixed window minimization broken in rev. 1361

Browse Source 
git-svn-id: svn://kolibrios.org@1443 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Evgeny Grechnikov (Diamond) 2010-03-26 22:19:27 +00:00
parent dec9645258
commit 806d141a51
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
programs/develop/fasm/trunk/fasm.asm
View File

@ -32,14 +32,12 @@ use32
dd params,cur_dir_path ; parameters,icon dd params,cur_dir_path ; parameters,icon
include 'lang.inc' include 'lang.inc'
include '..\..\..\macros.inc' include '../../../macros.inc'
purge add,sub ; macros.inc does incorrect substitution purge add,sub ; macros.inc does incorrect substitution
include 'fasm.inc' include 'fasm.inc'
include '..\..\..\develop\libraries\box_lib\trunk\box_lib.mac' include '../../../develop/libraries/box_lib/trunk/box_lib.mac'
;include '..\..\..\develop\libraries\box_lib\trunk\editbox.mac' include '../../../develop/libraries/box_lib/load_lib.mac'
;include '..\..\..\develop\libraries\box_lib\trunk\checkbox.mac'
include '..\..\..\develop\libraries\box_lib\load_lib.mac'
@use_library @use_library
@ -118,9 +116,7 @@ still:
pop eax pop eax
mcall mcall
cmp al,6 cmp al,6
jne @f je call_mouse
call mouse
@@:
dec eax dec eax
je red ; Redraw request je red ; Redraw request
dec eax dec eax
@ -139,6 +135,10 @@ key: ; Key
jmp still jmp still
call_mouse:
call mouse
jmp still
button: ; Button in Window button: ; Button in Window
mov al,17 mov al,17

14
programs/develop/fasm/trunk/system.inc
View File

@ -57,13 +57,21 @@ filepos dd 0x0
init_memory: init_memory:
mov ecx, 16*1024*1024 ; mov ecx, 16*1024*1024
;
allocate_memory: ; 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 mov [memory_setting],ecx
mcall 68, 12 mcall 68, 12
or eax,eax or eax,eax
jz out_of_memory jz out_of_memory
mov [memblock], eax
mov [additional_memory],eax mov [additional_memory],eax
add eax,[memory_setting] add eax,[memory_setting]
mov [memory_end],eax mov [memory_end],eax