XenOn/kolibrios-fun
1
1
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Wiki Activity

Fixed misuse of "/rd/1" (changed to "/sys") for some programs

Browse Source 
git-svn-id: svn://kolibrios.org@9585 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
vitalkrilov 2022-01-07 01:01:22 +00:00
parent 00d6588c05
commit 97e3188585
19 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
programs/bcc32/examples/color_dlg/color_dlg.cpp
View File

@ -47,7 +47,7 @@ bool KolibriOnStart(TStartData &kos_start, TThreadData /*th*/)
cold.procinfo = procinfo; cold.procinfo = procinfo;
cold.com_area_name = "FFFFFFFF_color_dialog"; cold.com_area_name = "FFFFFFFF_color_dialog";
cold.com_area = 0; cold.com_area = 0;
cold.start_path = "/rd/1/colrdial"; cold.start_path = "/sys/colrdial";
cold.draw_window = DrawWindow; cold.draw_window = DrawWindow;
cold.status = 0; cold.status = 0;
cold.x_size = 420; cold.x_size = 420;

4
programs/bcc32/examples/open_dlg/open_dlg.cpp
View File

@ -48,8 +48,8 @@ bool KolibriOnStart(TStartData &kos_start, TThreadData /*th*/)
ofd.com_area_name = "FFFFFFFF_open_dialog"; ofd.com_area_name = "FFFFFFFF_open_dialog";
ofd.com_area = 0; ofd.com_area = 0;
ofd.opendir_path = plugin_path; ofd.opendir_path = plugin_path;
ofd.dir_default_path = "/rd/1"; ofd.dir_default_path = "/sys";
ofd.start_path = "/rd/1/File managers/opendial"; ofd.start_path = "/sys/File managers/opendial";
ofd.draw_window = DrawWindow; ofd.draw_window = DrawWindow;
ofd.status = 0; ofd.status = 0;
ofd.openfile_path = openfile_path; ofd.openfile_path = openfile_path;

6
programs/bcc32/games/blocks/blocks.cpp
View File

@ -444,8 +444,8 @@ bool KolibriOnStart(TStartData &kos_start, TThreadData /*th*/)
ofd.com_area_name = "FFFFFFFF_open_dialog"; ofd.com_area_name = "FFFFFFFF_open_dialog";
ofd.com_area = 0; ofd.com_area = 0;
ofd.opendir_path = plugin_path; ofd.opendir_path = plugin_path;
ofd.dir_default_path = "/rd/1"; ofd.dir_default_path = "/sys";
ofd.start_path = "/rd/1/File managers/opendial"; ofd.start_path = "/sys/File managers/opendial";
ofd.draw_window = DrawWindow; ofd.draw_window = DrawWindow;
ofd.status = 0; ofd.status = 0;
ofd.openfile_path = openfile_path; ofd.openfile_path = openfile_path;
@ -611,4 +611,4 @@ bool KolibriOnClose(TThreadData /*th*/)
if(f_data) delete f_data; if(f_data) delete f_data;
if(model_list) delete model_list; if(model_list) delete model_list;
return true; return true;
} }

2
programs/cmm/app_plus/app_plus.c
View File

@ -19,7 +19,7 @@
#define SCRX WINW-180 #define SCRX WINW-180
#define SCRY 20 #define SCRY 20
char default_dir[] = "/rd/1"; char default_dir[] = "/sys";
od_filter filter2; od_filter filter2;
#define BTN_MANUAL_SEARCH 10 #define BTN_MANUAL_SEARCH 10

4
programs/cmm/appearance/const.h
View File

