WebSVN – Kolibri OS – Diff – /programs/fs/unz/unz.asm

 include 'lang.inc'
 include '../../macros.inc'
 include '../../proc32.inc'
 include '../../develop/libraries/box_lib/trunk/box_lib.mac'
 include '../../dll.inc'
+;include '../../debug.inc'
+;include 'include/macros.inc'
+;include 'include/proc32.inc'
+;include 'include/box_lib.mac'
+;include 'include/dll.inc'
 include 'debug.inc'
-version equ '0.65'
+version equ '0.70'
-version_dword equ 0*10000h + 65
+version_dword equ 0*10000h + 70
 WIN_W = 400
+WIN_W = 400
+SIZE_COPY_BUF = 1024*1024*2
 MM_MAX_BLOCKS equ 1024
 SIZE_COPY_BUF = 1024*1024*2
 virtual at 0
 .cur_console_size dd	?
 end virtual
+;--  CODE  -------------------------------------------------------------------
+include 'parse.inc'
-include 'parse.inc'
+include 'fs.inc'
+include 'file_tree.inc'
+include 'memory_manager.inc'
+include 'dialogs.inc'
 include 'fs.inc'
-;--  CODE  -------------------------------------------------------------------
+start:
 ;dnl
 ;dpsP params
-start:
+;dnl
-	mcall	68, 11
-	mcall	40, 100111b + 0C0000000h
-	stdcall dll.Load, IMPORTS
+	mcall	68, 11
-	test	eax, eax
+	mcall	40, 100111b + 0C0000000h
-	jnz	exit
+	stdcall dll.Load, IMPORTS
-	mov	[pathOut],0
+	test	eax, eax
 	jnz	exit
 	je	.arbeit
 	jmp	errorParsing
 .arbeit:
 ;2.
-	call	getParam2
+	call	getParamOutPath
 	cmp	eax, 2
 	je	errorParsing
 	jmp	@b
 .check:
-	call	startUnpack
+	call  startUnpack
-	mcall	-1
+	mcall -1
 @@:
 	stdcall [OpenDialog_Init],OpenDialog_data
 ;init edit fields  --------------
 	xor	al,al
 	mov	eax, 1024
 	sub	eax, ecx
 	mov	dword[edtUnpPath.size], eax
 	mov	dword[edtUnpPath.pos], eax
+;--------
+;       call    file_tree_Init
 ;main loop --------------------
 	jmp	wm_redraw
     @@:
 	cmp	ah, 2
 	jne	@f
-	;mcall   51,1,startUnpack,stackUnpack
+	mcall	51,1,startUnpack,stackUnpack
-	;mov     [bWinChild],1
+	mov	[bWinChild],1
-	call   startUnpack
+	;call   startUnpack
 	jmp	wm_redraw
     @@:
 wm_mouse:
 	cmp	[bWinChild],0
 	jne	still
 	stdcall [edit_box_mouse],edtPack
 	stdcall [edit_box_mouse],edtUnpPath
+;       stdcall file_tree_Mouse
 	jmp	still
 exit:
 	mcall	-1
+errorParsing:
 dph edx
 errorParsing:
-	dps 'errorParsing'
+	dps ' errorParsing'
 	edit_boxes_set_sys_color edtPack,endEdits,sc
 	stdcall [edit_box_draw],edtPack
-	stdcall [edit_box_draw],edtUnpPath
+	stdcall [edit_box_draw],edtUnpPath
 	; plain window labels
 	cmp	[redInput],0
 	jne	@f
 	mov	ecx,[sc.work_text]
      .l1:
 	mcall 4, <15,16>, , strInp
 	mov	ecx,[sc.work_text]
 	or	ecx,90000000h
 	mcall 4, <15,37>, , strPath
