KolibriOS/kolibrios
13
14
Fork 12
Code Issues 113 Pull Requests 16 Actions Projects 1 Releases Wiki Activity

Unz: use @notify instead on dialog window when unarchiving error occurs to prevent many window creating

Browse Source 
git-svn-id: svn://kolibrios.org@7162 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kiril Lipatov
2018-02-18 12:39:19 +00:00
parent 217ed6f176
commit d82cdb9873
1 changed files with 6 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
programs/fs/unz/unz.asm
View File

@@ -522,66 +522,15 @@ proc SayErr num_strings:dword, strings:dword,num_buttons:dword, buttons:dword
mov ebx,[strings] mov ebx,[strings]
m2m [errmess0], dword [ebx] m2m [errmess0], dword [ebx]
.l1: .l1:
mcall 51,1,threadSayErr,stackDlg
m2m [fsRunNotifyOK.param],[errmess0]
mcall 70,fsRunNotifyOK
popad popad
mov eax,1 mov eax,1
ret ret
endp endp
proc SimpleSayErr str:dword
pushad
m2m [errmess0],[str]
mcall 51,1,threadSayErr,stackDlg
popad
ret
endp
proc threadSayErr
mcall 40, 111b+0C000000h
.wm_redraw:
mcall 12, 1
mcall 48, 3, sc, sizeof.system_colors
mov edx, [sc.work]
or edx, 0x33000000
mcall 0, <220,WIN_W>, <220,110>, , , title
mov ecx,[sc.work_text]
or ecx,90000000h
mov edx,[errmess0]
mcall 4, <15,11>
mcall 8, <105,100>,<45,25>,1,[sc.work_button]
mov ecx,[sc.work_button_text]
or ecx,90000000h
mcall 4, <147,51>, , strOk
mcall 12, 2
.still:
mcall 10
cmp eax, 1
je .wm_redraw
cmp eax, 2
je .wm_key
cmp eax, 3
je .wm_button
jmp .still
.wm_button:
mcall 17
cmp ah, 1
je .exit
jmp .still
.wm_key:
mcall 2
jmp .still
.exit:
mcall -1
endp
;------------------------------------------------------------------------------- ;-------------------------------------------------------------------------------
;------------------------------------------------------------------------------- ;-------------------------------------------------------------------------------
;------------------------------------------------------------------------------- ;-------------------------------------------------------------------------------
@@ -730,7 +679,7 @@ bWinChild db 0 ;1 -
redInput db 0 ;1 - <20><><EFBFBD>ᢥ<EFBFBD><E1A2A5><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> redInput db 0 ;1 - <20><><EFBFBD>ᢥ<EFBFBD><E1A2A5><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
if lang eq ru if lang eq ru
title db 'uNZ v0.11 - <20><>ᯠ<EFBFBD><E1AFA0><EFBFBD>騪 Zip <20> 7z',0 title db 'uNZ v0.12 - <20><>ᯠ<EFBFBD><E1AFA0><EFBFBD>騪 Zip <20> 7z',0
strGo db '<27><>ᯠ<EFBFBD><E1AFA0><EFBFBD><EFBFBD><EFBFBD><EFBFBD>',0 strGo db '<27><>ᯠ<EFBFBD><E1AFA0><EFBFBD><EFBFBD><EFBFBD><EFBFBD>',0
strInp db ' <20><>娢',0 strInp db ' <20><>娢',0
strPath db '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>',0 strPath db '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>',0
@@ -744,7 +693,7 @@ if lang eq ru
strNotSupport db "'<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ন<EFBFBD><E0A6A8><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>ଠ<EFBFBD> <20><>娢<EFBFBD>' -E",0 strNotSupport db "'<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ন<EFBFBD><E0A6A8><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>ଠ<EFBFBD> <20><>娢<EFBFBD>' -E",0
strNotFound db "'<27><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' -E",0 strNotFound db "'<27><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' -E",0
else else
title db 'uNZ v0.11 - Unarchiver of Zip and 7z',0 title db 'uNZ v0.12 - Unarchiver of Zip and 7z',0
strGo db 'Unpack',0 strGo db 'Unpack',0
strInp db 'Archive',0 strInp db 'Archive',0
strPath db 'Extract to',0 strPath db 'Extract to',0