WebSVN – Kolibri OS – Diff – /programs/network/downloader/trunk/downloader.asm

+; version: 0.5
+; last update:  07/10/2010
+; written by:   Marat Zakiyanov aka Mario79, aka Mario
+; changes:      reducing the size of the binary code,
+;               program uses far less memory while running
+;               (>0x7000, the old version used >0x100000),
+;               process only net event at start with parameter
+;-----------------------------------------------------------
+; version 0.3 -0.4
+; written by:   CleverMouse
+;
+;-----------------------------------------------------------
 ; wget 0.2 by barsuk
 ; based on Menuet Httpc
 use32
- org    0x0
+	org	0x0
- db     'MENUET01'    ; header
+	db 'MENUET01'	; header
- dd     0x01          ; header version
+	dd 0x01		; header version
- dd     START         ; entry point
+	dd START	; entry point
- dd     I_END         ; image size
+	dd IM_END	; image size
- dd     0x100000      ; required memory
+	dd I_END	;0x100000 ; required memory
- dd     0x100000      ; esp
+	dd stacktop	; esp
- dd     params		  ; I_PARAM
+	dd params	; I_PARAM
- dd		0x0     	  ;I_Path
+	dd 0x0		; I_Path
-include 'lang.inc'
+include	'lang.inc'
+include	'../../../macros.inc'
+include	"../../../proc32.inc"
-include '../../../macros.inc'
+include	"dll.inc"
-include "DEBUG.INC"
+include	"debug.inc"
-URLMAXLEN       equ     256  ; maximum length of url string
+URLMAXLEN	equ 256	; maximum length of url string
-primary_buffer_size	equ	4096
+primary_buffer_size	equ 4096
 ; Memory usage
+; Memory usage
+; webpage headers at buf_headers
+START:	; start of execution
+;dps	<"Program started",13,10>
+; prepare webAddr area
+	mov	al,' '
+	mov	edi,webAddr
+	mov	ecx,URLMAXLEN
+	cld
+	rep	stosb
+	xor	eax,eax
+	stosb
+; prepare document area
+	mov	al,'/'
+	mov	edi,document
-; webpage headers at buf_headers
-START:                              ; start of execution
-;dps <"Program started",13,10>
+	cld
-    mov     eax,40                          ; Report events
+	stosb
-    mov     ebx,10000111b                   ; Stack 8 + defaults
+	mov	al,' '
+	mov	ecx,URLMAXLEN-1
+	rep	stosb
-    mcall
-	mov		eax, 68						; create local heap
+; create local heap
-	mov		ebx, 11
-	mcall
+	mcall	68,11
-	call		load_settings
+	call	load_settings
 	cmp	[params],byte 0
-	cmp		byte [params], 0
+	jz	prepare_event	;red
 	jz		red
+	mcall	40,10000000b ; only net event!!!
-	; we have an url
+; we have an url
 	mov	edi,document_user
-	mov		edi, document_user
+	mov	al,' '
+	mov	ecx,URLMAXLEN
-	mov		al, ' '
+	rep	stosb
 	mov		ecx, URLMAXLEN
+	mov	esi,params
-	rep		stosb
+	mov	edi,document_user
-	mov		esi, params
+.copy_param:
-	mov		edi, document_user
+	mov	al,[esi]
+	cmp	al,0
-.copy_param:
+	jz	.done
 	mov		al, [esi]
-	cmp		al, 0
+	cmp	al,' '
-	jz		.done
+	jz	.done_inc
 	cmp		al, ' '
-	mov		ah, 22			; strange way to tell that socket should be opened...
+	mov	ah,22	; strange way to tell that socket should be opened...
 	call	socket_commands
+	jmp	still
+prepare_event:
+; Report events
+; Stack 8 + defaults
-	jmp		still
+	mcall	40,10000111b
-red:                    ; redraw
+red:	; redraw
-    call    draw_window
+	call	draw_window
-still:
-    mov     eax,23                 ; wait here for event
     mov     ebx,1
-    mcall
+still:
+	mcall	23,1	; wait here for event
 	cmp	eax,1	; redraw request ?
-    cmp     eax,1                  ; redraw request ?
+	je	red
-    je      red
+	cmp	eax,2	; key in buffer ?
-    cmp     eax,2                  ; key in buffer ?
+	je	key
     je      key
-    cmp     eax,3                  ; button in buffer ?
+	cmp	eax,3	; button in buffer ?
-    je      button
 	je	button
     ; Get the web page data from the remote server
-    call    read_incoming_data
-    mov     eax,[status]
-    mov     [prev_status],eax
+; Get the web page data from the remote server
-    mov     eax,53
-    mov     ebx,6
+	call	read_incoming_data
-    mov     ecx,[socket]
+	mov	eax,[status]
-    mcall
+	mov	[prev_status],eax
+	mcall	53,6,[socket]
 	mov	[status],eax
     mov     [status],eax
 	cmp	[prev_status],4
-    cmp     [prev_status],4
-    jge     no_send
+	jge	no_send
     cmp     [status],4
-    jne     no_send
+	cmp	[status],4
 	jne	no_send
     mov     [onoff],1
 	mov	[onoff],1
-    call    send_request
+	call	send_request
-no_send:
-    call    print_status
+no_send:
-    cmp     [prev_status],4
-    jne     no_close
-    cmp     [status],4   ; connection closed by server
+	call	print_status
-    jbe     no_close     ; respond to connection close command
-                         ; draw page
-    call    read_incoming_data
 	cmp	[prev_status],4
-    mov     eax,53
+	jne	no_close
-    mov     ebx,8
+	cmp	[status],4	; connection closed by server
-    mov     ecx,[socket]
+	jbe	no_close	; respond to connection close command
-    mcall
+; draw page
-    call    draw_page
+	call	read_incoming_data
 	mcall	53,8,[socket]
-    mov     [onoff],0
+	call	draw_page
 	mov	[onoff],0
 no_close:
 no_up:
-    jmp     still
+	jmp	still
-button:                 ; button
+button:	; button
-;dps <"Button pressed",13,10>
+;dps	<"Button pressed",13,10>
-    mov     eax,17      ; get id
-    mcall
+	mcall	17	; get id
-	cmp		ah,26
+	cmp	ah,26
-	je		save
+	je	save
-    cmp     ah,1                   ; button id=1 ?
+	cmp	ah,1	; button id=1 ?
-    jne     noclose
 	jne	noclose
-;dps "Closing socket before exit... "
+;	dps	"Closing socket before exit... "
-    mcall
+	mcall
 save:
-dps "saving"
+dps	"saving"
-newline
-	mov		eax, 70
+newline
-	mov		ebx, fileinfo
-	mcall
+	mcall	70,fileinfo
-;pregs
 ;pregs
-	jmp		still
+	jmp	still
 noclose:
-    call    print_text
+	call	print_text
-    mov     edi,[addr]
+	mov	edi,[addr]
-f11:
-    mov     eax,10
+f11:
-    mcall
+	mcall	10
-    cmp     eax,2 ; key?
+	cmp	eax,2	; key?
-    jz      fbu
+	jz	fbu
-    jmp     still
+	jmp	still
 fbu:
-    mov     eax,2
+fbu:
-    mcall  ; get key
+	mcall	2	; get key
-    shr     eax,8
+	shr	eax,8
-    cmp     eax,8
+	cmp	eax,8
-    mov     [edi],byte ' '
+	mov	[edi],byte ' '
-    call    print_text
+	call	print_text
-    jmp     f11
+	jmp	f11
 nobs:
-    cmp     eax, dword 10
+	cmp	eax,10
-    je      retkey
+	je	retkey
-    cmp     eax, dword 13
+	cmp	eax,13
-    je      retkey
+	je	retkey
-    cmp     eax,dword 31
+	cmp	eax,31
-    jbe     f11
+	jbe	f11
 ; Removed in v0.4
-;    cmp     eax,dword 95
+;	cmp	eax,95
-;    jb      keyok
+;	jb	keyok
-;    sub     eax,32
 ;	sub	eax,32
-keyok:
     mov     [edi],al
 keyok:
-    call    print_text
+	mov	[edi],al
 	call	print_text
-    add     edi,1
+	add	edi,1
-    mov     esi,[addr]
-    add     esi,URLMAXLEN
+	mov	esi,[addr]
-    cmp     esi,edi
+	add	esi,URLMAXLEN
-    jnz     f11
+	cmp	esi,edi
 	jnz	f11
-    jmp  still
+	jmp	still
-retkey:
-    mov     ah, 22   ; start load
+retkey:
 	mov	ah,22	; start load
 nourl:
