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

 DEBUGGING_DISABLED          equ     0
 DEBUGGING_STATE             equ     DEBUGGING_DISABLED
 use32
-                org     0x0
+use32
+ 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	      ; image size
-                dd      I_END                   ; program image size
+ dd	I_END+0x10000 ; required memory
-                dd      0x100000                ; required amount of memory
+ dd	I_END+0x10000 ; esp
-                dd      0x00000000              ; reserved=no extended header
+ dd	0x0 , 0x0     ; I_Param , I_Path
 include 'lang.inc'
-include 'macros.inc'
+include '..\..\..\macros.inc'
 START:                                      ; start of execution
     mov     eax,40                          ; Report events
+    mov     ebx,10000111b                   ; Stack 8 + defaults
-    mov     ebx,10000111b                   ; Stack 8 + defaults
+    int     0x40
     int     0x40
     mov     dword [prompt], p1
-    mov     dword [prompt], p1
+    mov     dword [promptlen], p1len - p1   ; 'waiting for command'
     mov     dword [promptlen], p1len - p1   ; 'waiting for command'
 red:
     call    draw_window                     ; at first, draw the window
 still:
     mov     eax,10                          ; wait here for event
-    int     0x40
+    mcall
-    cmp     eax,1                           ; redraw request ?
-    jz      red
-    cmp     eax,2                           ; key in buffer ?
-    jz      key
     cmp     eax,3                           ; button in buffer ?
-    jz      button
+    cmp     eax,1                           ; redraw request ?
+    jz      red
-    jmp     still
+    cmp     eax,2                           ; key in buffer ?
     jz      key
-red:                            ; redraw
+    cmp     eax,3                           ; button in buffer ?
-    call    draw_window
+    jz      button
     jmp     still
     jmp     still
 key:                            ; Keys are not valid at this part of the
     mov     eax,2               ; loop. Just read it and ignore
-    int     0x40
+    mcall
     jmp     still
 button:                         ; button
     mov     eax,17              ; get id
-    int     0x40
+    mcall
     cmp     ah,1                ; button id=1 ?
     mov     edi,[addr]
 f11:
     mov     eax,10
-    int     0x40
+    mcall
     cmp     eax,2
     jz      fbu
     jmp     still
 fbu:
     mov     eax,2
-    int     0x40  ; get key
+    mcall  ; get key
     shr     eax,8
     cmp     eax,8
     mov     ebx,103*65536+26*6
     mov     ecx,[ya]
     shl     ecx,16
     mov     cx,8
     mov     edx,0x224466
-    int     0x40
+    mcall
     mov     eax,4
     mov     ebx,103*65536
     add     ebx,[ya]
     mov     ecx,0xffffff
     mov     edx,[addr]
     mov     esi,26
-    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, [dnsIP]
-    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)
 end if
     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
     mov     eax, 53
     mov     ebx, 1
     mov     ecx, [socketNum]
-    int     0x40
+    mcall
     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
     ; close socket
     mov     eax, 53
     mov     ebx, 1
     mov     ecx, [socketNum]
-    int     0x40
+    mcall
 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,100*65536+300         ; [x start] *65536 + [x size]
-    mov     ecx,100*65536+140         ; [y start] *65536 + [y size]
-    mov     edx,0x03224466            ; color of work area RRGGBB
-    mov     esi,0x00334455            ; color of grab bar  RRGGBB,8->color gl
-    mov     edi,0x00ddeeff            ; color of frames    RRGGBB
+    mov     ecx,100*65536+140         ; [y start] *65536 + [y size]
-    int     0x40
-                                      ; WINDOW LABEL
-    mov     eax,4                     ; function 4 : write text to window
-    mov     ebx,8*65536+8             ; [x start] *65536 + [y start]
-    mov     ecx,0x00ffffff            ; color of text RRGGBB
-    mov     edx,labelt                ; pointer to text beginning
+    mov     edx,0x13224466            ; color of work area RRGGBB
-    mov     esi,labellen-labelt       ; text length
+    mov     edi,title                 ; WINDOW LABEL;
-    int     0x40
+    mcall
     mov     eax,8                     ; Resolve
     mov     ebx,20*65536+190
     mov     ecx,79*65536+15
     mov     edx,3
     mov     esi,0x557799
-    int     0x40
+    mcall
-    mov     eax,8
-    mov     ebx,270*65536+10
+    ;mov     eax,8
-    mov     ecx,34*65536+10
+    mov     ebx,270*65536+10
-    mov     edx,4
+    mov     ecx,34*65536+10
-    mov     esi,0x557799
+    inc     edx
-    int     0x40
+    mcall
-    mov     eax,8
-    mov     ebx,270*65536+10
+    ;mov     eax,8
-    mov     ecx,50*65536+10
+    mov     ebx,270*65536+10
-    mov     edx,5
+    mov     ecx,50*65536+10
-    mov     esi,0x557799
+    inc     edx
     mov     ecx,[promptlen]
     rep     movsb
     ; Re-draw the screen text
+    cld
-    cld
+    mov     eax,4
     mov     ebx,25*65536+35           ; draw info text with function 4
     mov     ecx,0xffffff
     mov     edx,text
-    mov     esi,40
     mov     esi,40
 newline:
-    mov     eax,4
-    int     0x40
+    mcall
     add     ebx,16
     add     edx,40
     cmp     [edx],byte 'x'
     mov     ebx,3*65536
 ipdisplay:
     mov     eax,47
     movzx   ecx,byte [edi]
-    int     0x40
+    mcall
     add     edx,6*4*65536
     inc     edi
     cmp     edi,hostIP+4
     jb      ipdisplay
 dw001:
     mov     eax,12                    ; function 12:tell os about windowdraw
     mov     ebx,2                     ; 2, end of draw
-    int     0x40
+    mcall
 dps_001:
     mov     eax,63
     mov     ebx, 1
     push    esi
-    int 0x40
+    mcall
     inc   word [ind]
     mov  ax, [ind]
     and ax, 0x1f
     cmp  ax, 0
     jne  ds1
     mov   cl, 13
     mov     eax,63
     mov     ebx, 1
-    int 0x40
+    mcall
     mov   cl, 10
     mov     eax,63
     mov     ebx, 1
-    int 0x40
+    mcall
     db '                                        '
     db '                                        '
     db 'x <- END MARKER, DONT DELETE            '
-labelt:
     db   'DNS Client'
-labellen:
+title    db   'DNS Client',0
 p5:             db 'Resolving...               '
 p5len:
 dnsServer       db  '194.145.128.1              ' ; iolfree.ie DNS
-query           db  'WWW.MENUETOS.ORG           '
+query           db  'WWW.MENUETOS.NET           '
 hostIP:         dd 0

Subversion Repositories Kolibri OS

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