From a2700ea35cfdcdcc0f9256d6322b034498be7feb Mon Sep 17 00:00:00 2001 From: Ivan Baravy Date: Fri, 2 Oct 2020 12:33:16 +0000 Subject: [PATCH] Replace some hardcoded /rd/1 paths with /sys. git-svn-id: svn://kolibrios.org@8088 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/common/settings/system.ini | 4 ++-- kernel/trunk/data32.inc | 12 ++++++------ kernel/trunk/docs/sysfuncs.txt | 6 +++--- .../develop/libraries/box_lib/asm/trunk/data.inc | 2 +- programs/develop/libraries/box_lib/load_lib.mac | 2 +- programs/system/icon_new/icon.asm | 8 ++++---- programs/system/os/kolibri.asm | 6 +++--- programs/system/os/modules.inc | 4 ++-- programs/system/skincfg/trunk/idata.inc | 2 +- programs/system/taskbar/trunk/MOI.INC | 4 ++-- 10 files changed, 25 insertions(+), 25 deletions(-) diff --git a/data/common/settings/system.ini b/data/common/settings/system.ini index 51d8c0a647..806ada0b64 100644 --- a/data/common/settings/system.ini +++ b/data/common/settings/system.ini @@ -20,5 +20,5 @@ program=/sys/demos/spiral [style] buttons_gradient=1 -bg_program=/rd/1/media/kiv -bg_param=\T__/rd/1/home.png +bg_program=/sys/media/kiv +bg_param=\T__/sys/home.png diff --git a/kernel/trunk/data32.inc b/kernel/trunk/data32.inc index 3195b2f565..2ae1287b73 100644 --- a/kernel/trunk/data32.inc +++ b/kernel/trunk/data32.inc @@ -147,9 +147,9 @@ msg_unresolved db 'unresolved ',0 ;end if msg_CR db 13,10,0 -szPS2MDriver db '/rd/1/drivers/PS2MOUSE.SYS',0 +szPS2MDriver db '/sys/drivers/PS2MOUSE.SYS',0 ;szCOM_MDriver db 'COM_MOUSE',0 -szVidintel db '/rd/1/drivers/vidintel.sys',0 +szVidintel db '/sys/drivers/vidintel.sys',0 szUSB db 'USB',0 szEXPORTS db 'EXPORTS',0 @@ -158,8 +158,8 @@ sz_EXPORTS db '_EXPORTS',0 szIMPORTS db 'IMPORTS',0 read_firstapp db '/sys/' -firstapp db '/RD/1/LAUNCHER',0 -notifyapp db '/RD/1/@notify',0 +firstapp db '/sys/LAUNCHER',0 +notifyapp db '/sys/@notify',0 if lang eq ru ud_user_message cp866 'Ошибка: неподдерживаемая инструкция процессора',0 mtrr_user_message cp866 '"Обнаружена проблема с конфигурацией MTRR.\nПроизводительность может быть пониженной" -dW',0 @@ -175,9 +175,9 @@ kernel_file_load: dq 0 ; offset in file dd 0x31000 ; number of bytes to read dd _CLEAN_ZONE ; buffer for data - db '/RD/1/KERNEL.MNT',0 + db '/sys/KERNEL.MNT',0 -dev_data_path db '/RD/1/DRIVERS/DEVICES.DAT',0 +dev_data_path db '/sys/DRIVERS/DEVICES.DAT',0 align 4 diff --git a/kernel/trunk/docs/sysfuncs.txt b/kernel/trunk/docs/sysfuncs.txt index 65eb6f7c35..9e5389f232 100644 --- a/kernel/trunk/docs/sysfuncs.txt +++ b/kernel/trunk/docs/sysfuncs.txt @@ -1697,7 +1697,7 @@ Returned value: Remarks: * If the buffer is too small to hold all path, only part of the string will be copied and terminated with 0. - * By default, current folder for the thread is "/rd/1". + * By default, current folder for the thread is "/sys". * At process/thread creation the current folder will be inherited from the parent. ---------------------------------------------------------------------- @@ -1741,7 +1741,7 @@ Returned value: Remarks: * If the buffer is too small to hold all path, only part of the string will be copied and terminated with 0. - * By default, current folder for the thread is "/rd/1". + * By default, current folder for the thread is "/sys". * At process/thread creation the current folder will be inherited from the parent. @@ -3348,7 +3348,7 @@ Remarks: * Driver name is case-sensitive. Maximum length of the name is 16 characters, including terminating null character, the rest is ignored. - * Driver ABC is loaded from file /rd/1/drivers/ABC.sys. + * Driver ABC is loaded from file /sys/drivers/ABC.sys. ---------------------- Constants for registers: ---------------------- eax - SF_SYS_MISC (68) diff --git a/programs/develop/libraries/box_lib/asm/trunk/data.inc b/programs/develop/libraries/box_lib/asm/trunk/data.inc index 9acf77af89..e625b05b0a 100644 --- a/programs/develop/libraries/box_lib/asm/trunk/data.inc +++ b/programs/develop/libraries/box_lib/asm/trunk/data.inc @@ -472,7 +472,7 @@ od_path: db '/sys/File Managers/OpenDial',0 communication_area_default_pach: - db '/rd/1',0 + db '/sys',0 Filter: dd Filter.end - Filter.1 diff --git a/programs/develop/libraries/box_lib/load_lib.mac b/programs/develop/libraries/box_lib/load_lib.mac index f11b506e1a..4df07e31c2 100644 --- a/programs/develop/libraries/box_lib/load_lib.mac +++ b/programs/develop/libraries/box_lib/load_lib.mac @@ -107,7 +107,7 @@ library_fun_memory_alloc equ 0 ; align 4 arrea_xx dd 0 -file_name db '/rd/1/@notify',0 +file_name db '/sys/@notify',0 align 4 run_notify_struct: diff --git a/programs/system/icon_new/icon.asm b/programs/system/icon_new/icon.asm index e2821f61fa..5199617960 100644 --- a/programs/system/icon_new/icon.asm +++ b/programs/system/icon_new/icon.asm @@ -1,5 +1,5 @@ -ICON_STRIP equ '/rd/1/icons32.png' -ICON_INI equ '/rd/1/settings/icon.ini' +ICON_STRIP equ '/sys/icons32.png' +ICON_INI equ '/sys/settings/icon.ini' ICON_SIZE equ 68 ;ࠧ IMG_SIZE equ 32 ;ࠧ TEXT_BOTTOM_Y equ 14 ; Y ⥪ @@ -1047,7 +1047,7 @@ DlgAddActiv dd 0 IconIni db ICON_INI,0 -pthNotify db '/rd/1/@notify',0 +pthNotify db '/sys/@notify',0 keyName db 'name',0 keyPath db 'path',0 @@ -1346,4 +1346,4 @@ stack_main: -ENDMEM: \ No newline at end of file +ENDMEM: diff --git a/programs/system/os/kolibri.asm b/programs/system/os/kolibri.asm index ab9127ea18..a14624ac00 100644 --- a/programs/system/os/kolibri.asm +++ b/programs/system/os/kolibri.asm @@ -308,7 +308,7 @@ export 'kolibri.dll' \ end data -kolibri_dll db '/rd/1/lib/kolibri.dll',0 +kolibri_dll db '/sys/lib/kolibri.dll',0 .size = $ - kolibri_dll console_dll db 'console.dll',0 @@ -322,11 +322,11 @@ msg_relocated2 db ' applied',13,10,0 msg_noreloc1 db 'Module ',0 msg_noreloc2 db ' is not at preferred base and has no fixups',0 loader_debugboard_prefix db 'S : ',0 -notify_program db '/rd/1/@notify',0 +notify_program db '/sys/@notify',0 msg_cannot_open db 'Cannot open ',0 msg_paths_begin db ' in any of ' -module_path1 db '/rd/1/lib/' +module_path1 db '/sys/lib/' .size = $ - module_path1 db ', ' module_path2 db '/kolibrios/lib/' diff --git a/programs/system/os/modules.inc b/programs/system/os/modules.inc index 2a3eaadaac..bff8ad3348 100644 --- a/programs/system/os/modules.inc +++ b/programs/system/os/modules.inc @@ -7,7 +7,7 @@ ; ; If filename starts with '/', it is treated as an absolute file name. ; Otherwise, dlopen searches for filename in predefined locations: -; /rd/1/lib, /kolibrios/lib, directory of the executable file. +; /sys/lib, /kolibrios/lib, directory of the executable file. ; The current directory is *not* searched. ; ; If the same module is loaded again with dlopen(), the same @@ -511,7 +511,7 @@ proc load_module uses ebx esi ebp jmp .load_failed .relative: ; 1d. The given path is relative. -; Try /rd/1/lib/, /kolibrios/lib/ and path to executable +; Try /sys/lib/, /kolibrios/lib/ and path to executable ; in this order. stdcall try_map_module, module_path1, module_path1.size test eax, eax diff --git a/programs/system/skincfg/trunk/idata.inc b/programs/system/skincfg/trunk/idata.inc index 2c4468ae31..09f1fec3f0 100644 --- a/programs/system/skincfg/trunk/idata.inc +++ b/programs/system/skincfg/trunk/idata.inc @@ -374,7 +374,7 @@ ColorDialog_data: cd_communication_area_name: db 'FFFFFFFF_color_dialog',0 colordialog_path: - db '/rd/1/colrdial',0 + db '/sys/colrdial',0 ;--------------------------------------------------------------------- frame_data: .type dd 0 ;+0 diff --git a/programs/system/taskbar/trunk/MOI.INC b/programs/system/taskbar/trunk/MOI.INC index ab9a6797b8..f981c58eb5 100644 --- a/programs/system/taskbar/trunk/MOI.INC +++ b/programs/system/taskbar/trunk/MOI.INC @@ -130,7 +130,7 @@ point2 dd 0 dd 0 dd 1 dd inicont - db '/rd/1/settings/lang.ini',0 + db '/sys/settings/lang.ini',0 get_key: dd 0 @@ -138,7 +138,7 @@ point dd 0 dd 0 dd 384 dd current_keymap - db '/rd/1/settings/keymap.key',0 + db '/sys/settings/keymap.key',0 key_r db 0 key_r2 db 0