KolibriOS/kolibrios
12
4
Fork 13
Code Issues 78 Pull Requests 5 Projects Releases Activity

APP_PLUS: revert last change: so it can handle param again

Browse Source 
C-- LIBIMG: fix memory leak
SYSMON: always on top now
WebView: fix: remove garbage on the top of the UTF pages

git-svn-id: svn://kolibrios.org@8407 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2020-12-14 15:54:00 +00:00
parent 561e5c5b1c
commit eac740c648
4 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
programs/cmm/app_plus/app_plus.c
View File

@ -70,6 +70,11 @@ need to reboot system to try again."
void main()
{
if (param) {
SetAdditionalSystemDirectory("kolibrios", #param+1);
ExitProcess();
}
WaitAutosearch();
CheckKosMounted();

14
programs/cmm/browser/TWB/TWB.c
View File

@ -282,7 +282,19 @@ void TWebBrowser::ParseHtml(dword _bufpointer, _bufsize){
if (tag.name) {
CheckForLineBreak();
Paint();
if (tag.name) SetStyle();
if (tag.name) {
EAX = cur_encoding;
$push eax
SetStyle();
$pop eax
// The thing is that UTF if longer than other encodings.
// So if encoding was changed to UTF than $bufpos position is wrong now,
// and we have to start parse from the very beginning
if (EAX != cur_encoding) && (cur_encoding == CH_UTF8) {
ParseHtml(bufpointer, bufsize);
return;
}
}
}
break;
default:

3
programs/cmm/lib/obj/libimg.h
View File

@ -147,6 +147,9 @@ struct libimg_image
:void libimg_image::convert_into(dword _to)
{
img_convert stdcall(image, 0, _to, 0, 0);
$push eax
img_destroy stdcall(image);
$pop eax
if (!EAX) {
notify("'LibImg convertation error!'E");
} else {

5
programs/cmm/sysmon/sysmon.c
View File

@ -108,7 +108,8 @@ void main()
int btn;
//dword cpu_frequency = GetCpuFrequency()/1000;
load_lib();
SetEventMask(EVM_REDRAW + EVM_KEY + EVM_BUTTON + EVM_MOUSE + EVM_MOUSE_FILTER);
@SetWindowLayerBehaviour(-1, ZPOS_ALWAYS_TOP);
@SetEventMask(EVM_REDRAW + EVM_KEY + EVM_BUTTON + EVM_MOUSE + EVM_MOUSE_FILTER);
loop() switch(@WaitEventTimeout(50))
{
case evMouse:
@ -121,7 +122,7 @@ void main()
if (select_list.ProcessKey(key_scancode)) SelectList_LineChanged();
break;
case evButton:
btn = GetButtonID();
btn = @GetButtonID();
if (1==btn) ExitProcess();
if (show_system.click(btn)) {