[cmm/downloader] add new proxy for https sources

added verification of the second initialization attempt

Reviewed-on: #274

kernel/trunk/blkdev/flp_drv.inc

@@ -12,6 +12,13 @@
 ; Source code author -  Kulakov Vladimir Gennadievich.
 ; Adaptation and improvement -  Mario79.
 
+give_back_application_data_1:
+        mov     esi, FDD_BUFF;FDD_DataBuffer  ;0x40000
+        mov     ecx, 128
+        cld
+        rep movsd
+        ret
+
 take_data_from_application_1:
         mov     edi, FDD_BUFF;FDD_DataBuffer  ;0x40000
         mov     ecx, 128
@@ -710,38 +717,18 @@ endg
 ; This function is called in boot process.
 ; It creates filesystems /fd and/or /fd2, if the system has one/two floppy drives.
 proc floppy_init
-;      search for FDDs and add them to the list of disks
-;      author - Mario79
-        mov     al, 0x10
-        out     0x70, al
-        mov     cx, 0xff
-.wait_cmos:
-        dec     cx
-        test    cx, cx
-        jnz     .wait_cmos
-        in      al, 0x71
-        test    al, al
-        jz      .no_fdd
-
-        push    eax ; b[esp]=al [esp+1..3]- ??
-
-        stdcall attach_int_handler, 6, FDCInterrupt, 0
-        DEBUGF  1, "K : Set Floppy IRQ6 return code %x\n", eax
-
         mov     ecx, floppy_mutex
         call    mutex_init
-; First floppy is present if [esp] and 0xF0 is nonzero.
-        test    byte [esp], 0xF0
+; First floppy is present if [DRIVE_DATA] and 0xF0 is nonzero.
+        test    byte [DRIVE_DATA], 0xF0
         jz      .no1
         stdcall disk_add, floppy_functions, floppy1_name, 1, DISK_NO_INSERT_NOTIFICATION
 .no1:
-; Second floppy is present if [esp] and 0x0F is nonzero.
-        test    byte [esp], 0x0F
+; Second floppy is present if [DRIVE_DATA] and 0x0F is nonzero.
+        test    byte [DRIVE_DATA], 0x0F
         jz      .no2
         stdcall disk_add, floppy_functions, floppy2_name, 2, DISK_NO_INSERT_NOTIFICATION
 .no2:
-        add     esp, 4
-.no_fdd:
         ret
 endp
 

kernel/trunk/const.inc

@@ -878,6 +878,37 @@ struct  PCIDEV
         owner           dd ? ; pointer to SRV or 0
 ends
 
+struct  IDE_DATA
+        ProgrammingInterface dd ?
+        Interrupt            dw ?
+        RegsBaseAddres       dw ?
+        BAR0_val             dw ?
+        BAR1_val             dw ?
+        BAR2_val             dw ?
+        BAR3_val             dw ?
+        dma_hdd_channel_1    db ?
+        dma_hdd_channel_2    db ?
+        pcidev               dd ?       ; pointer to corresponding PCIDEV structure
+ends
+
+struct  IDE_CACHE
+        pointer              dd ?
+        size                 dd ?   ; not use
+        data_pointer         dd ?
+        system_data_size     dd ?   ; not use
+        appl_data_size       dd ?   ; not use
+        system_data          dd ?
+        appl_data            dd ?
+        system_sad_size      dd ?
+        appl_sad_size        dd ?
+        search_start         dd ?
+        appl_search_start    dd ?
+ends
+
+struct  IDE_DEVICE
+        UDMA_possible_modes  db ?
+        UDMA_set_mode        db ?
+ends
 
 ; The following macro assume that we are on uniprocessor machine.
 ; Serious work is needed for multiprocessor machines.

kernel/trunk/detect/dev_fd.inc

@@ -0,0 +1,36 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                              ;;
+;; Copyright (C) KolibriOS team 2004-2024. All rights reserved. ;;
+;; Distributed under terms of the GNU General Public License    ;;
+;;                                                              ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+
+;***************************************************
+;      clear the DRIVE_DATA table,
+;      search for FDDs and add them into the table
+;      author - Mario79
+;***************************************************
+        xor     eax, eax
+        mov     edi, DRIVE_DATA
+        mov     ecx, DRIVE_DATA_SIZE/4
+        cld
+        rep stosd
+
+        mov     al, 0x10
+        out     0x70, al
+        mov     cx, 0xff
+wait_cmos:
+        dec     cx
+        test    cx, cx
+        jnz     wait_cmos
+        in      al, 0x71
+        mov     [DRIVE_DATA], al
+        test    al, al
+        jz      @f
+
+        stdcall attach_int_handler, 6, FDCInterrupt, 0
+        DEBUGF  1, "K : Set IDE IRQ6 return code %x\n", eax
+        call    floppy_init
+@@:
+

