From 3e9224b667958c62c2da2d6041c0e352bce05cf1 Mon Sep 17 00:00:00 2001 From: Serhii Sakhno Date: Fri, 31 Dec 2021 00:19:27 +0000 Subject: [PATCH] cmm: fix programs that use copyf git-svn-id: svn://kolibrios.org@9536 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/cmm/eolite/include/copy_and_delete.h | 1 - programs/cmm/lib/copyf.h | 1 + programs/cmm/misc/install.c | 23 ++++++++++--------- programs/cmm/misc/osupdate.c | 1 + 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/programs/cmm/eolite/include/copy_and_delete.h b/programs/cmm/eolite/include/copy_and_delete.h index 5b4081a2ba..4c621d0aba 100644 --- a/programs/cmm/eolite/include/copy_and_delete.h +++ b/programs/cmm/eolite/include/copy_and_delete.h @@ -161,7 +161,6 @@ _DIFFERENT_DRIVES: } path_offset = clipbuf + 10; - copy_state = FILE_DEFAULT; saved_state = FILE_DEFAULT; for (j = 0; j < paste_elements_count; j++) { strcpy(#copy_from, path_offset); diff --git a/programs/cmm/lib/copyf.h b/programs/cmm/lib/copyf.h index 26d5352e3a..252b1f9cc3 100644 --- a/programs/cmm/lib/copyf.h +++ b/programs/cmm/lib/copyf.h @@ -31,6 +31,7 @@ bool is_remember = false; { dword error; BDVK CopyFile_atr1; + copy_state = FILE_DEFAULT; if (!from1) || (!in1) { diff --git a/programs/cmm/misc/install.c b/programs/cmm/misc/install.c index adbf691f6d..2ce00893f9 100644 --- a/programs/cmm/misc/install.c +++ b/programs/cmm/misc/install.c @@ -8,20 +8,20 @@ #include "../lib/patterns/restart_process.h" char logo[] = " -ÛÛÛÛ ÛÛÛÛ ÛÛÛÛÛÛÛÛÛÛ ÛÛÛÛ ÛÛÛÛ ÛÛÛÛÛÛÛÛÛÛÛ - ÛÛÛÛ ÛÛ ÛÛÛ ÛÛÛ ÛÛÛ ÛÛ ÛÛÛ ÛÛ - ÛÛÛÛÛ ÛÛ ÛÛÛ ÛÛÛÛÛ ÛÛ ÛÛÛ ÛÛ - ÛÛ ÛÛÛ ÛÛ ÛÛÛÛÛÛÛ ÛÛÛ ÛÛÛ - ÛÛ ÛÛÛÛÛ ÛÛÛ ÛÛÛÛÛ ÛÛÛ - ÛÛ ÛÛÛÛ ÛÛÛ ÛÛÛ ÛÛÛ ÛÛÛ -ÛÛÛÛ ÛÛÛ ÛÛÛÛÛÛÛÛÛÛ ÛÛÛÛ ÛÛÛÛ ÛÛÛÛÛ +���� ���� ���������� ���� ���� ����������� + ���� �� ��� ��� ��� �� ��� �� + ����� �� ��� ����� �� ��� �� + �� ��� �� ������� ��� ��� + �� ����� ��� ����� ��� + �� ���� ��� ��� ��� ��� +���� ��� ���������� ���� ���� ����� "; #ifdef LANG_RUS -#define T_INTRO "®¯à®¡ã©â¥ ­®¢®¥ ¢¨§ã «ì­®¥ ®ä®à¬«¥­¨¥ Š®«¨¡à¨, ª®â®à®¥ à ­ìè¥ ¡ë«® ¤®áâ㯭® ⮫쪮 ¢ KolibriNext."; -#define T_INSTALL "“áâ ­®¢¨âì" -#define T_COMPLETE "“áâ ­®¢ª  § ¢¥à襭 " -#define T_EXIT "‚ë室" +#define T_INTRO "���஡�� ����� ���㠫쭮� ��ଫ���� ������, ���஥ ࠭�� �뫮 ����㯭� ⮫쪮 � KolibriNext."; +#define T_INSTALL "��⠭�����" +#define T_COMPLETE "��⠭���� �����襭�" +#define T_EXIT "��室" #else #define T_INTRO "Try a new visual design of KolibriOS, which previously was available only in KolibriNext."; #define T_INSTALL "Install" @@ -37,6 +37,7 @@ bool install_complete = false; void main() { word btn; + saved_state = FILE_REPLACE; load_dll(libini, #lib_init,1); loop() switch(WaitEvent()) { diff --git a/programs/cmm/misc/osupdate.c b/programs/cmm/misc/osupdate.c index 9d260e063a..513b18ca56 100644 --- a/programs/cmm/misc/osupdate.c +++ b/programs/cmm/misc/osupdate.c @@ -52,6 +52,7 @@ sensor progress = { 40, WINH-70, WINW-80, 20 }; void main() { int btn; + saved_state = FILE_REPLACE; load_dll(libHTTP, #http_lib_init,1); SetWindowLayerBehaviour(-1, ZPOS_ALWAYS_TOP); @SetEventMask(EVM_REDRAW + EVM_KEY + EVM_BUTTON + EVM_STACK);