From 819b3e8259d5a836e537a79ebde68f4bfdf2dc5d Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Tue, 27 Apr 2021 20:32:18 +0000 Subject: [PATCH] WebView 3.32: fix images load git-svn-id: svn://kolibrios.org@8698 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/cmm/browser/WebView.c | 4 ++-- programs/cmm/browser/const.h | 2 +- programs/cmm/examples/Tupfile.lua | 1 - programs/cmm/lib/obj/http.h | 3 +++ 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/programs/cmm/browser/WebView.c b/programs/cmm/browser/WebView.c index 3a7ae94774..8572fc266c 100644 --- a/programs/cmm/browser/WebView.c +++ b/programs/cmm/browser/WebView.c @@ -238,7 +238,6 @@ void main() } LoadInternalPage(http.content_pointer, http.content_received); free(http.content_pointer); - http.hfree(); } else if (http_get_type==IMG) { _IMG_RES: @@ -247,8 +246,8 @@ void main() } else { cache.add(cur_img_url, 0, 0, IMG, NULL); } - free(http.content_pointer); http.hfree(); + free(http.content_pointer); GetImg(false); } } @@ -726,6 +725,7 @@ void LoadInternalPage(dword _bufdata, _in_bufsize){ } else { WB1.DrawPage(); } + http.hfree(); if (WB1.img_url.count) { GetImg(true); DrawOmnibox(); } } } diff --git a/programs/cmm/browser/const.h b/programs/cmm/browser/const.h index 18413cbffc..27b2ba38b8 100644 --- a/programs/cmm/browser/const.h +++ b/programs/cmm/browser/const.h @@ -107,4 +107,4 @@ char editbox_icons[] = FROM "res/editbox_icons.raw"; #define DEFAULT_URL URL_SERVICE_HOMEPAGE -char version[]="WebView 3.31b"; \ No newline at end of file +char version[]="WebView 3.32"; \ No newline at end of file diff --git a/programs/cmm/examples/Tupfile.lua b/programs/cmm/examples/Tupfile.lua index 40b81bd14f..8065e07c86 100644 --- a/programs/cmm/examples/Tupfile.lua +++ b/programs/cmm/examples/Tupfile.lua @@ -8,6 +8,5 @@ tup.rule("collections.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("K tup.rule("menu.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "menu.com") tup.rule("rgb.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "rgb.com") tup.rule("console.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "console.com") -tup.rule("info.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "info.com") tup.rule("pigex.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "pigex.com") tup.rule("math.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "math.com") diff --git a/programs/cmm/lib/obj/http.h b/programs/cmm/lib/obj/http.h index 5177a124af..81185fb861 100644 --- a/programs/cmm/lib/obj/http.h +++ b/programs/cmm/lib/obj/http.h @@ -115,6 +115,7 @@ bool _http::stop() { if (transfer) { + /* EAX = transfer; EAX = EAX.http_msg.content_ptr; // get pointer to data $push EAX // save it on the stack @@ -122,6 +123,8 @@ bool _http::stop() $pop EAX free(EAX); // free data transfer=0; + */ + hfree(); return true; } return false;