Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 8857 → Rev 8858

/kernel/trunk/core/sys32.inc
1,6 → 1,6
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; ;;
;; Copyright (C) KolibriOS team 2004-2020. All rights reserved. ;;
;; Copyright (C) KolibriOS team 2004-2021. All rights reserved. ;;
;; Distributed under terms of the GNU General Public License. ;;
;; ;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
554,7 → 554,7
 
pusha ; save window coordinates for window restoring
cld
shl esi, 5
shl esi, BSF sizeof.WDATA
add esi, window_data
mov eax, [esi+WDATA.box.left]
mov [draw_limits.left], eax
566,16 → 566,12
mov [draw_limits.bottom], eax
 
xor eax, eax
mov [esi+WDATA.box.left], eax
mov [esi+WDATA.box.width], eax
mov [esi+WDATA.box.top], eax
mov [esi+WDATA.box.height], eax
mov [esi+WDATA.cl_workarea], eax
mov [esi+WDATA.cl_titlebar], eax
mov [esi+WDATA.cl_frames], eax
mov dword [esi+WDATA.z_modif], eax; clear all flags: z_modif, wstate, redraw, wdrawn
mov edi, esi
mov ecx, sizeof.WDATA/4
rep stosd
 
lea edi, [esi-window_data+draw_data]
mov ecx, 32/4
mov ecx, sizeof.WDATA/4
rep stosd
popa
 
/kernel/trunk/core/taskman.inc
1,6 → 1,6
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; ;;
;; Copyright (C) KolibriOS team 2004-2016. All rights reserved. ;;
;; Copyright (C) KolibriOS team 2004-2021. All rights reserved. ;;
;; Distributed under terms of the GNU General Public License. ;;
;; ;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
484,9 → 484,9
push ebx
push ecx
mov ebx, [TASK_COUNT]
shl ebx, 5 ; ebx *= 32 (32 is size of TASKDATA struct)
shl ebx, BSF sizeof.TASKDATA ; multiply by size
; add 2*32 cause:
; 0x80003000 - 0x80003020 isnt a task actually
; [TASK_TABLE; TASK_TABLE + 32) isnt a task actually
; skip first process in the task table
mov ecx, 2*32
 
509,7 → 509,7
ret
 
.pid_found:
shr ecx, 5
shr ecx, BSF sizeof.TASKDATA ; divide by size
mov eax, ecx ;convert offset to index of slot
pop ecx
pop ebx