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

 ; SET UP OS TASK
         mov  esi,boot_setostask
         call boot_log
         ; name for OS/IDLE process
-        mov  [0x80000+256+0],dword 'OS/I'
+		mov  dword [0x80000+256+APPDATA.app_name],   dword 'OS/I'
-        mov  [0x80000+256+4],dword 'DLE '
+		mov  dword [0x80000+256+APPDATA.app_name+4], dword 'DLE '
         ; task list
-        mov  [0x3020+0xE],byte  1     ; on screen number
+        mov  [0x3020+TASKDATA.wnd_number], 1 ; on screen number
-        mov  [0x3020+0x4],dword 1     ; process id number
+        mov  [0x3020+TASKDATA.pid], 1        ; process id number
-        mov  [0x3020+0x10], dword 0   ; process base address
+        mov  [0x3020+TASKDATA.mem_start], 0  ; process base address
         ; set default flags & stacks
         mov  [l.eflags],dword 0x11202 ; sti and resume
      pushad
      cmp   al,1                  ; ecx is a pointer ?
      jne   displnl1
      mov   edi,[0x3010]
-     mov   edi,[edi+0x10]
+     mov   edi,[edi+TASKDATA.mem_start]
      mov   ebx,[edi+ebx]
    displnl1:
      sub   esp,64
      cmp   ah,0                  ; DECIMAL
      jne   no_display_desnum
      shr   eax,16
-     and   eax,0x3f
-     push  eax
-     ;mov   edi,[0x3010]
+     and   eax,0x3f
-     ;mov   edi,[edi+0x10]
+     push  eax
      mov   edi,esp
      add   edi,4+64
      mov   ecx,eax
      cmp   ah,0x01               ; HEXADECIMAL
      jne   no_display_hexnum
      shr   eax,16
      and   eax,0x3f
      push  eax
-     ;mov   edi,[0x3010]
-     ;mov   edi,[edi+0x10]
      mov   edi,esp
      add   edi,4+64
      mov   ecx,eax
      mov   eax,ebx
      mov   ebx,16
      cmp   ah,0x02               ; BINARY
      jne   no_display_binnum
      shr   eax,16
      and   eax,0x3f
      push  eax
-     ;mov   edi,[0x3010]
-     ;mov   edi,[edi+0x10]
      mov   edi,esp
      add   edi,4+64
      mov   ecx,eax
      mov   eax,ebx
      mov   ebx,2
      mov   eax,[esp+64+32-8+4]
      mov   ebx,[esp+64+32-12+4]
      push  edx                       ; add window start x & y
      push  ebx
      mov   edx,[0x3010]
-     mov   ebx,[edx-twdw]
+     mov   ebx,[edx-twdw+WDATA.box.left]
      shl   ebx,16
-     add   ebx,[edx-twdw+4]
+     add   ebx,[edx-twdw+WDATA.box.top]
      add   eax,ebx
      pop   ebx
      pop   edx
      mov   edi,0
      call  dtext
      cmp  eax,2                      ; KEYBOARD
      jnz  nsyse2
      cmp  ebx,1
      jnz  kbnobase
      mov  edi,[0x3010]
-     add  ecx,[edi+0x10]
+     add  ecx,[edi+TASKDATA.mem_start]
      mov  eax,ecx
      mov  ebx,keymap
      mov  ecx,128
      call memmove
      ret
    kbnobase:
      cmp  ebx,2
      jnz  kbnoshift
      mov  edi,[0x3010]
-     add  ecx,[edi+0x10]
+     add  ecx,[edi+TASKDATA.mem_start]
      mov  eax,ecx
      mov  ebx,keymap_shift
      mov  ecx,128
      call memmove
      ret
    kbnoshift:
      cmp  ebx,3
      jne  kbnoalt
      mov  edi,[0x3010]
-     add  ecx,[edi+0x10]
+     add  ecx,[edi+TASKDATA.mem_start]
      mov  eax,ecx
      mov  ebx,keymap_alt
      mov  ecx,128
      call memmove
      ret
      cmp  eax,2
      jne  ngsyse2
      cmp  ebx,1
      jnz  kbnobaseret
      mov  edi,[0x3010]
