Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 9043 → Rev 9045

/kernel/trunk/blkdev/disk.inc
1310,7 → 1310,7
mov ebx, [ebx+f70s5arg.buf]
stdcall is_region_userspace, ebx, ecx
movi eax, ERROR_MEMORY_POINTER
jz .done
jnz .done
mov edi, ebx
xor eax, eax
rep stosb
/kernel/trunk/core/clipboard.inc
52,7 → 52,7
 
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
stdcall is_region_userspace, edx, ecx
jnz @f
jz @f
mov eax, -1
jmp .exit_1
@@:
/kernel/trunk/core/taskman.inc
812,7 → 812,7
test edi, edi
jz @f
stdcall is_region_userspace, edi, [ebp+APP_HDR.filename_size]
jz @f
jnz @f
mov al, '/'
stosb
rep movsb
840,7 → 840,7
.copy_cmdline:
inc ecx ; keep in mind about 0 in the end
stdcall is_region_userspace, edi, ecx
jz .check_tls_header
jnz .check_tls_header
dec ecx
rep movsb
mov byte [edi], 0
/kernel/trunk/fs/fs_lfn.inc
92,7 → 92,7
; syscall_fileSystemUnicode: ; with user pointer correctness checking
; ; in: ebx -> f.80 parameter structure
; stdcall file_system_is_operation_safe, ebx
; jnz @f
; jz @f
 
; DEBUGF 1, "sysfn80 addr error\n"
; mov dword [image_of_eax], ERROR_MEMORY_POINTER
108,7 → 108,7
; syscall_file_system_lfn: ; with user pointer correctness checking
; ; in: ebx -> f.70 parameter structure
; stdcall file_system_is_operation_safe, ebx
; jnz @f
; jz @f
 
; DEBUGF 1, "sysfn70 addr error\n"
; mov dword [image_of_eax], ERROR_MEMORY_POINTER
550,7 → 550,7
.get:
; in: ecx -> buffer, edx = length, eax = encoding
stdcall is_region_userspace, ecx, edx
jnz @f
jz @f
 
; if illegal buffer given
xor edx, edx
/kernel/trunk/gui/window.inc
130,7 → 130,7
mov edx, 192 ; max size
@@:
stdcall is_region_userspace, esi, edx ;
jnz @f ;
jz @f ;
ret ;
@@:
mov edi, common_colours
147,7 → 147,7
mov edx, 192 ; max size
@@:
stdcall is_region_userspace, edi, edx
jnz @f
jz @f
ret
@@:
mov esi, common_colours
/kernel/trunk/kernel.asm
1419,13 → 1419,13
test bl, bl
jz @f
stdcall is_region_userspace, ecx, 1
jnz @f
jz @f
ret
@@:
test esi, 0x08000000
jz @f
stdcall is_region_userspace, edi, 1
jnz @f
jz @f
ret
@@:
;It is not optimization
1767,7 → 1767,7
 
; if given memory address belongs to kernel then error
stdcall is_region_userspace, ebx, 128
jz .addr_error
jnz .addr_error
 
mov eax, keymap
mov ecx, 128
1780,7 → 1780,7
jnz .alt
 
stdcall is_region_userspace, ebx, 128
jz .addr_error
jnz .addr_error
 
mov eax, keymap_shift
mov ecx, 128
1793,7 → 1793,7
jne .country
 
stdcall is_region_userspace, ebx, 128
jz .addr_error
jnz .addr_error
 
mov eax, keymap_alt
mov ecx, 128
2459,7 → 2459,7
jnz .exit
.small_table:
stdcall is_region_userspace, edx, DRIVE_DATA_SIZE
jz .exit
jnz .exit
mov edi, edx
mov esi, DRIVE_DATA
mov ecx, DRIVE_DATA_SIZE ;10
2475,7 → 2475,7
sysfn_getversion: ; 18.13 = get kernel ID and version
; if given memory address belongs to kernel then error
stdcall is_region_userspace, ecx, version_end-version_inf
jz .addr_error
jnz .addr_error
 
mov edi, ecx
mov esi, version_inf
2838,7 → 2838,7
 
; add check pointer
stdcall is_region_userspace, ecx, esi
jz .fin
jnz .fin
 
cmp [img_background], static_background_data
jnz @f
3191,7 → 3191,7
;
; if given memory address belongs to kernel then error
stdcall is_region_userspace, ebx, 0x4C
jz .addr_error
jnz .addr_error
 
cmp ecx, -1 ; who am I ?
jne .no_who_am_i
4401,7 → 4401,7
lea eax, [eax*3]
stdcall is_region_userspace, ebx, eax
pop ecx
jz sys_putimage.exit
jnz sys_putimage.exit
 
sys_putimage:
test ecx, 0x80008000
4451,7 → 4451,7
imul eax, ecx
stdcall is_region_userspace, ebx, eax
pop ecx
jz sys_putimage.exit
jnz sys_putimage.exit
 
mov eax, [current_slot_idx]
shl eax, 8
5206,7 → 5206,7
syscall_writetext: ; WriteText
 
stdcall is_region_userspace, edx, esi
jz .err
jnz .err
 
mov eax, [TASK_BASE]
mov ebp, [eax-twdw+WDATA.box.left]
5230,7 → 5230,7
 
@@: ; check pointer
stdcall is_region_userspace, edi, 0
jz .err
jnz .err
jmp dtext
.err:
ret
5403,7 → 5403,7
lea ebp, [ebp*3]
imul ebp, esi
stdcall is_region_userspace, edi, ebp
jz .exit
jnz .exit
 
mov ebp, edx
dec ebp
5474,7 → 5474,7
lea ebp, [ebp*4]
imul ebp, esi
stdcall is_region_userspace, edi, ebp
jz .exit
jnz .exit
mov ebp, edx
 
5754,23 → 5754,20
; @return ZF = 1 if region in userspace memory,
; ZF = 0 otherwise
proc is_region_userspace stdcall, base:dword, len:dword
push eax ebx
push eax
mov eax, [base]
 
cmp eax, OS_BASE
ja @f
cmp eax, OS_BASE-1
ja @f ; zf
 
add eax, [len]
jc @f ; zf
cmp eax, OS_BASE
ja @f
ja @f ; zf
 
mov eax, 1
jmp .ret
cmp eax, eax ; ZF
@@:
xor eax, eax
.ret:
test eax, eax
pop ebx eax
pop eax
ret
endp
 
/kernel/trunk/network/stack.inc
830,7 → 830,7
.get_dev_name:
mov ebx, eax
stdcall is_region_userspace, ecx, 64
jz .bad_buffer
jnz .bad_buffer
mov esi, [ebx + NET_DEVICE.name]
mov edi, ecx