Heed - fix draw_window (memory leak and disconnecting from OpenDialog)

git-svn-id: svn://kolibrios.org@3456 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Marat Zakiyanov (Mario79) 2013-04-07 21:51:43 +00:00
parent 37684e0d2a
commit 76b59449b1

View File

@ -234,11 +234,19 @@ red:
draw_window_1: draw_window_1:
call start_draw call start_draw
call draw_window call draw_window
mov eax,[threath_buf+70]
test eax,10b
jnz .end
test eax,100b
jnz .end
call show_file_size call show_file_size
call show_codepage call show_codepage
call show_insert call show_insert
call ready_screen_buffer call ready_screen_buffer
call main_area call main_area
.end:
ret ret
;--------------------------------------------------------------------- ;---------------------------------------------------------------------
key: key:
@ -1387,12 +1395,16 @@ draw_window:
xor esi,esi xor esi,esi
mcall 0,100*65536+653,100*65536+360,((0x73 shl 24) + frgrd_color),,title_buf ;title mcall 0,100*65536+653,100*65536+360,((0x73 shl 24) + frgrd_color),,title_buf ;title
mcall 9,threath_buf,-1 mcall 9,threath_buf,-1
cmp byte [threath_buf+70],3 ;®ª­® á¢ñà­ãâ® ¢ § £®«®¢®ª? ; cmp byte [threath_buf+70],3 ;®ª­® á¢ñà­ãâ® ¢ § £®«®¢®ª?
jnae @f ; jnae @f
mov eax,[threath_buf+70]
test eax,10b
jnz .@d
test eax,100b
jz @f
.@d: .@d:
call end_draw call end_draw
add esp,4 ret
jmp still
;-------------------------------------- ;--------------------------------------
@@: @@:
cmp dword [threath_buf+66],(24*4) ;ŻŕŽ˘ĽŕŞ  Ź¨­¨Ź Ťě­ŽŠ ˘ëáŽâë cmp dword [threath_buf+66],(24*4) ;ŻŕŽ˘ĽŕŞ  Ź¨­¨Ź Ťě­ŽŠ ˘ëáŽâë
@ -1971,6 +1983,13 @@ draw_ed_box: ;
cmp al,1 cmp al,1
jne .2 jne .2
call draw_window call draw_window
mov eax,[threath_buf+70]
test eax,10b
jnz .2
test eax,100b
jnz .2
call main_area call main_area
bt [flags],2 bt [flags],2
jnc @f jnc @f
@ -3437,7 +3456,8 @@ file_name:
cur_dir_path rb 4096 cur_dir_path rb 4096
buf_cmd_lin rb 0 buf_cmd_lin rb 0
procinfo: ;opendialog procinfo: ;opendialog
threath_buf rb 0x400 threath_buf:
rb 0x400
path: path:
rb 1024+16 ;opendialog rb 1024+16 ;opendialog
@ -3479,8 +3499,8 @@ sel1_string rb 9
sel2_string rb 9 sel2_string rb 9
cur_help_string rb 1 ;­ŽŹĽŕ áâப¨, á ŞŽâŽŕŽŠ ˘ë˘Ž¤¨âáď ⼪áâ ˘ help - ŽŞ­Ľ cur_help_string rb 1 ;­ŽŹĽŕ áâப¨, á ŞŽâŽŕŽŠ ˘ë˘Ž¤¨âáď ⼪áâ ˘ help - ŽŞ­Ľ
help_is_open_already db ? ;¥á«¨ ®ª­® á¯à ¢ª¨ ®âªàëâ®, â® §¤¥áì 1 help_is_open_already rb 1 ;¥á«¨ ®ª­® á¯à ¢ª¨ ®âªàëâ®, â® §¤¥áì 1
help_window_pid dd ? help_window_pid rd 1
func_70 f70 func_70 f70
;--------------------------------------------------------------------- ;---------------------------------------------------------------------