-     add  ecx,[edi+0x10]
+     add  ecx,[edi+TASKDATA.mem_start]
      mov  ebx,ecx
      mov  eax,keymap
      mov  ecx,128
      call memmove
      ret
    kbnobaseret:
      cmp  ebx,2
      jnz  kbnoshiftret
      mov  edi,[0x3010]
-     add  ecx,[edi+0x10]
+     add  ecx,[edi+TASKDATA.mem_start]
      mov  ebx,ecx
      mov  eax,keymap_shift
      mov  ecx,128
      call memmove
      ret
    kbnoshiftret:
      cmp  ebx,3
      jne  kbnoaltret
      mov  edi,[0x3010]
-     add  ecx,[edi+0x10]
+     add  ecx,[edi+TASKDATA.mem_start]
      mov  ebx,ecx
      mov  eax,keymap_alt
      mov  ecx,128
      call memmove
      ret
     jnz  nowr
     mov  eax,[0xfb0a]
     shl  eax,16
     mov  ax,[0xfb0c]
     mov  esi,[0x3010]
-    sub  esi,twdw
-    mov  bx,[esi]
+    mov  bx, word [esi-twdw+WDATA.box.left]
     shl  ebx,16
-    mov  bx,[esi+4]
+    mov  bx, word [esi-twdw+WDATA.box.top]
     sub  eax,ebx
     mov  [esp+36],eax
     ret
   nowr:
-sys_end:
+sys_end:
      mov   eax,[0x3010]
-     add   eax,0xa
+     mov   eax,[0x3010]
-     mov   [eax],byte 3  ; terminate this program
+     mov   [eax+TASKDATA.state], 3  ; terminate this program
      mov  edx,[0x3004]
      cmp  ebx,edx
      ja   noprocessterminate
      mov  eax,[0x3004]
      shl  ebx,5
-     mov  edx,[ebx+0x3000+4]
+     mov  edx,[ebx+0x3000+TASKDATA.pid]
-     add  ebx,0x3000+0xa
+     add  ebx,0x3000+TASKDATA.state
      cmp  byte [ebx], 9
      jz   noprocessterminate
      ;call MEM_Heap_Lock      ;guarantee that process isn't working with heap
      mov ecx,10
      cld
      rep movsb
      ret
    for_all_tables:
-     mov edi,[3010h]
+     mov edi,[0x3010]
-     mov edi,[edi+10h]
+     mov edi,[edi+TASKDATA.mem_start]
      add edi,ecx
      mov esi,0x40000
      ret
   full_table:
      cmp  ebx,2
 sysfn_lastkey:          ; 18.12 = return 0 (backward compatibility)
         and     dword [esp+36], 0
         ret
 sysfn_getversion:       ; 18.13 = get kernel ID and version
-     mov edi,[3010h]
+     mov edi,[0x3010]
-     mov edi,[edi+10h]
+     mov edi,[edi+TASKDATA.mem_start]
      add edi,ebx
      mov esi,version_inf
      mov ecx,version_end-version_inf
      cld
     cmp   eax,5                            ; BLOCK MOVE TO BGR
     jnz   nosb5
   ; bughere
     mov   edi, [0x3010]
-    add   ebx, [edi+0x10]
+    add   ebx, [edi+TASKDATA.mem_start]
  ;   mov   esi, ebx
  ;   mov   edi, ecx
     mov   eax, ebx
     mov   ebx, ecx
 ;  +26 dword     used mem
 ;  +30 dword     PID , process idenfification number
+;
-    mov  edi,[0x3010]   ; eax = return area
-    add  edi,0x10
+    mov  edi,[0x3010]   ; eax = return area
-    add  eax,[edi]
+    add  eax,[edi + TASKDATA.mem_start]
     cmp  ebx,-1         ; who am I ?
     jne  no_who_am_i
     ; return memory usage
     xor  edx,edx
     mov  eax,0x20
     mul  ebx
-    add  eax,0x3000+0x1c
+    add  eax,0x3000+TASKDATA.cpu_usage
     mov  ebx,eax
     pop  eax
     mov  ecx,[ebx]
     mov  [eax],ecx