-    call    socket_commands     ; opens or closes the connection
+nourl:
-    jmp     still
+	call	socket_commands	; opens or closes the connection
 ;       This is done as GET then URL then HTTP/1.1',13,10,13,10 in 3 packets
+;
 ;****************************************************************************
 send_request:
-    pusha
+	pusha
-	mov		esi, string0
+	mov	esi,string0
-	mov		edi, request
+	mov	edi,request
 	movsd
-    ; If proxy is used, make absolute URI - prepend http://
+; If proxy is used, make absolute URI - prepend http://
-	cmp		byte [proxyAddr], 0
+	cmp	[proxyAddr],byte 0
-	jz		.noproxy
+	jz	.noproxy
-	mov		dword [edi], 'http'
+	mov	dword [edi],'http'
-	mov		byte [edi+4], ':'
+	mov	[edi+4],byte ':'
-	mov		word [edi+5], '//'
+	mov	[edi+5],word '//'
-	add		edi, 7
+	add	edi,7
-	mov		esi, webAddr
+	mov	esi,webAddr
 .copy_host_loop:
 	lodsb
-	cmp		al, ' '
+	cmp	al,' '
-	jz		.noproxy
+	jz	.noproxy
 	stosb
-	jmp		.copy_host_loop
+	jmp	.copy_host_loop
 .noproxy:
+	xor	edx,edx ; 0
 	mov		edx, 0
 .next_edx:
-    ; Determine the length of the url to send in the GET request
+; Determine the length of the url to send in the GET request
-	mov		al, [edx+document]
+	mov	al,[edx+document]
-	cmp		al, ' '
+	cmp	al,' '
-    je     	.document_done
+	je	.document_done
-	mov		[edi], al
+	mov	[edi],al
-	inc		edi
+	inc	edi
-    inc     edx
+	inc	edx
-	jmp		.next_edx
+	jmp	.next_edx
 .document_done:
 .document_done:
-	mov		esi, stringh
+	mov	esi,stringh
+	mov	ecx,stringh_end-stringh
-	mov		ecx, stringh_end-stringh
-	rep		movsb
+	rep	movsb
 	xor	edx,edx	; 0
 	mov		edx, 0
 .webaddr_next:
-	mov		al, [webAddr + edx]
+	mov	al,[webAddr + edx]
-	cmp		al, ' '
+	cmp	al,' '
-	je		.webaddr_done
+	je	.webaddr_done
-	mov		[edi], al
+	mov	[edi],al
-	inc		edi
+	inc	edi
-	inc		edx
+	inc	edx
-	jmp		.webaddr_next
+	jmp	.webaddr_next
 .webaddr_done:
 .webaddr_done:
-	cmp		byte [proxyUser], 0
-	jz		@f
+	cmp	[proxyUser],byte 0
-	call		append_proxy_auth_header
+	jz	@f
-@@:
+	call	append_proxy_auth_header
 @@:
-	mov  edx, request
+	mov	edx,request
 @@:
-   mov  cl,[edx]
+	mov	cl,[edx]
-   cmp edx,edi
+	cmp	edx,edi
-   jz   @f
+	jz	@f
-   int  40h
+	mcall
-   inc  edx
+	inc	edx
-   jmp  @b
+	jmp	@b
 @@:
 	popa
-    mov     edx, edi
+	mov	edx,edi
-	sub		edx, request
 	sub	edx,request
-	;;;;now write \r\nConnection: Close \r\n\r\n
+;;;;now write \r\nConnection: Close \r\n\r\n
-    mov     eax, 53     ; ' HTTP/1.1 .. '
-    mov     ebx, 7
-    mov     ecx, [socket]
-    mov     esi, request
-    mcall
 	mcall	53,7,[socket],,request	;' HTTP/1.1 .. '
-    popa
+	popa
-    ret
 	ret
 ;****************************************************************************
 ;    Function
 ;       print_status
+;
 ;   Description
 ;       displays the socket/data received status information
+;
 ;****************************************************************************
-print_status:
-    pusha
-    mov     eax,26
+print_status:
-    mov     ebx,9
-    mcall
+	pusha
 	mcall	26,9
-    cmp     eax,[nextupdate]
+	cmp	eax,[nextupdate]
-    jb      status_return
 	jb	status_return
-    add     eax,25
     mov     [nextupdate],eax
 	add	eax,25
-    mov     eax,13
+	mov	[nextupdate],eax
-    mov     ebx,5*65536+100
-    mov     ecx,[winys]
-    shl     ecx,16
-    add     ecx,-18*65536+10
-    mov     edx,0xffffff
-    mcall
+	mov	ecx,[winys]
 	shl	ecx,16
-    mov     eax,47
+	add	ecx,-18*65536+10
-    mov     ebx,3*65536
+	mcall	13,<5,100>,,0xffffff
-    mov     ecx,[status]
-    mov     edx,12*65536-18
-    add     edx,[winys]
     mov     esi,0x000000
-    mcall
+	mov	edx,12*65536-18
+	add	edx,[winys]
-    mov     eax,47
-    mov     ebx,6*65536
+	xor	esi,esi
-    mov     ecx,[pos]
+	mcall	47,<3,0>,[status],,
     mov     edx,40*65536-18
-    add     edx,[winys]
-    mov     esi,0x000000
+	mov	edx,40*65536-18
-    mcall
+	add	edx,[winys]
 	mcall	,<6,0>,[pos]
 status_return:
-    popa
+status_return:
-    cmp     [onoff],1
+	cmp	[onoff],1
-    je      rid
+	je	rid
-    ret
+	ret
-rid:
 rid:
 	push	esi
 	push	edi
-dps "rid"
+dps	"rid"
 newline
 newbyteread:
-	;call	print_status
-    mov     eax, 53
+newbyteread:
-    mov     ebx, 2
-    mov     ecx, [socket]
-    mcall
+	;call	print_status
 	mcall	53,2,[socket]
-    cmp     eax,0
-    je      no_more_data
-    mov     eax, 53
-    mov     ebx, 11
+	cmp	eax,0
-	mov		edx, primary_buf
-    mov     ecx, [socket]
+	je	no_more_data
 	mov		esi, primary_buffer_size
-    mcall
+	mcall	53,11,[socket],primary_buf,primary_buffer_size
 ;dps "part "
-;dph eax
-;newline
+;dps	"part "
 ;dph	eax
-	mov		edi, [pos]
-	add		[pos], eax
-	push	eax
+;newline
-	mov		eax, 68
-	mov		ebx, 20
-	mov		ecx, [pos]
+	mov	edi,[pos]
-	mov		edx, [buf_ptr]
+	add	[pos],eax
-	mcall
+	push	eax
 	mcall	68,20,[pos],[buf_ptr]
-	mov		[buf_ptr], eax
+	mov	[buf_ptr],eax
-	add		edi, eax
+	add	edi,eax
-	mov		esi, primary_buf
+	mov	esi,primary_buf
-	pop		ecx					; number of recently read bytes
-	lea		edx, [ecx - 3]
-	rep		movsb
+	pop	ecx	; number of recently read bytes
-no_more_data:
 	lea	edx,[ecx - 3]
-	mov		eax, 53
+	rep	movsb
-	mov		ebx, 6
 	mov		ecx, [socket]
-	mcall
+no_more_data:
-	cmp		eax, 4
-	jne		no_more_data.finish
+	mcall	53,6,[socket]
 	cmp	eax,4
-	jmp		newbyteread
 	jne	no_more_data.finish
-.finish:
 	jmp	newbyteread
-;dps "finish "
-;pregs
+.finish:
+;dps	"finish	"
-	call	parse_result
+;pregs
-	mov		ecx, [shared_name]
+	call	parse_result
-	cmp		byte [ecx], 0
+	mov	ecx,[shared_name]
-	jnz		save_in_shared
-	mov		eax, 70
+	cmp	[ecx],byte 0
-	mov		ebx, fileinfo
-	mcall
+	jnz	save_in_shared
 ;dps "saving "
-;pregs
 	mcall	70,fileinfo
-	;jmp		close_end_exit
+;dps	"saving "
 ;pregs
-	pop		edi
-	pop		esi
+;	jmp	close_end_exit
 	pop	edi
-	; if called from command line, then exit
-	cmp		byte [params], 0
-	jnz		exit
+	pop	esi
+; if called from command line, then exit
-    ret
+	cmp	[params],byte 0
 	jnz	exit
+	ret
 save_in_shared:
