dunkaist/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

t_edit: fix open null file

Browse Source 
git-svn-id: svn://kolibrios.org@8262 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
IgorA
2020-11-27 14:30:47 +00:00
parent b43350b8b9
commit 2ef1505e27
4 changed files with 65 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
programs/develop/libraries/box_lib/trunk/t_edit.asm
View File

@@ -820,6 +820,12 @@ proc ted_on_open_file
push edx ;source
push esi
or ebx,ebx
jnz @f
;<3B>᫨ 䠩<> <20><><EFBFBD>⮩
stdcall ted_clear,edi,1 ;<3B><><EFBFBD>⨬ <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
jmp .end_opn
@@:
stdcall ted_clear,edi,0 ;<3B><><EFBFBD>⨬ <20><> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><>⮬<EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD> <20>㤥<EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>묨 <20><><EFBFBD>묨
;<3B><><EFBFBD><EFBFBD><EFBFBD> ᨬ<><E1A8AC><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>襭<EFBFBD><E8A5AD> <20><>ப<EFBFBD> ⮫쪮 10 (<28><><EFBFBD> 13)
@@ -842,9 +848,8 @@ proc ted_on_open_file
.no_10:
;<3B><>ॢ<EFBFBD><E0A5A2><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 䠩<> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> t_edit
mov eax,ebx
mov ecx,ebx
add eax,2
lea eax,[ebx+2]
ConvertIndexToPointer eax
mov edx,ted_tex
add edx,ebx
@@ -860,8 +865,8 @@ proc ted_on_open_file
mov dword[eax+symbol.tc],-1
mov dword[eax+symbol.td],0
cmp ecx,0
je @f
or ecx,ecx
jz @f
dec ecx
dec edx
sub eax,sizeof.symbol
@@ -890,11 +895,11 @@ proc ted_on_open_file
@@: ;clear memory, need if before was open big file
add edx,sizeof.symbol
cmp edx,ted_tex_end
jge @f
jge .end_opn
mov dword[edx+symbol.tc],0
mov dword[edx+symbol.td],0
jmp @b
@@:
.end_opn:
call ted_get_num_lines
cmp eax,TED_LINES_IN_NEW_FILE
@@ -2446,12 +2451,11 @@ endp
; edi = pointer to tedit struct
; end_pos = position end 'symbol' struct
align 16
proc ted_find_help_id, end_pos:dword
proc ted_find_help_id uses ebx ecx, end_pos:dword
; ecx = word_n
; ebx = l_pos
mov ted_help_id,-1
push ebx ecx
xor ebx,ebx
mov bl,[edx]
shl bx,2 ;ebx*=4
@@ -2518,7 +2522,6 @@ proc ted_find_help_id, end_pos:dword
;return word_n;
.if_0e:
pop ecx ebx
ret
endp
@@ -2588,8 +2591,7 @@ align 4
or eax,eax
jz @f
cmp eax,6
je @f
jmp .ret_f
jne .ret_f
@@:
cmp ebx,-1
je .ret_f
@@ -3427,8 +3429,7 @@ align 4
cmp byte[edx],9
je @f
cmp byte[edx],13
je @f
jmp .end_f
jne .end_f
@@:
lea edx,[ted_symbol_space]
.end_f:
@@ -3472,8 +3473,8 @@ proc ted_draw, edit:dword
stdcall ted_clear_line_before_draw, edi,ebx,1,esi
call ted_get_first_visible_pos
cmp edx,0
je .no_draw_text
or edx,edx
jz .no_draw_text
mov esi,1 ;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>뢮<EFBFBD><EBA2AE><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ⥪<><E2A5AA><EFBFBD> <20><> 1-<2D><> ᨬ<><E1A8AC><EFBFBD><EFBFBD>
@@:
call ted_iterat_next