-    pop  ebx
-;    mov  ebx,[esp]
-;    shl  ebx,1
-;    add  ebx,0xc000
+    pop  ebx
     mov  cx, [0xC000 + ebx * 2]
-    mov  [eax+4],cx
-;    mov  ebx,[esp]
-;    shl  ebx,1
-;    add  ebx,0xc400
+    mov  [eax+4],cx
     mov  cx, [0xC400 + ebx * 2]
-    mov  [eax+6],cx
-;    pop  ebx
+    mov  [eax+6],cx
     push eax
     mov  eax,ebx
     shl  eax,8
-    add  eax,0x80000
+    add  eax,0x80000+APPDATA.app_name
     pop  ebx
     add  ebx,10
     mov  ecx,11
     mov    edx,0x100000*16
     pop    ecx                                   ; get gdt of tss
     cmp    ecx,1
     je     os_mem
     shl    ecx,8
-    mov    edx,[0x80000+ecx+0x8c]
+    mov    edx,[0x80000+ecx+APPDATA.mem_size] ;0x8c
     mov    eax,std_application_base_address
-    ;add    ecx,0x80000+0x88
-    ;mov    ecx,[ecx]
-;    shl    ecx,3
     ; eax run base -> edx used memory
-;    mov    al,[ecx+gdts+ app_code-3 +4]        ;  base  23:16
-;    mov    ah,[ecx+gdts+ app_code-3 +7]        ;  base  31:24
-;    shl    eax,16
-;    mov    ax,[ecx+gdts+ app_code-3 +2]        ;  base  0:15
-;    movzx  edx,word [ecx+gdts+ app_code-3 +0]
-;    shl    edx,12
   os_mem:
     dec    edx
     mov    [ebx+12],eax
     mov    [ebx+16],edx
     ; PID (+30)
     mov    eax,[esp]
     shl    eax,5
-    add    eax,0x3000+0x4
+    add    eax,0x3000+TASKDATA.pid
     mov    eax,[eax]
     mov    [ebx+20],eax
     ; window position and size
     mov    esi,[esp]
     shl    esi,5
-    add    esi,window_data
+    add    esi,window_data + WDATA.box
     mov    edi,[esp+4]
     add    edi,34
-    mov    ecx,4*4
+    mov    ecx,4
     cld
-    rep    movsb
+    rep    movsd
     ; Process state (+50)
     cmp   eax,2
     jnz   srl1
     mov   edx,[0x3010]      ; return whole screen draw area for this app
     add   edx,draw_data-0x3000
-    mov   [edx+0],dword 0
+    mov   [edx+RECT.left], 0
-    mov   [edx+4],dword 0
+    mov   [edx+RECT.top], 0
     mov   eax,[0xfe00]
-    mov   [edx+8],eax
+    mov   [edx+RECT.right],eax
     mov   eax,[0xfe04]
-    mov   [edx+12],eax
+    mov   [edx+RECT.bottom],eax
-    mov   edi,[0x3010]
-    sub   edi,twdw
+    mov   edi,[0x3010]
-    mov   [edi+30],byte 1   ; no new position & buttons from app
+    mov   [edi-twdw+WDATA.fl_wdrawn], 1   ; no new position & buttons from app
         test    [edi+window_data+WDATA.fl_wstyle],WSTYLE_HASCAPTION
         jz      @f
         mov     ecx,[edi*8+0x80000+APPDATA.wnd_caption]
         or      ecx,ecx
         jz      @f
-        add     ecx,[edi+twdw+0x10]
+        add     ecx,[edi+twdw+TASKDATA.mem_start]
         movzx   eax,[edi+window_data+WDATA.fl_wstyle]
         and     al,0x0F
         cmp     al,3
         mov     cl,[edi+WDATA.fl_wstyle]
     sub   edi,window_data
     shl   edi,3
-    add   edi,0x80000+0x90
+    add   edi,0x80000
         and     cl,0x0F
-        mov     [edi-0x90+APPDATA.wnd_caption],0
+        mov     [edi+APPDATA.wnd_caption],0
         cmp     cl,3