-	mov	eax, 68
+save_in_shared:
+	mov	esi,1	; SHM_OPEN+SHM_WRITE
-	mov	ebx, 22
+	mcall	68,22
-	mov	esi, 1	; SHM_OPEN+SHM_WRITE
+	test	eax,eax
-	mcall
+	jz	save_in_shared_done
-	test	eax, eax
+	sub	edx,4
-	jz	save_in_shared_done
+	jbe	save_in_shared_done
 	sub	edx, 4
-	jbe	save_in_shared_done
+	mov	ecx,[final_size]
-	mov	ecx, [final_size]
+	cmp	ecx,edx
-	shr	ecx, 2
+	shr	ecx,2
 	rep	movsd
-	mov	ecx, edx
+	mov	ecx,edx
-	and	ecx, 3
+	and	ecx,3
 	rep	movsb
 save_in_shared_done:
 	pop	edi
 	pop	esi
 	jmp	exit
-	; this function cuts header, and removes chunk sizes if doc is chunked
+; this function cuts header, and removes chunk sizes if doc is chunked
-	; in: buf_ptr, pos; out: buf_ptr, pos.
+; in: buf_ptr, pos; out: buf_ptr, pos.
 parse_result:
-	; close socket
-    mov     eax, 53
+parse_result:
-    mov     ebx, 8
-    mov     ecx, [socket]
+; close socket
-    mcall
+	mcall	53,8,[socket]
-dps "close socket: "
-dph eax
+dps	"close	socket: "
-newline
+dph	eax
-	mov		edi, [buf_ptr]
+newline
-	mov		edx, [pos]
+	mov	edi,[buf_ptr]
-	mov		[buf_size], edx
-	;mov		eax, 70
-	;mov		ebx, fileinfo_tmp
+	mov	edx,[pos]
-	;mcall
+	mov	[buf_size],edx
 ;	mcall	70,fileinfo_tmp
-dps "pos = "
+dps	"pos = "
-dph edx
-newline
+dph	edx
+newline
 	; first, find end of headers
+; first, find end of headers
 .next_byte:
-	cmp		dword [edi], 0x0d0a0d0a		; ìíå ëåíü ÷èòàòü ñòàíäàðò, ïóñòü áóäóò îáà âàðèàíòà
+	cmp	[edi],dword 0x0d0a0d0a	; ìíå ëåíü ÷èòàòü ñòàíäàðò, ïóñòü áóäóò îáà âàðèàíòà
-	je		.end_of_headers
+	je	.end_of_headers
-	cmp		dword [edi], 0x0a0d0a0d
+	cmp	[edi],dword 0x0a0d0a0d
-	je		.end_of_headers
-	inc		edi
+	je	.end_of_headers
-	dec		edx
+	inc	edi
-	jne		.next_byte
+	dec	edx
-	; no end of headers. it's an error. let client see all those headers.
-	ret
+	jne	.next_byte
-.end_of_headers:
+; no end of headers. it's an error. let client see all those headers.
 	ret
 	; here we look at headers and search content-length or transfer-encoding headers
 .end_of_headers:
-;dps "eoh "
+; here we look at headers and search content-length or transfer-encoding headers
-;newline
+;dps	"eoh "
-	sub		edi, [buf_ptr]
+;newline
-	add		edi, 3
+	sub	edi,[buf_ptr]
-	mov		[body_pos], edi		; store position where document body starts
-	mov		[is_chunked], 0
+	add	edi,3
 	mov	[body_pos],edi	; store position where document body starts
-	; find content-length in headers
+	mov	[is_chunked],0
-	; not good method, but should work for 'Content-Length:'
+; find content-length in headers
 ; not good method, but should work for 'Content-Length:'
-	mov		esi, [buf_ptr]
+	mov	esi,[buf_ptr]
-	mov		edi, s_contentlength
+	mov	edi,s_contentlength
-	mov		ebx, [body_pos]
+	mov	ebx,[body_pos]
-	mov		edx, 0
+	xor	edx,edx	; 0
 .cl_next:
-	mov		al, [esi]
+	mov	al,[esi]
-	cmp		al, [edi + edx]
+	cmp	al,[edi + edx]
-	jne		.cl_fail
+	jne	.cl_fail
-	inc		edx
+	inc	edx
-	cmp		edx, len_contentlength
+	cmp	edx,len_contentlength
-	je		.cl_found
+	je	.cl_found
-	jmp		.cl_incr
+	jmp	.cl_incr
 .cl_fail:
-	mov		edx, 0
+	xor	edx,edx	; 0
 .cl_incr:
-	inc		esi
+	inc	esi
-	dec		ebx
+	dec	ebx
-	je		.cl_error
+	je	.cl_error
-	jmp		.cl_next
+	jmp	.cl_next
-.cl_error:
-;pregs
+.cl_error:
-;newline
-;dph esi
+;pregs
-;dps	" content-length not found "
+;newline
-	; find 'chunked'
+;dph	esi
 ;dps	" content-length not found "
-	; äà, ÿ êîïèðóþ êîä, ýòî óæàñíî, íî ìíå õî÷åòñÿ, ÷òîáû ïîñêîðåå çàðàáîòàëî
+; find 'chunked'
-	; à òàì óæ îòðåôàêòîðþ
+; äà, ÿ êîïèðóþ êîä, ýòî óæàñíî, íî ìíå õî÷åòñÿ, ÷òîáû ïîñêîðåå çàðàáîòàëî
+; à òàì óæ îòðåôàêòîðþ
 	mov	esi,[buf_ptr]
-	mov		esi, [buf_ptr]
+	mov	edi,s_chunked
-	mov		edi, s_chunked
+	mov	ebx,[body_pos]
-	mov		ebx, [body_pos]
+	xor	edx,edx	; 0
 	mov		edx, 0
 .ch_next:
-	mov		al, [esi]
+	mov	al,[esi]
-	cmp		al, [edi + edx]
+	cmp	al,[edi + edx]
+	jne	.ch_fail
-	jne		.ch_fail
+	inc	edx
-	inc		edx
+	cmp	edx,len_chunked
+	je	.ch_found
-	cmp		edx, len_chunked
+	jmp	.ch_incr
 	je		.ch_found
-	jmp		.ch_incr
+.ch_fail:
-.ch_fail:
+	xor	edx,edx	; 0
 	mov		edx, 0
-.ch_incr:
+.ch_incr:
-	inc		esi
+	inc	esi
-	dec		ebx
+	dec	ebx
-	je		.ch_error
+	je	.ch_error
-	jmp		.ch_next
+	jmp	.ch_next
 .ch_error:
 .ch_error:
-	; if neither of the 2 headers is found, it's an error
-;dps "transfer-encoding: chunked not found "
+; if neither of the 2 headers is found, it's an error
-	mov		eax, [pos]
+;dps	"transfer-encoding: chunked not found "
-	sub		eax, [body_pos]
+	mov	eax,[pos]
-	jmp		.write_final_size
+	sub	eax,[body_pos]
 	jmp	.write_final_size
 .ch_found:
 .ch_found:
-	mov		[is_chunked], 1
-	mov		eax, [body_pos]
+	mov	[is_chunked],1
-	add		eax, [buf_ptr]
+	mov	eax,[body_pos]
-	sub		eax, 2
+	add	eax,[buf_ptr]
-	mov		[prev_chunk_end], eax
+	sub	eax,2
-;dps "check cl eax==ebx "
+;dps	"check cl eax==ebx "
 ;pregs
 	; everything is ok, so we return
 ; everything is ok, so we return
-	mov		eax, [body_pos]
+	mov	eax,[body_pos]
-	mov		ebx, [buf_ptr]
+	mov	ebx,[buf_ptr]
-	add		ebx, eax
+	add	ebx,eax
-	mov		[final_buffer], ebx
+	mov	[final_buffer],ebx
-	;mov		ebx, [pos]
+;	mov	ebx,[pos]
-	;sub		ebx, eax
-	;mov		[final_size], ebx
+;	sub	ebx,eax
 ;	mov	[final_size],ebx
-	ret
 	ret
 parse_chunks:
 parse_chunks:
-;dps "parse chunks"
-;newline
+;dps	"parse chunks"
-	; we have to look through the data and remove sizes of chunks we see
+;newline
 	; we have to look through the data and remove sizes of chunks we see
 	; 1. read size of next chunk
 	; 2. if 0, it's end. if not, continue.
 	; 3. make a good buffer and copy a chunk there
 	xor	eax,eax
-	mov		[final_buffer], 0
-	mov		[final_size], 0
+	mov	[final_buffer],eax	; 0
 	mov	[final_size],eax	; 0
 .read_size:
-	mov		eax, [prev_chunk_end]
+.read_size:
-	mov		ebx, eax
-	sub		ebx, [buf_ptr]
+	mov	eax,[prev_chunk_end]
 	mov	ebx,eax
