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

fix backward compatibility broken in #6675

Browse Source 
git-svn-id: svn://kolibrios.org@6705 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
0CodErr
2016-11-12 17:19:46 +00:00
parent fe94d7915b
commit 0a05348fad
2 changed files with 96 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
programs/develop/libraries/box_lib/trunk/box_lib.mac
View File

@@ -19,13 +19,13 @@ bp_size equ [ebp+48]
ed_pos equ [edi + 52] ; carret current position ed_pos equ [edi + 52] ; carret current position
ed_offset equ [edi + 56] ed_offset equ [edi + 56]
cl_curs_x equ [edi + 60] ; previous cursor X cl_curs_x equ [edi + 60] ; previous cursor X
cl_curs_y equ [edi+64] ; previous cursor Y cl_curs_y equ [edi + 62] ; previous cursor Y
ed_shift_pos equ [edi+68] ; selection current position ed_shift_pos equ [edi + 64] ; selection current position
ed_shift_pos_old equ [edi+72] ; selection previous position ed_shift_pos_old equ [edi + 66] ; selection previous position
ed_height equ [edi+76] ed_height equ [edi + 68]
ed_char_width equ [edi+80] ed_char_width equ [edi + 72]
ed_struc_size = 84 ed_struc_size = 76
;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;
;; flags for EditBox ;; ;; flags for EditBox ;;
@@ -75,10 +75,10 @@ struc edit_box width,left,top,color,shift_color,focus_border_color,\
.size dd size+0 .size dd size+0
.pos dd pos+0 .pos dd pos+0
.offset dd 0 .offset dd 0
.cl_curs_x dd 0 .cl_curs_x dw 0
.cl_curs_y dd 0 .cl_curs_y dw 0
.shift dd 0 .shift dw 0
.shift_old dd 0 .shift_old dw 0
.height dd 0 .height dd 0
.char_width dd 0 .char_width dd 0
} }

78
programs/develop/libraries/box_lib/trunk/editbox.mac
View File