+        jne     @f
-        jne     @f
+        mov     [edi+APPDATA.wnd_caption],esi
-        mov     [edi-0x90+APPDATA.wnd_caption],esi
+    @@: mov     esi,[esp+0]
     @@: mov     esi,[esp+0]
     add   edi, APPDATA.saved_box
     mov   ecx,4
     cld
     rep   movsd
     pop   edi esi ecx
     push  eax ebx ecx edx
 ;;;    mov   eax, 1
 ;;;    call  delay_hs
-    movzx eax, word [edi+00]
+    mov   eax, [edi+WDATA.box.left]
-    movzx ebx, word [edi+04]
+    mov   ebx, [edi+WDATA.box.top]
-    movzx ecx, word [edi+8]
+    mov   ecx, [edi+WDATA.box.width]
-    movzx edx, word [edi+12]
+    mov   edx, [edi+WDATA.box.height]
     add   ecx, eax
     add   edx, ebx
     call  calculatescreen
     pop   edx ecx ebx eax
     mov   [0xf400],byte 0           ; empty keyboard buffer
         ret
 sys_window_move:
-        mov     edi,[0x00003000]
+        mov     edi,[0x3000]
         shl     edi,5
         add     edi,window_data
         test    [edi+WDATA.fl_wstate],WSTATE_MAXIMIZED
         jnz     .window_move_return
-        push  dword [edi+0]           ; save old coordinates
+        push    dword [edi + WDATA.box.left]  ; save old coordinates
-        push  dword [edi+4]
+        push    dword [edi + WDATA.box.top]
-        push  dword [edi+8]
+        push    dword [edi + WDATA.box.width]
-        push  dword [edi+12]
+        push    dword [edi + WDATA.box.height]
         cmp   eax,-1                  ; set new position and size
         je    .no_x_reposition
-        mov   [edi+0],eax
+        mov     [edi + WDATA.box.left], eax
       .no_x_reposition:
         cmp   ebx,-1
         je    .no_y_reposition
-        mov   [edi+4],ebx
+        mov     [edi + WDATA.box.top], ebx
       .no_y_reposition:
         test    [edi+WDATA.fl_wstate],WSTATE_ROLLEDUP
         jnz     .no_y_resizing
         cmp   ecx,-1
         je    .no_x_resizing
-        mov   [edi+8],ecx
+        mov     [edi + WDATA.box.width], ecx
       .no_x_resizing:
         cmp   edx,-1
         je    .no_y_resizing
-        mov   [edi+12],edx
+        mov     [edi + WDATA.box.height], edx
       .no_y_resizing:
         call  check_window_position
         pushad                       ; save for window fullscreen/resize
         mov   esi,edi
         sub   edi,window_data
         shr   edi,5
         shl   edi,8
-        add   edi,0x80000+0x90
+        add   edi, 0x80000 + APPDATA.saved_box
         mov   ecx,4
         cld
         rep   movsd
         mov   [dly],ebx
         mov   [dlxe],ecx
         mov   [dlye],edx
         call  calculatescreen
-        mov   [edi+31],byte 1       ; flag the process as redraw
+        mov   [edi + WDATA.fl_redraw], 1 ; flag the process as redraw
         mov   eax,edi               ; redraw screen at old position
     mov   [mouse_active], 0
     xor   edi, edi
     mov   ecx, [0x3004]
    set_mouse_event:
     add   edi, 256
-    or    [edi+0x80000+0xA8], dword 00100000b
+    or    [edi+0x80000+APPDATA.event_mask], dword 00100000b
     loop  set_mouse_event
   mouse_not_active:
     cmp   [0xfff0],byte 0               ; background update ?
     jz    nobackgr
     cmp    [background_defined], 0
     jz    nobackgr
     mov   [0xfff0],byte 2
     call  change_task
-    mov   [draw_data+32+0],dword 0
+	mov   [draw_data+32 + RECT.left],dword 0
-    mov   [draw_data+32+4],dword 0
+	mov   [draw_data+32 + RECT.top],dword 0
     mov   eax,[0xfe00]
     mov   ebx,[0xfe04]