-	mov		edx, eax
 	sub	ebx,[buf_ptr]
-;dps "rs "
+	mov	edx,eax
-;pregs
+;dps	"rs "
 ;pregs
-	add		ebx, eax
+	add	ebx,eax
-	mov		[prev_chunk_end], ebx
+	mov	[prev_chunk_end],ebx
-;dps "sz "
+;dps	"sz "
-;pregs
 ;pregs
-	; do copying: from buf_ptr+edx to final_buffer+prev_final_size count eax
 ; do copying: from buf_ptr+edx to final_buffer+prev_final_size count eax
-	; realloc final buffer
 ; realloc final buffer
 	push	eax
 	push	edx
-	push	dword [final_size]
 	push	dword [final_size]
-	add		[final_size], eax
-	mov		eax, 68
-	mov		ebx, 20
-	mov		ecx, [final_size]
+	add	[final_size],eax
-	mov		edx, [final_buffer]
-	mcall
+	mcall	68,20,[final_size],[final_buffer]
-	mov		[final_buffer], eax
+	mov	[final_buffer],eax
-;dps "re "
+;dps	"re "
-;pregs
 ;pregs
-	pop		edi
+	pop	edi
-	pop		esi
+	pop	esi
-	pop		ecx
 	pop	ecx
-	;add		[pos], ecx
 ;	add	[pos],ecx
-	add		edi, [final_buffer]
 	add	edi,[final_buffer]
-;dps "cp "
+;dps	"cp "
-;pregs
 ;pregs
-	rep		movsb
 	rep	movsb
-	jmp		.read_size
+	jmp	.read_size
 chunks_end:
-	; free old buffer
+; free old buffer
-dps "chunks end"
-newline
-	mov		eax, 68
+dps	"chunks end"
-	mov		ebx, 13
-	mov		ecx, [buf_ptr]
-	mcall
+newline
-	; done!
+	mcall	68,13,[buf_ptr]
-	ret
 ; done!
 	ret
 ; reads content-length from [edi+ecx], result in eax
-read_number:
+; reads content-length from [edi+ecx], result in eax
 read_number:
+	push	ebx
-	push	ebx
+	xor	eax,eax
-	xor		eax, eax
+	xor	ebx,ebx
 	xor		ebx, ebx
 .next:
-	mov		bl, [esi]
+	mov	bl,[esi]
-	ja		.not_number
+	ja	.not_number
-	sub		bl, '0'
+	sub	bl,'0'
-	shl		eax, 1
+	shl	eax,1
-	lea		eax,[eax + eax * 4]		; eax *= 10
+	lea	eax,[eax + eax * 4]	; eax *= 10
-	add		eax, ebx
+	add	eax,ebx
 .not_number:
-	cmp		bl, 13
+	cmp	bl,13
-	jz		.done
+	jz	.done
-	inc		esi
+	inc	esi
-	jmp		.next
+	jmp	.next
 .done:
-	pop		ebx
+	pop	ebx
 ;newline
-;dps "strtoint eax "
+;dps	"strtoint eax "
 ;pregs
 	ret
-; reads hex from eax, result in eax, end of text in ebx
+; reads hex from eax,result in eax,end of text in ebx
-read_hex:
 read_hex:
-	add		eax, 2
+	add	eax,2
-	mov		ebx, eax
 	mov	ebx,eax
-	mov		eax, [ebx]
+	mov	eax,[ebx]
-	mov		[deba], eax
 	mov	[deba],eax
 ;	pushf
-;   pushad
+;	pushad
-;   mov  edx,deba
+;	mov	edx,deba
-;   call debug_outstr
+;	call	debug_outstr
-;   popad
+;	popad
-;   popf
 ;	popf
-	xor		eax, eax
+	xor	eax,eax
-	xor		ecx, ecx
+	xor	ecx,ecx
 .next:
-	mov		cl, [ebx]
+	mov	cl,[ebx]
-	jz		.done
+	jz	.done
-;dph ebx
+;dph	ebx
-	or		cl, 0x20
+	or	cl,0x20
-	sub		cl, '0'
+	sub	cl,'0'
-	jb		.bad
+	jb	.bad
-	cmp		cl, 0x9
+	cmp	cl,0x9
-	jbe		.adding
+	jbe	.adding
-	sub		cl, 'a'-'0'-10
+	sub	cl,'a'-'0'-10
-	cmp		cl, 0x0a
+	cmp	cl,0x0a
-	jb		.bad
+	jb	.bad
-	cmp		cl, 0x0f
+	cmp	cl,0x0f
-	ja		.bad
+	ja	.bad
 .adding:
-	shl		eax, 4
+	shl	eax,4
-	or		eax, ecx
+	or	eax,ecx
-;	jmp		.not_number
+;	jmp	.not_number
 ;.bad:
 ;newline
-;dps "hextoint eax "
+;dps	"hextoint eax "
 ;pregs
 	ret
 ;****************************************************************************
 ;    Function
 ;       draw_page
+;
+;
 ;****************************************************************************
 draw_page:
 	ret
 ;****************************************************************************
 ;    Function
 ;       linefeed
+;
 ;   Description
+;
+;
 ;****************************************************************************
-linefeed:
 linefeed:
-    ret
+	ret
 ;****************************************************************************
-    jnz     tst3
+	jnz	tst3
-	dps "opening socket"
+dps	"opening socket"
-	newline
+newline
+; Clear all page memory
+	xor	eax,eax
+	mov	[prev_chunk_end],eax	; 0
+	cmp	[buf_ptr],eax	; 0
-    ; Clear all page memory
+	jz	no_free
-	mov		[prev_chunk_end], 0
-	cmp		[buf_ptr], 0
-	jz		no_free
-	mov		eax, 68		; free buffer
 	mov		ebx, 13
+	mcall	68,13,[buf_ptr]	; free	buffer
-	mov		ecx, [buf_ptr]
-	mcall
 no_free:
-	mov		[buf_size], 0
+	xor	eax,eax
-    ; Parse the entered url
+	mov	[buf_size],eax	; 0
-    call    parse_url
+; Parse the entered url
+	call	parse_url
 ; Get a free port number
-    ; Get a free port number
+	mov	ecx,1000	; local port starting at 1000
         mov         ecx, 1000           ; local port starting at 1000
-getlp1:
-        inc         ecx
-        push    ecx
+getlp1:
-        mov         eax, 53
+	inc	ecx
-        mov         ebx, 9
+	push	ecx
-        mcall
+	mcall	53,9
-        pop         ecx
-        cmp         eax, 0                      ; is this local port in use?
-        jz              getlp1              ; yes - so try next
+	pop	ecx
+	cmp	eax,0	; is this local port in use?
-    mov     eax,53
+	jz	getlp1	; yes - so try next
     mov     ebx,5
-    mov     edx,80
+	mov	edx,80
-    cmp     [proxyAddr], 0
+	cmp	[proxyAddr],byte 0
-    jz      sc000
-    mov     edx,[proxyPort]
-sc000:
+	jz	sc000
-    mov     esi,dword [server_ip]
-    mov     edi,1
-    mcall
-    mov     [socket], eax
 	mov	edx,[proxyPort]
-    mov     [pos],0
-    mov     [pagex],0
-    mov     [pagey],0
+sc000:
+	mcall	53,5,,,[server_ip],1
+	mov	[socket],eax
+	mov	[pagexs],80
+	push	eax
+	xor	eax,eax ; 0
+	mov	[pos],eax
-    mov     [pagexs],80
+	mov	[pagex],eax
-    mov     [command_on_off],0
+	mov	[pagey],eax
 	mov	[command_on_off],eax
-	mov		[is_body], 0
+	mov	[is_body],eax
-    ret
+	pop	eax
-tst3:
-    cmp     ah,24     ; close socket
-    jnz     no_24
+	ret
-    mov     eax,53
-    mov     ebx,8
     mov     ecx,[socket]
-    mcall
+tst3:
-    call    draw_page
 	cmp	ah,24	; close	socket
-    ret
+	jnz	no_24
-no_24:
+	mcall	53,8,[socket]
-    ret
+	call	draw_page
-    mov     ax, '//'
+	mov	ax,'//'
 pu_000:
-    cmp     [esi], byte ' '     ; end of text?
+	cmp	[esi],byte ' '	; end of text?
-    je      pu_002              ; yep, so not found
+	je	pu_002		; yep, so not found
-    cmp     word [esi], ax
+	cmp	[esi],ax
-    je      pu_001              ; Found it, so esi+2 is start
+	je	pu_001	; Found it, so esi+2 is start
-    inc     esi
+	inc	esi
-    loop    pu_000
+	loop	pu_000
 pu_002:
