From 1d80a7eb770fcc2f4b5aae21a2393229b184d920 Mon Sep 17 00:00:00 2001
From: "Kirill Lipatov (Leency)" <lipatov.kiril@gmail.com>
Date: Sun, 20 May 2018 14:03:53 +0000
Subject: [PATCH] fix aelia

git-svn-id: svn://kolibrios.org@7284 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 programs/cmm/aelia/aelia.c              | 7 ++++---
 programs/cmm/aelia/favicon.h            | 2 +-
 programs/cmm/browser/WebView.c          | 1 -
 programs/cmm/browser/download_manager.h | 2 ++
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/programs/cmm/aelia/aelia.c b/programs/cmm/aelia/aelia.c
index 6d2c836070..0ebba50561 100644
--- a/programs/cmm/aelia/aelia.c
+++ b/programs/cmm/aelia/aelia.c
@@ -1,4 +1,4 @@
-#define MEMSIZE 4096*60
+#define MEMSIZE 4096*80
 
 #include "../lib/kfont.h"
 #include "../lib/io.h"
@@ -296,8 +296,9 @@ char favicon_address[UML];
 			while (downloader.state!=STATE_COMPLETED)
 			{ 
 				downloader.MonitorProgress(); 
-				if (downloader.data_full_size>0)
-					DrawProgress(STEP_2_COUNT_PAGE_HEIGHT-STEP_1_DOWNLOAD_PAGE*downloader.data_downloaded_size/downloader.data_full_size); 
+				if (downloader.httpd.content_length>0)
+					DrawProgress(STEP_2_COUNT_PAGE_HEIGHT-STEP_1_DOWNLOAD_PAGE*
+						downloader.httpd.content_received/downloader.httpd.content_length); 
 				else
 					DrawProgress(STEP_2_COUNT_PAGE_HEIGHT-STEP_1_DOWNLOAD_PAGE/2);
 			}
diff --git a/programs/cmm/aelia/favicon.h b/programs/cmm/aelia/favicon.h
index 341cd029e5..0b236b08ca 100644
--- a/programs/cmm/aelia/favicon.h
+++ b/programs/cmm/aelia/favicon.h
@@ -20,7 +20,7 @@ void _favicon::draw(int x,y)
 {
 	dword favicon_data_decoded;
 	if (favget.bufpointer) {
-		img_decode stdcall (favget.bufpointer, favget.data_full_size, 0);
+		img_decode stdcall (favget.bufpointer, favget.httpd.content_length, 0);
 		if (EAX==0) return;
 		favicon_data_decoded = EAX;
 		img_draw stdcall(favicon_data_decoded, x,y, 16, 16, 0, 0);
diff --git a/programs/cmm/browser/WebView.c b/programs/cmm/browser/WebView.c
index ddb5dd5999..376bcd3068 100644
--- a/programs/cmm/browser/WebView.c
+++ b/programs/cmm/browser/WebView.c
@@ -28,7 +28,6 @@
 #include "..\lib\patterns\http_downloader.h"
 
 _http http = {0, 0, 0, 0, 0, 0, 0};
-DOWNLOADER downloader;
 
 char homepage[] = FROM "html\\homepage.htm""\0";
 
diff --git a/programs/cmm/browser/download_manager.h b/programs/cmm/browser/download_manager.h
index 57643d1df1..38eb56a3ab 100644
--- a/programs/cmm/browser/download_manager.h
+++ b/programs/cmm/browser/download_manager.h
@@ -1,3 +1,5 @@
+DOWNLOADER downloader;
+
 #ifdef LANG_RUS
 	#define DL_WINDOW_HEADER "Менеджер загрузок"
 	#define START_DOWNLOADING "Начать закачку"