-	; text on buttons
 	mov	ecx,[sc.work_button_text]
 	or	ecx,90000000h
 if lang eq ru
 	mcall 4, <107,70>, , strGo
 else
 	mcall 4, <127,70>, , strGo
 end if
 	mcall 4, <(WIN_W-47),12>, , strDots
 	mcall 4, <(WIN_W-47),37>, , strDots
+;       call file_tree_Draw
 	mcall 12, 2
 	ret
 endp
 	test	eax,eax
 	jnz	@f
 	cmp	ebx,0		;;/ !!!!
 	je	 .errNotFound	;;§ ç¥¨¥ ebx ¯®«ãç¥® ®¯ëâë¬ ¯ãâñ¬.
-	cmp	ebx,400h	;;ª ª ®® ¡ã¤¥â à ¡®â âì á ¤àã£¨¬¨ ¢¥àá¨ï¬¨
+	cmp	ebx,400h
-	je	 .errNotSupp	;;¡¨¡«¨®â¥ª¨ - ¥ ïá®!
+	je	 .errNotSupp
       @@:
 	mov	[hPlugin],eax
 ;get num of all files
-;        stdcall calcSizeArch,[hPlugin]
-;        push    ebp
-;        stdcall [aReadFolder], [hPlugin]
-;        pop     ebp
-;        push    ebp
-;        stdcall [aOpen], [hPlugin], .str1, O_READ
-;        pop     ebp
-;
+       ; stdcall calcSizeArch,[hPlugin]
-;        push    ebp
+	push	ebp
-;        stdcall [aSetpos],[hPlugin],0,POSEND
-;        pop     ebp
-;        add     [numbytes],eax
 	stdcall [aSetFolder],[hPlugin], .strRoot,0
 	pop	ebp
 ;unpack
 ;       void __stdcall GetFiles(HANDLE hPlugin, int NumItems, void* items[], void* addfile, void* adddir);
 	push	ebp
 	stdcall [aGetFiles], [hPlugin], -1, 0, myAddFile, myAddDir
 	pop	ebp
+jmp @f
-;jmp @f
+   .str1 db '/LICENSE.txt',0
-;   .str1 db '/LICENSE.txt',0
+   .strRoot db '.svn',0
-;@@:
+@@:
 	int3
 	ret
 endp
+allnumbytes dd 0
 strBackFold db '../',0
 proc calcSizeArch hPlugin:dword
+locals
-locals
+  bdwk rb 560
-  bdwk rb 560
+  num	rd 1
 endl
+;int __stdcall ReadFolder(HANDLE hPlugin, unsigned dirinfo_start,
-;int __stdcall ReadFolder(HANDLE hPlugin, unsigned dirinfo_start,
+;        unsigned dirinfo_size, void* dirdata);
+	mov	[num],0
-;        unsigned dirinfo_size, void* dirdata);
+    ;    int3
-int3
+.mainloop:
 	push	ebp
-	lea	eax,[bdwk]
+	lea	eax, [bdwk]
-	stdcall [aReadFolder], [hPlugin],1,560,eax
+	stdcall [aReadFolder], [hPlugin],[num],1,eax
 	pop	ebp
-	ret
+	cmp	eax,6
+	je	.lastFile
+;??????????????????????????????????????????????????????????????????????????????????????????????????
-endp
+	lea	ebx,[bdwk+0x20]      ;¯®ç¥¬ã «¨¡  ¯¨è¥â ¢ á¬¥é¥¨¥ +0x20 - ¥¨§¥áâ®
+	test	[ebx],dword 10h
+	jz	@f
+;bool __stdcall SetFolder(HANDLE hPlugin, const char* relative_path,
-;-------------------------------------------------------------------------------
+;                         const char* absolute_path);
+	push	ebp
-;-------------------------------------------------------------------------------
+	lea	eax,[ebx+40]
-;-------------------------------------------------------------------------------
+dps 'Folder: '
-;SayErr  int num_strings, const char* strings[],
+dpsP eax
-;                      int num_buttons, const char* buttons[]);
+dnl
-proc SayErr num_strings:dword, strings:dword,num_buttons:dword, buttons:dword
+	stdcall [aSetFolder],[hPlugin], eax,0
 	pushad