@ -63,7 +63,7 @@ enum {
_ini ini = { "/sys/settings/system.ini" }; _ini ini = { "/sys/settings/system.ini" };
char default_dir[] = "/rd/1"; char default_dir[] = "/sys";
od_filter filter2 = { 8, "TXT\0\0" }; od_filter filter2 = { 8, "TXT\0\0" };
_tabs tabs = { -sizeof(t_skins)-sizeof(t_wallpapers)-sizeof(t_screensaver) _tabs tabs = { -sizeof(t_skins)-sizeof(t_wallpapers)-sizeof(t_screensaver)
@ -103,4 +103,4 @@ dword get_real_kolibrios_path()
void SelectList_LineChanged() void SelectList_LineChanged()
{ {
EventApply(); EventApply();
} }

8
programs/cmm/browser/WebView.c
View File

@ -76,7 +76,7 @@ dword http_get_type=PAGE;
dword render_start_time; dword render_start_time;
int menu_id=NULL; int menu_id=NULL;
char default_dir[] = "/rd/1"; char default_dir[] = "/sys";
od_filter filter2 = { 22, "TXT\0HTM\0HTML\0DOCX\0\0" }; od_filter filter2 = { 22, "TXT\0HTM\0HTML\0DOCX\0\0" };
char editURL[URL_SIZE+1]; char editURL[URL_SIZE+1];
@ -461,10 +461,10 @@ void EventAllTabsClick(dword _n)
void EventEditSource() void EventEditSource()
{ {
if (check_is_the_adress_local(history.current())) { if (check_is_the_adress_local(history.current())) {
RunProgram("/rd/1/develop/cedit", history.current()); RunProgram("/sys/develop/cedit", history.current());
} else { } else {
CreateFile(WB1.bufsize, WB1.bufpointer, "/tmp0/1/WebView_tmp.htm"); CreateFile(WB1.bufsize, WB1.bufpointer, "/tmp0/1/WebView_tmp.htm");
if (!EAX) RunProgram("/rd/1/develop/cedit", "/tmp0/1/WebView_tmp.htm"); if (!EAX) RunProgram("/sys/develop/cedit", "/tmp0/1/WebView_tmp.htm");
} }
} }
@ -1002,4 +1002,4 @@ dword GetImg(bool _new)
DrawStatusBar(NULL); DrawStatusBar(NULL);
} }
stop: stop:

4
programs/cmm/diff/diff_gui.h
View File

@ -18,7 +18,7 @@
//proc_info Form; //proc_info Form;
#define WIN_W 450 #define WIN_W 450
char default_dir[] = "/rd/1"; char default_dir[] = "/sys";
od_filter filter2 = {0,0}; od_filter filter2 = {0,0};
char src_path[4096]; char src_path[4096];
@ -156,4 +156,4 @@ void EventInsert()
{ {
if ( src_box.flags & ed_focus ) EventOpenDialogFirst(); if ( src_box.flags & ed_focus ) EventOpenDialogFirst();
if ( dst_box.flags & ed_focus ) EventOpenDialogSecond(); if ( dst_box.flags & ed_focus ) EventOpenDialogSecond();
} }

2
programs/cmm/imgedit/imgedit.c
View File

@ -35,7 +35,7 @@ proc_info Form;
dword semi_white; dword semi_white;
bool bg_dark=false; bool bg_dark=false;
char default_dir[4096] = "/rd/1"; char default_dir[4096] = "/sys";
od_filter filter2 = { 69, "BMP\0GIF\0ICO\0CUR\0JPEG\0JPG\0PNG\0PNM\0TGA\0TIFF\0TIF\0WBMP\0XBM\0XCF\Z80\0\0" }; od_filter filter2 = { 69, "BMP\0GIF\0ICO\0CUR\0JPEG\0JPG\0PNG\0PNM\0TGA\0TIFF\0TIF\0WBMP\0XBM\0XCF\Z80\0\0" };
libimg_image icons18; libimg_image icons18;

8
programs/cmm/misc/acpi_install.c
View File

@ -8,15 +8,15 @@ void main()
RunProgram("/kolibrios/drivers/acpi/acpi", NULL); RunProgram("/kolibrios/drivers/acpi/acpi", NULL);
pause(300); pause(300);
if (file_exists("/rd/1/drivers/devices.dat")) { if (file_exists("/sys/drivers/devices.dat")) {
if (GetSystemLanguage()==4) { if (GetSystemLanguage()==4) {
notify("'ACPI/APIC\n/rd/1/drivers/devices.dat ¡ë« ãᯥ譮 ᣥ­¥à¨à®¢ ­.\n“áâ ­®¢ª  ¥éñ ­¥ § ª®­ç¥­ . ‘«¥¤ã©â¥ 㪠§ ­¨ï¬ ¢ Readme!' -tdO"); notify("'ACPI/APIC\n/sys/drivers/devices.dat ¡ë« ãᯥ譮 ᣥ­¥à¨à®¢ ­.\n“áâ ­®¢ª  ¥éñ ­¥ § ª®­ç¥­ . ‘«¥¤ã©â¥ 㪠§ ­¨ï¬ ¢ Readme!' -tdO");
} else { } else {
notify("'ACPI/APIC\n/rd/1/drivers/devices.dat was succesfully generated.\nInstallation is not completed.\nFor the next steps please check Readme!' -tdO"); notify("'ACPI/APIC\n/sys/drivers/devices.dat was succesfully generated.\nInstallation is not completed.\nFor the next steps please check Readme!' -tdO");
} }
RunProgram("/sys/@open", "/kolibrios/drivers/acpi/readme.txt"); RunProgram("/sys/@open", "/kolibrios/drivers/acpi/readme.txt");
} else { } else {
notify("'Error generating /rd/1/drivers/devices.dat' -E"); notify("'Error generating /sys/drivers/devices.dat' -E");
} }
ExitProcess(); ExitProcess();

4
programs/cmm/pixie2/pixie.c
View File

@ -26,7 +26,7 @@
//===================================================// //===================================================//
//simple open dialog data //simple open dialog data
char default_dir[] = "/rd/1"; char default_dir[] = "/sys";
od_filter filter2 = { 15, "MP3\0WAV\0XM\0\0" }; od_filter filter2 = { 15, "MP3\0WAV\0XM\0\0" };
#define ABOUT_MESSAGE " v2.94 Final #define ABOUT_MESSAGE " v2.94 Final
@ -600,4 +600,4 @@ void EventShowTagInfo()
stop: stop:
char menu_stak[4096]; char menu_stak[4096];

2
programs/cmm/quark/data.h
View File

@ -84,7 +84,7 @@ struct THEME
dword bg, text, cursor, found; dword bg, text, cursor, found;
} theme; } theme;
char default_dir[] = "/rd/1"; char default_dir[] = "/sys";
od_filter filter2 = { 0, "" }; od_filter filter2 = { 0, "" };
CANVAS canvas; CANVAS canvas;