-    ; not found, so reset esi to start
+; not found, so reset esi to start
-    mov     esi, document_user -2
+	mov	esi,document_user-2
 pu_001:
-    add     esi, 2
+pu_001:
-    mov     ebx, esi    ; save address of start of web address
+	add	esi,2
-    mov     edi, document_user + URLMAXLEN  ; end of string
+	mov	ebx,esi	; save address of start of web address
 	mov	edi,document_user + URLMAXLEN	; end of string
-    ; look for page delimiter - it's a '/' character
+; look for page delimiter - it's a '/' character
 pu_003:
 pu_006:
-    movsb
+	movsb
-    cmp     esi, ecx
+	cmp	esi,ecx
-    je      pu_007              ; end of string?
+	je	pu_007		; end of string?
-    cmp     [esi], byte ' '     ; end of text
+	cmp	[esi],byte ' '	; end of text
-    je      pu_007
+;	je	pu_007		; äçåí-àññåìáëåð
+;	jmp	pu_006		; íå íàäî ïëîäèòü ñóùíîñòè ïî íàïðàñíó
-    jmp     pu_006
+	jne	pu_006
 pu_007:
-    pop     esi                 ; point esi to '/' delimiter
+	pop	esi	; point esi to '/' delimiter
-    cld
+	cld
 pu_008:
-    movsb
+	movsb
-    cmp     esi, ecx
+	cmp	esi,ecx
+;	je	pu_009		; äçåí-àññåìáëåð
-    je      pu_009
+;	jmp	pu_008		; íå íàäî ïëîäèòü ñóùíîñòè ïî íàïðàñíó
-    jmp     pu_008
+	jne	pu_008
-pu_009:
-    ; For debugging, display resulting strings
+pu_009:
 ; For debugging, display resulting strings
-if DEBUGGING_STATE = DEBUGGING_ENABLED
+if	DEBUGGING_STATE = DEBUGGING_ENABLED
-    mov     esi, document_user
+	mov	esi,document_user
-    call    debug_print_string
+	call	debug_print_string
-    mov     esi, webAddr
+	mov	esi,webAddr
-    call    debug_print_string
+	call	debug_print_string
-    mov     esi, document
+	mov	esi,document
-    call    debug_print_string
-end if
+	call	debug_print_string
 end	if
-    ; Look up the ip address, or was it specified?
+; Look up the ip address, or was it specified?
-    mov     al, [proxyAddr]
+	mov	al,[proxyAddr]
-    cmp     al, 0
+	cmp	al,0
-    cmp     al, '0'
+	cmp	al,'0'
-    jb      pu_010              ; Resolve address
+	jb	pu_010	; Resolve address
-    cmp     al, '9'
+	cmp	al,'9'
-    ja      pu_010              ; Resolve address
+	ja	pu_010	; Resolve address
-if DEBUGGING_STATE = DEBUGGING_ENABLED
+if	DEBUGGING_STATE = DEBUGGING_ENABLED
-    mov     esi, str2       ; print gotip
+	mov	esi,str2	; print	gotip
-    call    debug_print_string
+	call	debug_print_string
-end if
 end	if
-    ; Convert address
+; Convert address
-    ; If proxy is given, get proxy address instead of server
+; If proxy is given, get proxy address instead of server
-    mov     esi,proxyAddr-1
+	mov	esi,proxyAddr-1
-    cmp     byte [esi+1], 0
+	cmp	byte [esi+1],0
-    jnz     pu_020
+	jnz	pu_020
-    mov     esi,webAddr-1
+	mov	esi,webAddr-1
 pu_020:
 pu_020:
+	mov	edi,server_ip
-    mov     edi,server_ip
+	xor	eax,eax
     xor     eax,eax
 ip1:
-    inc     esi
+	inc	esi
-    cmp     [esi],byte '0'
+	cmp	[esi],byte '0'
-    imul    eax,10
+	imul	eax,10
-    movzx   ebx,byte [esi]
+	movzx	ebx,byte [esi]
-    sub     ebx,48
+	sub	ebx,48
-    add     eax,ebx
+	add	eax,ebx
-    jmp     ip1
+	jmp	ip1
 ip2:
-    mov     [edi],al
+	mov	[edi],al
-    xor     eax,eax
+	xor	eax,eax
-    inc     edi
+	inc	edi
-    cmp     edi,server_ip+3
+	cmp	edi,server_ip+3
-    jbe     ip1
+	jbe	ip1
-    jmp     pu_011
+	jmp	pu_011
-pu_010:
 pu_010:
-if DEBUGGING_STATE = DEBUGGING_ENABLED
+if	DEBUGGING_STATE = DEBUGGING_ENABLED
-    mov     esi, str1       ; print resolving
+	mov	esi,str1	; print	resolving
-    call    debug_print_string
+	call	debug_print_string
-end if
 end	if
-    ; Resolve Address
+; Resolve Address
-    call    translateData       ; Convert domain & DNS IP address
+	call	translateData	; Convert domain & DNS IP address
-    call    resolveDomain       ; get ip address
+	call	resolveDomain	; get ip address
-if DEBUGGING_STATE = DEBUGGING_ENABLED
+if	DEBUGGING_STATE = DEBUGGING_ENABLED
-    mov     esi, str3
+	mov	esi,str3
-    call    debug_print_string
+	call	debug_print_string
-end if
 end	if
 pu_011:
-    ; Done
+pu_011:
-    ret
+; Done
 	ret
 ;***************************************************************************
+;
 ;    The ename, in query, is converted and stored in dnsMsg
+;
 ;***************************************************************************
 translateData:
     ; first, get the IP address of the DNS server
     ; Then, build up the request string.
-    ; Build the request string
     ; Build the request string
-    mov     eax, 0x00010100
+	mov	eax,0x00010100
-    mov     [dnsMsg], eax
+	mov	[dnsMsg],eax
-    mov     eax, 0x00000100
+	mov	eax,0x00000100
-    mov     [dnsMsg+4], eax
+	mov	[dnsMsg+4],eax
-    mov     eax, 0x00000000
+	mov	eax,0x00000000
-    mov     [dnsMsg+8], eax
 	mov	[dnsMsg+8],eax
-    ; domain name goes in at dnsMsg+12
+; domain name goes in at dnsMsg+12
-    mov     esi, dnsMsg + 12        ; location of label length
+	mov	esi,dnsMsg +12	;location of label length
-    mov     edi, dnsMsg + 13        ; label start
+	mov	edi,dnsMsg + 13	;label start
-    mov     edx, proxyAddr
+	mov	edx,proxyAddr
-    cmp     byte [edx], 0
+	cmp	byte [edx],0
-    jnz     td000
+	jnz	td000
+	mov	edx,webAddr
     mov     edx, webAddr
 td000:
-    mov     ecx, 12                  ; total string length so far
+	mov	ecx,12	; total string length so far
 td0021:
-    mov     al, [edx]
+	mov	al,[edx]
-    cmp     al, ' '
+	cmp	al,' '
+	je	td001	; we have finished the string translation
     je      td001                   ; we have finished the string translation
-    cmp     al, 0
+	cmp	al,0
+	je	td001
     je      td001
-    cmp     al, '.'                 ; we have finished the label
+	cmp	al,'.'	; we have finished the label
-    je      td004
+	je	td004
-    mov     esi, edi
+	mov	esi,edi
-    inc     edi
+	inc	edi
-    inc     edx
+	inc	edx
-    jmp     td002
+	jmp	td002
-    ; write label len + label text
 ; write label len + label text
 td001:
-    mov     [edi], byte 0
+	mov	[edi],byte 0
-    inc     ecx
+	inc	ecx
-    inc     edi
+	inc	edi
-    mov     [edi], dword 0x01000100
+	mov	[edi],dword 0x01000100
-    add     ecx, 4
 	add	ecx,4
-    mov     [dnsMsgLen], ecx
 	mov	[dnsMsgLen],ecx
-    ret
 	ret
 ;***************************************************************************
 ;   Function
 ;      resolveDomain
-    ; Get a free port number
+; Get a free port number
-        mov         ecx, 1000           ; local port starting at 1000
+	mov	ecx,1000	; local port starting at 1000
 getlp:
