diff --git a/programs/cmm/eolite/Eolite.c b/programs/cmm/eolite/Eolite.c index d871e4c148..2c47a88c7e 100644 --- a/programs/cmm/eolite/Eolite.c +++ b/programs/cmm/eolite/Eolite.c @@ -8,9 +8,9 @@ TODO: - 70.5 - get volume info and label */ -#define ABOUT_TITLE "EOLITE 5.02 Gold" -#define TITLE_EOLITE "Eolite File Manager 5.02 Gold" -#define TITLE_KFM "Kolibri File Manager 2.02 Gold"; +#define ABOUT_TITLE "EOLITE 5.03 Gold" +#define TITLE_EOLITE "Eolite File Manager 5.03 Gold" +#define TITLE_KFM "Kolibri File Manager 2.03 Gold"; #define MEMSIZE 1024 * 250 #include "../lib/clipboard.h" @@ -1233,8 +1233,11 @@ dword GetDeviceSize(dword p) if (ESBYTE[p+1] == '/') p++; if (ESBYTE[p+1] == 'c') && (ESBYTE[p+2] == 'd') && (ESBYTE[p+4] == 0) return 0; - GetFileInfo(p, #bdvk); - return ConvertSize64(bdvk.sizelo, bdvk.sizehi); + if (GetFileInfo(p, #bdvk)) { + return 0; + } else { + ConvertSize64(bdvk.sizelo, bdvk.sizehi); + } } int GetRealFileCountInFolder(dword folder_path) diff --git a/programs/cmm/eolite/include/left_panel.h b/programs/cmm/eolite/include/left_panel.h index e8beca49eb..aa9296e5f1 100644 --- a/programs/cmm/eolite/include/left_panel.h +++ b/programs/cmm/eolite/include/left_panel.h @@ -33,7 +33,7 @@ void _SystemDiscs::Get() { sprintf(#dev_name,"/%s",i1*304+ devbuf+72); GetDir(#diskbuf, #dev_disc_num, #dev_name, DIRS_NOROOT); - for (j1=0; j1color gl - mov edi,title - mcall + mov eax,0 ; function 0 : define and draw window + mov ebx,200*65536+250 ; [x start] *65536 + [x size] + mov ecx,200*65536+106 ; [y start] *65536 + [y size] + mov edx,0x34ffffff ; color of work area RRGGBB,8->color gl + mov edi,title + mcall ; function 4 : write text to window - xor ecx,ecx - mcall 4,<33,8>,,text1,6 - mcall ,<85,8>,,text2,9 - mcall ,<8,28>,,tdec,4 - add ebx,23 - mcall ,,,thex + mcall 4,<55,8>,0x10000000,text1,5 + mcall ,<130,8>,,text2,9 + mcall ,<8,30>,,tdec,4 + add ebx,23 + mcall ,,,thex - movzx ecx,byte [keyid] - mcall 47,0x30000,,<40,28>,0x224466 - add edx,23 - mov bh,1 - mcall + movzx ecx,byte [keyid] + mcall 47,0x30000,,<55,30>,0x10224466 + add edx,23 + mov bh,1 + mcall - mov bh,0 - movzx ecx,byte [scan_keyid] - mcall ,,,<100,28> - add edx,23 - mov bh,1 - mcall + mov bh,0 + movzx ecx,byte [scan_keyid] + mcall ,,,<130,30> + add edx,23 + mov bh,1 + mcall ; function 12:tell os about windowdraw ; 2, end of draw - mcall 12,2 - ret + mcall 12,2 + ret ; DATA AREA - text1: db 'ASCII:' - text2: db 'SCANCODE:' + text1: db 'ASCII' + text2: db 'SCANCODE' tdec: db 'DEC:' thex: db 'HEX:' - title: db 'KEYBOARD ASCIICODES-PRESS ANY KEY',0 + title: db 'Keyboard ASCII codes',0 I_END: keyid: rb 1 scan_keyid: rb 1