From 23f728b028fc24cac902e98a8cc52a691d4911f6 Mon Sep 17 00:00:00 2001 From: Ivan Baravy Date: Sun, 20 Jun 2021 22:37:20 +0000 Subject: [PATCH] unz: Fix password dialog. git-svn-id: svn://kolibrios.org@8900 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/fs/unz/dialogs.inc | 8 +++----- programs/fs/unz/unz.asm | 4 +--- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/programs/fs/unz/dialogs.inc b/programs/fs/unz/dialogs.inc index e4bc8bd717..7cb28e129b 100644 --- a/programs/fs/unz/dialogs.inc +++ b/programs/fs/unz/dialogs.inc @@ -108,9 +108,9 @@ endp proc DialogBox dlgInfo:dword pushad mov ebx,[dlgInfo] - mov eax,[ebx+19*4] - mov [forpassword],eax - mov byte[eax], 0 + mov ebx,[ebx+25*4] + add ebx, 12 ; password_ansi + mov [edtPassword+9*4], ebx ; text mov [stateDlg], 0 mcall 51,1,threadDialogBox,stackDlg @@ -133,8 +133,6 @@ endp proc threadDialogBox mcall 40, 100111b+0C000000h - mov eax,[forpassword] - mov [edtPassword+4*9],eax xor eax,eax mov dword[edtPassword.size], eax mov dword[edtPassword.pos], eax diff --git a/programs/fs/unz/unz.asm b/programs/fs/unz/unz.asm index 0a2c52db40..d0cfc96163 100644 --- a/programs/fs/unz/unz.asm +++ b/programs/fs/unz/unz.asm @@ -663,7 +663,6 @@ strDots db '...', 0 ; int num_buttons, const char* buttons[]); ; int __stdcall DialogBox(DLGDATA* dlg); -forpassword rd 1 stateDlg dd 0 ;0 - in process, 1 - button ok, 2 - button cancel errmess0 dd strErrorExc @@ -765,7 +764,7 @@ edtPack edit_box (WIN_W-100-60),100,10,0FFFFFFh,0xff,0x80ff,0h,0x90000000,\ edtUnpPath edit_box (WIN_W-100-60),100,35,0FFFFFFh,0xff,0x80ff,0h,0x90000000,\ 1024, pathOut, 0,0,0,0 edtPassword edit_box 200, 56, 40, 0FFFFFFh,0xff,0x80ff,0h,0x90000000,\ - 255, password, 0, ed_focus+ed_always_focus ;+ed_pass + 255, 0, 0, ed_focus+ed_always_focus ;+ed_pass endEdits: @@ -864,7 +863,6 @@ path rb 512 fInp rb 1024 pathOut rb 1024 ;путь, куда распакуется всё files rd 256 -password rb 256 fZipInfo rb 40