-	cmp	[num_strings],1
-	je	@f
-	m2m	[errmess0], strErrorExc
+	pop	ebp
+	stdcall calcSizeArch, [hPlugin]
+	inc	[num]
+	jmp	.mainloop
+   @@:
+	lea	ebx,[bdwk+0x20]
+lea	eax,[ebx+40]
+dps 'File: '
+dpsP eax
+dnl
+	mov	eax,[ebx+32]
-	jmp	.l1
+	add	[allnumbytes],eax
+	inc	[num]
+	jmp	.mainloop
-       @@:
+.lastFile:
+;        lea     ebx,[bdwk+0x20]
+;        test    [ebx],dword 10h
+;        jz      @f
+;
+;        push    ebp
-	mov	ebx,[strings]
+;        lea     eax,[ebx+40]
+;        stdcall [aSetFolder],[hPlugin], eax,0
-	m2m	[errmess0], dword [ebx]
+;        pop     ebp
-       .l1:
+;        stdcall calcSizeArch, [hPlugin]
 ;    @@:
-	m2m	[fsRunNotifyOK.param],[errmess0]
-	mcall	70,fsRunNotifyOK
-	popad
-	mov	eax,1
-	ret
-endp
-;-------------------------------------------------------------------------------
-;-------------------------------------------------------------------------------
-;-------------------------------------------------------------------------------
-    ; "enter password" dialog for KFar
-;password_dlg:
-;        dd      1       ; use standard dialog colors
-;        dd      -1      ; center window by x
-;        dd      -1      ; center window by y
-;.width  dd      ?       ; width (will be filled according to current console width)
-;        dd      2       ; height
-;        dd      4, 2    ; border size
-;        dd      aEnterPasswordTitle     ; title
-;        dd      ?       ; colors (will be set by KFar)
-;        dd      0       ; used internally by dialog manager, ignored
-;        dd      0, 0    ; reserved for DlgProc
-;        dd      2       ; 2 controls
-;; the string "enter password"
-;        dd      1       ; type: static
-;        dd      1,0     ; upper-left position
-;.width1 dd      ?,0     ; bottom-right position
-;        dd      aEnterPassword  ; data
+	push	ebp
+	stdcall [aSetFolder],[hPlugin], strBackFold,0
+	pop	ebp
+	ret
+endp
+proc rec_calcSize hPlugin:dword
+locals
-;        dd      0       ; flags
-;; editbox for password
-;        dd      3       ; type: edit
-;        dd      1,1     ; upper-left position
-;.width2 dd      ?,0     ; bottom-right position
-;        dd      password_data   ; data
-;        dd      2Ch     ; flags
-proc DialogBox dlgInfo:dword
-	pushad
-	mov	ebx,[dlgInfo]
-	mov	eax,[ebx+19*4]
-	mov	[forpassword],eax
-	mov	byte[eax], 0
-	mov	[stateDlg], 0
-	mcall	51,1,threadDialogBox,stackDlg
-	;wait thread...
-    @@: cmp	[stateDlg],0
-	jne	@f
-	mcall	5,1
+  bdwk rb 560
-	jmp	@b
+endl
+;int __stdcall ReadFolder(HANDLE hPlugin, unsigned dirinfo_start,
+;        unsigned dirinfo_size, void* dirdata);
+;bool __stdcall SetFolder(HANDLE hPlugin, const char* relative_path, const char* absolute_path);
-     @@:
-	popad
-	cmp	[stateDlg], 1
-	jne	@f
-	xor	eax, eax
-	ret
-    @@:
-	or	eax, -1
-	ret
-endp
+	push	ebp
-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
-.wm_redraw:
-	mcall	12, 1
-	mcall	48, 3, sc, sizeof.system_colors
-	mov	edx, [sc.work]
-	or	edx, 0x33000000
-	mcall	0, <200,320>, <200,140>, , , title
-	edit_boxes_set_sys_color edtPack,endEdits,sc
-	stdcall [edit_box_draw],edtPassword
-	mov	ecx,[sc.work_text]
-	or	ecx,90000000h
-	mcall 4, <56,12>, , strGetPass
-	mcall 8, <70,80>,<74,22>,2,[sc.work_button]
-	mov	ecx,[sc.work_button_text]
-	or	ecx,90000000h
-	mcall 4, <103,79>, , strOk
-	mcall 8, <165,80>,<74,22>,1,[sc.work_button]
-	mov	ecx,[sc.work_button_text]
-	or	ecx,90000000h
-	mcall 4, <182,79>, , strCancel
-	mcall 12, 2
-.still:
-	mcall	10
-	cmp	eax, 1
-	je	.wm_redraw
-	cmp	eax, 2
-	je	.wm_key
-	cmp	eax, 3
-	je	.wm_button
+	lea	eax,[bdwk]
-	cmp	eax, 6
-	je	.wm_mouse
+	stdcall [aReadFolder], [hPlugin],1,560,eax
+	pop	ebp
-	jmp	.still
-.wm_key:
-	mcall	2
+	ret
-	stdcall [edit_box_key],edtPassword
+endp
-	jmp	.still
+;-------------------------------------------------------------------------------
+;-------------------------------------------------------------------------------
+;-------------------------------------------------------------------------------
-.wm_button:
-	mcall	17
+hTrPlugin dd 0
+;eax - file struct for sys70
+proc rdFoldforTree
+locals
+  fi rd 0
+endl
+	cmp	[hTrPlugin],0
+	je	.exit
-	cmp	ah, 2		;OK
+	push	ebx edi esi
-	jne	@f
-	mov	[stateDlg],1
+	mov	[fi],eax
-	jmp	.exit
-    @@:
+	push	ebp
 	stdcall [aSetFolder],[hTrPlugin], [eax+20],0
 bWinChild db 0	;1 - ¤®ç¥à¥¥ ®ª® ¥áâì, £« ¢®¥ ®ª® ¥ ¤®«¦® à¥ £¨à®¢ âì
 redInput  db 0	;1 - ¯®¤á¢¥â¨âì ªà áë¬  ¤¯¨áì
 if lang eq ru
