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

         db      'MENUET01'      ; header
         dd      0x01            ; header version
         dd      START           ; entry point
         dd      IM_END          ; image size
-        dd      I_END+0x100     ; required memory
+        dd      I_END+0x1000    ; required memory
-        dd      I_END+0x100     ; esp
+        dd      I_END+0x1000    ; esp
         dd      params          ; I_PARAM
         dd      0x0             ; I_Path
 START:
-        mcall   68, 11                  ; init heap so we can allocate memory dynamically
-        mcall   40, EV_STACK
+        mcall   68, 11                  ; init heap so we can allocate memory dynamically
 ; load libraries
         stosb
         mov     al, ' '
         mov     ecx, URLMAXLEN-1
         rep     stosb
+; load proxy settings
-        call    load_settings
+        invoke  ini.get_str, inifile, sec_proxy, key_proxy, proxyAddr, 256, proxyAddr
-        cmp     byte[params], 0
+        invoke  ini.get_int, inifile, sec_proxy, key_proxyport, 80
+        mov     [proxyPort], eax
+        invoke  ini.get_str, inifile, sec_proxy, key_user, proxyUser, 256, proxyUser
-        je      prepare_event   ;red
+        invoke  ini.get_str, inifile, sec_proxy, key_password, proxyPassword, 256, proxyPassword
-; we have an url
-        mov     edi, document_user
+; check parameters
-        mov     al, ' '
+        cmp     byte[params], 0         ; no parameters ?
-        mov     ecx, URLMAXLEN
+        je      reset_events            ; load the GUI
         rep     stosb
+; we have an url, copy untill space or 0
         mov     esi, params
         mov     edi, document_user
+        mov     ecx, 1024               ; max parameter size
-; copy untill space or 0
+        mov     [shared_name], 0
   .copy_param:
-        mov     al, [esi]
+        lodsb
         test    al, al
         jz      .done
         cmp     al, ' '
-        jz      .done_inc
+        jz      .done_with_shared
-        mov     [edi], al
-        inc     esi
-        inc     edi
+        stosb
-        jmp     .copy_param
         dec     ecx
+        jnz     .copy_param
-  .done_inc:
+        DEBUGF  2, "Invalid parameters\n"
+        jmp     exit
+  .done_with_shared:
+        mov     [shared_name], esi
+  .done:
+        xor     al, al
+        stosb
+download:
+        DEBUGF  1, "Starting download\n"
+        call    parse_url
+        call    open_socket
+        call    send_request
+        mcall   68, 12, BUFFERSIZE      ; create buffer, we'll resize it later if needed..
+        mov     [buf_ptr], eax
+        mov     [buf_size], 0
+        call    read_incoming_data
+        mcall   close, [socketnum]
+        call    parse_result
+        call    save
+        mcall   68, 13, [final_buffer]  ; free buffer
-; url is followed by shared memory name.
+        cmp     byte [params], 0
-        inc     esi
+        jne     exit
-  .done:
-        mov     [shared_name], esi
+reset_events:
         jmp     download
         DEBUGF  1, "resetting events\n"
-prepare_event:
-; Report events
-; Stack 8 + defaults
+; Report events
-        mcall   40, 10100111b
-red:    ; redraw
+; defaults + mouse
+        mcall   40, EVM_REDRAW + EVM_KEY + EVM_BUTTON + EVM_MOUSE
+redraw:
         call    draw_window
 still:
-        cmp     byte [params], 0
+        DEBUGF  1, "waiting for events\n"
         jne     exit
         mcall   10      ; wait here for event
-        mcall   10      ; wait here for event
         cmp     eax, 1  ; redraw request ?
-        je      red
+        cmp     eax, EV_REDRAW
         je      redraw
         jmp     still
 button:
         mcall   17      ; get id
         mcall   17      ; get id
         cmp     ah, 26
         jne     @f
         call    save_to_file
 exit:
         or      eax, -1  ; close this program
