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

 DEBUGGING_ENABLED           equ     1
 DEBUGGING_DISABLED          equ     0
 DEBUGGING_STATE             equ     DEBUGGING_DISABLED
-use32
 use32
-                org     0x0
+ org	0x0
-                db      'MENUET00'              ; 8 byte id
+ db	'MENUET01'    ; header
-                dd      38                      ; required os
+ dd	0x01	      ; header version
-                dd      START                   ; program start
+ dd	START	      ; entry point
-                dd      I_END                   ; program image size
+ dd	I_END	      ; image size
+ dd	0x100000      ; required memory
-                dd      0x100000                ; required amount of memory
+ dd	0x100000      ; esp
-                dd      0x00000000              ; reserved=no extended header
+ dd	0x0 , 0x0     ; I_Param , I_Path
 include 'lang.inc'
-include 'macros.inc'
+include '..\..\..\macros.inc'
 ;include "DEBUG.INC"
 ;dps <"Program started",13,10>
     mov     eax,40                          ; Report events
+    mov     ebx,10000111b                   ; Stack 8 + defaults
-    mov     ebx,10000111b                   ; Stack 8 + defaults
+    mcall
     int     0x40
 red:                    ; redraw
     call    draw_window
 still:
     mov     eax,23                 ; wait here for event
     mov     ebx,1
-    int     0x40
+    mcall
     mov     [prev_status],eax
     mov     eax,53
     mov     ebx,6
     mov     ecx,[socket]
-    int     0x40
+    mcall
     mov     [status],eax
     call    read_incoming_data
     mov     eax,53
     mov     ebx,8
     mov     ecx,[socket]
-    int     0x40
+    mcall
     call    draw_page
-    mov     [onoff],0
-no_close:
-    jmp     still
     mov     [onoff],0
 red:                    ; redraw
-    call    draw_window
+no_close:
     jmp     still
 key:                    ; key
     mov     eax,2       ; just read it and ignore
-    int     0x40
+    mcall
     jmp     still
 button:                 ; button
 ;dps <"Button pressed",13,10>
     mov     eax,17      ; get id
-    int     0x40
+    mcall
     cmp     ah,1                   ; button id=1 ?
     jne     noclose
 ;dps "Closing socket before exit... "
     mov     eax, 53
     mov     ebx, 8
     mov     ecx, [socket]
-    int     0x40
+    mcall
 ;dpd eax
 ;dps <13,10>
 exit:
     or      eax,-1                 ; close this program
     mov     edi,[addr]
 f11:
     mov     eax,10
-    int     0x40
+    mcall
     cmp     eax,2 ; key?
     jz      fbu
     jmp     still
 fbu:
     mov     eax,2
-    int     0x40  ; get key
+    mcall  ; get key
     shr     eax,8
     cmp     eax,8
     mov     eax,53     ; 'GET '
     mov     ebx,7
     mov     ecx,[socket]
     mov     edx,4
     mov     esi,string0
-    int     0x40
+    mcall
     mov     edx,0
     mov     eax,53     ; document_user
     mov     ebx,7
     mov     ecx,[socket]
     mov     esi,document
-    int     0x40
+    mcall
     mov     eax,53     ; ' HTTP/1.0 .. '
     mov     ebx,7
     mov     ecx,[socket]
     mov     edx,stringh_end-stringh
     mov     esi,stringh
-    int     0x40
+    mcall
 print_status:
     pusha
     mov     eax,26
     mov     ebx,9
-    int     0x40
+    mcall
     cmp     eax,[nextupdate]
     mov     ebx,5*65536+100
     mov     ecx,[winys]
     shl     ecx,16
     add     ecx,-18*65536+10
     mov     edx,0xffffff
-    int     0x40
+    mcall
     mov     eax,47
     mov     ebx,3*65536
     mov     ecx,[status]
     mov     edx,12*65536-18
     add     edx,[winys]
     mov     esi,0x000000
-    int     0x40
+    mcall
     mov     eax,47
     mov     ebx,6*65536
     mov     ecx,[pos]
     mov     edx,40*65536-18
     add     edx,[winys]
     mov     esi,0x000000
-    int     0x40
+    mcall
 newbyteread:
     mov     eax, 53
     mov     ebx, 2
     mov     ecx, [socket]