-    mov   [draw_data+32+8],eax
+	mov   [draw_data+32 + RECT.right],eax
-    mov   [draw_data+32+12],ebx
+	mov   [draw_data+32 + RECT.bottom],ebx
     call  drawbackground
     mov   [0xfff0],byte 0
     mov   edx,0x3040
     movzx ecx,byte [0xff00]
     add   ecx,5
   markz:
-    mov   [edx+0xa],byte 3
+    mov   [edx+TASKDATA.state],byte 3
     add   edx,0x20
     loop  markz
   noshutdown:
     mov   eax,[0x3004]                  ; termination
-    mov   ebx,0x3020+0xa
+    mov   ebx,0x3020+TASKDATA.state
     mov   esi,1
          mov   edi,eax
          cmp   ecx,1               ; limit for background
          jz    bgli
-         mov   eax,[edi+0]
+         mov   eax, [edi + WDATA.box.left]
-         mov   ebx,[edi+4]
+         mov   ebx, [edi + WDATA.box.top]
-         mov   ecx,[edi+8]
+         mov   ecx, [edi + WDATA.box.width]
-         mov   edx,[edi+12]
+         mov   edx, [edi + WDATA.box.height]
-         add   ecx,eax
+         add   ecx, eax
-         add   edx,ebx
+         add   edx, ebx
          mov   ecx,[dlxe]   ; ecx = area x end     eax = window x start
          cmp   ecx,eax
          jb    ricino
-         mov   eax,[edi+0]
+         mov   eax, [edi + WDATA.box.left]
-         mov   ebx,[edi+4]
+         mov   ebx, [edi + WDATA.box.top]
-         mov   ecx,[edi+8]
+         mov   ecx, [edi + WDATA.box.width]
-         mov   edx,[edi+12]
+         mov   edx, [edi + WDATA.box.height]
-         add   ecx,eax
+         add   ecx, eax
-         add   edx,ebx
+         add   edx, ebx
          mov   eax,edi
          add   eax,draw_data-window_data
          mov   ebx,[dlx]          ; set limits
-         mov   [eax+0],ebx
+         mov   [eax + RECT.left], ebx
          mov   ebx,[dly]
-         mov   [eax+4],ebx
+         mov   [eax + RECT.top], ebx
          mov   ebx,[dlxe]
-         mov   [eax+8],ebx
+         mov   [eax + RECT.right], ebx
          mov   ebx,[dlye]
-         mov   [eax+12],ebx
+         mov   [eax + RECT.bottom], ebx
          call  drawbackground
        newdw8:
        nobgrd:
-         mov   [eax+31],byte 1    ; mark as redraw
+         mov   [eax + WDATA.fl_redraw],byte 1    ; mark as redraw
 set_app_param:
         push edi
         mov  edi,[0x3010]
-        mov  [edi],eax
+        mov  [edi+TASKDATA.event_mask],eax
 delay_hs:     ; delay in 1/100 secs
         push  eax
         push  ecx
         push  edx
-        mov   edx,[timer_ticks];[0xfdf0]
+        mov   edx,[timer_ticks]
         add   edx,eax
       newtic:
-        mov   ecx,[timer_ticks];[0xfdf0]
+        mov   ecx,[timer_ticks]
         cmp   edx,ecx
 align 4
 sys_programirq:
-    mov   edi,[0x3010]
-    add   edi,0x10
+    mov   edi,[0x3010]
-    add   eax,[edi]
+    add   eax,[edi+TASKDATA.mem_start]
     cmp   ebx,16
     jae   .not_owner
     mov   edi,[0x3010]
-    mov   edi,[edi+0x4]
+    mov   edi,[edi+TASKDATA.pid]
     cmp   edi,[irq_owner+ebx*4]
     je    spril1
      mov   edx,eax           ; check for correct owner
      shl   edx,2
      add   edx,irq_owner
      mov   edx,[edx]
      mov   edi,[0x3010]
-     mov   edi,[edi+0x4]
+     mov   edi,[edi+TASKDATA.pid]
      cmp   edx,edi
      je    gidril1
 .not_owner:
      mov   [esp+32],dword 2     ; ecx=2
      ret
      add   edi,1
      mov   [0x2d0000],edi
      shl   edi,4
      add   edi,0x2d0000
      mov   esi,[0x3010]