- title db 'uNZ v0.12 -  á¯ ª®¢é¨ª Zip ¨ 7z',0
+ title db 'uNZ v0.2 -  á¯ ª®¢é¨ª Zip ¨ 7z',0
  strGo db ' á¯ ª®¢ âì',0
  strInp db  '    àå¨¢',0
  strPath db '§¢«¥çì ¢',0
  strUnpackOk  db "'á¯¥è® à á¯ ª®¢ ®' -O",0
  strUnpackFault  db "'è¨¡ª  à á¯ ª®¢ª¨' -E",0
  strNotSupport db "'¥¯®¤¤¥à¦¨¢ ¥¬ë© ä®à¬ â  àå¨¢ ' -E",0
  strNotFound db "' ©« ¥  ©¤¥' -E",0
 else if lang eq es
- title db 'uNZ v0.12 - Desarchivador para Zip y 7z',0
+ title db 'uNZ v0.2 - Desarchivador para Zip y 7z',0
  strGo db 'Desarchivar',0
  strInp db 'Archivar',0
  strPath db 'Extraer en',0
  strError db 'Error',0
  strErrorExc db 'Error desconocido',0
  strUnpackOk db "'Extracion exitosa' -O",0
  strUnpackFault db "'Fallo al extraer' -E",0
  strNotSupport db "'El formato del archivo no es soportado' -E",0
  strNotFound db "'Archivo no encontrado' -E",0
 else
