From c794686e7fab8d072da563056127be91b232dd87 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Thu, 2 Aug 2012 17:41:55 +0000 Subject: [PATCH] Eolite 1.34: memory leak fixed git-svn-id: svn://kolibrios.org@2904 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/fs/Eolite/trunk/Eolite.c-- | 2 +- programs/fs/Eolite/trunk/History.txt | 4 +++- programs/fs/Eolite/trunk/include/about_dialog.h | 2 +- programs/fs/Eolite/trunk/include/ini.h | 7 ++++--- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/programs/fs/Eolite/trunk/Eolite.c-- b/programs/fs/Eolite/trunk/Eolite.c-- index 8268fc8880..53dbce5ec0 100644 --- a/programs/fs/Eolite/trunk/Eolite.c-- +++ b/programs/fs/Eolite/trunk/Eolite.c-- @@ -20,7 +20,7 @@ int BUTTON_HEIGHT=18; #define ONLY_OPEN 2 //переменные -#define title "Eolite File Manager v1.33" +#define title "Eolite File Manager v1.34" dword selection_col = 0x94AECE; dword lpanel_col = 0x00699C; diff --git a/programs/fs/Eolite/trunk/History.txt b/programs/fs/Eolite/trunk/History.txt index 0b7b1fd7d9..e544b312f1 100644 --- a/programs/fs/Eolite/trunk/History.txt +++ b/programs/fs/Eolite/trunk/History.txt @@ -1,4 +1,6 @@ -- фикс для строки адреса. +- фикс для строки адреса; +- исправлена 100% загрузка процессора при удержании ползунка; +- исправлена серьёзная утечка памяти, уменьшено её потребление. 10.07.12 -- v1.30 - небольшие улучшения в работе кнопок "назад/вперёд"; diff --git a/programs/fs/Eolite/trunk/include/about_dialog.h b/programs/fs/Eolite/trunk/include/about_dialog.h index 74815c664b..123ac67c65 100644 --- a/programs/fs/Eolite/trunk/include/about_dialog.h +++ b/programs/fs/Eolite/trunk/include/about_dialog.h @@ -39,7 +39,7 @@ void about_dialog() DefineAndDrawWindow(600,150,181,256,0x34,0x10EFEBEF,"About Eolite"); DrawBar(0,0,172,50,0x8494C4); //голубое сзади PutPaletteImage(#logo,85,85,43,7,#logo_pal); - WriteText(46,100,0x90,0xBF40BF,"Eolite v1.33",0); + WriteText(46,100,0x90,0xBF40BF,"Eolite v1.34",0); $add ebx, 1<<16 $int 0x40 WriteText(55,120,0x80,0,"Developers:",0); diff --git a/programs/fs/Eolite/trunk/include/ini.h b/programs/fs/Eolite/trunk/include/ini.h index 15ed128a88..d4fbd60e16 100644 --- a/programs/fs/Eolite/trunk/include/ini.h +++ b/programs/fs/Eolite/trunk/include/ini.h @@ -35,11 +35,12 @@ void GetIni(byte onload) int errornum; dword buff, fsize, tj; //читаем файл - buff = malloc(1048576); + free(buff); + buff = malloc(12000); IF (onload==1) copystr(".ini", #program_path+strlen(#program_path)); - ReadFile(0, 1048576, buff, #program_path); + ReadFile(0, 12000, buff, #program_path); IF (EAX<>6) //если файла с настройками нет в папке с программой смотрим в папке по-умолчанию - ReadFile(0, 1048576, buff, "/sys/File managers/Eolite.ini"); + ReadFile(0, 12000, buff, "/sys/File managers/Eolite.ini"); IF (EAX<>6) //если файла с настройками тупо нет печалька { IF (onload==1) RunProgram(#NOTIFY_PATH, "Eolite.ini not found. Defaults will be used.");