WebSVN – Kolibri OS – Path Comparison – /

Regard whitespace Rev 1442 → Rev 1443

 /programs/develop/fasm/trunk/fasm.asm
 ,14 → 32,12
   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
 ,9 → 116,7
     pop eax
     mcall
     cmp al,6
-    jne @f
-      call mouse
-    @@:
+    je  call_mouse
     dec eax
     je  red          ; Redraw request
     dec eax
 ,6 → 135,10
     jmp  still
+call_mouse:
+    call mouse
+    jmp  still
 button:    ; Button in Window
     mov  al,17

 /programs/develop/fasm/trunk/system.inc
 ,13 → 57,21
 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