- title db 'uNZ v0.12 - Unarchiver of Zip and 7z',0
+ title db 'uNZ v0.2 - Unarchiver of Zip and 7z',0
  strGo db   'Unpack',0
  strInp db  'Archive',0
  strPath db 'Extract to',0
  strError db 'Error',0
  strErrorExc db 'Unrecognized error',0
  strUnpackFault  db "'Unprack failed' -E",0
  strNotSupport db "'Archive format is not supported' -E",0
  strNotFound db "'File not found' -E",0
 end if
 strNull db 0
-strDots db '...',0
+strDots db '...', 0
 ;--------
 	dd	0	;cur_width
 .size = $ - kfar_info
 ;--------
-iFiles dd 0	;ª®«¨ç¥áâ¢® ¢ë£àã¦ ¥¬ëå ä ©«®¢
+iFiles dd 0	;ª®«¨ç¥áâ¢® à á¯ ª®¢ë¢ ¥¬ëå ä ©«®¢
 endPointer dd buffer
 	db '/sys/@notify',0
 edtPack     edit_box (WIN_W-100-60),100,10,0FFFFFFh,0xff,0x80ff,0h,0x90000000,\
-, fInp, mouse_dd,0,0,0
+, fInp, 0,0,0,0
 edtUnpPath  edit_box (WIN_W-100-60),100,35,0FFFFFFh,0xff,0x80ff,0h,0x90000000,\
-, pathOut, mouse_dd,0,0,0
+, pathOut, 0,0,0,0
+edtPassword edit_box 200,56,70,0FFFFFFh,0xff,0x80ff,0h,0x90000000,255,\
+		password, 0,0,0,0
-edtPassword edit_box 200,56,70,0FFFFFFh,0xff,0x80ff,0h,0x90000000,255,\
+endEdits:
 		password, mouse_dd,0,0,0
 endEdits:
 ;-------------------------------------------------------------------------------
 	edit_box_mouse		,'edit_box_mouse'
 IncludeIGlobals
 IncludeIGlobals
 params1 db '-o "/hd0/1/unz/pig" -h "/hd0/1/unz/abc1"',0
 ;--  UDATA  -----------------------------------------------------------------------------
+init_end:
-init_end:
+align 16
-align 16
+IncludeUGlobals
-IncludeUGlobals
-;params db 'unz -o "fil epar1" -f "arch1.txt" -f "ar ch2.txt" file1',0
+path rb 512
 ;params db 'unz -o "fil epar1" -f arch1.txt -f "ar ch2.txt" file1',0
-;params db '/hd0/1/unz/xboot-1-0-build-14-en-win.zip',0
+;params db 'unz -o "fil epar1" -f "arch1.txt" -f "ar ch2.txt" file1',0
-;rb 4096
+;params db 'unz -o "fil epar1" -f arch1.txt -f "ar ch2.txt" file1',0
 fInp	rb 1024
-pathOut rb 1024
+fInp	rb 1024
-files	rd 256
+pathOut rb 1024 	;¯ãâì, ªã¤  à á¯ ªã¥âáï ¢áñ
 CopyDestEditBuf 	rb	12+512+1
 .length = $ - CopyDestEditBuf - 13
+bdvkPack rb 560
+;------------ memory_manager.inc
+align 4
+MM_NBlocks	rd 1  ;ª®«¨ç¥áâ¢® ¢ë¤¥«¥ëå ¡«®ª®¢ ¯ ¬ïâ¨
+MM_BlocksInfo	rd 2*MM_MAX_BLOCKS  ;begin,size
 bdvkPack rb 560
 ;--------
-buffer	rb 4096 ;for string of file name or extract
+buffer	rb 4096 ;for string of file name for extract

Subversion Repositories Kolibri OS

(root)/programs/fs/unz/unz.asm @ 7162 – Rev 7169 → 7538