-     mov   esi,[esi+0x4]
+     mov   esi,[esi+TASKDATA.pid]
      mov   [edi],esi
      mov   [edi+4],ebx
      mov   [edi+8],ecx
      mov   esi,[0x2d0000]     ; no reserved areas ?
      test  esi,esi
      je    frpal2
      mov   edx,[0x3010]
-     mov   edx,[edx+4]
+     mov   edx,[edx+TASKDATA.pid]
    frpal3:
      mov   edi,esi
      shl   edi,4
      add   edi,0x2d0000
      jz    reserve_irq
      lea   edi,[irq_owner+ebx*4]
      mov   edx,[edi]
      mov   eax,[0x3010]
-     cmp   edx,[eax+0x4]
+     cmp   edx,[eax+TASKDATA.pid]
      jne   fril1
      dec   ecx
      mov   [edi],ecx
    fril1:
      lea   edi,[irq_owner+ebx*4]
      cmp   dword [edi], 0
      jnz   ril1
      mov   edx,[0x3010]
-     mov   edx,[edx+0x4]
+     mov   edx,[edx+TASKDATA.pid]
      mov   [edi],edx
      dec   ecx
    ril1:
      mov   [esp+36],ecx ; return in eax
      test eax, eax                  ; get event data
      jnz  no_get_sys_events
      mov  esi,save_syscall_data     ; data
      mov  edi,[0x3010]
-     mov  edi,[edi+0x10]
+     mov  edi,[edi+TASKDATA.mem_start]
      add  edi,ebx
      cld
      rep  movsb
         dec     eax             ; 1 = set keyboard mode
      jne   no_set_keyboard_setup
      shl   edi,8
-     mov   [edi+0x800B4],bl
+     mov   [edi+0x80000 + APPDATA.keyboard_mode],bl
      ret
    no_set_keyboard_setup:
         dec     eax             ; 2 = get keyboard mode
      cmp  eax,1                      ; DEFINE IPC MEMORY
      jne  no_ipc_def
      mov  edi,[0x3000]
      shl  edi,8
      add  edi,0x80000
-     mov  [edi+0xA0],ebx
+     mov  [edi + APPDATA.ipc_start], ebx
-     mov  [edi+0xA4],ecx
+     mov  [edi + APPDATA.ipc_size], ecx
      mov  [esp+36],dword 0
      ret
    no_ipc_def:
      cmp  eax,2                      ; SEND IPC MESSAGE
      jne  no_ipc_send
      mov  esi,1
      mov  edi,0x3020
     ipcs1:
-     cmp  [edi+4],ebx
+     cmp  [edi+TASKDATA.pid], ebx
      je   ipcs2
      add  edi,0x20
      inc  esi
      cmp  esi,[0x3004]
      cli
      push esi
      mov  eax,esi
      shl  eax,8
-     mov  ebx,[eax+0x80000+0xa0]
+     mov  ebx,[eax+0x80000 + APPDATA.ipc_start]
      test ebx,ebx                  ; ipc area not defined ?
      je   ipc_err1
-     add  ebx,[eax+0x80000+0xa4]
+     add  ebx,[eax+0x80000 + APPDATA.ipc_size]
      mov  eax,esi
      shl  eax,5
-     add  ebx,[eax+0x3000+0x10]    ; ebx <- max data position
+     add  ebx,[eax+0x3000 + TASKDATA.mem_start]    ; ebx <- max data position
      mov  eax,esi                  ; to
      shl  esi,8
      add  esi,0x80000
-     mov  edi,[esi+0xa0]
+     mov  edi,[esi+APPDATA.ipc_start]
      shl  eax,5
      add  eax,0x3000
-     add  edi,[eax+0x10]
+     add  edi,[eax+TASKDATA.mem_start]
      cmp  [edi],byte 0             ; overrun ?
      jne  ipc_err2
      mov  ebp,edi
      add  edi,[edi+4]
      add  edi,8
      jg   ipc_err3                 ; not enough room ?
      push ecx
      mov  eax,[0x3010]