-        inc         ecx
+	inc	ecx
-        push    ecx
+	push	ecx
-        mov         eax, 53
-        mov         ebx, 9
-        mcall
+	mcall	53,9
-        pop         ecx
+	pop	ecx
-        cmp         eax, 0                      ; is this local port in use?
+	cmp	eax,0	; is this local port in use?
-        jz              getlp               ; yes - so try next
+	jz	getlp	; yes - so try next
-    ; Get DNS IP
-    mov     eax, 52
-    mov     ebx, 13
+; Get DNS IP
-    mcall
+	mcall	52,13
-    mov     esi, eax
+	mov	esi,eax
-    ; First, open socket
-    mov     eax, 53
-    mov     ebx, 0
+; First, open socket
-    mov     edx, 53    ; remote port - dns
+	mov	edx,53	; remote port - dns
+;	mov	esi,dword [dns_ip]
-;    mov     esi, dword [dns_ip]
+	xor	ebx,ebx	; 0
-    mcall
 	mcall	53
-    mov     [socketNum], eax
 	mov	[socketNum],eax
-    ; write to socket ( request DNS lookup )
-    mov     eax, 53
-    mov     ebx, 4
-    mov     ecx, [socketNum]
+; write to socket ( request DNS lookup )
-    mov     edx, [dnsMsgLen]
-    mov     esi, dnsMsg
-    mcall
 	mcall	53,4,[socketNum],[dnsMsgLen],dnsMsg
-    ; Setup the DNS response buffer
 ; Setup the DNS response buffer
-    mov     eax, dnsMsg
+	mov	eax,dnsMsg
-    mov     [dnsMsgLen], eax
 	mov	[dnsMsgLen],eax
-    ; now, we wait for
+; now, we wait for
-    ; UI redraw
+; UI redraw
-    ; UI close
+; UI close
-    ; or data from remote
+; or data from remote
-ctr001:
-    mov     eax,10                 ; wait here for event
-    mcall
+ctr001:
 	mcall	10	; wait here for event
+	cmp	eax,1	; redraw request ?
-    cmp     eax,1                  ; redraw request ?
+	je	ctr003
     je      ctr003
+	cmp	eax,2	; key in buffer ?
-    cmp     eax,2                  ; key in buffer ?
+	je	ctr004
     je      ctr004
-    cmp     eax,3                  ; button in buffer ?
-    je      ctr005
 	cmp	eax,3	; button in buffer ?
-    ; Any data in the UDP receive buffer?
-    mov     eax, 53
+	je	ctr005
-    mov     ebx, 2
-    mov     ecx, [socketNum]
-    mcall
+; Any data in the UDP receive buffer?
 	mcall	53,2,[socketNum]
-    cmp     eax, 0
+	cmp	eax,0
-    je      ctr001
+	je	ctr001
-    ; we have data - this will be the response
-ctr002:
-    mov     eax, 53
-    mov     ebx, 3
-    mov     ecx, [socketNum]
+; we have data - this will be the response
-    mcall                ; read byte - block (high byte)
+ctr002:
 	mcall	53,3,[socketNum]	; read byte - block (high byte)
-    ; Store the data in the response buffer
+; Store the data in the response buffer
-    mov     eax, [dnsMsgLen]
-    mov     [eax], bl
-    inc     dword [dnsMsgLen]
+	mov	eax,[dnsMsgLen]
-    mov     eax, 53
-    mov     ebx, 2
+	mov	[eax],bl
-    mov     ecx, [socketNum]
+	inc	dword [dnsMsgLen]
     mcall                ; any more data?
-    cmp     eax, 0
-    jne     ctr002              ; yes, so get it
+	mcall	53,2,[socketNum]	; any more data?
-    ; close socket
-    mov     eax, 53
+	cmp	eax,0
-    mov     ebx, 1
-    mov     ecx, [socketNum]
+	jne	ctr002	; yes, so get it
     mcall
 ; close	socket
-    mov     [socketNum], dword 0xFFFF
 	mcall	53,1,[socketNum]
-    ; Now parse the message to get the host IP
+	mov	[socketNum],dword  0xFFFF
-    ; Man, this is complicated. It's described in
+; Now parse the message to get the host IP
-    ; RFC 1035
+; Man, this is complicated. It's described in
     ; Note: The response is in dnsMsg
     ;       The end of the buffer is pointed to by [dnsMsgLen]
-    ; Clear the IP address text
+; Clear the IP address text
-    mov     [server_ip], dword 0
 	mov	[server_ip],dword  0
-    mov     esi, dnsMsg
 	mov	esi,dnsMsg
-    ; Is this a response to my question?
+; Is this a response to my question?
-    mov     al, [esi+2]
+	mov	al,[esi+2]
-    and     al, 0x80
+	and	al,0x80
-    cmp     al, 0x80
+	cmp	al,0x80
-    jne     ctr002a
 	jne	ctr002a
-    ; Were there any errors?
+; Were there any errors?
-    mov     al, [esi+3]
+	mov	al,[esi+3]
-    and     al, 0x0F
+	and	al,0x0F
-    cmp     al, 0x00
+	cmp	al,0x00
-    jne     ctr002a
 	jne	ctr002a
-    ; Is there ( at least 1 ) answer?
+; Is there ( at least 1 ) answer?
-    mov     ax, [esi+6]
+	mov	ax,[esi+6]
-    cmp     ax, 0x00
+	cmp	ax,0x00
-    je      ctr002a
+	je	ctr002a
-    ; Header validated. Scan through and get my answer
 ; Header valdated. Scan through and get my answer
-if DEBUGGING_STATE = DEBUGGING_ENABLED
+if	DEBUGGING_STATE = DEBUGGING_ENABLED
-    pusha
+	pusha
-    mov     esi, str4
+	mov	esi,str4
-    call    debug_print_string
+	call	debug_print_string
-    popa
+	popa
-end if
 end	if
-    add     esi, 12             ; Skip to the question field
 	add	esi,12	; Skip to the question field
-    ; Skip through the question field
+; Skip through the question field
-    call    skipName
+	call	skipName
-    add     esi, 4              ; skip past the questions qtype, qclass
+	add	esi,4	; skip past the questions qtype, qclass
-    ; find the right one ( TYPE = 0x0001 )
+; find the right one ( TYPE = 0x0001 )
-    call    skipName
+	call	skipName
-    mov     ax, [esi]
+	mov	ax,[esi]
-    cmp     ax, 0x0100          ; Is this the IP address answer?
+	cmp	ax,0x0100	; Is this the IP address answer?
-    jne     ctr002c
+	jne	ctr002c
-    ; Yes! Point esi to the first byte of the IP address
+; Yes! Point esi to the first byte of the IP address
-    add     esi, 10
+	add	esi,10
-    mov     eax, [esi]
+	mov	eax,[esi]
-    mov     [server_ip], eax
+	mov	[server_ip],eax
-    ret
+	ret
-ctr002c:                        ; Skip through the answer, move to the next
+ctr002c:	; Skip through the answer, move to the next
-    add     esi, 8
+	add	esi,8
-    movzx   eax, byte [esi+1]
+	movzx	eax,byte [esi+1]
-    mov     ah, [esi]
+	mov	ah,[esi]
-    add     esi, eax
+	add	esi,eax
-    add     esi, 2
 	add	esi,2
-    ; Have we reached the end of the msg?
+; Have we reached the end of the msg?
-    ; This is an error condition, should not happen
+; This is an error condition, should not happen
-    cmp     esi, [dnsMsgLen]
+	cmp	esi,[dnsMsgLen]
-    jl      ctr002z             ; Check next answer
+	jl	ctr002z	; Check next answer
-ctr003:                         ; redraw
+ctr003:	; redraw
-    call    draw_window
+	call	draw_window
-    jmp     ctr001
+	jmp	ctr001
-ctr004:                         ; key
+ctr004:	; key
-    mov     eax,2               ; just read it and ignore
-    mcall
+	mcall	2	; just read it and ignore
-    jmp     ctr001
+	jmp	ctr001
-ctr005:                         ; button
-    mov     eax,17              ; get id
-    mcall
+ctr005:	; button
 	mcall	17	; get id
-    mov     dl, ah
-    ; close socket
+	mov	dl,ah
-    mov     eax, 53
-    mov     ebx, 1
     mov     ecx, [socketNum]
-    mcall
+	; close	socket
 	mcall	53,1,[socketNum]
-    cmp     dl, 1
+	cmp	dl,1
-    je      exit
 	je	exit
-    mov     [socketNum], dword 0xFFFF
-    mov     [server_ip], dword 0
-    ret
+	mov	[socketNum],dword  0xFFFF
 	mov	[server_ip],dword  0
 	ret
+;
 ;   Description
 ;       Load settings from configuration file network.ini
+;
 ;***************************************************************************
-include "proc32.inc"
-include "dll.inc"
 load_settings:
-    stdcall dll.Load, @IMPORT
+	stdcall	dll.Load,@IMPORT
-    test    eax, eax
+	test	eax,eax
-    jnz     ls001
+	jnz	ls001
-    invoke  ini.get_str, inifile, sec_proxy, key_proxy, proxyAddr, 256, proxyAddr
+	invoke	ini.get_str,inifile,sec_proxy,key_proxy,proxyAddr,256,proxyAddr
-    mov     esi, proxy_auth_basic
+	mov	esi,proxy_auth_basic
-    mov     ecx, proxy_auth_basic_end - proxy_auth_basic
+	mov	ecx,proxy_auth_basic_end - proxy_auth_basic
-    rep     movsb
+	rep	movsb
-    ; base64-encode string :
+; base64-encode string :
-    mov     esi, proxyUser
+	mov	esi,proxyUser
 apah000:
-    lodsb
+	lodsb
-    test    al, al
+	test	al,al
-    jz      apah001
+	jz	apah001
-    call    encode_base64_byte
+	call	encode_base64_byte
-    jmp     apah000
+	jmp	apah000
 apah001:
-    mov     al, ':'
+	mov	al,':'
-    call    encode_base64_byte
+	call	encode_base64_byte
-    mov     esi, proxyPassword
+	mov	esi,proxyPassword
 apah002:
-    lodsb
+	lodsb
-    test    al, al
+	test	al,al
-    jz      apah003
+	jz	apah003
-    call    encode_base64_byte
+	call	encode_base64_byte
-    jmp     apah002
+	jmp	apah002
 apah003:
-    call    encode_base64_final
+	call	encode_base64_final
-    ret
+	ret
-    shl     edx, 8
+	shl	edx,8
-    mov     dl, al
+	mov	dl,al
-    cmp     ecx, 3
+	cmp	ecx,3
-    je      ebb001
+	je	ebb001
-    ret
+	ret
 ebb001:
-    shl     edx, 8
+	shl	edx,8
-    inc     ecx
+	inc	ecx
 ebb002:
-    rol     edx, 6
+	rol	edx,6
-    xor     eax, eax
+	xor	eax,eax
-    xchg    al, dl
+	xchg	al,dl
-    mov     al, [base64_table+eax]
+	mov	al,[base64_table+eax]
-    call    encode_base64_byte
+	call	encode_base64_byte
-    test    ecx, ecx
+	test	ecx,ecx
-    jz      ebf001
+	jz	ebf001
-    call    encode_base64_byte
+	call	encode_base64_byte
-    mov     byte [edi-2], '='
+	mov	byte [edi-2],'='
 ebf001:
-    mov     byte [edi-1], '='
+	mov	byte [edi-1],'='
 ebf000:
-    ret
+	ret
+;
 ;****************************************************************************
 debug_print_string:
-    push    esi
+	push	esi
-    mov     cl, '"'
+	mov	cl,'"'
-    mov     eax,63
-    mov     ebx, 1
-    mcall
+	mcall	63,1
-    pop     esi
+	pop	esi
 dps_000:
-    mov     cl, [esi]
+	mov	cl,[esi]
-    cmp     cl, 0
+	cmp	cl,0
+	je	dps_exit
     je      dps_exit
-    cmp     cl, ' '
+	cmp	cl,' '
-    je      dps_exit
+	je	dps_exit
-    jmp     dps_001
+	jmp	dps_001
-dps_exit:
-    mov     cl, '"'
-    mov     eax,63
+dps_exit:
-    mov     ebx, 1
+	mov	cl,'"'
-    mcall
-    mov     cl, 13
-    mov     eax,63
+	mcall	63,1
-    mov     ebx, 1
+	mov	cl,13
-    mcall
-    mov     cl, 10
-    mov     eax,63
+	mcall
-    mov     ebx, 1
+	mov	cl,10
-    mcall
+	mcall
-    ret
-dps_001:
+	ret
-    mov     eax,63
-    mov     ebx, 1
-    push    esi
+dps_001:
-    mcall
+	push	esi
 	mcall	63,1
-    pop     esi
+	pop	esi
-    inc     esi
-    jmp     dps_000
+	inc	esi
-end if
+	jmp	dps_000
 end	if
 ;****************************************************************************
 ;    Function
 ;       print_text
+;
 ;   Description
 ;       display the url (full path) text
-;
-;****************************************************************************
+;
-print_text:
+;****************************************************************************
-    ; Draw a bar to blank out previous text
+print_text:
-    mov     eax,13
+; Draw a bar to blank out previous text
-    mov     ebx,30*65536+URLMAXLEN*6  ; 50 should really be [len], and 103 [xa]
+	mov	ebx,30*65536+URLMAXLEN*6	; 50 should really be [len] and 103 [xa]
-    mov     ecx,[ya]
-    shl     ecx,16
-    mov     cx,9
+	mov	ecx,[ya]
-    mov     edx,0xFFFFFF
-    mcall
+	shl	ecx,16
 	mov	cx,9
-    ; write text
-    mov     eax,4
+	mcall	13,,,0xFFFFFF
-    mov     ebx,30*65536
+; write text
-    add     ebx,[ya]
-    mov     ecx,0x000000
-    mov     edx,[addr]
+	mov	ebx,30*65536
-    mov     esi,URLMAXLEN
+	add	ebx,[ya]
-    mcall
+	xor	ecx,ecx
 	mcall	4,,,[addr],URLMAXLEN
-    ret
+	ret
+;   *********************************************
+;   *******  WINDOW DEFINITIONS AND DRAW ********
+;   *********************************************
-;   *********************************************
-;   *******  WINDOW DEFINITIONS AND DRAW ********
-;   *********************************************
-draw_window:
 draw_window:
-	cmp		byte [params], 0
-	jz		.noret
-    mov     eax,12                    ; function 12:tell os about windowdraw
-    mov     ebx,1                     ; 1, start of draw
-    mcall
-	; ýòî íåñêîëüêî çàãàäî÷íî, íî åñëè íå ðèñîâàòü îêîøêî ñîâñåì, ïðîãà íå ïàøåò.
-    mov     eax,0                     ; function 0 : define and draw window
-    mov     ebx,0          ; [x start] *65536 + [x size]
-    mov     ecx,0          ; [y start] *65536 + [y size]
-    mov     edx,0x14ffffff            ; color of work area RRGGBB,8->color gl
-    mov     edi,title                 ; WINDOW LABEL
-    mcall
-    mov     eax,12                    ; function 12:tell os about windowdraw
-    mov     ebx,2                     ; 2, end of draw
-    mcall
 ; function 12: tell os about windowdraw
-	ret
+; 1 start of draw
+	mcall	12,1
+;	cmp	[params],byte 0
-.noret:
+;	jz	.noret
-    mov     eax,12                    ; function 12:tell os about windowdraw
+; ýòî íåñêîëüêî çàãàäî÷íî, íî åñëè íå ðèñîâàòü îêîøêî ñîâñåì, ïðîãà íå ïàøåò.
-    mov     ebx,1                     ; 1, start of draw
+; DRAW	WINDOW
-    mcall
+; eax	function 0 : define and draw window
+;	xor	eax,eax
+; ebx	[x start] *65536 + [x size]
+;	xor	ebx,ebx
+; ecx	[y start] *65536 + [y size]
+;	xor	ecx,ecx
+; edx	color of work area RRGGBB,8->color gl
+; esi	color of bar and flags
+;	xor	esi,esi
-                                   ; DRAW WINDOW
+;	mcall	,,,0x14ffffff,,title
+; function 12: tell os about windowdraw
+; 2, end of draw
+;	mcall	12,2
+;	ret
+;.noret:
+; DRAW	WINDOW
-    mov     eax,0                     ; function 0 : define and draw window
+; eax	function 0 : define and draw window
-    mov     ebx,50*65536+600          ; [x start] *65536 + [x size]
+	xor	eax,eax
-    mov     ecx,350*65536+200          ; [y start] *65536 + [y size]
+; ebx	[x start] *65536 + [x size]
-    mov     edx,0x14ffffff            ; color of work area RRGGBB,8->color gl
+; ecx	[y start] *65536 + [y size]
+; edx	color of work area RRGGBB,8->color gl
-    mov     edi,title                 ; WINDOW LABEL
+; esi	color of bar and flags
+	xor	esi,esi
-    mcall
+; edi	WINDOW	LABEL
+	mcall	,<50,600>,<350,200>,0x14ffffff,,title
-    mov     esi, URLMAXLEN            ; URL
-    mov     eax,4                     ; function 4 : write text to window
-    mov     ebx,30*65536+38           ; [x start] *65536 + [y start]
-    mov     ecx,0x000000              ; color of text RRGGBB
-    mov     edx,document_user         ; pointer to text beginning
+; eax	function 4: write text to window
-    mcall
+; ebx	[x start] *65536 + [y start]
 ; ecx	color of text RRGGBB
