KolibriOS
/
kolibrios
5
2
Fork 1
Code Issues 62 Pull Requests 1 Projects Releases Activity

Replace some hardcoded /rd/1 paths with /sys. 

git-svn-id: svn://kolibrios.org@8088 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Ivan Baravy 2020-10-02 12:33:16 +00:00
parent 5e4de2dfd1
commit a2700ea35c
10 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/common/settings/system.ini
View File

@ -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

12
kernel/trunk/data32.inc
View File

@ -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

6
kernel/trunk/docs/sysfuncs.txt
View File

@ -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)

2
programs/develop/libraries/box_lib/asm/trunk/data.inc
View File

@ -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

2
programs/develop/libraries/box_lib/load_lib.mac
View File

@ -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:

8
programs/system/icon_new/icon.asm
View File

@ -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:
ENDMEM:

6
programs/system/os/kolibri.asm
View File

@ -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/'

4
programs/system/os/modules.inc
View File

@ -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

2
programs/system/skincfg/trunk/idata.inc
View File

@ -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

4
programs/system/taskbar/trunk/MOI.INC
View File

@ -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