WebSVN – Kolibri OS – Diff – /kernel/trunk/kernel.asm

 format binary as "mnt"
 include 'macros.inc'
 include 'struct.inc'
-$Revision: 9925 $
+$Revision: 9926 $
 ; set clipboard
         xor     eax, eax
         mov     [clipboard_slots], eax
         mov     [clipboard_write_lock], eax
-        stdcall kernel_alloc, 4096
+        stdcall kernel_alloc, PAGE_SIZE
         test    eax, eax
         jnz     @f
         sub     edx, eax
         add     edx, esp
         mov     ebx, [esp+64+32-8+4]
 ; add window start x & y
-        mov     edi, [current_slot_idx]
-        mov     ecx, edi
-        shl     edi, BSF sizeof.APPDATA
+        mov     ecx, [current_slot_idx]
         shl     ecx, BSF sizeof.WDATA
         mov     eax, [window_data + ecx + WDATA.box.left]
-        add     eax, [SLOT_BASE + edi + APPDATA.wnd_clientbox.left]
+        add     eax, [window_data + ecx + WDATA.clientbox.left]
         shl     eax, 16
         add     eax, [window_data + ecx + WDATA.box.top]
-        add     eax, [SLOT_BASE + edi + APPDATA.wnd_clientbox.top]
+        add     eax, [window_data + ecx + WDATA.clientbox.top]
         add     ebx, eax
         mov     ecx, [esp+64+32-12+4]
         mov     eax, [esp+64+8]         ; background color (if given)
         movzx   esi, word [WIN_STACK + ecx*2]
         cmp     esi, 1
         je      .nowindowdeactivate ; already deactive
         mov     edi, ecx
-        shl     edi, 5
+        shl     edi, BSF sizeof.WDATA
         add     edi, window_data
         movzx   esi, word [WIN_STACK + ecx * 2]
         lea     esi, [WIN_POS + esi * 2]
         call    window._.window_deactivate
         je      .fail
         mov     eax, edx
         shl     edx, BSF sizeof.WDATA
-        cmp     [edx*8 + SLOT_BASE + APPDATA.state], TSTATE_FREE
+        cmp     [edx*(sizeof.APPDATA/sizeof.WDATA) + SLOT_BASE + APPDATA.state], TSTATE_FREE
         je      .fail
         add     ebx, 10
         mov     ecx, 11
         call    memmove
         pop     ecx
-        shr     ecx, 3
+        shr     ecx, (BSF sizeof.APPDATA - BSF sizeof.WDATA)
 ; +22: address of the process in memory
 ; +26: size of used memory - 1
         push    edi
         lea     edi, [ebx+12]
         xor     eax, eax
         mov     edx, 0x100000*16
-        cmp     ecx, 1 shl 5
+        cmp     ecx, 1 shl BSF sizeof.WDATA
         je      .os_mem
-        mov     edx, [SLOT_BASE + ecx*8 + APPDATA.process]
+        mov     edx, [SLOT_BASE + ecx*(sizeof.APPDATA/sizeof.WDATA) + APPDATA.process]
         mov     edx, [edx + PROC.mem_used]
         mov     eax, std_application_base_address
 .os_mem:
         stosd
         lea     eax, [edx-1]
         stosd
 ; +30: PID/TID
-        mov     eax, [SLOT_BASE + ecx*8 + APPDATA.tid]
+        mov     eax, [SLOT_BASE + ecx*(sizeof.APPDATA/sizeof.WDATA) + APPDATA.tid]
         stosd
         movsd
         movsd
         movsd
     ; Process state (+50)
-        movzx   eax, byte [SLOT_BASE + ecx*8 + APPDATA.state]
+        movzx   eax, byte [SLOT_BASE + ecx*(sizeof.APPDATA/sizeof.WDATA) + APPDATA.state]
         stosd
     ; Window client area box
-        lea     esi, [SLOT_BASE + ecx*8 + APPDATA.wnd_clientbox]
+        lea     esi, [window_data + ecx + WDATA.clientbox]
         movsd
         movsd
         movsd
         movsd
     ; Window state
         mov     al, [window_data + ecx + WDATA.fl_wstate]
         stosb
     ; Event mask (+71)
-        mov     EAX, dword [SLOT_BASE + ecx*8 + APPDATA.event_mask]
+        mov     EAX, dword [SLOT_BASE + ecx*(sizeof.APPDATA/sizeof.WDATA) + APPDATA.event_mask]
         stosd
 .exit:
         ret
 ;--------------------------------------
 align 4
 @@:
-        mov     edi, [current_slot]
+        mov     edi, [current_slot_idx]
+        shl     edi, BSF sizeof.WDATA
-        add     dx, word[edi + APPDATA.wnd_clientbox.top]
+        add     dx, word[window_data + edi + WDATA.clientbox.top]
         rol     edx, 16
-        add     dx, word[edi + APPDATA.wnd_clientbox.left]
+        add     dx, word[window_data + edi + WDATA.clientbox.left]
         rol     edx, 16
 ;--------------------------------------
 align 4
 .forced:
         push    ebp esi 0
 ;        shr     eax, 3
         stdcall is_region_userspace, ebx, eax
         pop     esi ecx
         jnz     sys_putimage.exit
+        mov     eax, [current_slot_idx]
-        mov     eax, [current_slot]
+        shl     eax, BSF sizeof.WDATA
-        add     dx, word [eax + APPDATA.wnd_clientbox.top]
+        add     dx, word [window_data + eax + WDATA.clientbox.top]
         rol     edx, 16
-        add     dx, word [eax + APPDATA.wnd_clientbox.left]
+        add     dx, word [window_data + eax + WDATA.clientbox.left]
         rol     edx, 16
 ;--------------------------------------
 align 4
 .forced:
 ; ebx y beginning
 ; ecx x end
         ; edx y end
 ; edi color
 ;__sys_drawbar:
-;        mov     esi, [current_slot]
+;        mov     esi, [current_slot_idx]
+;        shl     esi, BSF sizeof.WDATA
-;        add     eax, [esi+APPDATA.wnd_clientbox.left]
+;        add     eax, [window_data+esi+WDATA.clientbox.left]
-;        add     ecx, [esi+APPDATA.wnd_clientbox.left]
+;        add     ecx, [window_data+esi+WDATA.clientbox.left]
-;        add     ebx, [esi+APPDATA.wnd_clientbox.top]
+;        add     ebx, [window_data+esi+WDATA.clientbox.top]
-;        add     edx, [esi+APPDATA.wnd_clientbox.top]
+;        add     edx, [window_data+esi+WDATA.clientbox.top]
 ;--------------------------------------
 ;align 4
 ;.forced:
 ;        call    vesa20_drawbar
 ;        call    [draw_pointer]

Subversion Repositories Kolibri OS

(root)/kernel/trunk/kernel.asm – Rev 9925 → 9926