From 90e6abd0114efcc6f7adea75869f9aa72ff60b05 Mon Sep 17 00:00:00 2001 From: pavelyakov Date: Tue, 4 Aug 2015 15:48:36 +0000 Subject: [PATCH] Update libs cmm. git-svn-id: svn://kolibrios.org@5676 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/cmm/eolite/Eolite.c | 2 +- programs/cmm/example/example.c | 1 - programs/cmm/lib/clipboard.h | 1 + programs/cmm/lib/copyf.h | 1 + programs/cmm/lib/cursor.h | 1 + programs/cmm/lib/date.h | 1 + programs/cmm/lib/dll.h | 1 + programs/cmm/lib/draw_buf.h | 1 + programs/cmm/lib/encoding.h | 1 + programs/cmm/lib/file_system.h | 1 + programs/cmm/lib/gui.h | 1 + programs/cmm/lib/io.h | 1 + programs/cmm/lib/kolibri.h | 11 +++++++++++ programs/cmm/lib/lexer.h | 1 + programs/cmm/lib/list_box.h | 1 + programs/cmm/lib/math.h | 1 + programs/cmm/lib/mem.h | 1 + programs/cmm/lib/mouse.h | 1 + programs/cmm/lib/obj/box_lib.h | 1 + programs/cmm/lib/obj/http.h | 1 + programs/cmm/lib/obj/iconv.h | 1 + programs/cmm/lib/obj/libimg_lib.h | 1 + programs/cmm/lib/obj/libini.h | 1 + programs/cmm/lib/obj/libio_lib.h | 1 + programs/cmm/lib/random.h | 1 + programs/cmm/lib/socket.h | 1 + programs/cmm/lib/strings.h | 1 + programs/cmm/lib/system.h | 1 + 28 files changed, 37 insertions(+), 2 deletions(-) diff --git a/programs/cmm/eolite/Eolite.c b/programs/cmm/eolite/Eolite.c index d4a089034..1f0b3cb9f 100644 --- a/programs/cmm/eolite/Eolite.c +++ b/programs/cmm/eolite/Eolite.c @@ -6,7 +6,7 @@ #endif //libraries -#define MEMSIZE 0xD0000 +#define MEMSIZE 500000 #include "..\lib\clipboard.h" #include "..\lib\strings.h" #include "..\lib\mem.h" diff --git a/programs/cmm/example/example.c b/programs/cmm/example/example.c index 83fb38e7d..047b7fd24 100644 --- a/programs/cmm/example/example.c +++ b/programs/cmm/example/example.c @@ -6,7 +6,6 @@ void main() { int id, key, i; dword file; - io.dir.load(0,DIR_ONLYREAL); loop() { diff --git a/programs/cmm/lib/clipboard.h b/programs/cmm/lib/clipboard.h index 3cccabab1..5bba53136 100644 --- a/programs/cmm/lib/clipboard.h +++ b/programs/cmm/lib/clipboard.h @@ -1,5 +1,6 @@ #ifndef INCLUDE_CLIPBOARD_H #define INCLUDE_CLIPBOARD_H +#print "[include ]\n" #ifndef INCLUDE_KOLIBRI_H #include "../lib/kolibri.h" diff --git a/programs/cmm/lib/copyf.h b/programs/cmm/lib/copyf.h index 3d62778eb..218f97a5d 100644 --- a/programs/cmm/lib/copyf.h +++ b/programs/cmm/lib/copyf.h @@ -1,6 +1,7 @@ //copyf - copy file or folder with content #ifndef INCLUDE_COPYF_H #define INCLUDE_COPYF_H +#print "[include ]\n" #ifndef INCLUDE_FILESYSTEM_H #include "../lib/file_system.h" diff --git a/programs/cmm/lib/cursor.h b/programs/cmm/lib/cursor.h index 55f114e36..b4026c015 100644 --- a/programs/cmm/lib/cursor.h +++ b/programs/cmm/lib/cursor.h @@ -1,6 +1,7 @@ // cursor file should be 32x32 in default MS Windows .cur format #ifndef INCLUDE_CURSOR_H #define INCLUDE_CURSOR_H +#print "[include ]\n" #ifndef INCLUDE_KOLIBRI_H #include "../lib/kolibri.h" diff --git a/programs/cmm/lib/date.h b/programs/cmm/lib/date.h index 9e35b1499..c0ce9ab1a 100644 --- a/programs/cmm/lib/date.h +++ b/programs/cmm/lib/date.h @@ -1,6 +1,7 @@ //IO library #ifndef INCLUDE_DATE_H #define INCLUDE_DATE_H +#print "[include ]\n" #ifndef INCLUDE_STRING_H #include "../lib/strings.h" diff --git a/programs/cmm/lib/dll.h b/programs/cmm/lib/dll.h index d95fc294d..b4dc975d6 100644 --- a/programs/cmm/lib/dll.h +++ b/programs/cmm/lib/dll.h @@ -1,5 +1,6 @@ #ifndef INCLUDE_DLL_H #define INCLUDE_DLL_H +#print "[include ]\n" #ifndef INCLUDE_FILESYSTEM_H #include "../lib/file_system.h" diff --git a/programs/cmm/lib/draw_buf.h b/programs/cmm/lib/draw_buf.h index bf67e9fa9..6ccbd918f 100644 --- a/programs/cmm/lib/draw_buf.h +++ b/programs/cmm/lib/draw_buf.h @@ -1,5 +1,6 @@ #ifndef INCLUDE_DRAW_BUF_H #define INCLUDE_DRAW_BUF_H +#print "[include ]\n" #ifndef INCLUDE_KOLIBRI_H #include "../lib/kolibri.h" diff --git a/programs/cmm/lib/encoding.h b/programs/cmm/lib/encoding.h index 2eb6752f7..8c101576a 100644 --- a/programs/cmm/lib/encoding.h +++ b/programs/cmm/lib/encoding.h @@ -1,5 +1,6 @@ #ifndef INCLUDE_ENCODING_H #define INCLUDE_ENCODING_H +#print "[include ]\n" #ifndef INCLUDE_KOLIBRI_H #include "../lib/kolibri.h" diff --git a/programs/cmm/lib/file_system.h b/programs/cmm/lib/file_system.h index b48206ecd..1f9911de6 100644 --- a/programs/cmm/lib/file_system.h +++ b/programs/cmm/lib/file_system.h @@ -1,5 +1,6 @@ #ifndef INCLUDE_FILESYSTEM_H #define INCLUDE_FILESYSTEM_H +#print "[include ]\n" #ifndef INCLUDE_DATE_H #include "../lib/date.h" diff --git a/programs/cmm/lib/gui.h b/programs/cmm/lib/gui.h index cf49287af..0b10f14b4 100644 --- a/programs/cmm/lib/gui.h +++ b/programs/cmm/lib/gui.h @@ -1,5 +1,6 @@ #ifndef INCLUDE_GUI_H #define INCLUDE_GUI_H +#print "[include ]\n" #ifndef INCLUDE_KOLIBRI_H #include "../lib/kolibri.h" diff --git a/programs/cmm/lib/io.h b/programs/cmm/lib/io.h index 3bc6f7b05..f9f608580 100644 --- a/programs/cmm/lib/io.h +++ b/programs/cmm/lib/io.h @@ -22,6 +22,7 @@ #ifndef INCLUDE_IO_H #define INCLUDE_IO_H +#print "[include ]\n" #ifndef INCLUDE_DATE_H #include "../lib/date.h" diff --git a/programs/cmm/lib/kolibri.h b/programs/cmm/lib/kolibri.h index 7d01d475b..f88e0178b 100644 --- a/programs/cmm/lib/kolibri.h +++ b/programs/cmm/lib/kolibri.h @@ -1,9 +1,19 @@ //CODED by Veliant, Leency, Nable. GNU GPL licence. #ifndef INCLUDE_KOLIBRI_H #define INCLUDE_KOLIBRI_H +#print "[include ]\n" + +#pragma option OST +#pragma option ON +#pragma option cri- +#pragma option -CPA +#initallvar 0 +#jumptomain FALSE #startaddress 0 + #code32 TRUE + char os_name[8] = {'M','E','N','U','E','T','0','1'}; dword os_version = 0x00000001; dword start_addr = #______INIT______; @@ -21,6 +31,7 @@ char program_path[4096]; #define false 0 //Events + #define evReDraw 1 #define evKey 2 #define evButton 3 diff --git a/programs/cmm/lib/lexer.h b/programs/cmm/lib/lexer.h index 6edc22422..9ca7ecf12 100644 --- a/programs/cmm/lib/lexer.h +++ b/programs/cmm/lib/lexer.h @@ -1,5 +1,6 @@ #ifndef INCLUDE_LEXER_H #define INCLUDE_LEXER_H +#print "[include ]\n" #ifndef INCLUDE_STRING_H #include "../lib/strings.h" diff --git a/programs/cmm/lib/list_box.h b/programs/cmm/lib/list_box.h index 17b8cc227..62d9c1f57 100644 --- a/programs/cmm/lib/list_box.h +++ b/programs/cmm/lib/list_box.h @@ -1,6 +1,7 @@ //list_box #ifndef INCLUDE_LIST_BOX_H #define INCLUDE_LIST_BOX_H +#print "[include ]\n" #ifndef INCLUDE_KOLIBRI_H #include "../lib/kolibri.h" diff --git a/programs/cmm/lib/math.h b/programs/cmm/lib/math.h index 500f8f5c8..c04408f8c 100644 --- a/programs/cmm/lib/math.h +++ b/programs/cmm/lib/math.h @@ -1,6 +1,7 @@ //IO library #ifndef INCLUDE_MATH_H #define INCLUDE_MATH_H +#print "[include ]\n" #ifndef INCLUDE_KOLIBRI_H #include "../lib/kolibri.h" diff --git a/programs/cmm/lib/mem.h b/programs/cmm/lib/mem.h index 19d307a22..520825328 100644 --- a/programs/cmm/lib/mem.h +++ b/programs/cmm/lib/mem.h @@ -1,5 +1,6 @@ #ifndef INCLUDE_MEM_H #define INCLUDE_MEM_H +#print "[include ]\n" #ifndef INCLUDE_KOLIBRI_H #include "../lib/kolibri.h" diff --git a/programs/cmm/lib/mouse.h b/programs/cmm/lib/mouse.h index fe06eefcd..6300892b8 100644 --- a/programs/cmm/lib/mouse.h +++ b/programs/cmm/lib/mouse.h @@ -1,5 +1,6 @@ #ifndef INCLUDE_MOUSE_H #define INCLUDE_MOUSE_H +#print "[include ]\n" //Button MOUSE #define MOUSE_LEFT 001b diff --git a/programs/cmm/lib/obj/box_lib.h b/programs/cmm/lib/obj/box_lib.h index 779254777..a51100946 100644 --- a/programs/cmm/lib/obj/box_lib.h +++ b/programs/cmm/lib/obj/box_lib.h @@ -1,6 +1,7 @@ //BOX_LIB - Asper #ifndef INCLUDE_BOX_LIB_H #define INCLUDE_BOX_LIB_H +#print "[include ]\n" #ifndef INCLUDE_KOLIBRI_H #include "../lib/kolibri.h" diff --git a/programs/cmm/lib/obj/http.h b/programs/cmm/lib/obj/http.h index 6ae57eaea..7bbb6f994 100644 --- a/programs/cmm/lib/obj/http.h +++ b/programs/cmm/lib/obj/http.h @@ -1,6 +1,7 @@ //HTTP library #ifndef INCLUDE_LIBHTTP_H #define INCLUDE_LIBHTTP_H +#print "[include ]\n" #ifndef INCLUDE_KOLIBRI_H #include "../lib/kolibri.h" diff --git a/programs/cmm/lib/obj/iconv.h b/programs/cmm/lib/obj/iconv.h index 7181286b4..602c499b2 100644 --- a/programs/cmm/lib/obj/iconv.h +++ b/programs/cmm/lib/obj/iconv.h @@ -1,6 +1,7 @@ //convert text characters #ifndef INCLUDE_LIBICONV_H #define INCLUDE_LIBICONV_H +#print "[include ]\n" #ifndef INCLUDE_KOLIBRI_H #include "../lib/kolibri.h" diff --git a/programs/cmm/lib/obj/libimg_lib.h b/programs/cmm/lib/obj/libimg_lib.h index f9277ee96..b2b8ffae2 100644 --- a/programs/cmm/lib/obj/libimg_lib.h +++ b/programs/cmm/lib/obj/libimg_lib.h @@ -1,6 +1,7 @@ //Asper #ifndef INCLUDE_LIBIMG_H #define INCLUDE_LIBIMG_H +#print "[include ]\n" #ifndef INCLUDE_KOLIBRI_H #include "../lib/kolibri.h" diff --git a/programs/cmm/lib/obj/libini.h b/programs/cmm/lib/obj/libini.h index 56d574f3d..ad380b701 100644 --- a/programs/cmm/lib/obj/libini.h +++ b/programs/cmm/lib/obj/libini.h @@ -1,5 +1,6 @@ #ifndef INCLUDE_LIBINI_H #define INCLUDE_LIBINI_H +#print "[include ]\n" #ifndef INCLUDE_KOLIBRI_H #include "../lib/kolibri.h" diff --git a/programs/cmm/lib/obj/libio_lib.h b/programs/cmm/lib/obj/libio_lib.h index 4f6e1c99a..4026f0283 100644 --- a/programs/cmm/lib/obj/libio_lib.h +++ b/programs/cmm/lib/obj/libio_lib.h @@ -1,6 +1,7 @@ //Asper #ifndef INCLUDE_LIBIO_H #define INCLUDE_LIBIO_H +#print "[include ]\n" #ifndef INCLUDE_KOLIBRI_H #include "../lib/kolibri.h" diff --git a/programs/cmm/lib/random.h b/programs/cmm/lib/random.h index 232d434cb..48f1399cc 100644 --- a/programs/cmm/lib/random.h +++ b/programs/cmm/lib/random.h @@ -1,5 +1,6 @@ #ifndef INCLUDE_RANDOM_H #define INCLUDE_RANDOM_H +#print "[include ]\n" #ifndef INCLUDE_KOLIBRI_H #include "../lib/kolibri.h" diff --git a/programs/cmm/lib/socket.h b/programs/cmm/lib/socket.h index a80dc0ddd..860eee6d5 100644 --- a/programs/cmm/lib/socket.h +++ b/programs/cmm/lib/socket.h @@ -1,5 +1,6 @@ #ifndef INCLUDE_SOCKET_H #define INCLUDE_SOCKET_H +#print "[include ]\n" #ifndef INCLUDE_KOLIBRI_H #include "../lib/kolibri.h" diff --git a/programs/cmm/lib/strings.h b/programs/cmm/lib/strings.h index 1a0df17a5..61f5066e3 100644 --- a/programs/cmm/lib/strings.h +++ b/programs/cmm/lib/strings.h @@ -1,5 +1,6 @@ #ifndef INCLUDE_STRING_H #define INCLUDE_STRING_H +#print "[include ]\n" #ifndef INCLUDE_MEM_H #include "../lib/mem.h" diff --git a/programs/cmm/lib/system.h b/programs/cmm/lib/system.h index 6af8d6a2b..143f691eb 100644 --- a/programs/cmm/lib/system.h +++ b/programs/cmm/lib/system.h @@ -1,5 +1,6 @@ #ifndef INCLUDE_SYSTEM_H #define INCLUDE_SYSTEM_H +#print "[include ]\n" :struct COLORS {