From 077426950347435103da13805782430ad82e5a56 Mon Sep 17 00:00:00 2001
From: "Kirill Lipatov (Leency)" <lipatov.kiril@gmail.com>
Date: Sun, 20 May 2018 13:54:35 +0000
Subject: [PATCH] fix Liza

git-svn-id: svn://kolibrios.org@7283 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 programs/cmm/browser/WebView.c              |  1 +
 programs/cmm/lib/obj/http.h                 |  4 ++--
 programs/cmm/lib/obj/network.h              |  4 ++--
 programs/cmm/lib/patterns/http_downloader.h |  2 +-
 programs/cmm/liza/liza.c                    | 12 +++++++-----
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/programs/cmm/browser/WebView.c b/programs/cmm/browser/WebView.c
index 376bcd3068..ddb5dd5999 100644
--- a/programs/cmm/browser/WebView.c
+++ b/programs/cmm/browser/WebView.c
@@ -28,6 +28,7 @@
 #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/lib/obj/http.h b/programs/cmm/lib/obj/http.h
index 89f2136710..73def4afee 100644
--- a/programs/cmm/lib/obj/http.h
+++ b/programs/cmm/lib/obj/http.h
@@ -12,7 +12,7 @@
 dword libHTTP = #alibHTTP;
 char alibHTTP[] = "/sys/lib/http.obj";
 
-dword http_lib_init          = #aLib_init;
+dword http_lib_init          = #aHTTPinit;
 dword http_get               = #aHTTPget;
 dword http_head              = #aHTTPhead;
 dword http_post              = #aHTTPpost;
@@ -25,7 +25,7 @@ dword uri_escape             = #aURIescape;
 dword uri_unescape           = #aURIunescape;
 $DD 2 dup 0
 
-char aLib_init[]             = "lib_init";
+char aHTTPinit[]             = "lib_init";
 char aHTTPget[]              = "get";
 char aHTTPhead[]             = "head";
 char aHTTPpost[]             = "post";
diff --git a/programs/cmm/lib/obj/network.h b/programs/cmm/lib/obj/network.h
index 735a3f115d..f6fc0261d3 100644
--- a/programs/cmm/lib/obj/network.h
+++ b/programs/cmm/lib/obj/network.h
@@ -12,7 +12,7 @@
 dword network_lib = #a_network_lib;
 char a_network_lib[]="/sys/lib/network.obj";
 
-dword network_lib_init    = #aLib_init;
+dword network_lib_init    = #aInet_init;
 dword inet_addr           = #aInet_addr;  //"192.168.0.1" -> dword IP
 dword inet_ntoa           = #aInet_ntoa;
 dword getaddrinfo         = #aGetaddrinfo;
@@ -22,7 +22,7 @@ dword getaddrinfo_abort   = #aGetaddrinfo_abort;
 dword freeaddrinfo        = #aFreeaddrinfo;
 $DD 2 dup 0
 
-char aLib_init[]              = "lib_init";
+char aInet_init[]              = "lib_init";
 char aInet_addr[]            = "inet_addr";
 char aInet_ntoa[]            = "inet_ntoa";
 char aGetaddrinfo[]          = "getaddrinfo";
diff --git a/programs/cmm/lib/patterns/http_downloader.h b/programs/cmm/lib/patterns/http_downloader.h
index 6a2b95af98..6ad0b42091 100644
--- a/programs/cmm/lib/patterns/http_downloader.h
+++ b/programs/cmm/lib/patterns/http_downloader.h
@@ -90,7 +90,7 @@ struct DOWNLOADER {
 	dword Start();
 	void Stop();
 	bool MonitorProgress();
-} downloader;
+};
 
 dword DOWNLOADER::Start(dword _url)
 {
diff --git a/programs/cmm/liza/liza.c b/programs/cmm/liza/liza.c
index 9c6c63a171..ba18ed407b 100644
--- a/programs/cmm/liza/liza.c
+++ b/programs/cmm/liza/liza.c
@@ -16,20 +16,22 @@
 //*.obj libraries
 #include "../lib/obj/box_lib.h"
 #include "../lib/obj/network.h"
+#include "../lib/obj/http.h"
 #include "../lib/obj/libio.h"
 #include "../lib/obj/libimg.h"
 #include "../lib/obj/netcode.h"
 #include "../lib/obj/iconv.h"
 //patternts
-#include "..\lib\patterns\history.h"
+#include "../lib/patterns/history.h"
+#include "../lib/patterns/http_downloader.h"
 //images
 byte letter_icons[sizeof(file "img/letter_icons.raw")] = FROM "img/letter_icons.raw";
 #include "img/letter_icons.h"
 
-struct mockup
-{
-	dword transfer;
-} http = {0};
+_http http = {0};
+bool old_tag_parser_mode = false;
+bool debug_mode = false;
+char accept_language[]= "Accept-Language: ru\n";
 
 //connection algorithm
 enum {