-    ; mov     eax,38
+; edx	pointer to text beginning
-    ; mov     ebx,5*65536+545
-    ; mov     ecx,60*65536+60
-    ; mov     edx,0x000000
-    ; mcall
-    ;mov     eax,38
-    ;mov     ebx,5*65536+545
-    ; mov     ecx,[winys]
-    ; shl     ecx,16
+; esi	max lenght
+	xor	ecx,ecx
+	mcall	4,<30,38>,,document_user,URLMAXLEN
+;	xor	edx,edx
+;	mcall	38,<5,545>,<60,60>
+;	mov	ecx,[winys]
-    ; add     ecx,[winys]
+;	shl	ecx,16
-    ; sub     ecx,26*65536+26
-    ;mov     edx,0x000000
-    ;mcall
-                                   ; RELOAD
+;	add	ecx,[winys]
-    mov     eax,8                     ; function 8 : define and draw button
-    mov     ebx,388*65536+50          ; [x start] *65536 + [x size]
-    mov     ecx,34*65536+14           ; [y start] *65536 + [y size]
-    mov     edx,22                    ; button id
+;	sub	ecx,26*65536+26
-    mov     esi,0x5588dd              ; button color RRGGBB
-    mcall
-                                   ; URL
+;	mcall	38,<5,545>
-    ;mov     eax,8                     ; function 8 : define and draw button
-    mov     ebx,10*65536+12          ; [x start] *65536 + [x size]
-    mov     ecx,34*65536+12           ; [y start] *65536 + [y size]
     mov     edx,10                    ; button id
-    ;mov     esi,0x5588dd              ; button color RRGGBB
-    mcall
-                                   ; STOP
-    ;mov     eax,8                     ; function 8 : define and draw button
+; RELOAD
-    mov     ebx,443*65536+50          ; [x start] *65536 + [x size]
-    mov     ecx,34*65536+14           ; [y start] *65536 + [y size]
+; eax	function 8 : define and draw button
-    mov     edx,24                    ; button id
+; ebx	[x start] *65536 + [x size]
-    ;mov     esi,0x5588dd              ; button color RRGGBB
+; ecx	[y start] *65536 + [y size]
-    mcall
+; edx	button id
+; esi	button color RRGGBB
-									; SAVE
+	mcall	8,<388,50>,<34,14>,22,0x5588dd
-    mov     ebx,(443+55)*65536+50          ; [x start] *65536 + [x size]
+; URL
-    mov     ecx,34*65536+14           ; [y start] *65536 + [y size]
-    mov     edx,26                    ; button id
+	mcall	,<10,12>,<34,12>,10
-    ;mov     esi,0x5588dd              ; button color RRGGBB
+; STOP
-    mcall
+	mcall	,<443,50>,<34,14>,24
+; SAVE
-                                   ; BUTTON TEXT
+	mcall	,<498,50>,,26
+; BUTTON TEXT
-    mov     eax,4                     ; function 4 : write text to window
+; eax	function 4 : write text to window
-    mov     ebx,390*65536+38          ; [x start] *65536 + [y start]
+; ebx	[x start] *65536 + [y start]
-    mov     ecx,0xffffff              ; color of text RRGGBB
+; ecx	color	of	text	RRGGBB
-    mov     edx,button_text           ; pointer to text beginning
+; edx	pointer	to	text	beginning
-    mov     esi,30                    ; text length
+; esi	text	length
-    mcall
+	mcall	4,<390,38>,0xffffff,button_text,30
 	call	display_page
     call    display_page
+; function 12: tell os about windowdraw
-    mov     eax,12                    ; function 12:tell os about windowdraw
+; 2, end of draw
-    mov     ebx,2                     ; 2, end of draw
+	mcall	12,2
-    mcall
+	ret
 ;-----------------------------------------------------------------------------
-buf_ptr			dd		0
+buf_ptr		dd 0
-				;db	'/rd/1/1',0
+;		db	'/rd/1/1',0
-deba			dd		0
+deba		dd 0
-				db		0
+		db 0
 ;---------------------------------------------------------------------
-if DEBUGGING_STATE = DEBUGGING_ENABLED
+if	DEBUGGING_STATE = DEBUGGING_ENABLED
-str1:       db  "Resolving...",0
+str1:		db "Resolving...",0
-str3:       db  "Resolved",0
+str3:		db "Resolved",0
-str2:       db  "GotIP",0
+str2:		db "GotIP",0
-str4:       db  "GotResponse",0
+str4:		db "GotResponse",0
-end if
+end	if
-params		db	1024 dup(0)
 ;---------------------------------------------------------------------
-button_text     db      ' RELOAD    STOP       SAVE    '
+button_text	db ' RELOAD    STOP       SAVE    '
-dpx             dd      25  ; x - start of html page in pixels in window
+dpx		dd 25	; x - start of html page in pixels in window
-dpy             dd      65  ; for y
+dpy		dd 65	; for	y
-lastletter      db      0
+lastletter	db 0
-title         db      'Downloader',0
+title		db 'Downloader',0
+server_ip:	db 207,44,212,20
+;dns_ip:	db 194,145,128,1
-server_ip:      db      207,44,212,20
+;---------------------------------------------------------------------
-;dns_ip:         db      194,145,128,1
+;webAddr:
+;times URLMAXLEN db ' '
-webAddr:        times URLMAXLEN db ' '
+;db	0
-db 0
+;document_user:	db 'Click on the button to the left to enter a URL',0
-document_user:  db      'Click on the button to the left to enter a URL',0
+;times URLMAXLEN+document_user-$ db 0
-times URLMAXLEN+document_user-$ db 0
-document:       db      '/'
+;document:	db '/'
-times URLMAXLEN-1       db      ' '
+;times URLMAXLEN-1 db ' '
 ;---------------------------------------------------------------------
-s_contentlength		db	'Content-Length:'
+s_contentlength	db 'Content-Length:'
-len_contentlength	=	15
+len_contentlength = 15
-key_proxy		db		'proxy',0
+key_proxy	db 'proxy',0
-key_proxyport		db		'port',0
+key_proxyport	db 'port',0
-key_user		db		'user',0
+key_user	db 'user',0
-key_password		db		'password',0
+key_password	db 'password',0
-request			db		256 dup(0)
-proxyAddr		db		256 dup(0)
 proxyUser		db		256 dup(0)
 proxyPassword	db		256 dup(0)
-proxyPort		dd		80
+proxyPort	dd 80
-onoff           dd      0x0
+onoff		dd 0x0
-nextupdate:     dd      0
+nextupdate:	dd 0
-winys:          dd      400
-primary_buf		rb		primary_buffer_size
+winys:		dd 400
+dnsMsgLen:	dd 0
+socketNum:	dd 0xFFFF
+;---------------------------------------------------------------------
+document_user:	db 'Click on the button to the left to enter a URL',0
+;---------------------------------------------------------------------
+IM_END:
+	rb URLMAXLEN-(IM_END - document_user)
+;---------------------------------------------------------------------
+align 4
+document:
+	rb URLMAXLEN
+;---------------------------------------------------------------------
+align 4
+webAddr:
+	rb URLMAXLEN+1
+;---------------------------------------------------------------------
+align 4
+primary_buf:
+	rb primary_buffer_size
+;---------------------------------------------------------------------
+align 4
+params:		; db 1024 dup(0)
+	rb 1024
+;---------------------------------------------------------------------
+align 4
+request:	; db 256 dup(0)
+	rb 256
+;---------------------------------------------------------------------
+align 4
+proxyAddr:	; db 256 dup(0)
+	rb 256
+;---------------------------------------------------------------------
+align 4
+proxyUser:	; db 256 dup(0)
+	rb 256
+;---------------------------------------------------------------------
+align 4
+proxyPassword:	; db 256 dup(0)
+	rb 256
-dnsMsgLen:      dd 0
+;---------------------------------------------------------------------
+align 4
+dnsMsg:
+	rb 4096
+;	rb 0x100000
+;---------------------------------------------------------------------
+align 4
+	rb 4096
-socketNum:      dd 0xFFFF
+stacktop:
+;---------------------------------------------------------------------
-dnsMsg:
+I_END:

Subversion Repositories Kolibri OS

(root)/programs/network/downloader/trunk/downloader.asm – Rev 1645 → 1646