@@ -207,7 +207,7 @@ edit_box.draw_shift:
test word ed_flags,ed_shift_bac ;<3B><>⠭<EFBFBD><E2A0AD><EFBFBD><EFBFBD> 䫠<><E4ABA0>, <20>뤥<EFBFBD><EBA4A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> test word ed_flags,ed_shift_bac ;<3B><>⠭<EFBFBD><E2A0AD><EFBFBD><EFBFBD> 䫠<><E4ABA0>, <20>뤥<EFBFBD><EBA4A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
jz @f jz @f
mov ebp,shift_color mov ebp,shift_color
mov ebx,ed_shift_pos movzx ebx, word ed_shift_pos
call edit_box_key.sh_cl_ call edit_box_key.sh_cl_
@@: ret @@: ret
;---------------------------------------------------------- ;----------------------------------------------------------
@@ -284,36 +284,36 @@ edit_box.get_n:
ret ret
;---------------------------------------------------------- ;----------------------------------------------------------
;--- <20><><EFBFBD>楤<EFBFBD><E6A5A4><EFBFBD> <20><>ᮢ<EFBFBD><E1AEA2><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> -------------------------- ;------------------ Draw Cursor Procedure -----------------
;---------------------------------------------------------- ;----------------------------------------------------------
;<EFBFBD>室<EFBFBD><EFBFBD><EFBFBD> ebp- 梥<> ; in: ebp = Color
edit_box.clear_cursor: edit_box.clear_cursor:
mov edx, ebp mov edx, ebp
mov ebx,cl_curs_x movzx ebx, word cl_curs_x
mov ecx,cl_curs_y movzx ecx, word cl_curs_y
jmp edit_box.draw_curs jmp edit_box.draw_curs
edit_box.draw_cursor: edit_box.draw_cursor:
mov edx, ed_text_color
mov eax, ed_pos mov eax, ed_pos
sub eax, ed_offset sub eax, ed_offset
mul dword ed_char_width mul dword ed_char_width
mov ebx, eax mov ebx, eax
add ebx, ed_left add ebx, ed_left
inc ebx inc ebx
mov edx,ebx
shl ebx,16
add ebx,edx
mov ecx, ed_top mov ecx, ed_top
add ecx, 2 add ecx, 2
mov edx,ecx mov cl_curs_x, bx
mov cl_curs_y, cx
edit_box.draw_curs:
mov eax, ebx
shl ebx, 16
or ebx, eax
mov eax, ecx
shl ecx, 16 shl ecx, 16
add ecx,edx or ecx, eax
add ecx, ed_height add ecx, ed_height
sub ecx, 3 sub ecx, 3
mov cl_curs_x,ebx
mov cl_curs_y,ecx
mov edx,ed_text_color
edit_box.draw_curs:
mcall 38 mcall 38
ret ret
@@ -444,7 +444,7 @@ edit_box_key.shift:
je edit_box_key.f_exit je edit_box_key.f_exit
mov ebp,shift_color mov ebp,shift_color
or word ed_flags,ed_shift_bac ;<3B><>⠭<EFBFBD><E2A0AD><EFBFBD><EFBFBD> 䫠<><E4ABA0>, <20>뤥<EFBFBD><EBA4A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> or word ed_flags,ed_shift_bac ;<3B><>⠭<EFBFBD><E2A0AD><EFBFBD><EFBFBD> 䫠<><E4ABA0>, <20>뤥<EFBFBD><EBA4A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
mov ebx,ed_shift_pos movzx ebx, word ed_shift_pos
call edit_box_key.sh_cl_ call edit_box_key.sh_cl_
jmp edit_box.draw_cursor_text jmp edit_box.draw_cursor_text
@@ -544,10 +544,10 @@ edit_box_key.draw_wigwag_cl:
edit_box_key.sh_first_sh: edit_box_key.sh_first_sh:
test word ed_flags,ed_shift test word ed_flags,ed_shift
je @f je @f
mov ed_shift_pos_old,ebx mov ed_shift_pos_old,bx
test word ed_flags,ed_shift_on test word ed_flags,ed_shift_on
jne @f jne @f
mov ed_shift_pos,ebx mov ed_shift_pos,bx
or word ed_flags,ed_shift_on or word ed_flags,ed_shift_on
@@: ret @@: ret
;<3B><>ࠡ<EFBFBD>⪠ <20>ࠩ<EFBFBD><E0A0A9><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> editbox <20><><EFBFBD> <20><><EFBFBD><EFBFBD>⮬ shift ;<3B><>ࠡ<EFBFBD>⪠ <20>ࠩ<EFBFBD><E0A0A9><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> editbox <20><><EFBFBD> <20><><EFBFBD><EFBFBD>⮬ shift
@@ -560,7 +560,7 @@ edit_box_key.sh_st_of:
je @f je @f
call edit_box.draw_bg call edit_box.draw_bg
mov ebp,ed_color mov ebp,ed_color
mov ebx,ed_shift_pos movzx ebx, word ed_shift_pos
call edit_box_key.sh_cl_ ;<3B><><EFBFBD><EFBFBD>⪠ <20>뤥<EFBFBD><EBA4A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>ࠣ<EFBFBD><E0A0A3><EFBFBD><EFBFBD><EFBFBD> call edit_box_key.sh_cl_ ;<3B><><EFBFBD><EFBFBD>⪠ <20>뤥<EFBFBD><EBA4A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>ࠣ<EFBFBD><E0A0A3><EFBFBD><EFBFBD><EFBFBD>
and word ed_flags,ed_shift_cl ; <20><><EFBFBD><EFBFBD>⪠ <20><> ⮣<>, <20><><EFBFBD> <20><>ࠫ<EFBFBD> <20>뤥<EFBFBD><EBA4A5><EFBFBD><EFBFBD><EFBFBD> and word ed_flags,ed_shift_cl ; <20><><EFBFBD><EFBFBD>⪠ <20><> ⮣<>, <20><><EFBFBD> <20><>ࠫ<EFBFBD> <20>뤥<EFBFBD><EBA4A5><EFBFBD><EFBFBD><EFBFBD>
jmp edit_box.draw_cursor_text jmp edit_box.draw_cursor_text
@@ -576,7 +576,7 @@ edit_box_key.sh_enable:
je @f je @f
call edit_box.check_offset call edit_box.check_offset
mov ebp,ed_color mov ebp,ed_color
mov ebx,ed_shift_pos movzx ebx, word ed_shift_pos
call edit_box_key.sh_cl_ ;<3B><><EFBFBD><EFBFBD>⪠ <20>뤥<EFBFBD><EBA4A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>ࠣ<EFBFBD><E0A0A3><EFBFBD><EFBFBD><EFBFBD> call edit_box_key.sh_cl_ ;<3B><><EFBFBD><EFBFBD>⪠ <20>뤥<EFBFBD><EBA4A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>ࠣ<EFBFBD><E0A0A3><EFBFBD><EFBFBD><EFBFBD>
call edit_box_key.draw_wigwag_cl call edit_box_key.draw_wigwag_cl
and word ed_flags,ed_shift_cl ; 1<><31><EFBFBD> <20><> <20>㦭<EFBFBD> and word ed_flags,ed_shift_cl ; 1<><31><EFBFBD> <20><> <20>㦭<EFBFBD>
@@ -591,9 +591,9 @@ edit_box_key.sh_ext_en:
test word ed_flags,ed_offset_fl test word ed_flags,ed_offset_fl
je @f je @f
;<3B><>ᮢ<EFBFBD><E1AEA2><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>襭<EFBFBD><E8A5AD><EFBFBD> <20><>אַ㣮<EFACAE>쭨<EFBFBD><ECADA8><EFBFBD> <20> <20><> <20><><EFBFBD><EFBFBD>⪠ ;<3B><>ᮢ<EFBFBD><E1AEA2><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>襭<EFBFBD><E8A5AD><EFBFBD> <20><>אַ㣮<EFACAE>쭨<EFBFBD><ECADA8><EFBFBD> <20> <20><> <20><><EFBFBD><EFBFBD>⪠
mov eax,ed_shift_pos movzx eax, word ed_shift_pos
mov ebx,ed_pos mov ebx,ed_pos
mov ecx,ed_shift_pos_old movzx ecx, word ed_shift_pos_old
;<3B>஢<EFBFBD>ઠ <20> <20><>ᮢ<EFBFBD><E1AEA2><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>襭<EFBFBD><E8A5AD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>⥩ ;<3B>஢<EFBFBD>ઠ <20> <20><>ᮢ<EFBFBD><E1AEA2><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>襭<EFBFBD><E8A5AD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>⥩
cmp eax,ecx cmp eax,ecx
je edit_box_key.1_shem je edit_box_key.1_shem
@@ -616,7 +616,7 @@ edit_box_key.sh_e_end:
ret ret
@@: mov ebp,shift_color @@: mov ebp,shift_color
mov ebx,ed_shift_pos movzx ebx, word ed_shift_pos
call edit_box_key.sh_cl_ call edit_box_key.sh_cl_
jmp edit_box_key.sh_e_end jmp edit_box_key.sh_e_end
;<3B>㭪<EFBFBD><E3ADAA><EFBFBD> <20><><EFBFBD> <20><>ࠡ<EFBFBD>⪨ shift <20><><EFBFBD> <20><><EFBFBD><EFBFBD>⨨ home and end ;<3B>㭪<EFBFBD><E3ADAA><EFBFBD> <20><><EFBFBD> <20><>ࠡ<EFBFBD>⪨ shift <20><><EFBFBD> <20><><EFBFBD><EFBFBD>⨨ home and end
@@ -626,13 +626,13 @@ edit_box_key.sh_home_end:
test word ed_flags,ed_shift_bac test word ed_flags,ed_shift_bac
je @f je @f
mov ebp,ed_color mov ebp,ed_color
mov ebx,ed_shift_pos_old movzx ebx, word ed_shift_pos_old
call edit_box_key.sh_cl_ call edit_box_key.sh_cl_
@@: @@:
test word ed_flags,ed_shift test word ed_flags,ed_shift
je edit_box_key.sh_exit_ ;<3B><><EFBFBD><EFBFBD><EFBFBD> je edit_box_key.sh_exit_ ;<3B><><EFBFBD><EFBFBD><EFBFBD>
mov ebp,shift_color mov ebp,shift_color
mov ebx,ed_shift_pos movzx ebx, word ed_shift_pos
call edit_box_key.sh_cl_ call edit_box_key.sh_cl_
or word ed_flags,ed_shift_bac ;<3B><>⠭<EFBFBD><E2A0AD><EFBFBD><EFBFBD> 䫠<><E4ABA0>, <20>뤥<EFBFBD><EBA4A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> or word ed_flags,ed_shift_bac ;<3B><>⠭<EFBFBD><E2A0AD><EFBFBD><EFBFBD> 䫠<><E4ABA0>, <20>뤥<EFBFBD><EBA4A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
jmp edit_box_key.sh_e_end jmp edit_box_key.sh_e_end
@@ -661,7 +661,7 @@ edit_box_key.del_char:
mov esi,ed_text mov esi,ed_text
test word ed_flags,ed_shift_on test word ed_flags,ed_shift_on
je @f je @f
mov eax,ed_shift_pos movzx eax, word ed_shift_pos
mov ebx,esi mov ebx,esi
cmp eax,ecx cmp eax,ecx
jae edit_box_key.dh_n jae edit_box_key.dh_n
@@ -671,7 +671,7 @@ edit_box_key.del_char:
add ebx,eax ;eax <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> add ebx,eax ;eax <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
sub edx,ecx sub edx,ecx
add esi,ecx add esi,ecx
mov ed_shift_pos,ebp mov ed_shift_pos,bp
jmp edit_box_key.del_ch_sh jmp edit_box_key.del_ch_sh
edit_box_key.dh_n: edit_box_key.dh_n:
@@ -680,7 +680,7 @@ edit_box_key.dh_n:
add ebx,ecx add ebx,ecx
sub edx,eax sub edx,eax
add esi,eax add esi,eax
mov ed_shift_pos,ebp mov ed_shift_pos,bp
jmp edit_box_key.del_ch_sh jmp edit_box_key.del_ch_sh
@@: add esi,ecx ;㪠<><E3AAA0>⥫<EFBFBD> + ᬥ饭<E1ACA5><E9A5AD> <20> ॠ<>쭮<EFBFBD><ECADAE> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> @@: add esi,ecx ;㪠<><E3AAA0>⥫<EFBFBD> + ᬥ饭<E1ACA5><E9A5AD> <20> ॠ<>쭮<EFBFBD><ECADAE> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
@@ -848,14 +848,14 @@ macro are_key_shift_press
pusha pusha
; clear input area ; clear input area
mov ebp,ed_color mov ebp,ed_color
mov ebx,ed_shift_pos movzx ebx, word ed_shift_pos
call edit_box_key.sh_cl_ call edit_box_key.sh_cl_
mov ebp,ed_size mov ebp,ed_size
call edit_box_key.clear_bg call edit_box_key.clear_bg
popa popa
call edit_box_key.del_char call edit_box_key.del_char
mov ebx,ed_size mov ebx,ed_size
sub ebx,ed_shift_pos sub bx,ed_shift_pos
mov ed_size,ebx mov ed_size,ebx
pop eax pop eax
@@: @@:
@@ -966,7 +966,7 @@ edit_box_key.draw_all:
push edit_box_key.shift push edit_box_key.shift
test word ed_flags,ed_shift_on test word ed_flags,ed_shift_on
je @f je @f
mov eax,ed_shift_pos movzx eax, word ed_shift_pos
mov ebx,ed_size mov ebx,ed_size
sub ebx,eax sub ebx,eax
mov ed_size,ebx mov ed_size,ebx
@@ -1159,9 +1159,9 @@ edit_box_mouse.mouse_wigwag:
edit_box_mouse.mdraw: edit_box_mouse.mdraw:
mov ed_pos,eax mov ed_pos,eax
;<3B><>ᮢ<EFBFBD><E1AEA2><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>襭<EFBFBD><E8A5AD><EFBFBD> <20><>אַ㣮<EFACAE>쭨<EFBFBD><ECADA8><EFBFBD> <20> <20><> <20><><EFBFBD><EFBFBD>⪠ ;<3B><>ᮢ<EFBFBD><E1AEA2><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>襭<EFBFBD><E8A5AD><EFBFBD> <20><>אַ㣮<EFACAE>쭨<EFBFBD><ECADA8><EFBFBD> <20> <20><> <20><><EFBFBD><EFBFBD>⪠
mov ecx,ed_shift_pos movzx ecx, word ed_shift_pos
mov ebx,ed_shift_pos_old movzx ebx, word ed_shift_pos_old
mov ed_shift_pos_old,eax mov ed_shift_pos_old,ax
;<3B>஢<EFBFBD>ઠ <20> <20><>ᮢ<EFBFBD><E1AEA2><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>襭<EFBFBD><E8A5AD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>⥩ ;<3B>஢<EFBFBD>ઠ <20> <20><>ᮢ<EFBFBD><E1AEA2><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>襭<EFBFBD><E8A5AD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>⥩
cmp ecx,ebx cmp ecx,ebx
je edit_box_mouse.m1_shem ;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20>뫮 ࠭<><E0A0AD> je edit_box_mouse.m1_shem ;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20>뫮 ࠭<><E0A0AD>
@@ -1195,7 +1195,7 @@ edit_box_mouse.mleft:
dec eax dec eax
call edit_box.check_offset call edit_box.check_offset
push eax push eax
mov ebx,ed_shift_pos movzx ebx, word ed_shift_pos
mov ebp,shift_color mov ebp,shift_color
call edit_box_key.sh_cl_ call edit_box_key.sh_cl_
pop eax pop eax
@@ -1208,7 +1208,7 @@ edit_box_mouse.mright:
jae edit_box_mouse.mwigvag jae edit_box_mouse.mwigvag
inc eax inc eax
call edit_box.check_offset call edit_box.check_offset
mov ebx,ed_shift_pos movzx ebx, word ed_shift_pos
mov ebp,shift_color mov ebp,shift_color
push eax push eax
call edit_box_key.sh_cl_ call edit_box_key.sh_cl_
@@ -1253,7 +1253,7 @@ edit_box_mouse._mshift:
test word ed_flags,ed_shift_bac test word ed_flags,ed_shift_bac
je @f je @f
mov ebp,ed_color mov ebp,ed_color
mov ebx,ed_shift_pos movzx ebx, word ed_shift_pos
push eax push eax
call edit_box_key.sh_cl_ call edit_box_key.sh_cl_
and word ed_flags,ed_shift_bac_cl and word ed_flags,ed_shift_bac_cl
@@ -1261,7 +1261,7 @@ edit_box_mouse._mshift:
@@: @@:
test word ed_flags,ed_mouse_on test word ed_flags,ed_mouse_on
jne @f jne @f
mov ed_shift_pos,eax mov ed_shift_pos,ax
or word ed_flags,ed_mouse_on or word ed_flags,ed_mouse_on
mov ed_pos,eax mov ed_pos,eax
mov ebx,ed_mouse_variable mov ebx,ed_mouse_variable
@@ -1271,12 +1271,12 @@ edit_box_mouse._mshift:
call edit_box.draw_bg call edit_box.draw_bg
jmp edit_box_mouse.m_sh jmp edit_box_mouse.m_sh
@@: cmp eax,ed_shift_pos @@: cmp ax,ed_shift_pos
je edit_box.editbox_exit je edit_box.editbox_exit
mov ed_pos,eax mov ed_pos,eax
call edit_box.draw_bg call edit_box.draw_bg
mov ebp,shift_color mov ebp,shift_color
mov ebx,ed_shift_pos movzx ebx, word ed_shift_pos
call edit_box_key.sh_cl_ call edit_box_key.sh_cl_
or word ed_flags,ed_mous_adn_b or word ed_flags,ed_mous_adn_b
edit_box_mouse.m_sh: edit_box_mouse.m_sh: