From 1589fb5312ed0ed54a539de094766a985f0fd875 Mon Sep 17 00:00:00 2001 From: pavelyakov Date: Sun, 2 Aug 2015 15:15:15 +0000 Subject: [PATCH] mem_Init() initialized default git-svn-id: svn://kolibrios.org@5651 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/cmm/Calypte/Calypte.c | 1 - programs/cmm/appearance/appearance.c | 1 - programs/cmm/browser/WebView.c | 1 - programs/cmm/dicty/dicty.c | 2 +- programs/cmm/downloader/Downloader.c | 1 - programs/cmm/end/end.c | 1 - programs/cmm/eolite/Eolite.c | 2 +- programs/cmm/example/example.c | 2 +- programs/cmm/installer/installer.c | 2 +- programs/cmm/kolibrin/kolibrin.c | 1 - programs/cmm/lib/kolibri.h | 9 ++++++++- programs/cmm/liza/liza.c | 2 +- programs/cmm/mouse_cfg/mouse_cfg.c | 1 - programs/cmm/notify/notify.c | 1 - programs/cmm/panels_cfg/panels_cfg.c | 1 - programs/cmm/software_widget/software_widget.c | 2 +- programs/cmm/ttf_viewer/ttf_viewer.c | 1 - 17 files changed, 14 insertions(+), 17 deletions(-) diff --git a/programs/cmm/Calypte/Calypte.c b/programs/cmm/Calypte/Calypte.c index 6617eb22e5..4cfad5d902 100644 --- a/programs/cmm/Calypte/Calypte.c +++ b/programs/cmm/Calypte/Calypte.c @@ -127,7 +127,6 @@ void main() strcpy(#menu_text_area1.sub_menu4, MENU1_SUBMENU4); menu_text_area1.end = 0; - mem_Init(); load_dll(boxlib, #box_lib_init,0); load_dll(libio, #libio_init,1); load_dll(Proc_lib, #OpenDialog_init,0); diff --git a/programs/cmm/appearance/appearance.c b/programs/cmm/appearance/appearance.c index 76272ce148..0da674e9d6 100644 --- a/programs/cmm/appearance/appearance.c +++ b/programs/cmm/appearance/appearance.c @@ -164,7 +164,6 @@ void main() { int id, key, mouse_clicked; - mem_Init(); SetEventMask(0x27); load_dll(boxlib, #box_lib_init,0); list[SKINS].current = list[WALLPAPERS].current = -1; diff --git a/programs/cmm/browser/WebView.c b/programs/cmm/browser/WebView.c index b4127a3e2f..1fdd0a9648 100644 --- a/programs/cmm/browser/WebView.c +++ b/programs/cmm/browser/WebView.c @@ -122,7 +122,6 @@ void main() int half_scroll_size; int scroll_used=0, show_menu; - mem_Init(); CursorPointer.Load(#CursorFile); load_dll(boxlib, #box_lib_init,0); load_dll(libio, #libio_init,1); diff --git a/programs/cmm/dicty/dicty.c b/programs/cmm/dicty/dicty.c index 170fd2462b..c5fb2a95dd 100644 --- a/programs/cmm/dicty/dicty.c +++ b/programs/cmm/dicty/dicty.c @@ -34,7 +34,7 @@ edit_box edit1= {200,20,16,0xffffff,0x94AECE,0x94AECE,0x94AECE,0,248,#edword,#mo void main() { int id, key; - mem_Init(); + load_dll(boxlib, #box_lib_init,0); dict_folder = abspath(DICT_DIRECROTY); diff --git a/programs/cmm/downloader/Downloader.c b/programs/cmm/downloader/Downloader.c index 94b8658185..a6b4cacd91 100644 --- a/programs/cmm/downloader/Downloader.c +++ b/programs/cmm/downloader/Downloader.c @@ -48,7 +48,6 @@ void main() char filepath[4096]; char notify_message[4296]; - mem_Init(); load_dll(boxlib, #box_lib_init,0); load_dll(libio, #libio_init,1); load_dll(libHTTP, #http_lib_init,1); diff --git a/programs/cmm/end/end.c b/programs/cmm/end/end.c index c4f8115e0b..65bd6ac201 100644 --- a/programs/cmm/end/end.c +++ b/programs/cmm/end/end.c @@ -52,7 +52,6 @@ void main() int key; dword s1,s2, s3, s4, sides_w,i; - mem_Init(); WIN_SIZE_X=GetScreenWidth()+1; WIN_SIZE_Y=GetScreenHeight()+1; PANEL_X=WIN_SIZE_X-PANEL_SIZE_X/2; diff --git a/programs/cmm/eolite/Eolite.c b/programs/cmm/eolite/Eolite.c index 4ee4a7629a..7c9d9d86cd 100644 --- a/programs/cmm/eolite/Eolite.c +++ b/programs/cmm/eolite/Eolite.c @@ -179,7 +179,7 @@ void main() char IPC_BUF[10]; dword tmp; rand_n = random(40); - mem_Init(); + load_dll(boxlib, #box_lib_init,0); load_dll(libini, #lib_init,1); eolite_ini_path = abspath("Eolite.ini"); diff --git a/programs/cmm/example/example.c b/programs/cmm/example/example.c index 647fd2e532..83fb38e7d2 100644 --- a/programs/cmm/example/example.c +++ b/programs/cmm/example/example.c @@ -6,7 +6,7 @@ void main() { int id, key, i; dword file; - mem_Init(); + io.dir.load(0,DIR_ONLYREAL); loop() { diff --git a/programs/cmm/installer/installer.c b/programs/cmm/installer/installer.c index 45dad7eaf0..6145820bb9 100644 --- a/programs/cmm/installer/installer.c +++ b/programs/cmm/installer/installer.c @@ -14,7 +14,7 @@ void main() { - mem_Init(); + SetAddApplDir("kolibrios", abspath("kolibrios")+1); RunProgram("/sys/media/kiv", "\\S__/kolibrios/res/Wallpapers/In the wind there is longing.png"); copyf(abspath("tmp"), "/tmp0/1"); diff --git a/programs/cmm/kolibrin/kolibrin.c b/programs/cmm/kolibrin/kolibrin.c index 36e7d7888f..bd09cc5a3e 100644 --- a/programs/cmm/kolibrin/kolibrin.c +++ b/programs/cmm/kolibrin/kolibrin.c @@ -12,7 +12,6 @@ void main() char install_path[4096]; signed int result; - mem_Init(); pause(200); GetDir(#dirbuf, #fcount, "/", DIRS_ONLYREAL); diff --git a/programs/cmm/lib/kolibri.h b/programs/cmm/lib/kolibri.h index e991cda9f6..f81b95b57f 100644 --- a/programs/cmm/lib/kolibri.h +++ b/programs/cmm/lib/kolibri.h @@ -959,7 +959,14 @@ void ______INIT______() //program_path_length = strlen(I_Path); MOUSE_TIME = 50; //Default 500 ms. __generator = GetStartTime(); - //mem_Init(); + + $push ebx + $mov eax, 68 + $mov ebx, 11 + $int 0x40 + + $pop ebx + main(); } ______STOP______: diff --git a/programs/cmm/liza/liza.c b/programs/cmm/liza/liza.c index f1e053c7bc..fa867093fc 100644 --- a/programs/cmm/liza/liza.c +++ b/programs/cmm/liza/liza.c @@ -100,7 +100,7 @@ char version[]=" WebView 0.1"; #include "parselist.c" void main() { - mem_Init(); + CursorPointer.Load(#CursorFile); load_dll(boxlib, #box_lib_init,0); load_dll(network_lib, #network_lib_init,0); diff --git a/programs/cmm/mouse_cfg/mouse_cfg.c b/programs/cmm/mouse_cfg/mouse_cfg.c index fa7c4add70..32b312e9d5 100644 --- a/programs/cmm/mouse_cfg/mouse_cfg.c +++ b/programs/cmm/mouse_cfg/mouse_cfg.c @@ -56,7 +56,6 @@ struct mouse_cfg1 { void main() { char id, old_button_clicked; - mem_Init(); load_dll(boxlib, #box_lib_init,0); LoadCfg(); diff --git a/programs/cmm/notify/notify.c b/programs/cmm/notify/notify.c index 453670b657..dc130d548d 100644 --- a/programs/cmm/notify/notify.c +++ b/programs/cmm/notify/notify.c @@ -118,7 +118,6 @@ void main() //emulate multithread :) while (GetPixelColor(SCREEN_SIZE_X-1, SCREEN_SIZE_X, WIN_Y)==0x333333) WIN_Y+=WIN_SIZE_Y+17; - mem_Init(); shadow_buf_24 = malloc(WIN_SIZE_X*WIN_SIZE_Y*3); shadow_buf_32 = malloc(WIN_SIZE_X*WIN_SIZE_Y*4+8); lighter_pixel1 = malloc(3); diff --git a/programs/cmm/panels_cfg/panels_cfg.c b/programs/cmm/panels_cfg/panels_cfg.c index 063cb019c8..d8c139a885 100644 --- a/programs/cmm/panels_cfg/panels_cfg.c +++ b/programs/cmm/panels_cfg/panels_cfg.c @@ -92,7 +92,6 @@ void main() { dword id, key; - mem_Init(); load_dll(libini, #lib_init,1); load_dll(boxlib, #box_lib_init,0); diff --git a/programs/cmm/software_widget/software_widget.c b/programs/cmm/software_widget/software_widget.c index de0cced32e..61b1ec963b 100644 --- a/programs/cmm/software_widget/software_widget.c +++ b/programs/cmm/software_widget/software_widget.c @@ -63,7 +63,7 @@ void load_config() void main() { dword id, key; - mem_Init(); + load_dll(libio, #libio_init,1); load_dll(libimg, #libimg_init,1); load_dll(libini, #lib_init,1); diff --git a/programs/cmm/ttf_viewer/ttf_viewer.c b/programs/cmm/ttf_viewer/ttf_viewer.c index 4db8e909b3..c5008cbd73 100644 --- a/programs/cmm/ttf_viewer/ttf_viewer.c +++ b/programs/cmm/ttf_viewer/ttf_viewer.c @@ -38,7 +38,6 @@ void main() { int id, key; - mem_Init(); load_dll(libtruetype, #truetype, 1); load_dll(Proc_lib, #OpenDialog_init,0); OpenDialog_init stdcall (#o_dialog);