2
programs/cmm/tmpdisk/tmpdisk.c
View File

@ -50,7 +50,7 @@ void main()
{ {
if (! driver_handle = LoadDriver("tmpdisk")) if (! driver_handle = LoadDriver("tmpdisk"))
{ {
notify("'TmpDisk\nError: /rd/1/drivers/tmpdisk.obj driver loading failed\nVirtual disk wouldn't be added' -tE"); notify("'TmpDisk\nError: /sys/drivers/tmpdisk.obj driver loading failed\nVirtual disk wouldn't be added' -tE");
ExitProcess(); ExitProcess();
} }

2
programs/demos/3dcube2/trunk/ascgl.inc
View File

@ -435,7 +435,7 @@ end_bmp:
; LOADBMP - Load bmp image from file ; LOADBMP - Load bmp image from file
; (SYNTAX) LOADBMP 'file_path',temp_area(rb 0x10000),load_area,dd soi ; (SYNTAX) LOADBMP 'file_path',temp_area(rb 0x10000),load_area,dd soi
; (SAMPLE) LOADBMP '/rd/1/menuet.bmp',temp_area,I_END,tsoi ; (SAMPLE) LOADBMP '/sys/menuet.bmp',temp_area,I_END,tsoi
; ( NOTE ) Macros create on Base of ; ( NOTE ) Macros create on Base of
; Picture browser by lisovin@26.ru & Ivan Poddubny ; Picture browser by lisovin@26.ru & Ivan Poddubny
; SOI - Start of image ; SOI - Start of image

2
programs/demos/3detx60b/trunk/ascl.inc
View File

@ -30,7 +30,7 @@ lang equ ru ; ru en fr ge fi
; LOADFILE ; LOADFILE
; (SYNTAX) LOADFILE 'full_path_to_file',file_load_area,file_temp_area ; (SYNTAX) LOADFILE 'full_path_to_file',file_load_area,file_temp_area
; (SAMPLE) LOADFILE '/rd/1/clock.bmp',load_area,temp_area ; (SAMPLE) LOADFILE '/sys/clock.bmp',load_area,temp_area
macro loadfile file_name,file_load_area,file_temp_area macro loadfile file_name,file_load_area,file_temp_area
{ {

6
programs/demos/life/trunk/ascl.inc
View File

@ -30,7 +30,7 @@ lang equ ru ; ru en fr ge fi
; LOADFILE ; LOADFILE
; (SYNTAX) LOADFILE 'full_path_to_file',file_load_area,file_temp_area ; (SYNTAX) LOADFILE 'full_path_to_file',file_load_area,file_temp_area
; (SAMPLE) LOADFILE '/rd/1/clock.bmp',load_area,temp_area ; (SAMPLE) LOADFILE '/sys/clock.bmp',load_area,temp_area
macro loadfile file_name,file_load_area,file_temp_area macro loadfile file_name,file_load_area,file_temp_area
{ {
@ -324,7 +324,7 @@ run_fileinfo:
dd 0 dd 0
dd procinfo ; 0x10000 dd procinfo ; 0x10000
;run_filepath ;run_filepath
db '/RD/1/SYSXTREE',0 db '/SYS/SYSXTREE',0
procinfo: procinfo:
times 256 db 0 times 256 db 0
@ -535,7 +535,7 @@ run_fileinfo:
dd 0 dd 0
dd procinfo dd procinfo
run_filepath: run_filepath:
db '/RD/1/SYSXTREE',0 db '/SYS/SYSXTREE',0
procinfo: procinfo:
times 256 db 0 times 256 db 0

4
programs/demos/life2/life2.cpp
View File

@ -1705,8 +1705,8 @@ bool KolibriOnStart(TStartData &me_start, TThreadData th)
ofd.com_area_name = "FFFFFFFF_open_dialog"; ofd.com_area_name = "FFFFFFFF_open_dialog";
ofd.com_area = 0; ofd.com_area = 0;
ofd.opendir_path = plugin_path; ofd.opendir_path = plugin_path;
ofd.dir_default_path = "/rd/1"; ofd.dir_default_path = "/sys";
ofd.start_path = "/rd/1/File managers/opendial"; ofd.start_path = "/sys/File managers/opendial";
ofd.draw_window = DrawWindow; ofd.draw_window = DrawWindow;
ofd.status = 0; ofd.status = 0;
ofd.openfile_path = CommandLine; ofd.openfile_path = CommandLine;

2
programs/demos/trantest/trunk/ascl.inc
View File

@ -30,7 +30,7 @@ lang equ ru ; ru en fr ge fi
; LOADFILE ; LOADFILE
; (SYNTAX) LOADFILE 'full_path_to_file',file_load_area,file_temp_area ; (SYNTAX) LOADFILE 'full_path_to_file',file_load_area,file_temp_area
; (SAMPLE) LOADFILE '/rd/1/clock.bmp',load_area,temp_area ; (SAMPLE) LOADFILE '/sys/clock.bmp',load_area,temp_area
macro loadfile file_name,file_load_area,file_temp_area macro loadfile file_name,file_load_area,file_temp_area
{ {

4
programs/demos/view3ds/data.inc
View File

@ -384,7 +384,7 @@ base_vector:
; fsize dd 0 ;180000 ; sizeof(workarea) ; fsize dd 0 ;180000 ; sizeof(workarea)
; fptr dd 0 ;workarea ; fptr dd 0 ;workarea
; file_name: ; file_name:
; db '/rd/1/3d/house.3ds',0 ; db '/sys/3d/house.3ds',0
; ; db '/tmp0/1/ant.3ds',0 ; ; db '/tmp0/1/ant.3ds',0
; ;
; rb 256 ; rb 256
@ -512,7 +512,7 @@ end if
fsize dd 0 ;180000 ; sizeof(workarea) fsize dd 0 ;180000 ; sizeof(workarea)
fptr dd 0 ;workarea fptr dd 0 ;workarea
file_name: file_name:
db '/rd/1/3d/house.3ds',0 db '/sys/3d/house.3ds',0
; db '/tmp0/1/sc.3ds',0 ; db '/tmp0/1/sc.3ds',0
rb 256 rb 256

4
programs/develop/cmm/main.cpp
View File

@ -1140,8 +1140,8 @@ char m1[256];
if (inih = fopen(m1,"rb")) if (inih = fopen(m1,"rb"))
{_loadIni(inih);return;} {_loadIni(inih);return;}
} }
//for KolibriOS: load /rd/0/settings/c--.ini //for KolibriOS: load /sys/settings/c--.ini
inih = fopen("/rd/1/settings/c--.ini","rb"); inih = fopen("/sys/settings/c--.ini","rb");
for(;;){ for(;;){
if(fgets(m1,255,inih)==NULL)break; if(fgets(m1,255,inih)==NULL)break;
if(SelectComand(m1,0)==c_end)BadCommandLine(m1); if(SelectComand(m1,0)==c_end)BadCommandLine(m1);