-        mcall
-download:
-        DEBUGF  1, "Starting download\n"
-        call    parse_url
-        call    open_socket
-        call    send_request
-        mcall   68, 12, BUFFERSIZE
-        mov     [buf_ptr], eax
-        mov     [buf_size], 0
-        call    read_incoming_data
-        mcall   close, [socketnum]
-        call    parse_result
-        call    save
-        mcall   68, 13, [final_buffer]
-        jmp     still
+        mcall
+save:
-save:
+        cmp     [shared_name], 0
-        mov     ecx, [shared_name]
+        je      .use_file
-        test    ecx, ecx
-        jz      @f
+        call    save_in_shared
+        jmp     .done
-        cmp     [ecx], byte 0
+  .use_file:
         jnz     save_in_shared
-    @@:
+        call    save_to_file
-        call    save_to_file
+  .done:
 ; if called from command line, then exit
+        cmp     byte[params], 0
-        cmp     byte[params], 0
+        jne     exit
         jne     exit
-        ret
-save_in_shared:
+        ret
-        mov     esi, 1   ; SHM_OPEN+SHM_WRITE
-        mcall   68, 22
-        test    eax, eax
-        jz      exit
 save_in_shared:
+; open the shared memory area
-        sub     edx, 4
+        mov     esi, 1
-        jbe     exit
+        mcall   68, 22, [shared_name], , 1 ; SHM_OPEN+SHM_WRITE
+        test    eax, eax
-        mov     ecx, [final_size]
+        jz      exit
         cmp     ecx, edx
-        jb      @f
+        mov     ecx, [final_size]
 ; store the size
-        mov     ecx, edx
+        mov     [eax], ecx
-    @@:
-        mov     [eax], ecx
+; now copy the data
         lea     edi, [eax+4]
         mov     esi, [final_buffer]
         mov     esi, edi
         sub     esi, request    ; length
         xor     edi, edi        ; flags
+        mcall   send, [socketnum], request  ;' HTTP/1.1 .. '
         mcall   send, [socketnum], request  ;' HTTP/1.1 .. '
         ret
 ;****************************************************************************
 ;****************************************************************************
 read_incoming_data:
+        DEBUGF  1, "Reading incoming data\n"
-        DEBUGF  1, "Reading incoming data\n"
+        mcall   40, EVM_STACK   ; we only want stack events now
         mov     eax, [buf_ptr]
         mov     [pos], eax
         ja      .bad
-.adding:
+  .adding:
         shl     eax, 4
-        or      eax, ecx
-;       jmp     .not_number
-;.bad:
+        or      eax, ecx
-.bad:
+  .bad:
         jmp     .next
-.done:
+  .done:
         mov     [edi], al
         xor     eax, eax
         inc     edi
         cmp     edi, server_ip+3
         jbe     ip1
-        jmp     pu_011
+        ret
 pu_010:
         DEBUGF  1, "Resolving %s\n", webAddr
         mov     eax, [eax + sockaddr_in.sin_addr]
         mov     [server_ip], eax
-        DEBUGF  1, "Resolved to %u.%u.%u.%u\n", [server_ip]:1, [server_ip + 1]:1, [server_ip + 2]:1, [server_ip + 3]:1
-pu_011:
-        ret
-;***************************************************************************
-;   Function
-;       load_settings
-;
-;   Description
-;       Load settings from configuration file network.ini
-;
-;***************************************************************************
-load_settings:
-        invoke  ini.get_str, inifile, sec_proxy, key_proxy, proxyAddr, 256, proxyAddr
-        invoke  ini.get_int, inifile, sec_proxy, key_proxyport, 80
-        mov     [proxyPort], eax
-        invoke  ini.get_str, inifile, sec_proxy, key_user, proxyUser, 256, proxyUser
-        invoke  ini.get_str, inifile, sec_proxy, key_password, proxyPassword, 256, proxyPassword
+        DEBUGF  1, "Resolved to %u.%u.%u.%u\n", [server_ip]:1, [server_ip + 1]:1, [server_ip + 2]:1, [server_ip + 3]:1
         ret
         mov     ecx, [sc.work_button_text]
         or      ecx, 80000000h
         mcall   4, <102, 59>, , button_text
+        mcall   12, 2 ; end window redraw
         mcall   12, 2 ; end window redraw
         ret

Subversion Repositories Kolibri OS

(root)/programs/network/downloader/downloader.asm – Rev 3618 → 3623