diff --git a/programs/cmm/eolite/Eolite.c b/programs/cmm/eolite/Eolite.c index 0611bb6c48..6ee01ebabc 100644 --- a/programs/cmm/eolite/Eolite.c +++ b/programs/cmm/eolite/Eolite.c @@ -80,8 +80,8 @@ enum {ONLY_SHOW, WITH_REDRAW, ONLY_OPEN}; //OpenDir -#define TITLE "Eolite File Manager v2.16" -#define ABOUT_TITLE "Eolite v2.16" +#define TITLE "Eolite File Manager v2.16.1" +#define ABOUT_TITLE "Eolite v2.16.1" dword col_padding, col_selec, col_lpanel; int toolbar_buttons_x[7]={9,46,85,134,167,203}; diff --git a/programs/cmm/eolite/include/copy.h b/programs/cmm/eolite/include/copy.h index 348f525609..27b9045c39 100644 --- a/programs/cmm/eolite/include/copy.h +++ b/programs/cmm/eolite/include/copy.h @@ -1,36 +1,25 @@ -//Leency 2008-2013 +//Leency 2008-2014 - -byte copy_from[4096], copy_to[4096], cut_active=0; +byte copy_to[4096]; +byte cut_active=0; enum {NOCUT, CUT, COPY_PASTE_END}; -struct buffer_data -{ - dword size; - dword type; - dword encoding; - byte buffer_data[4096]; -}; - -buffer_data buf_data; Clipboard clipboard; -#define WIN_W 300 -#define WIN_H 50 - void Copy(dword pcth, char cut) { - strcpy(#copy_from, pcth); - buf_data.size = sizeof(buffer_data); - buf_data.type = 0; - buf_data.encoding = 866; - strcpy(#buf_data.buffer_data, pcth); - clipboard.SetSlotData(sizeof(buffer_data), #buf_data); + clipboard.data.size = sizeof(buffer_data); + clipboard.data.type = 0; + clipboard.data.encoding = 1; + strcpy(#clipboard.data.buffer_data, pcth); + clipboard.SetSlotData(sizeof(buffer_data), #clipboard.data); cut_active = cut; } void copyf_Draw_Progress(dword filename) { + #define WIN_W 300 + #define WIN_H 50 DefineAndDrawWindow(Form.left+Form.width-200,Form.top+90,WIN_W,GetSkinHeight()+WIN_H-1,0x34,sc.work,T_PASTE_WINDOW); WriteText(5,8, 0x80, sc.work_text, T_PASTE_WINDOW_TEXT); DrawBar(5, 26, WIN_W-10, 10, sc.work); @@ -46,6 +35,7 @@ void copyf_Draw_Progress(dword filename) { void Paste() { char copy_rezult; + byte copy_from[4096]; strcpy(#copy_from, clipboard.GetSlotData(clipboard.GetSlotCount()-1)+12); @@ -71,7 +61,6 @@ void Paste() { strcpy(#file_path, #copy_from); Del_File(true); - copy_from=NULL; cut_active=false; } action_buf = COPY_PASTE_END; diff --git a/programs/cmm/lib/clipboard.h b/programs/cmm/lib/clipboard.h index 039e718e4f..8f2746bcdd 100644 --- a/programs/cmm/lib/clipboard.h +++ b/programs/cmm/lib/clipboard.h @@ -1,4 +1,14 @@ +struct buffer_data +{ + dword size; + dword type; + dword encoding; + byte buffer_data[4096]; +}; + + struct Clipboard { + buffer_data data; dword GetSlotCount(); dword GetSlotData( ECX); dword SetSlotData( EDX, ESI);