Fix some bugs.

git-svn-id: svn://kolibrios.org@4055 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Marat Zakiyanov (Mario79) 2013-10-20 01:32:51 +00:00
parent d08cd616a8
commit d870125d48

View File

@ -78,7 +78,9 @@
dd path dd path
include '../../macros.inc' include '../../macros.inc'
;include '../../debug.inc' ;define __DEBUG__ 1
;define __DEBUG_LEVEL__ 1
;include '../../debug-fdo.inc'
include '../../develop/libraries/box_lib/load_lib.mac' include '../../develop/libraries/box_lib/load_lib.mac'
include '../../develop/libraries/box_lib/trunk/box_lib.mac' include '../../develop/libraries/box_lib/trunk/box_lib.mac'
;include 'macros.inc' ;include 'macros.inc'
@ -1093,6 +1095,10 @@ load_start_directory:
ret ret
;--------------------------------------------------------------------- ;---------------------------------------------------------------------
load_next_dir: load_next_dir:
mov ebx,[file_browser_data_1.folder_block]
test ebx,ebx
jz .exit
mov ebx,[file_browser_data_1.selected_BDVK_adress] mov ebx,[file_browser_data_1.selected_BDVK_adress]
add ebx,40 add ebx,40
test [ebx-40],byte 0x10 test [ebx-40],byte 0x10
@ -1126,6 +1132,7 @@ load_next_dir:
mov [edi+44],eax mov [edi+44],eax
mov [edi+12],dword 0xffffff ; color white mov [edi+12],dword 0xffffff ; color white
call draw_draw_file_browser1 call draw_draw_file_browser1
.exit:
ret ret
.exit_dir: .exit_dir:
mov esi,dir_path mov esi,dir_path
@ -1556,6 +1563,10 @@ draw_open_button_label:
add edx,message_open_dialog_button add edx,message_open_dialog_button
mov edx,[edx] mov edx,[edx]
mov eax,[file_browser_data_1.folder_block]
test eax,eax
jz .1
mov eax,[file_browser_data_1.selected_BDVK_adress] mov eax,[file_browser_data_1.selected_BDVK_adress]
test [eax],byte 0x10 test [eax],byte 0x10
jz @f jz @f
@ -2268,6 +2279,9 @@ compare_expansion:
prepare_extension_and_mark: prepare_extension_and_mark:
mov esi,[dirinfo.return] mov esi,[dirinfo.return]
mov ebp,[esi+4] mov ebp,[esi+4]
test ebp,ebp
jz .end
add esi,32+40 add esi,32+40
.start: .start:
push esi push esi
@ -2283,6 +2297,7 @@ prepare_extension_and_mark:
add esi,304 add esi,304
dec ebp dec ebp
jnz .start jnz .start
.end:
ret ret
;--------------------------------------------------------------------- ;---------------------------------------------------------------------
search_extension_start: search_extension_start:
@ -3176,6 +3191,8 @@ IM_END:
;--------------------------------------------------------------------- ;---------------------------------------------------------------------
do_not_draw_open_button_label rb 1 do_not_draw_open_button_label rb 1
;--------------------------------------------------------------------- ;---------------------------------------------------------------------
;include_debug_strings
;---------------------------------------------------------------------
align 4 align 4
app_colours: app_colours: