From a037fae1d9e6e39146831e0a259906d48b2bdb94 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Fri, 31 Dec 2021 00:35:57 +0000 Subject: [PATCH] clean-up git-svn-id: svn://kolibrios.org@9537 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/cmm/eolite/include/copy_and_delete.h | 1 - programs/cmm/eolite/include/progress_dialog.h | 8 +++++--- programs/cmm/lib/copyf.h | 5 ----- programs/cmm/lib/date.h | 9 +++++---- 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/programs/cmm/eolite/include/copy_and_delete.h b/programs/cmm/eolite/include/copy_and_delete.h index 4c621d0aba..325c7db026 100644 --- a/programs/cmm/eolite/include/copy_and_delete.h +++ b/programs/cmm/eolite/include/copy_and_delete.h @@ -124,7 +124,6 @@ void PasteThread() int paste_elements_count = 0; dword clipbuf; dword path_offset; - dword copy_state_ex = 0; clipbuf = Clipboard__GetSlotData(Clipboard__GetSlotCount()-1); if (DSDWORD[clipbuf+4] != 3) return; diff --git a/programs/cmm/eolite/include/progress_dialog.h b/programs/cmm/eolite/include/progress_dialog.h index eacd462cd7..e3c7a9a5d6 100644 --- a/programs/cmm/eolite/include/progress_dialog.h +++ b/programs/cmm/eolite/include/progress_dialog.h @@ -47,8 +47,11 @@ void DisplayOperationForm(int operation_flag) } copy_bar.frame_color = sc.work_graph; - if (copy_state == FILE_EXISTS) event_mode = #WaitEvent; - else event_mode = #CheckEvent; + if (copy_state == FILE_EXISTS) { + event_mode = #WaitEvent; + } else { + event_mode = #CheckEvent; + } event_mode(); switch(EAX) { @@ -75,7 +78,6 @@ void DisplayOperationForm(int operation_flag) if (remember_choice.click(EAX+1)) { is_remember = remember_choice.checked; } - break; } break; case evReDraw: diff --git a/programs/cmm/lib/copyf.h b/programs/cmm/lib/copyf.h index 252b1f9cc3..8deb56e483 100644 --- a/programs/cmm/lib/copyf.h +++ b/programs/cmm/lib/copyf.h @@ -14,11 +14,6 @@ enum { FILE_SKIP, }; -enum { - MODE_NORMAL, - MODE_FORCE -}; - #define WRITE_ERROR_DEBUG 0 #define WRITE_ERROR_NOTIFY 1 :int writing_error_channel = WRITE_ERROR_DEBUG; diff --git a/programs/cmm/lib/date.h b/programs/cmm/lib/date.h index e34760c7f7..70925dd43d 100644 --- a/programs/cmm/lib/date.h +++ b/programs/cmm/lib/date.h @@ -21,16 +21,17 @@ EDX = x<<16+y; ESI = 0x90<<24+color; ECX = EDI.date.day; - $int 0x40; + $int 64 EDX += 20<<16; ECX = EDI.date.month; - $int 0x40; + $int 64 EDX += 20<<16; EBX = 4<<16; ECX = EDI.date.year; - $int 0x40; + $int 64 DrawBar(x+17,y+10,2,2,color); - DrawBar(x+37,y+10,2,2,color); + $add ebx, 20 << 16 + $int 64 } #endif \ No newline at end of file