From c26000cc1061146ea1acb191ed54d2cf2902f02f Mon Sep 17 00:00:00 2001
From: "Kirill Lipatov (Leency)" <lipatov.kiril@gmail.com>
Date: Sun, 6 Jan 2013 17:18:53 +0000
Subject: [PATCH] Eolite 1.51: do not sort big folders (this is hack, because
 there are some errors with sorting)

git-svn-id: svn://kolibrios.org@3150 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 programs/fs/Eolite/trunk/Eolite.c--           | 26 ++++++++++++-------
 .../fs/Eolite/trunk/include/about_dialog.h    |  2 +-
 programs/fs/Eolite/trunk/include/ini.h        |  4 +--
 programs/fs/Eolite/trunk/lib/kolibri.h        |  4 +--
 4 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/programs/fs/Eolite/trunk/Eolite.c-- b/programs/fs/Eolite/trunk/Eolite.c--
index 8aa736d8f2..656df7fa31 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.5"
+dword title[] = "Eolite File Manager v1.51";
 dword col_work    = 0xE4DFE1;
 dword col_border  = 0x819FC5;
 dword col_padding = 0xC8C9C9;
@@ -62,7 +62,8 @@ int scroll_size;
 int toolbar_buttons_x[7]={9,46,85,134,167,203};
 char tmp_disk_del_param[3]="d0\0";
 
-dword file_mas[6898];
+dword file_mas[65535];
+
 int j, i, mouse_dd;
 int scroll_used;
 
@@ -420,9 +421,9 @@ inline fastcall void draw_window()
 	int min_size_y = disc_num*16+195;
 	
 	if (GetScreenHeight()<480)
-		DefineAndDrawWindow(20,0,582,GetScreenHeight()-30,0x73,col_work,title);
+		DefineAndDrawWindow(20,0,582,GetScreenHeight()-30,0x73,col_work,#title);
 	else
-		DefineAndDrawWindow(98,90,582,482,0x73,col_work,title);
+		DefineAndDrawWindow(98,90,582,482,0x73,col_work,#title);
 	GetProcessInfo(#Form, SelfInfo);
 	if (Form.status_window>2) return;
 	if (Form.height<min_size_y) MoveSize(OLD,OLD,OLD,min_size_y);
@@ -591,7 +592,7 @@ void Open_Dir(dword temp_, redraw){
 		if (somelen) path_[somelen]=NULL;
 		
 		if (buf) free(buf);
-    	buf = malloc(32);
+    	buf = malloc(512);
 		errornum=ReadDir(0, buf, #path_);
 		if (errornum<>0) //ошибка при чтении папки
 		{
@@ -601,10 +602,10 @@ void Open_Dir(dword temp_, redraw){
 			return;
 		}
     	count = ESDWORD[buf+8];
-    	buf = realloc(count * 304 + 32, buf); //почему 32?
+    	buf = realloc(count * 304 + 512, buf); //почему 32?
 		ReadDir(count, buf, #path_);
-		IF (EBX>6897) && (EBX<>-1) EBX=6897; //1 на удачу ;)
 		count=EBX;
+		if (count>sizeof(file_mas)) count=sizeof(file_mas);
 	}
 	if (count<>-1)
 	{
@@ -631,11 +632,13 @@ void Open_Dir(dword temp_, redraw){
 inline Sorting()
 {
 	dword k=0, l=1;
-	if (!strcmp(#path,"/")) //не сортировать папки и не менять регистр в "/"
+
+	if (!strcmp(#path,"/")) //|| (count > 5000) //не сортировать папки и не менять регистр в "/"
 	{
 		FOR(k=1;k<count;k++;) file_mas[k]=k;
 		return;
 	}
+	
 	FOR (j=count-1, off=count-1*304+buf+32; j>=0; j--, off-=304;)  //папки вверх, файлы вниз
 	{
 		TitleCase(off+40);
@@ -650,13 +653,16 @@ inline Sorting()
 			l++;
 		}
 	}
+	
 	//Собственно сортировка: вначале папки, потом файлы
 	Sort_by_Name(0,k-1);
 	IF (sort_num==1) Sort_by_Name(k,count-1);
 	IF (sort_num==2) Sort_by_Type(k,count-1);
 	IF (sort_num==3) Sort_by_Size(k,count-1);
-	//если папка ".." не первая, ставим её туда
-	IF (k>0) && (strcmp(file_mas[0]*304+buf+72,"..")<>0) FOR(k--; k>0; k--;) IF (!strcmp(file_mas[k]*304+buf+72,"..")) file_mas[k]><file_mas[0];
+	if (strcmp(file_mas[0]*304+buf+72,"..")<>0) //если папка ".." не первая, ставим её туда
+	{
+		FOR(k--; k>0; k--;) { IF (!strcmp(file_mas[k]*304+buf+72,"..")) file_mas[k]><file_mas[0]; }
+	}
 }
 
 
diff --git a/programs/fs/Eolite/trunk/include/about_dialog.h b/programs/fs/Eolite/trunk/include/about_dialog.h
index dbc40c1c9d..8b715aa7cc 100644
--- a/programs/fs/Eolite/trunk/include/about_dialog.h
+++ b/programs/fs/Eolite/trunk/include/about_dialog.h
@@ -36,7 +36,7 @@ void about_dialog()
 				DefineAndDrawWindow(600,150,181,232+GetSkinHeight(),0x34,col_work,"About Eolite");
 				DrawBar(0,0,172,50,0x8494C4); //голубое сзади
 				PutPaletteImage(#logo,85,85,43,7,#logo_pal);
-				WriteText(46,100,0x90,0xBF40BF,"Eolite v1.50",0);
+				WriteText(46,100,0x90,0xBF40BF,"Eolite v1.51",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 dd8f10cb4a..df5498714d 100644
--- a/programs/fs/Eolite/trunk/include/ini.h
+++ b/programs/fs/Eolite/trunk/include/ini.h
@@ -19,8 +19,8 @@ unsigned char *ERROR_TEXT[]={
 "Error #9 - FAT table is destroyed",
 "Error #10 - Access denied",
 "Error #11 - Device error",
-"", "", "", "", "", "", "", "", "",
-"", "", "", "", "", "", "", "", "", 
+0, 0, 0, 0, 0, 0, 0, 0, 0,
+0, 0, 0, 0, 0, 0, 0, 0, 0, 
 "Error #30 - Not enough memory",
 "Error #31 - File is not executable",
 "Error #32 - Too many processes",
diff --git a/programs/fs/Eolite/trunk/lib/kolibri.h b/programs/fs/Eolite/trunk/lib/kolibri.h
index ac3b260b8e..ce3f57f075 100644
--- a/programs/fs/Eolite/trunk/lib/kolibri.h
+++ b/programs/fs/Eolite/trunk/lib/kolibri.h
@@ -7,8 +7,8 @@ byte   os_name[8]   = {'M','E','N','U','E','T','0','1'};
 dword  os_version   = 0x00000001;
 dword  start_addr   = #main;
 dword  final_addr   = #stop+32;
-dword  alloc_mem    = 0x00080000;
-dword  x86esp_reg   = 0x00080000;
+dword  alloc_mem    = 0x000b0000;
+dword  x86esp_reg   = 0x000b0000;
 dword  I_Param      = #param;
 dword  I_Path       = #program_path;