KFar 0.35: some bugfixes

git-svn-id: svn://kolibrios.org@522 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Evgeny Grechnikov (Diamond) 2007-05-24 11:29:36 +00:00
parent 4f326f77c6
commit aa94143ec9

View File

@ -133,6 +133,7 @@ start:
.skip_assoc: .skip_assoc:
xor ebp, ebp xor ebp, ebp
xor esi, esi xor esi, esi
.shortcut_loop:
mov edi, saved_file_name mov edi, saved_file_name
push dword nullstr push dword nullstr
push 512 push 512
@ -169,6 +170,7 @@ start:
call xpgrealloc call xpgrealloc
test eax, eax test eax, eax
jnz @f jnz @f
pop esi
mov edi, FolderShortcuts mov edi, FolderShortcuts
mov ecx, 10 mov ecx, 10
rep stosd rep stosd
@ -188,7 +190,7 @@ start:
.shortcut_cont: .shortcut_cont:
inc [aShortcut.d] inc [aShortcut.d]
cmp [aShortcut.d], '9' cmp [aShortcut.d], '9'
jbe .skip_assoc jbe .shortcut_loop
mov esi, FolderShortcuts mov esi, FolderShortcuts
mov ecx, 10 mov ecx, 10
dec ebp dec ebp
@ -1685,6 +1687,7 @@ end if
int 0x40 int 0x40
test eax, eax test eax, eax
pop eax pop eax
mov byte [edi], dl
jnz .createupcont1 jnz .createupcont1
test byte [attrinfo.attr], 10h test byte [attrinfo.attr], 10h
jnz .createupdone1 jnz .createupdone1
@ -1705,7 +1708,6 @@ end if
.ret3: .ret3:
ret ret
.createupcont1: .createupcont1:
mov [edi], dl
dec eax dec eax
@@: @@:
dec edi dec edi
@ -1729,6 +1731,7 @@ end if
push RetryOrCancelBtn push RetryOrCancelBtn
push 2 push 2
call makedir call makedir
mov byte [edi], dl
mov [bNeedRestoreName], 1 mov [bNeedRestoreName], 1
pop eax pop eax
jnz .ret3 jnz .ret3
@ -1866,7 +1869,7 @@ end if
@@: @@:
loop .f8_loop loop .f8_loop
.f8_multiple_cancel: .f8_multiple_cancel:
jmp .ctrl_r jmp .copydone
.f8: .f8:
cmp [ebp + panel1_selected_num - panel1_data], 0 cmp [ebp + panel1_selected_num - panel1_data], 0
jnz .f8_has_selected jnz .f8_has_selected
@ -1910,6 +1913,7 @@ end if
mov [del_bSkipAll], 0 mov [del_bSkipAll], 0
mov eax, ecx mov eax, ecx
call delete_file call delete_file
jmp .copydone
.ctrl_r: .ctrl_r:
; Rescan panel ; Rescan panel
; call read_folder ; call read_folder
@ -5269,7 +5273,7 @@ find_extension:
pop esi pop esi
ret ret
header db 'Kolibri Far 0.34',0 header db 'Kolibri Far 0.35',0
nomem_draw db 'No memory for redraw.',0 nomem_draw db 'No memory for redraw.',0
.size = $ - nomem_draw .size = $ - nomem_draw