Spaceraven/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

fix aelia

Browse Source 
git-svn-id: svn://kolibrios.org@7284 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2018-05-20 14:03:53 +00:00
parent 0774269503
commit 1d80a7eb77
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
programs/cmm/aelia/aelia.c
View File

@ -1,4 +1,4 @@
#define MEMSIZE 4096*60 #define MEMSIZE 4096*80
#include "../lib/kfont.h" #include "../lib/kfont.h"
#include "../lib/io.h" #include "../lib/io.h"
@ -296,8 +296,9 @@ char favicon_address[UML];
while (downloader.state!=STATE_COMPLETED) while (downloader.state!=STATE_COMPLETED)
{ {
downloader.MonitorProgress(); downloader.MonitorProgress();
if (downloader.data_full_size>0) if (downloader.httpd.content_length>0)
DrawProgress(STEP_2_COUNT_PAGE_HEIGHT-STEP_1_DOWNLOAD_PAGE*downloader.data_downloaded_size/downloader.data_full_size); DrawProgress(STEP_2_COUNT_PAGE_HEIGHT-STEP_1_DOWNLOAD_PAGE*
downloader.httpd.content_received/downloader.httpd.content_length);
else else
DrawProgress(STEP_2_COUNT_PAGE_HEIGHT-STEP_1_DOWNLOAD_PAGE/2); DrawProgress(STEP_2_COUNT_PAGE_HEIGHT-STEP_1_DOWNLOAD_PAGE/2);
} }

2
programs/cmm/aelia/favicon.h
View File

@ -20,7 +20,7 @@ void _favicon::draw(int x,y)
{ {
dword favicon_data_decoded; dword favicon_data_decoded;
if (favget.bufpointer) { 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; if (EAX==0) return;
favicon_data_decoded = EAX; favicon_data_decoded = EAX;
img_draw stdcall(favicon_data_decoded, x,y, 16, 16, 0, 0); img_draw stdcall(favicon_data_decoded, x,y, 16, 16, 0, 0);

1
programs/cmm/browser/WebView.c
View File

@ -28,7 +28,6 @@
#include "..\lib\patterns\http_downloader.h" #include "..\lib\patterns\http_downloader.h"
_http http = {0, 0, 0, 0, 0, 0, 0}; _http http = {0, 0, 0, 0, 0, 0, 0};
DOWNLOADER downloader;
char homepage[] = FROM "html\\homepage.htm""\0"; char homepage[] = FROM "html\\homepage.htm""\0";

2
programs/cmm/browser/download_manager.h
View File

@ -1,3 +1,5 @@
DOWNLOADER downloader;
#ifdef LANG_RUS #ifdef LANG_RUS
#define DL_WINDOW_HEADER "Œ¥­¥¤¦¥à § £à㧮ª" #define DL_WINDOW_HEADER "Œ¥­¥¤¦¥à § £à㧮ª"
#define START_DOWNLOADING "<22> ç âì § ª çªã" #define START_DOWNLOADING "<22> ç âì § ª çªã"