kernel/trunk/detect/disks.inc

@@ -0,0 +1,13 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                              ;;
+;; Copyright (C) KolibriOS team 2004-2024. All rights reserved. ;;
+;; Distributed under terms of the GNU General Public License    ;;
+;;                                                              ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+
+include 'dev_fd.inc'
+include 'dev_hdcd.inc'
+include 'getcache.inc'
+include 'sear_par.inc'
+

kernel/trunk/kernel.asm

@@ -754,7 +754,7 @@ end if
 ;-----------------------------------------------------------------------------
         mov     esi, boot_detectfloppy
         call    boot_log
-        call    floppy_init
+include 'detect/dev_fd.inc'
 ;-----------------------------------------------------------------------------
 ; create pci-devices list
 ;-----------------------------------------------------------------------------

programs/cmm/browser/WebView.c

@@ -521,7 +521,7 @@ bool GetUrl(dword _http_url)
 		http.get(_http_url);
 		return true;
 	} else if (!strncmp(_http_url,"https://",8)) {
-		strcpy(#new_url_full, "http://gate.aspero.pro/?site=");
+		strcpy(#new_url_full, "http://176.223.130.192:82/?site=");
 		strncat(#new_url_full, _http_url, URL_SIZE);
 		http.get(#new_url_full);
 		return true;

programs/cmm/downloader/dl.c

@@ -168,9 +168,9 @@ void StartDownloading()
 	ResetDownloadSpeed();
 	pb.back_color = 0xFFFfff;
 	if (!strncmp(#uEdit,"https:",6)) {
-		//miniprintf(#get_url, "http://gate.aspero.pro/?site=%s", #uEdit);
-		notify("'HTTPS for download temporary is not supported,\ntrying to download the file via HTTP' -W");
-		miniprintf(#uEdit, "http://%s", #uEdit+8);
+		miniprintf(#get_url, "http://176.223.130.192:82/?site=%s", #uEdit);
+		// notify("'HTTPS for download temporary is not supported,\ntrying to download the file via HTTP' -W");
+		// miniprintf(#uEdit, "http://%s", #uEdit+8);
 	}
 	strcpy(#get_url, #uEdit);
 

programs/cmm/lib/obj/http.h

@@ -112,7 +112,7 @@ struct _http
 dword _http::get(dword _url)
 {
 	cur_url = _url;
-	if (streqrp(cur_url, "http://gate.aspero.pro/?site=")) cur_url += 29;
+	if (streqrp(cur_url, "http://176.223.130.192:82/?site=")) cur_url += 29;
 	http_get stdcall (_url, 0, 0, #accept_language);
 	transfer = EAX;
 	return EAX;

programs/develop/libraries/http/http.asm

@@ -100,6 +100,10 @@ lib_init: ;//////////////////////////////////////////////////////////////////;;
         mov     [mem.alloc], eax
         mov     [mem.free], ebx
         mov     [mem.realloc], ecx
+
+        cmp     [dll.load], edx
+        je      .ok
+
         mov     [dll.load], edx
 
         invoke  dll.load, @IMPORT
@@ -115,6 +119,7 @@ lib_init: ;//////////////////////////////////////////////////////////////////;;
         invoke  ini.get_str, inifile, sec_proxy, key_password, proxyPassword, 256, proxyPassword
         popa
 
+  .ok:
         DEBUGF  1, "HTTP library: init OK\n"
         xor     eax, eax
         ret

programs/develop/libraries/libs-dev/libimg/libimg.asm

@@ -78,6 +78,10 @@ proc lib_init ;///////////////////////////////////////////////////////////////;;
         mov     [mem.alloc], eax
         mov     [mem.free], ebx
         mov     [mem.realloc], ecx
+
+        cmp     [dll.load], edx
+        je      .ok
+
         mov     [dll.load], edx
 
         or      edx, edx

programs/develop/libraries/libs-dev/libini/libini_p.asm

@@ -37,6 +37,10 @@ proc libini._.init ;////////////////////////////////////////////////////////////
         mov     [mem.alloc], eax
         mov     [mem.free], ebx
         mov     [mem.realloc], ecx
+
+        cmp     [dll.load], edx
+        je      .ok
+
         mov     [dll.load], edx
 
         invoke  dll.load, @IMPORT

programs/develop/libraries/proc_lib/trunk/proc_lib.asm

@@ -33,6 +33,7 @@ use_ColorDialog
 ;--------------------------------------------------
 align 16
 lib_init:
+        xor     eax, eax
         ret
 
 ;--------------------------------------------------