-    int     0x40
+    mcall
     cmp     eax,0
     je      no_more_data
 read_more:
     mov     eax, 53
     mov     ebx, 3
     mov     ecx, [socket]
-    int     0x40
+    mcall
     cmp     eax,0
     jne     read_more
     mov     eax,5
     mov     ebx,50
-    int     0x40
+    mcall
     jmp     newbyteread
     imul    ecx,10
     add     ecx,[dpy]
     shl     ecx,16
     add     ecx,10
     mov     edx,0xffffff
-    int     0x40
+    mcall
     mov     eax,4
     mov     ebx,[esp+4]
     imul    ebx,6
     mov     ecx,0x0000ff
 noecx128:
     mov     esi,1
-    int     0x40
+    mcall
 getlp1:
         inc         ecx
         push    ecx
         mov         eax, 53
         mov         ebx, 9
-        int     0x40
+        mcall
         pop         ecx
         cmp         eax, 0                      ; is this local port in use?
         jz              getlp1              ; yes - so try next
     mov     eax,53
     mov     ebx,5
     mov     edx,80
     mov     esi,dword [server_ip]
     mov     edi,1
-    int     0x40
+    mcall
     mov     [socket], eax
     mov     [pos],0
     jnz     no_24
     mov     eax,53
     mov     ebx,8
     mov     ecx,[socket]
-    int     0x40
+    mcall
 getlp:
         inc         ecx
         push    ecx
         mov         eax, 53
         mov         ebx, 9
-        int     0x40
+        mcall
         pop         ecx
         cmp         eax, 0                      ; is this local port in use?
         jz              getlp               ; yes - so try next
     ; First, open socket
     mov     eax, 53
     mov     ebx, 0
     mov     edx, 53    ; remote port - dns
     mov     esi, dword [dns_ip]
-    int     0x40
+    mcall
     mov     [socketNum], eax
     ; write to socket ( request DNS lookup )
     mov     eax, 53
     mov     ebx, 4
     mov     ecx, [socketNum]
     mov     edx, [dnsMsgLen]
     mov     esi, dnsMsg
-    int     0x40
+    mcall
     ; UI close
     ; or data from remote
 ctr001:
     mov     eax,10                 ; wait here for event
-    int     0x40
+    mcall
     cmp     eax,1                  ; redraw request ?
     je      ctr003
     ; Any data in the UDP receive buffer?
     mov     eax, 53
     mov     ebx, 2
     mov     ecx, [socketNum]
-    int     0x40
+    mcall
     cmp     eax, 0
     je      ctr001
     ; we have data - this will be the response
 ctr002:
     mov     eax, 53
     mov     ebx, 3
     mov     ecx, [socketNum]
-    int     0x40                ; read byte - block (high byte)
+    mcall                ; read byte - block (high byte)
     ; Store the data in the response buffer
     mov     eax, [dnsMsgLen]
     mov     [eax], bl
     inc     dword [dnsMsgLen]
     mov     eax, 53
     mov     ebx, 2
     mov     ecx, [socketNum]
-    int     0x40                ; any more data?
+    mcall                ; any more data?
     cmp     eax, 0
     jne     ctr002              ; yes, so get it
     ; close socket
     call    draw_window
     jmp     ctr001
 ctr004:                         ; key
     mov     eax,2               ; just read it and ignore
-    int     0x40
+    mcall
     jmp     ctr001
 ctr005:                         ; button
     mov     eax,17              ; get id
-    int     0x40
+    mcall
     mov     dl, ah
     ; close socket
     mov     eax, 53
     mov     ebx, 1
     mov     ecx, [socketNum]
 debug_print_string:
     push    esi
     mov     cl, '"'
     mov     eax,63
     mov     ebx, 1
-    int     0x40
+    mcall
     pop     esi
 dps_000:
     mov     cl, [esi]
 dps_exit:
     mov     cl, '"'
     mov     eax,63
     mov     ebx, 1
-    int     0x40
+    mcall
     mov     cl, 13
     mov     eax,63
     mov     ebx, 1
-    int     0x40
+    mcall
     mov     cl, 10
     mov     eax,63
     mov     ebx, 1