-     mov  eax,[eax+4]
+     mov  eax,[eax+TASKDATA.pid]
      mov  [edi-8],eax
      mov  [edi-4],ecx
      mov  edi,ebp                  ; increase memory position
      add  dword [edi+4],ecx
      mov  edi,[esp]
      shl  edi,8
-     or   dword [edi+0x80000+0xA8],dword 01000000b ; ipc message
+     or   dword [edi+0x80000+APPDATA.event_mask],dword 01000000b ; ipc message
      cmp  [check_idle_semaphore],dword 20
      jge  ipc_no_cis
 syscall_setpixel:                       ; SetPixel
      mov   edx,[0x3010]
-     add   eax,[edx-twdw]
+     add   eax,[edx-twdw+WDATA.box.left]
-     add   ebx,[edx-twdw+4]
+     add   ebx,[edx-twdw+WDATA.box.top]
         mov     edi,[0x3000]
         shl     edi,8
 align 4
 syscall_writetext:                      ; WriteText
      mov   edi,[0x3010]
-     mov   ebp,[edi-twdw]
+     mov   ebp,[edi-twdw+WDATA.box.left]
         mov     esi,[0x3000]
         shl     esi,8
         add     ebp,[esi+0x80000+APPDATA.wnd_clientbox.left]
      shl   ebp,16
-     add   ebp,[edi-twdw+4]
-        add     bp,word[esi+0x80000+APPDATA.wnd_clientbox.top]
+     add   ebp,[edi-twdw+WDATA.box.top]
-     add   edi,0x10
+        add     bp,word[esi+0x80000+APPDATA.wnd_clientbox.top]
-     add   ecx,[edi]
+	 add   ecx,[edi+TASKDATA.mem_start]
      add   eax,ebp
      xor   edi,edi
      jmp   dtext
 align 4
 syscall_openramdiskfile:                ; OpenRamdiskFile
      mov   edi,[0x3010]
 align 4
 syscall_startapp:                       ; StartApp
      mov   edi,[0x3010]
-     add   edi,0x10
+     add   edi, TASKDATA.mem_start
      add   eax,[edi]
      test  ebx,ebx
      jz    noapppar
 align 4
 syscall_delramdiskfile:                 ; DelRamdiskFile
      mov   edi,[0x3010]
-     add   edi,0x10
+     add   edi, TASKDATA.mem_start
      add   eax,[edi]
      call  filedelete
      mov   [esp+36],eax
      ret
 align 4
 syscall_writeramdiskfile:               ; WriteRamdiskFile
      mov   edi,[0x3010]
-     add   edi,0x10
+     add   edi, TASKDATA.mem_start
 align 4
 syscall_readstring:                     ; ReadString
      mov   edi,[0x3010]
-     add   edi,0x10
+     add   edi, TASKDATA.mem_start
      add   eax,[edi]
      call  read_string
      mov   [esp+36],eax
      ret
 align 4
 syscall_drawline:                       ; DrawLine
      mov   edi,[0x3010]
-     movzx edx,word[edi-twdw]
+     movzx edx,word[edi-twdw+WDATA.box.left]
      mov   ebp,edx
         mov     esi,[0x3000]
         shl     esi,8
         add     ebp,[esi+0x80000+APPDATA.wnd_clientbox.left]
         add     dx,word[esi+0x80000+APPDATA.wnd_clientbox.left]
      shl   edx,16
      add   ebp,edx
-     movzx edx,word[edi-twdw+4]
+     movzx edx,word[edi-twdw+WDATA.box.top]
 align 4
 read_from_hd:                           ; Read from hd - fn not in use
      mov   edi,[0x3010]
-     add   edi,0x10
+     add   edi,TASKDATA.mem_start
      add   eax,[edi]
      add   ecx,[edi]
 align 4
 write_to_hd:                            ; Write a file to hd
      mov   edi,[0x3010]
-     add   edi,0x10
+     add   edi,TASKDATA.mem_start
      add   eax,[edi]
      add   ecx,[edi]
      add   edx,[edi]

Subversion Repositories Kolibri OS

(root)/kernel/trunk/kernel.asm @ 473 – Rev 114 → 115