-    int     0x40
+    mcall
     ret
 dps_001:
     mov     eax,63
     mov     ebx, 1
     push    esi
-    int     0x40
+    mcall
     pop     esi
     mov     ebx,30*65536+URLMAXLEN*6  ; 50 should really be [len], and 103 [xa]
     mov     ecx,[ya]
     shl     ecx,16
     mov     cx,9
     mov     edx,0xFFFFFF
-    int     0x40
+    mcall
     ; write text
     mov     eax,4
     mov     ebx,30*65536
     add     ebx,[ya]
     mov     ecx,0x000000
     mov     edx,[addr]
     mov     esi,URLMAXLEN
-    int     0x40
+    mcall
     ret
 ;   *********************************************
 ;   *******  WINDOW DEFINITIONS AND DRAW ********
 ;   *********************************************
 draw_window:
     mov     eax,12                    ; function 12:tell os about windowdraw
     mov     ebx,1                     ; 1, start of draw
-    int     0x40
+    mcall
-                                   ; DRAW WINDOW
-    mov     eax,0                     ; function 0 : define and draw window
-    mov     ebx,50*65536+550          ; [x start] *65536 + [x size]
-    mov     ecx,50*65536+400          ; [y start] *65536 + [y size]
-    mov     edx,0x03ffffff            ; color of work area RRGGBB,8->color gl
+                                   ; DRAW WINDOW
-    mov     esi,0x805080d0            ; color of grab bar  RRGGBB,8->color gl
-    mov     edi,0x005080d0            ; color of frames    RRGGBB
-    int     0x40
-                                   ; WINDOW LABEL
-    mov     eax,4                     ; function 4 : write text to window
+    mov     eax,0                     ; function 0 : define and draw window
-    mov     ebx,8*65536+8             ; [x start] *65536 + [y start]
+    mov     ebx,50*65536+550          ; [x start] *65536 + [x size]
-    mov     ecx,0x00ddeeff            ; color of text RRGGBB
+    mov     ecx,50*65536+400          ; [y start] *65536 + [y size]
-    mov     edx,labelt                ; pointer to text beginning
+    mov     edx,0x13ffffff            ; color of work area RRGGBB,8->color gl
-    mov     esi,labellen-labelt       ; text length
+    mov     edi,title                 ; WINDOW LABEL
-    int     0x40
+    mcall
     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
-    int     0x40
+    mcall
     mov     eax,38
     mov     ebx,5*65536+545
     mov     ecx,60*65536+60
     mov     edx,0x000000
-    int     0x40
+    mcall
-    mov     eax,38
+    ;mov     eax,38
-    mov     ebx,5*65536+545
+    ;mov     ebx,5*65536+545
     mov     ecx,[winys]
     shl     ecx,16
     add     ecx,[winys]
     sub     ecx,26*65536+26
-    mov     edx,0x000000
+    ;mov     edx,0x000000
-    int     0x40
+    mcall
                                    ; RELOAD
     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
     mov     esi,0x5588dd              ; button color RRGGBB
-    int     0x40
+    mcall
                                    ; URL
-    mov     eax,8                     ; function 8 : define and draw button
+    ;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
+    ;mov     esi,0x5588dd              ; button color RRGGBB
-    int     0x40
+    mcall
                                    ; STOP
-    mov     eax,8                     ; function 8 : define and draw button
+    ;mov     eax,8                     ; function 8 : define and draw button
     mov     ebx,443*65536+50          ; [x start] *65536 + [x size]
     mov     ecx,34*65536+14           ; [y start] *65536 + [y size]
     mov     edx,24                    ; button id
-    mov     esi,0x5588dd              ; button color RRGGBB
+    ;mov     esi,0x5588dd              ; button color RRGGBB
-    int     0x40
+    mcall
                                    ; BUTTON TEXT
 addr            dd  0x0
 ya              dd  0x0
 len             dd  0x00
 labelt:         db      'HTTPC - PgUp/PgDown'
-labellen:
+title         db      'HTTPC - PgUp/PgDown',0
 server_ip:      db      207,44,212,20

Subversion Repositories Kolibri OS

(root)/programs/network/httpc/trunk/httpc.asm – Rev 109 → 485