[drivers/usbother]: more grammar fixes in comments

Added array of endpoints in DRV_CONTEXT and save params for ioctl API.

programs/cmm/browser/WebView.c

@@ -521,7 +521,7 @@ bool GetUrl(dword _http_url)
 		http.get(_http_url);
 		return true;
 	} else if (!strncmp(_http_url,"https://",8)) {
-		strcpy(#new_url_full, "http://176.223.130.192:82/?site=");
+		strcpy(#new_url_full, "http://gate.aspero.pro/?site=");
 		strncat(#new_url_full, _http_url, URL_SIZE);
 		http.get(#new_url_full);
 		return true;

programs/cmm/downloader/dl.c

@@ -168,9 +168,9 @@ void StartDownloading()
 	ResetDownloadSpeed();
 	pb.back_color = 0xFFFfff;
 	if (!strncmp(#uEdit,"https:",6)) {
-		miniprintf(#get_url, "http://176.223.130.192:82/?site=%s", #uEdit);
+		//miniprintf(#get_url, "http://gate.aspero.pro/?site=%s", #uEdit);
-		// notify("'HTTPS for download temporary is not supported,\ntrying to download the file via HTTP' -W");
+		notify("'HTTPS for download temporary is not supported,\ntrying to download the file via HTTP' -W");
-		// miniprintf(#uEdit, "http://%s", #uEdit+8);
+		miniprintf(#uEdit, "http://%s", #uEdit+8);
 	}
 	strcpy(#get_url, #uEdit);
 

programs/cmm/lib/obj/http.h

@@ -112,7 +112,7 @@ struct _http
 dword _http::get(dword _url)
 {
 	cur_url = _url;
-	if (streqrp(cur_url, "http://176.223.130.192:82/?site=")) cur_url += 29;
+	if (streqrp(cur_url, "http://gate.aspero.pro/?site=")) cur_url += 29;
 	http_get stdcall (_url, 0, 0, #accept_language);
 	transfer = EAX;
 	return EAX;

programs/develop/libraries/TinyGL/asm_fork/examples/gears.asm

@@ -23,6 +23,12 @@ macro matr_cell c_funct,c_param,funct,param, dia
 	dia dword[esp-4*(c_param*(c_funct-funct)+(1+c_param-param))]
 }
 
+;Macro for double type parameters (8 bytes)
+macro glpush GLDoubleVar {
+	push dword[GLDoubleVar+4]
+	push dword[GLDoubleVar]
+}
+
 align 4
 start:
 	load_library name_tgl, library_path, system_path, import_tinygl
@@ -895,8 +901,22 @@ endp
 
 
 ;--------------------------------------------------
-include '../import.inc'
+align 4
+import_tinygl:
 
+macro E_LIB n
+{
+	n dd sz_#n
+}
+include '../export.inc'
+	dd 0,0
+macro E_LIB n
+{
+	sz_#n db `n,0
+}
+include '../export.inc'
+
+;--------------------------------------------------
 system_path db '/sys/lib/'
 name_tgl db 'tinygl.obj',0
 ;--------------------------------------------------

programs/develop/libraries/TinyGL/asm_fork/examples/test3.asm

@@ -1,7 +1,3 @@
-; SPDX-License-Identifier: GPL-2.0-only
-; Test 3 - example of drawing triangles
-; Copyright (C) 2014-2025 KolibriOS team
-
 use32
 	org 0
 	db 'MENUET01'
@@ -12,14 +8,13 @@ include '../../../../../macros.inc'
 include '../../../../../KOSfuncs.inc'
 include '../../../../../load_lib.mac'
 include '../../../../../dll.inc'
-include '../kosgl.inc'
 include '../opengl_const.inc'
 
 @use_library
 
 align 4
 start:
-	load_library name_tgl, library_path, system_path, import_tinygl
+	load_library name_tgl, library_path, system_path, import_lib_tinygl
 	cmp eax,SF_TERMINATE_PROCESS
 	jz button.exit
 
@@ -39,11 +34,11 @@ red_win:
 align 16
 still:
 	mcall SF_WAIT_EVENT
-	cmp al,EV_REDRAW
+	cmp al,1
 	jz red_win
-	cmp al,EV_KEY
+	cmp al,2
 	jz key
-	cmp al,EV_BUTTON
+	cmp al,3
 	jz button
 	jmp still
 
@@ -104,7 +99,7 @@ caption db 'Test tinygl library, [Esc] - exit, [<-] and [->] - rotate',0
 
 align 4
 draw_3d:
-stdcall [glClear], GL_COLOR_BUFFER_BIT + GL_DEPTH_BUFFER_BIT ;clear the color and depth buffer
+stdcall [glClear], GL_COLOR_BUFFER_BIT + GL_DEPTH_BUFFER_BIT ;очистим буфер цвета и глубины
 
 call [glPushMatrix]
 	stdcall [glRotatef], [angle_z],0.0,0.0,1.0
@@ -141,15 +136,30 @@ angle_z dd 15.0
 delt_size dd 3.0
 
 ;--------------------------------------------------
-include '../import.inc' ;tinygl
+align 4
+import_lib_tinygl:
 
+macro E_LIB n
+{
+	n dd sz_#n
+}
+include '../export.inc'
+	dd 0,0
+macro E_LIB n
+{
+	sz_#n db `n,0
+}
+include '../export.inc'
+
+;--------------------------------------------------
 system_path db '/sys/lib/'
 name_tgl db 'tinygl.obj',0
 ;--------------------------------------------------
 
 align 16
 i_end:
-ctx1 TinyGLContext
+ctx1 rb 28 ;TinyGLContext or KOSGLContext
+;sizeof.TinyGLContext = 28
 cur_dir_path rb 4096
 library_path rb 4096
 	rb 1024

programs/develop/libraries/TinyGL/asm_fork/examples/test_array1.asm

@@ -1,7 +1,3 @@
-; SPDX-License-Identifier: GPL-2.0-only
-; Test array1 - example of using vertex array functions
-; Copyright (C) 2014-2025 KolibriOS team
-
 use32
 	org 0
 	db 'MENUET01'
@@ -12,7 +8,6 @@ include '../../../../../macros.inc'
 include '../../../../../KOSfuncs.inc'
 include '../../../../../load_lib.mac'
 include '../../../../../dll.inc'
-include '../kosgl.inc'
 include '../opengl_const.inc'
 
 @use_library
@@ -196,15 +191,29 @@ align 4
 Indices rb FACES_COUNT*6 ;3 points per edge, point index 2 bytes
 
 ;--------------------------------------------------
-include '../import.inc' ;tinygl
+align 4
+import_tinygl:
 
+macro E_LIB n
+{
+	n dd sz_#n
+}
+include '../export.inc'
+	dd 0,0
+macro E_LIB n
+{
+	sz_#n db `n,0
+}
+include '../export.inc'
+
+;--------------------------------------------------
 system_path db '/sys/lib/'
 name_tgl db 'tinygl.obj',0
 ;--------------------------------------------------
 
 align 4
 i_end:
-ctx1 TinyGLContext
+	ctx1 rb 28 ;sizeof.TinyGLContext = 28
 cur_dir_path rb 4096
 library_path rb 4096
 	rb 4096

programs/develop/libraries/TinyGL/asm_fork/examples/test_glu1.asm

@@ -490,9 +490,127 @@ white_light dd 0.8, 0.8, 0.8, 1.0 ; Цвет и интенсивность ос
 lmodel_ambient dd 0.2, 0.2, 0.2, 1.0 ; Параметры фонового освещения
 
 ;--------------------------------------------------
-include '../import.inc' ;tinygl
+align 4
-include '../../../buf2d/import.inc'
+import_tinygl:
-include '../../../libs-dev/libimg/import.inc'
+
+macro E_LIB n
+{
+if defined sz_#n
+	n dd sz_#n
+end if
+}
+include '../export.inc'
+	dd 0,0
+macro E_LIB n
+{
+if used n
+	sz_#n db `n,0
+end if
+}
+include '../export.inc'
+
+align 4
+import_buf2d:
+	dd sz_init0
+	buf2d_create dd sz_buf2d_create
+	buf2d_create_f_img dd sz_buf2d_create_f_img
+	buf2d_clear dd sz_buf2d_clear
+	buf2d_draw dd sz_buf2d_draw
+	buf2d_delete dd sz_buf2d_delete
+	buf2d_resize dd sz_buf2d_resize
+	buf2d_line dd sz_buf2d_line
+	buf2d_rect_by_size dd sz_buf2d_rect_by_size
+	buf2d_filled_rect_by_size dd sz_buf2d_filled_rect_by_size
+	buf2d_circle dd sz_buf2d_circle
+	buf2d_img_hdiv2 dd sz_buf2d_img_hdiv2
+	buf2d_img_wdiv2 dd sz_buf2d_img_wdiv2
+	buf2d_conv_24_to_8 dd sz_buf2d_conv_24_to_8
+	buf2d_conv_24_to_32 dd sz_buf2d_conv_24_to_32
+	buf2d_bit_blt dd sz_buf2d_bit_blt
+	buf2d_bit_blt_transp dd sz_buf2d_bit_blt_transp
+	buf2d_bit_blt_alpha dd sz_buf2d_bit_blt_alpha
+	buf2d_curve_bezier dd sz_buf2d_curve_bezier
+	buf2d_convert_text_matrix dd sz_buf2d_convert_text_matrix
+	buf2d_draw_text dd sz_buf2d_draw_text
+	buf2d_crop_color dd sz_buf2d_crop_color
+	buf2d_offset_h dd sz_buf2d_offset_h
+	buf2d_flood_fill dd sz_buf2d_flood_fill
+	buf2d_set_pixel dd sz_buf2d_set_pixel
+	dd 0,0
+	sz_init0 db 'lib_init',0
+	sz_buf2d_create db 'buf2d_create',0
+	sz_buf2d_create_f_img db 'buf2d_create_f_img',0
+	sz_buf2d_clear db 'buf2d_clear',0
+	sz_buf2d_draw db 'buf2d_draw',0
+	sz_buf2d_delete db 'buf2d_delete',0
+	sz_buf2d_resize db 'buf2d_resize',0
+	sz_buf2d_line db 'buf2d_line',0
+	sz_buf2d_rect_by_size db 'buf2d_rect_by_size',0
+	sz_buf2d_filled_rect_by_size db 'buf2d_filled_rect_by_size',0
+	sz_buf2d_circle db 'buf2d_circle',0
+	sz_buf2d_img_hdiv2 db 'buf2d_img_hdiv2',0
+	sz_buf2d_img_wdiv2 db 'buf2d_img_wdiv2',0
+	sz_buf2d_conv_24_to_8 db 'buf2d_conv_24_to_8',0
+	sz_buf2d_conv_24_to_32 db 'buf2d_conv_24_to_32',0
+	sz_buf2d_bit_blt db 'buf2d_bit_blt',0
+	sz_buf2d_bit_blt_transp db 'buf2d_bit_blt_transp',0
+	sz_buf2d_bit_blt_alpha db 'buf2d_bit_blt_alpha',0
+	sz_buf2d_curve_bezier db 'buf2d_curve_bezier',0
+	sz_buf2d_convert_text_matrix db 'buf2d_convert_text_matrix',0
+	sz_buf2d_draw_text db 'buf2d_draw_text',0
+	sz_buf2d_crop_color db 'buf2d_crop_color',0
+	sz_buf2d_offset_h db 'buf2d_offset_h',0
+	sz_buf2d_flood_fill db 'buf2d_flood_fill',0
+	sz_buf2d_set_pixel db 'buf2d_set_pixel',0
+
+align 4
+import_libimg:
+	dd alib_init1
+;	img_is_img  dd aimg_is_img
+;	img_info    dd aimg_info
+;	img_from_file dd aimg_from_file
+;	img_to_file dd aimg_to_file
+;	img_from_rgb dd aimg_from_rgb
+;	img_to_rgb  dd aimg_to_rgb
+	img_to_rgb2 dd aimg_to_rgb2
+	img_decode  dd aimg_decode
+;	img_encode  dd aimg_encode
+;	img_create  dd aimg_create
+	img_destroy dd aimg_destroy
+;	img_destroy_layer dd aimg_destroy_layer
+;	img_count   dd aimg_count
+;	img_lock_bits dd aimg_lock_bits
+;	img_unlock_bits dd aimg_unlock_bits
+;	img_flip    dd aimg_flip
+;	img_flip_layer dd aimg_flip_layer
+;	img_rotate  dd aimg_rotate
+;	img_rotate_layer dd aimg_rotate_layer
+;	img_draw    dd aimg_draw
+;	img_convert dd aimg_convert
+
+	dd 0,0
+	alib_init1   db 'lib_init',0
+;	aimg_is_img  db 'img_is_img',0 ;определяет по данным, может ли библиотека сделать из них изображение
+;	aimg_info    db 'img_info',0
+;	aimg_from_file db 'img_from_file',0
+;	aimg_to_file db 'img_to_file',0
+;	aimg_from_rgb db 'img_from_rgb',0
+;	aimg_to_rgb  db 'img_to_rgb',0 ;преобразование изображения в данные RGB
+	aimg_to_rgb2 db 'img_to_rgb2',0
+	aimg_decode  db 'img_decode',0 ;автоматически определяет формат графических данных
+;	aimg_encode  db 'img_encode',0
+;	aimg_create  db 'img_create',0
+	aimg_destroy db 'img_destroy',0
+;	aimg_destroy_layer db 'img_destroy_layer',0
+;	aimg_count   db 'img_count',0
+;	aimg_lock_bits db 'img_lock_bits',0
+;	aimg_unlock_bits db 'img_unlock_bits',0
+;	aimg_flip    db 'img_flip',0
+;	aimg_flip_layer db 'img_flip_layer',0
+;	aimg_rotate  db 'img_rotate',0
+;	aimg_rotate_layer db 'img_rotate_layer',0
+;	aimg_draw    db 'img_draw',0
+;	aimg_convert db 'img_convert',0
 
 ;--------------------------------------------------
 system_dir_0 db '/sys/lib/'

programs/develop/libraries/TinyGL/asm_fork/examples/test_glu2.asm

@@ -473,9 +473,127 @@ white_light dd 0.8, 0.8, 0.8, 1.0 ; Цвет и интенсивность ос
 lmodel_ambient dd 0.2, 0.2, 0.2, 1.0 ; Параметры фонового освещения
 
 ;--------------------------------------------------
-include '../import.inc' ;tinygl
+align 4
-include '../../../buf2d/import.inc'
+import_tinygl:
-include '../../../libs-dev/libimg/import.inc'
+
+macro E_LIB n
+{
+if defined sz_#n
+	n dd sz_#n
+end if
+}
+include '../export.inc'
+	dd 0,0
+macro E_LIB n
+{
+if used n
+	sz_#n db `n,0
+end if
+}
+include '../export.inc'
+
+align 4
+import_buf2d:
+	dd sz_init0
+	buf2d_create dd sz_buf2d_create
+	buf2d_create_f_img dd sz_buf2d_create_f_img
+	buf2d_clear dd sz_buf2d_clear
+	buf2d_draw dd sz_buf2d_draw
+	buf2d_delete dd sz_buf2d_delete
+	buf2d_resize dd sz_buf2d_resize
+	buf2d_line dd sz_buf2d_line
+	buf2d_rect_by_size dd sz_buf2d_rect_by_size
+	buf2d_filled_rect_by_size dd sz_buf2d_filled_rect_by_size
+	buf2d_circle dd sz_buf2d_circle
+	buf2d_img_hdiv2 dd sz_buf2d_img_hdiv2
+	buf2d_img_wdiv2 dd sz_buf2d_img_wdiv2
+	buf2d_conv_24_to_8 dd sz_buf2d_conv_24_to_8
+	buf2d_conv_24_to_32 dd sz_buf2d_conv_24_to_32
+	buf2d_bit_blt dd sz_buf2d_bit_blt
+	buf2d_bit_blt_transp dd sz_buf2d_bit_blt_transp
+	buf2d_bit_blt_alpha dd sz_buf2d_bit_blt_alpha
+	buf2d_curve_bezier dd sz_buf2d_curve_bezier
+	buf2d_convert_text_matrix dd sz_buf2d_convert_text_matrix
+	buf2d_draw_text dd sz_buf2d_draw_text
+	buf2d_crop_color dd sz_buf2d_crop_color
+	buf2d_offset_h dd sz_buf2d_offset_h
+	buf2d_flood_fill dd sz_buf2d_flood_fill
+	buf2d_set_pixel dd sz_buf2d_set_pixel
+	dd 0,0
+	sz_init0 db 'lib_init',0
+	sz_buf2d_create db 'buf2d_create',0
+	sz_buf2d_create_f_img db 'buf2d_create_f_img',0
+	sz_buf2d_clear db 'buf2d_clear',0
+	sz_buf2d_draw db 'buf2d_draw',0
+	sz_buf2d_delete db 'buf2d_delete',0
+	sz_buf2d_resize db 'buf2d_resize',0
+	sz_buf2d_line db 'buf2d_line',0
+	sz_buf2d_rect_by_size db 'buf2d_rect_by_size',0
+	sz_buf2d_filled_rect_by_size db 'buf2d_filled_rect_by_size',0
+	sz_buf2d_circle db 'buf2d_circle',0
+	sz_buf2d_img_hdiv2 db 'buf2d_img_hdiv2',0
+	sz_buf2d_img_wdiv2 db 'buf2d_img_wdiv2',0
+	sz_buf2d_conv_24_to_8 db 'buf2d_conv_24_to_8',0
+	sz_buf2d_conv_24_to_32 db 'buf2d_conv_24_to_32',0
+	sz_buf2d_bit_blt db 'buf2d_bit_blt',0
+	sz_buf2d_bit_blt_transp db 'buf2d_bit_blt_transp',0
+	sz_buf2d_bit_blt_alpha db 'buf2d_bit_blt_alpha',0
+	sz_buf2d_curve_bezier db 'buf2d_curve_bezier',0
+	sz_buf2d_convert_text_matrix db 'buf2d_convert_text_matrix',0
+	sz_buf2d_draw_text db 'buf2d_draw_text',0
+	sz_buf2d_crop_color db 'buf2d_crop_color',0
+	sz_buf2d_offset_h db 'buf2d_offset_h',0
+	sz_buf2d_flood_fill db 'buf2d_flood_fill',0
+	sz_buf2d_set_pixel db 'buf2d_set_pixel',0
+
+align 4
+import_libimg:
+	dd alib_init1
+;	img_is_img  dd aimg_is_img
+;	img_info    dd aimg_info
+;	img_from_file dd aimg_from_file
+;	img_to_file dd aimg_to_file
+;	img_from_rgb dd aimg_from_rgb
+;	img_to_rgb  dd aimg_to_rgb
+	img_to_rgb2 dd aimg_to_rgb2
+	img_decode  dd aimg_decode
+;	img_encode  dd aimg_encode
+;	img_create  dd aimg_create
+	img_destroy dd aimg_destroy
+;	img_destroy_layer dd aimg_destroy_layer
+;	img_count   dd aimg_count
+;	img_lock_bits dd aimg_lock_bits
+;	img_unlock_bits dd aimg_unlock_bits
+;	img_flip    dd aimg_flip
+;	img_flip_layer dd aimg_flip_layer
+;	img_rotate  dd aimg_rotate
+;	img_rotate_layer dd aimg_rotate_layer
+;	img_draw    dd aimg_draw
+;	img_convert dd aimg_convert
+
+	dd 0,0
+	alib_init1   db 'lib_init',0
+;	aimg_is_img  db 'img_is_img',0 ;определяет по данным, может ли библиотека сделать из них изображение
+;	aimg_info    db 'img_info',0
+;	aimg_from_file db 'img_from_file',0
+;	aimg_to_file db 'img_to_file',0
+;	aimg_from_rgb db 'img_from_rgb',0
+;	aimg_to_rgb  db 'img_to_rgb',0 ;преобразование изображения в данные RGB
+	aimg_to_rgb2 db 'img_to_rgb2',0
+	aimg_decode  db 'img_decode',0 ;автоматически определяет формат графических данных
+;	aimg_encode  db 'img_encode',0
+;	aimg_create  db 'img_create',0
+	aimg_destroy db 'img_destroy',0
+;	aimg_destroy_layer db 'img_destroy_layer',0
+;	aimg_count   db 'img_count',0
+;	aimg_lock_bits db 'img_lock_bits',0
+;	aimg_unlock_bits db 'img_unlock_bits',0
+;	aimg_flip    db 'img_flip',0
+;	aimg_flip_layer db 'img_flip_layer',0
+;	aimg_rotate  db 'img_rotate',0
+;	aimg_rotate_layer db 'img_rotate_layer',0
+;	aimg_draw    db 'img_draw',0
+;	aimg_convert db 'img_convert',0
 
 ;--------------------------------------------------
 system_dir_0 db '/sys/lib/'

programs/develop/libraries/TinyGL/asm_fork/examples/textures0.asm

@@ -433,9 +433,127 @@ white_light dd 0.8, 0.8, 0.8, 1.0 ; Цвет и интенсивность ос
 lmodel_ambient dd 0.2, 0.2, 0.2, 1.0 ; Параметры фонового освещения
 
 ;--------------------------------------------------
-include '../import.inc' ;tinygl
+align 4
-include '../../../buf2d/import.inc'
+import_tinygl:
-include '../../../libs-dev/libimg/import.inc'
+
+macro E_LIB n
+{
+if defined sz_#n
+	n dd sz_#n
+end if
+}
+include '../export.inc'
+	dd 0,0
+macro E_LIB n
+{
+if used n
+	sz_#n db `n,0
+end if
+}
+include '../export.inc'
+
+align 4
+import_buf2d:
+	dd sz_init0
+	buf2d_create dd sz_buf2d_create
+	buf2d_create_f_img dd sz_buf2d_create_f_img
+	buf2d_clear dd sz_buf2d_clear
+	buf2d_draw dd sz_buf2d_draw
+	buf2d_delete dd sz_buf2d_delete
+	buf2d_resize dd sz_buf2d_resize
+	buf2d_line dd sz_buf2d_line
+	buf2d_rect_by_size dd sz_buf2d_rect_by_size
+	buf2d_filled_rect_by_size dd sz_buf2d_filled_rect_by_size
+	buf2d_circle dd sz_buf2d_circle
+	buf2d_img_hdiv2 dd sz_buf2d_img_hdiv2
+	buf2d_img_wdiv2 dd sz_buf2d_img_wdiv2
+	buf2d_conv_24_to_8 dd sz_buf2d_conv_24_to_8
+	buf2d_conv_24_to_32 dd sz_buf2d_conv_24_to_32
+	buf2d_bit_blt dd sz_buf2d_bit_blt
+	buf2d_bit_blt_transp dd sz_buf2d_bit_blt_transp
+	buf2d_bit_blt_alpha dd sz_buf2d_bit_blt_alpha
+	buf2d_curve_bezier dd sz_buf2d_curve_bezier
+	buf2d_convert_text_matrix dd sz_buf2d_convert_text_matrix
+	buf2d_draw_text dd sz_buf2d_draw_text
+	buf2d_crop_color dd sz_buf2d_crop_color
+	buf2d_offset_h dd sz_buf2d_offset_h
+	buf2d_flood_fill dd sz_buf2d_flood_fill
+	buf2d_set_pixel dd sz_buf2d_set_pixel
+	dd 0,0
+	sz_init0 db 'lib_init',0
+	sz_buf2d_create db 'buf2d_create',0
+	sz_buf2d_create_f_img db 'buf2d_create_f_img',0
+	sz_buf2d_clear db 'buf2d_clear',0
+	sz_buf2d_draw db 'buf2d_draw',0
+	sz_buf2d_delete db 'buf2d_delete',0
+	sz_buf2d_resize db 'buf2d_resize',0
+	sz_buf2d_line db 'buf2d_line',0
+	sz_buf2d_rect_by_size db 'buf2d_rect_by_size',0
+	sz_buf2d_filled_rect_by_size db 'buf2d_filled_rect_by_size',0
+	sz_buf2d_circle db 'buf2d_circle',0
+	sz_buf2d_img_hdiv2 db 'buf2d_img_hdiv2',0
+	sz_buf2d_img_wdiv2 db 'buf2d_img_wdiv2',0
+	sz_buf2d_conv_24_to_8 db 'buf2d_conv_24_to_8',0
+	sz_buf2d_conv_24_to_32 db 'buf2d_conv_24_to_32',0
+	sz_buf2d_bit_blt db 'buf2d_bit_blt',0
+	sz_buf2d_bit_blt_transp db 'buf2d_bit_blt_transp',0
+	sz_buf2d_bit_blt_alpha db 'buf2d_bit_blt_alpha',0
+	sz_buf2d_curve_bezier db 'buf2d_curve_bezier',0
+	sz_buf2d_convert_text_matrix db 'buf2d_convert_text_matrix',0
+	sz_buf2d_draw_text db 'buf2d_draw_text',0
+	sz_buf2d_crop_color db 'buf2d_crop_color',0
+	sz_buf2d_offset_h db 'buf2d_offset_h',0
+	sz_buf2d_flood_fill db 'buf2d_flood_fill',0
+	sz_buf2d_set_pixel db 'buf2d_set_pixel',0
+
+align 4
+import_libimg:
+	dd alib_init1
+;	img_is_img  dd aimg_is_img
+;	img_info    dd aimg_info
+;	img_from_file dd aimg_from_file
+;	img_to_file dd aimg_to_file
+;	img_from_rgb dd aimg_from_rgb
+;	img_to_rgb  dd aimg_to_rgb
+	img_to_rgb2 dd aimg_to_rgb2
+	img_decode  dd aimg_decode
+;	img_encode  dd aimg_encode
+;	img_create  dd aimg_create
+	img_destroy dd aimg_destroy
+;	img_destroy_layer dd aimg_destroy_layer
+;	img_count   dd aimg_count
+;	img_lock_bits dd aimg_lock_bits
+;	img_unlock_bits dd aimg_unlock_bits
+;	img_flip    dd aimg_flip
+;	img_flip_layer dd aimg_flip_layer
+;	img_rotate  dd aimg_rotate
+;	img_rotate_layer dd aimg_rotate_layer
+;	img_draw    dd aimg_draw
+;	img_convert dd aimg_convert
+
+	dd 0,0
+	alib_init1   db 'lib_init',0
+;	aimg_is_img  db 'img_is_img',0 ;определяет по данным, может ли библиотека сделать из них изображение
+;	aimg_info    db 'img_info',0
+;	aimg_from_file db 'img_from_file',0
+;	aimg_to_file db 'img_to_file',0
+;	aimg_from_rgb db 'img_from_rgb',0
+;	aimg_to_rgb  db 'img_to_rgb',0 ;преобразование изображения в данные RGB
+	aimg_to_rgb2 db 'img_to_rgb2',0
+	aimg_decode  db 'img_decode',0 ;автоматически определяет формат графических данных
+;	aimg_encode  db 'img_encode',0
+;	aimg_create  db 'img_create',0
+	aimg_destroy db 'img_destroy',0
+;	aimg_destroy_layer db 'img_destroy_layer',0
+;	aimg_count   db 'img_count',0
+;	aimg_lock_bits db 'img_lock_bits',0
+;	aimg_unlock_bits db 'img_unlock_bits',0
+;	aimg_flip    db 'img_flip',0
+;	aimg_flip_layer db 'img_flip_layer',0
+;	aimg_rotate  db 'img_rotate',0
+;	aimg_rotate_layer db 'img_rotate_layer',0
+;	aimg_draw    db 'img_draw',0
+;	aimg_convert db 'img_convert',0
 
 ;--------------------------------------------------
 system_dir_0 db '/sys/lib/'

programs/develop/libraries/TinyGL/asm_fork/examples/textures1.asm

@@ -364,9 +364,127 @@ angle_y dd 0.0
 delt_size dd 3.0
 
 ;--------------------------------------------------
-include '../import.inc' ;tinygl
+align 4
-include '../../../buf2d/import.inc'
+import_tinygl:
-include '../../../libs-dev/libimg/import.inc'
+
+macro E_LIB n
+{
+if defined sz_#n
+	n dd sz_#n
+end if
+}
+include '../export.inc'
+	dd 0,0
+macro E_LIB n
+{
+if used n
+	sz_#n db `n,0
+end if
+}
+include '../export.inc'
+
+align 4
+import_buf2d:
+	dd sz_init0
+	buf2d_create dd sz_buf2d_create
+	buf2d_create_f_img dd sz_buf2d_create_f_img
+	buf2d_clear dd sz_buf2d_clear
+	buf2d_draw dd sz_buf2d_draw
+	buf2d_delete dd sz_buf2d_delete
+	buf2d_resize dd sz_buf2d_resize
+	buf2d_line dd sz_buf2d_line
+	buf2d_rect_by_size dd sz_buf2d_rect_by_size
+	buf2d_filled_rect_by_size dd sz_buf2d_filled_rect_by_size
+	buf2d_circle dd sz_buf2d_circle
+	buf2d_img_hdiv2 dd sz_buf2d_img_hdiv2
+	buf2d_img_wdiv2 dd sz_buf2d_img_wdiv2
+	buf2d_conv_24_to_8 dd sz_buf2d_conv_24_to_8
+	buf2d_conv_24_to_32 dd sz_buf2d_conv_24_to_32
+	buf2d_bit_blt dd sz_buf2d_bit_blt
+	buf2d_bit_blt_transp dd sz_buf2d_bit_blt_transp
+	buf2d_bit_blt_alpha dd sz_buf2d_bit_blt_alpha
+	buf2d_curve_bezier dd sz_buf2d_curve_bezier
+	buf2d_convert_text_matrix dd sz_buf2d_convert_text_matrix
+	buf2d_draw_text dd sz_buf2d_draw_text
+	buf2d_crop_color dd sz_buf2d_crop_color
+	buf2d_offset_h dd sz_buf2d_offset_h
+	buf2d_flood_fill dd sz_buf2d_flood_fill
+	buf2d_set_pixel dd sz_buf2d_set_pixel
+	dd 0,0
+	sz_init0 db 'lib_init',0
+	sz_buf2d_create db 'buf2d_create',0
+	sz_buf2d_create_f_img db 'buf2d_create_f_img',0
+	sz_buf2d_clear db 'buf2d_clear',0
+	sz_buf2d_draw db 'buf2d_draw',0
+	sz_buf2d_delete db 'buf2d_delete',0
+	sz_buf2d_resize db 'buf2d_resize',0
+	sz_buf2d_line db 'buf2d_line',0
+	sz_buf2d_rect_by_size db 'buf2d_rect_by_size',0
+	sz_buf2d_filled_rect_by_size db 'buf2d_filled_rect_by_size',0
+	sz_buf2d_circle db 'buf2d_circle',0
+	sz_buf2d_img_hdiv2 db 'buf2d_img_hdiv2',0
+	sz_buf2d_img_wdiv2 db 'buf2d_img_wdiv2',0
+	sz_buf2d_conv_24_to_8 db 'buf2d_conv_24_to_8',0
+	sz_buf2d_conv_24_to_32 db 'buf2d_conv_24_to_32',0
+	sz_buf2d_bit_blt db 'buf2d_bit_blt',0
+	sz_buf2d_bit_blt_transp db 'buf2d_bit_blt_transp',0
+	sz_buf2d_bit_blt_alpha db 'buf2d_bit_blt_alpha',0
+	sz_buf2d_curve_bezier db 'buf2d_curve_bezier',0
+	sz_buf2d_convert_text_matrix db 'buf2d_convert_text_matrix',0
+	sz_buf2d_draw_text db 'buf2d_draw_text',0
+	sz_buf2d_crop_color db 'buf2d_crop_color',0
+	sz_buf2d_offset_h db 'buf2d_offset_h',0
+	sz_buf2d_flood_fill db 'buf2d_flood_fill',0
+	sz_buf2d_set_pixel db 'buf2d_set_pixel',0
+
+align 4
+import_libimg:
+	dd alib_init1
+;	img_is_img  dd aimg_is_img
+;	img_info    dd aimg_info
+;	img_from_file dd aimg_from_file
+;	img_to_file dd aimg_to_file
+;	img_from_rgb dd aimg_from_rgb
+;	img_to_rgb  dd aimg_to_rgb
+	img_to_rgb2 dd aimg_to_rgb2
+	img_decode  dd aimg_decode
+;	img_encode  dd aimg_encode
+;	img_create  dd aimg_create
+	img_destroy dd aimg_destroy
+;	img_destroy_layer dd aimg_destroy_layer
+;	img_count   dd aimg_count
+;	img_lock_bits dd aimg_lock_bits
+;	img_unlock_bits dd aimg_unlock_bits
+;	img_flip    dd aimg_flip
+;	img_flip_layer dd aimg_flip_layer
+;	img_rotate  dd aimg_rotate
+;	img_rotate_layer dd aimg_rotate_layer
+;	img_draw    dd aimg_draw
+;	img_convert dd aimg_convert
+
+	dd 0,0
+	alib_init1   db 'lib_init',0
+;	aimg_is_img  db 'img_is_img',0 ;определяет по данным, может ли библиотека сделать из них изображение
+;	aimg_info    db 'img_info',0
+;	aimg_from_file db 'img_from_file',0
+;	aimg_to_file db 'img_to_file',0
+;	aimg_from_rgb db 'img_from_rgb',0
+;	aimg_to_rgb  db 'img_to_rgb',0 ;преобразование изображения в данные RGB
+	aimg_to_rgb2 db 'img_to_rgb2',0
+	aimg_decode  db 'img_decode',0 ;автоматически определяет формат графических данных
+;	aimg_encode  db 'img_encode',0
+;	aimg_create  db 'img_create',0
+	aimg_destroy db 'img_destroy',0
+;	aimg_destroy_layer db 'img_destroy_layer',0
+;	aimg_count   db 'img_count',0
+;	aimg_lock_bits db 'img_lock_bits',0
+;	aimg_unlock_bits db 'img_unlock_bits',0
+;	aimg_flip    db 'img_flip',0
+;	aimg_flip_layer db 'img_flip_layer',0
+;	aimg_rotate  db 'img_rotate',0
+;	aimg_rotate_layer db 'img_rotate_layer',0
+;	aimg_draw    db 'img_draw',0
+;	aimg_convert db 'img_convert',0
 
 ;--------------------------------------------------
 system_dir_0 db '/sys/lib/'

programs/develop/libraries/TinyGL/asm_fork/examples/textures2.asm

@@ -315,9 +315,127 @@ angle_y dd 0.0
 delt_size dd 3.0
 
 ;--------------------------------------------------
-include '../import.inc' ;tinygl
+align 4
-include '../../../buf2d/import.inc'
+import_tinygl:
-include '../../../libs-dev/libimg/import.inc'
+
+macro E_LIB n
+{
+if defined sz_#n
+	n dd sz_#n
+end if
+}
+include '../export.inc'
+	dd 0,0
+macro E_LIB n
+{
+if used n
+	sz_#n db `n,0
+end if
+}
+include '../export.inc'
+
+align 4
+import_buf2d:
+	dd sz_init0
+	buf2d_create dd sz_buf2d_create
+	buf2d_create_f_img dd sz_buf2d_create_f_img
+	buf2d_clear dd sz_buf2d_clear
+	buf2d_draw dd sz_buf2d_draw
+	buf2d_delete dd sz_buf2d_delete
+	buf2d_resize dd sz_buf2d_resize
+	buf2d_line dd sz_buf2d_line
+	buf2d_rect_by_size dd sz_buf2d_rect_by_size
+	buf2d_filled_rect_by_size dd sz_buf2d_filled_rect_by_size
+	buf2d_circle dd sz_buf2d_circle
+	buf2d_img_hdiv2 dd sz_buf2d_img_hdiv2
+	buf2d_img_wdiv2 dd sz_buf2d_img_wdiv2
+	buf2d_conv_24_to_8 dd sz_buf2d_conv_24_to_8
+	buf2d_conv_24_to_32 dd sz_buf2d_conv_24_to_32
+	buf2d_bit_blt dd sz_buf2d_bit_blt
+	buf2d_bit_blt_transp dd sz_buf2d_bit_blt_transp
+	buf2d_bit_blt_alpha dd sz_buf2d_bit_blt_alpha
+	buf2d_curve_bezier dd sz_buf2d_curve_bezier
+	buf2d_convert_text_matrix dd sz_buf2d_convert_text_matrix
+	buf2d_draw_text dd sz_buf2d_draw_text
+	buf2d_crop_color dd sz_buf2d_crop_color
+	buf2d_offset_h dd sz_buf2d_offset_h
+	buf2d_flood_fill dd sz_buf2d_flood_fill
+	buf2d_set_pixel dd sz_buf2d_set_pixel
+	dd 0,0
+	sz_init0 db 'lib_init',0
+	sz_buf2d_create db 'buf2d_create',0
+	sz_buf2d_create_f_img db 'buf2d_create_f_img',0
+	sz_buf2d_clear db 'buf2d_clear',0
+	sz_buf2d_draw db 'buf2d_draw',0
+	sz_buf2d_delete db 'buf2d_delete',0
+	sz_buf2d_resize db 'buf2d_resize',0
+	sz_buf2d_line db 'buf2d_line',0
+	sz_buf2d_rect_by_size db 'buf2d_rect_by_size',0
+	sz_buf2d_filled_rect_by_size db 'buf2d_filled_rect_by_size',0
+	sz_buf2d_circle db 'buf2d_circle',0
+	sz_buf2d_img_hdiv2 db 'buf2d_img_hdiv2',0
+	sz_buf2d_img_wdiv2 db 'buf2d_img_wdiv2',0
+	sz_buf2d_conv_24_to_8 db 'buf2d_conv_24_to_8',0
+	sz_buf2d_conv_24_to_32 db 'buf2d_conv_24_to_32',0
+	sz_buf2d_bit_blt db 'buf2d_bit_blt',0
+	sz_buf2d_bit_blt_transp db 'buf2d_bit_blt_transp',0
+	sz_buf2d_bit_blt_alpha db 'buf2d_bit_blt_alpha',0
+	sz_buf2d_curve_bezier db 'buf2d_curve_bezier',0
+	sz_buf2d_convert_text_matrix db 'buf2d_convert_text_matrix',0
+	sz_buf2d_draw_text db 'buf2d_draw_text',0
+	sz_buf2d_crop_color db 'buf2d_crop_color',0
+	sz_buf2d_offset_h db 'buf2d_offset_h',0
+	sz_buf2d_flood_fill db 'buf2d_flood_fill',0
+	sz_buf2d_set_pixel db 'buf2d_set_pixel',0
+
+align 4
+import_libimg:
+	dd alib_init1
+;	img_is_img  dd aimg_is_img
+;	img_info    dd aimg_info
+;	img_from_file dd aimg_from_file
+;	img_to_file dd aimg_to_file
+;	img_from_rgb dd aimg_from_rgb
+;	img_to_rgb  dd aimg_to_rgb
+	img_to_rgb2 dd aimg_to_rgb2
+	img_decode  dd aimg_decode
+;	img_encode  dd aimg_encode
+;	img_create  dd aimg_create
+	img_destroy dd aimg_destroy
+;	img_destroy_layer dd aimg_destroy_layer
+;	img_count   dd aimg_count
+;	img_lock_bits dd aimg_lock_bits
+;	img_unlock_bits dd aimg_unlock_bits
+;	img_flip    dd aimg_flip
+;	img_flip_layer dd aimg_flip_layer
+;	img_rotate  dd aimg_rotate
+;	img_rotate_layer dd aimg_rotate_layer
+;	img_draw    dd aimg_draw
+;	img_convert dd aimg_convert
+
+	dd 0,0
+	alib_init1   db 'lib_init',0
+;	aimg_is_img  db 'img_is_img',0 ;определяет по данным, может ли библиотека сделать из них изображение
+;	aimg_info    db 'img_info',0
+;	aimg_from_file db 'img_from_file',0
+;	aimg_to_file db 'img_to_file',0
+;	aimg_from_rgb db 'img_from_rgb',0
+;	aimg_to_rgb  db 'img_to_rgb',0 ;преобразование изображения в данные RGB
+	aimg_to_rgb2 db 'img_to_rgb2',0
+	aimg_decode  db 'img_decode',0 ;автоматически определяет формат графических данных
+;	aimg_encode  db 'img_encode',0
+;	aimg_create  db 'img_create',0
+	aimg_destroy db 'img_destroy',0
+;	aimg_destroy_layer db 'img_destroy_layer',0
+;	aimg_count   db 'img_count',0
+;	aimg_lock_bits db 'img_lock_bits',0
+;	aimg_unlock_bits db 'img_unlock_bits',0
+;	aimg_flip    db 'img_flip',0
+;	aimg_flip_layer db 'img_flip_layer',0
+;	aimg_rotate  db 'img_rotate',0
+;	aimg_rotate_layer db 'img_rotate_layer',0
+;	aimg_draw    db 'img_draw',0
+;	aimg_convert db 'img_convert',0
 
 ;--------------------------------------------------
 system_dir_0 db '/sys/lib/'

programs/develop/libraries/TinyGL/asm_fork/import.inc

@@ -1,18 +0,0 @@
-align 4
-import_tinygl:
-
-macro E_LIB n
-{
-if defined sz_#n
-	n dd sz_#n
-end if
-}
-include 'export.inc'
-	dd 0,0
-macro E_LIB n
-{
-if used n
-	sz_#n db `n,0
-end if
-}
-include 'export.inc'

programs/develop/libraries/box_lib/asm/trunk/ctrldemo.asm

@@ -49,9 +49,9 @@ include '../../../../../load_lib.mac'
 ;--- Start of program ----------------------------------------------
 ;---------------------------------------------------------------------
 START:
-	mcall	SF_SYS_MISC,SSF_HEAP_INIT
+	mcall	68,11
-	mcall	SF_KEYBOARD,SSF_SET_INPUT_MODE,1
+	mcall	66,1,1
-	mcall	SF_SET_EVENTS_MASK,0x27
+	mcall	40,0x27
 ;---------------------------------------------------------------------	
 
 load_libraries	l_libs_start,end_l_libs
@@ -84,7 +84,7 @@ load_libraries	l_libs_start,end_l_libs
 
 	copy_path	icons_file_name,path,library_path,0
 	
-	mcall	SF_FILE,fileinfo
+	mcall	70,fileinfo
 
 	mov	[fileinfo+0],dword 0
 
@@ -93,14 +93,14 @@ load_libraries	l_libs_start,end_l_libs
 	mov	[img_size],ecx
 	
 
-	mcall	SF_SYS_MISC,SSF_MEM_ALLOC
+	mcall	68,12
 
 
 	mov	[fileinfo+16],eax
 	mov	[image_file],eax
 
 
-	mcall	SF_FILE,fileinfo
+	mcall	70,fileinfo
 	
 	xor	eax,eax
 	mov	[return_code],eax
@@ -108,7 +108,8 @@ load_libraries	l_libs_start,end_l_libs
 	push	image_file
 	call	[cnv_png_import.Start]
 	
-	mcall	SF_SYS_MISC,SSF_MEM_FREE,[image_file]
+	mov	ecx,[image_file]
+	mcall	68,13,
 	
 	cmp	[return_code],dword 0
 	jne	button.exit
@@ -150,28 +151,28 @@ load_libraries	l_libs_start,end_l_libs
 red:
 	call	draw_window
 still:
-	mcall	SF_WAIT_EVENT
+	mcall	10
 
-	cmp	eax,EV_REDRAW
+	cmp	eax,1
 	je	red
-	cmp	eax,EV_KEY
+	cmp	eax,2
 	je	key
-	cmp	eax,EV_BUTTON
+	cmp	eax,3
 	je	button
-	cmp	eax,EV_MOUSE
+	cmp	eax,6
 	je	mouse
 	jmp	still
 ;---------------------------------------------------------------------
 	key:
-	mcall	SF_GET_KEY
+	mcall	2
 	jmp	still
 ;---------------------------------------------------------------------
 	button:
-	mcall	SF_GET_BUTTON
+	mcall	17
 	cmp	ah,1
 	jne	still
 	.exit:
-	mcall	SF_TERMINATE_PROCESS
+	mcall	-1
 ;---------------------------------------------------------------------
 mouse:
 ;-----------------------------------------------
@@ -183,7 +184,7 @@ mouse:
 	jbe	.horizontal
 ; mouse event for Vertical ScrollBar
 	push	dword scroll_bar_data_vertical
-	call	[scrollbar_v_mouse]
+	call	[scrollbar_ver_mouse]
 	mov	eax,scroll_bar_data_vertical.redraw
 	xor	ebx,ebx
 	cmp	[eax],ebx
@@ -199,7 +200,7 @@ mouse:
 	jbe	.other
 ; mouse event for Horizontal ScrollBar
 	push	dword scroll_bar_data_horizontal
-	call	[scrollbar_h_mouse]
+	call	[scrollbar_hor_mouse]
 	mov	eax,scroll_bar_data_horizontal.redraw
 	xor	ebx,ebx
 	cmp	[eax],ebx	
@@ -239,7 +240,7 @@ mouse:
 .mouse_dinamic_button:
 ; mouse event for Dinamic Button 1
 	push	dword dinamic_button_data_1
-	call	[dbutton_mouse]
+	call	[dinamic_button_mouse]
 	mov	eax,dinamic_button_data_1.click
 	cmp	[eax],dword 1
 	jne	@f
@@ -248,7 +249,7 @@ mouse:
 @@:
 ; mouse event for Dinamic Button 2
 	push	dword dinamic_button_data_2
-	call	[dbutton_mouse]
+	call	[dinamic_button_mouse]
 	mov	eax,dinamic_button_data_2.click
 	cmp	[eax],dword 1
 	jne	still	;@f
@@ -282,7 +283,7 @@ analyse_out_menu_2:
 	jmp	still
 ;---------------------------------------------------------------------
 	about:
-	mcall	SF_CREATE_THREAD,1,thread3,thread
+	mcall	51,1,thread3,thread
 	jmp	still
 ;---------------------------------------------------------------------
 OpenDialog_start_0:
@@ -319,9 +320,9 @@ OpenDialog_start:
 ;---------------------------------------------------------------------
 ;---------------------------------------------------------------------
 draw_window:
-	mcall	SF_REDRAW,SSF_BEGIN_DRAW
+	mcall	12,1
-	mcall	SF_CREATE_WINDOW,<0,400>,<0,400>,0x03AABBCC,0x805080D0,0x005080D0
+	mcall	0,<0,400>,<0,400>,0x03AABBCC,0x805080D0,0x005080D0
-	mcall	SF_SET_CAPTION,1,header_1
+	mcall	71,1,header_1
 ;---------------------------------------------
 ; draw for Menu 1
 	push	dword menu_data_1
@@ -332,15 +333,15 @@ draw_window:
 ;---------------------------------------------
 ; draw for Dinamic Button	1
 	push	dword dinamic_button_data_1
-	call	[dbutton_draw]
+	call	[dinamic_button_draw]
 ; draw for Dinamic Button 2
 	push	dword dinamic_button_data_2
-	call	[dbutton_draw]
+	call	[dinamic_button_draw]
 ;---------------------------------------------
-	mcall	SF_DRAW_RECT,<170,200>,<25,15>,0xffffb0
+	mcall	13,<170,200>,<25,15>,0xffffb0
 ;	mov	bx,28
 ;	add	ebx,2 shl 16
-;	mcall	SF_DRAW_TEXT,,0xC0000000,text_work_area,,0xffffb0
+;	mcall	4,,0xC0000000,text_work_area,,0xffffb0
 ; draw for PathShow
 	push	dword PathShow_data_1
 	call	[PathShow_draw]	
@@ -356,21 +357,21 @@ draw_window:
 	
 ; draw for Vertical ScrollBar
 	push	dword scroll_bar_data_vertical
-	call	[scrollbar_v_draw]
+	call	[scrollbar_ver_draw]
 ; draw for Horizontal ScrollBar
 	push	dword scroll_bar_data_horizontal
-	call	[scrollbar_h_draw]
+	call	[scrollbar_hor_draw]
 ; reset all_redraw flag	
 	xor	eax,eax
 	mov	[scroll_bar_data_vertical.all_redraw],eax
 	mov	[scroll_bar_data_horizontal.all_redraw],eax
 ;---------------------------------------------
 	call	draw_cube
-	mcall	SF_REDRAW,SSF_END_DRAW
+	mcall	12,2
 	ret
 ;---------------------------------------------------------------------
 draw_cube:
-	mcall	SF_DRAW_RECT,<30,301>,<50,301>,0xafafaf
+	mcall	13,<30,301>,<50,301>,0xafafaf
 	mov	ecx,[scroll_bar_data_vertical.position]
 	add	ecx,50
 	shl	ecx,16
@@ -379,7 +380,7 @@ draw_cube:
 	add	ebx,30
 	shl	ebx,16
 	mov	bx,30
-	mcall	SF_DRAW_RECT,,,0x0
+	mcall	13,,,0x0
 	ret
 ;---------------------------------------------------------------------
 include 'data.inc'

programs/develop/libraries/box_lib/asm/trunk/data.inc

@@ -30,7 +30,7 @@ system_dir_ProcLib	db '/sys/lib/proc_lib.obj',0
 align	4
 l_libs_start:
 library01	l_libs system_dir_Boxlib+9, file_name, system_dir_Boxlib,\
- import_box_lib, plugins_directory
+ Box_lib_import, plugins_directory
 
 library02	l_libs system_dir_CnvPNG+9, file_name, system_dir_CnvPNG,\
  cnv_png_import, plugins_directory
@@ -126,7 +126,91 @@ deflate_unpack	dd 0
 ;---------------------------------------------------------------------
 
 ;---------------------------------------------------------------------
-include '../../import.inc' ;import_box_lib
+align	4
+Box_lib_import:	
+;init_lib		dd a_init
+;version_lib		dd a_version
+
+
+;edit_box_draw		dd aEdit_box_draw
+;edit_box_key		dd aEdit_box_key
+;edit_box_mouse		dd aEdit_box_mouse
+;version_ed		dd aVersion_ed
+
+;check_box_draw		dd aCheck_box_draw
+;check_box_mouse	dd aCheck_box_mouse
+;version_ch		dd aVersion_ch
+
+;option_box_draw	dd aOption_box_draw
+;option_box_mouse	dd aOption_box_mouse
+;version_op		dd aVersion_op
+
+scrollbar_ver_draw	dd aScrollbar_ver_draw
+scrollbar_ver_mouse	dd aScrollbar_ver_mouse
+scrollbar_hor_draw	dd aScrollbar_hor_draw
+scrollbar_hor_mouse	dd aScrollbar_hor_mouse
+;version_scrollbar	dd aVersion_scrollbar
+
+dinamic_button_draw	dd aDbutton_draw
+dinamic_button_mouse	dd aDbutton_mouse
+;version_dbutton	dd aVersion_dbutton
+
+menu_bar_draw		dd aMenu_bar_draw
+menu_bar_mouse		dd aMenu_bar_mouse
+menu_bar_activate	dd aMenu_bar_activate
+;version_menu_bar	dd aVersion_menu_bar
+
+;FileBrowser_draw	dd aFileBrowser_draw
+;FileBrowser_mouse	dd aFileBrowser_mouse
+;FileBrowser_key	dd aFileBrowser_key
+;Version_FileBrowser	dd aVersion_FileBrowser
+
+PathShow_prepare	dd sz_PathShow_prepare
+PathShow_draw		dd sz_PathShow_draw
+;Version_path_show	dd szVersion_path_show
+			dd 0,0
+
+;a_init			db 'lib_init',0
+;a_version		db 'version',0
+
+;aEdit_box_draw		db 'edit_box_draw',0
+;aEdit_box_key		db 'edit_box_key',0
+;aEdit_box_mouse	db 'edit_box_mouse',0
+;aVersion_ed		db 'version_ed',0
+
+;aCheck_box_draw	db 'check_box_draw',0
+;aCheck_box_mouse	db 'check_box_mouse',0
+;aVersion_ch		db 'version_ch',0
+
+;aOption_box_draw	db 'option_box_draw',0
+;aOption_box_mouse	db 'option_box_mouse',0
+;aVersion_op		db 'version_op',0
+
+aScrollbar_ver_draw	db 'scrollbar_v_draw',0
+aScrollbar_ver_mouse	db 'scrollbar_v_mouse',0
+aScrollbar_hor_draw	db 'scrollbar_h_draw',0
+aScrollbar_hor_mouse	db 'scrollbar_h_mouse',0
+;aVersion_scrollbar	db 'version_scrollbar',0
+
+aDbutton_draw		db 'dbutton_draw',0
+aDbutton_mouse		db 'dbutton_mouse',0
+;aVersion_dbutton	db 'version_dbutton',0
+
+aMenu_bar_draw		db 'menu_bar_draw',0
+aMenu_bar_mouse		db 'menu_bar_mouse',0
+aMenu_bar_activate	db 'menu_bar_activate',0
+;aVersion_menu_bar	db 'version_menu_bar',0
+
+;aFileBrowser_draw	db 'FileBrowser_draw',0
+;aFileBrowser_mouse	db 'FileBrowser_mouse',0
+;aFileBrowser_key	db 'FileBrowser_key',0
+;aVersion_FileBrowser	db 'version_FileBrowser',0
+
+sz_PathShow_prepare	db 'PathShow_prepare',0
+sz_PathShow_draw	db 'PathShow_draw',0
+;szVersion_path_show	db 'version_PathShow',0
+
+;---------------------------------------------------------------------
 
 ;---------------------------------------------------------------------	
 align	4

programs/develop/libraries/box_lib/asm/trunk/editbox_ex.asm

@@ -18,7 +18,7 @@ include '../../../../../load_lib.mac'
     @use_library         ;use load lib macros
 start:
 ;universal load library/librarys
-sys_load_library  library_name, library_path, system_path, import_box_lib
+sys_load_library  library_name, library_path, system_path, myimport
 ;if return code =-1 then exit, else nornary work
     cmp      eax,-1
     jz       exit
@@ -116,7 +116,37 @@ library_name    db 'box_lib.obj',0
 ;library_name     db 'box_lib.obj',0
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-include '../../import.inc' ;creating a function import table
+myimport:
+
+edit_box_draw    dd    aEdit_box_draw
+edit_box_key     dd    aEdit_box_key
+edit_box_mouse   dd    aEdit_box_mouse
+version_ed       dd    aVersion_ed
+
+init_checkbox    dd    aInit_checkbox
+check_box_draw   dd    aCheck_box_draw
+check_box_mouse  dd    aCheck_box_mouse
+version_ch       dd    aVersion_ch
+
+option_box_draw  dd    aOption_box_draw
+option_box_mouse dd    aOption_box_mouse
+version_op       dd    aVersion_op
+
+    dd    0,0
+
+aEdit_box_draw   db 'edit_box_draw',0
+aEdit_box_key    db 'edit_box_key',0
+aEdit_box_mouse  db 'edit_box_mouse',0
+aVersion_ed      db 'version_ed',0
+
+aInit_checkbox   db 'init_checkbox2',0
+aCheck_box_draw  db 'check_box_draw2',0
+aCheck_box_mouse db 'check_box_mouse2',0
+aVersion_ch      db 'version_ch2',0
+
+aOption_box_draw  db 'option_box_draw',0
+aOption_box_mouse db 'option_box_mouse',0
+aVersion_op       db 'version_op',0
 
 
 check1 check_box2 (10 shl 16 + 12),(45 shl 16 + 12),5,0x80AABBCC,0,0,check_text1,ch_flag_en

programs/develop/libraries/box_lib/asm/trunk/tooltip_demo.asm

@@ -34,14 +34,14 @@ START:
 ;---------------------------------------------------------------------
 ;--- <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ----------------------------------------
 ;---------------------------------------------------------------------
-mcall	SF_SYS_MISC, SSF_HEAP_INIT
+mcall	68, 11
 
-mcall SF_SET_EVENTS_MASK, $C0000027 ; <20><>᪠ ᮡ<>⨩ - <20><><EFBFBD><EFBFBD> ⮫쪮 <20> <20><>⨢<EFBFBD><E2A8A2><EFBFBD> <20><><EFBFBD><EFBFBD>
+mcall 40, $C0000027 ; <20><>᪠ ᮡ<>⨩ - <20><><EFBFBD><EFBFBD> ⮫쪮 <20> <20><>⨢<EFBFBD><E2A8A2><EFBFBD> <20><><EFBFBD><EFBFBD>
 
-sys_load_library  lib_name, lib_path, sys_path, import_box_lib
+sys_load_library  lib_name, lib_path, sys_path, myimport
 test eax,eax
 jz	@f
-	mcall SF_TERMINATE_PROCESS
+	mcall -1 ; alarm exit
 @@:
 
 
@@ -56,16 +56,16 @@ call draw_window ;
 ;---------------------------------------------------------------------
 
 still:
-mcall SF_WAIT_EVENT_TIMEOUT, 5 ; <20><><EFBFBD><EFBFBD><EFBFBD> ᮡ<><E1AEA1><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD> 祬 0.05<EFBFBD>
+mcall 23, 5 ; <20>㭪<EFBFBD><E3ADAA><EFBFBD> 23 - <20><><EFBFBD><EFBFBD><EFBFBD> ᮡ<><E1AEA1><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD> 祬 0.05<EFBFBD>
 test eax, eax ; <20><><EFBFBD> ᮡ<>⨩ - <20>஢<EFBFBD><E0AEA2><EFBFBD><EFBFBD><EFBFBD> <20><>ᮢ<EFBFBD><E1AEA2><EFBFBD><EFBFBD> <20><><EFBFBD>⨯<EFBFBD><E2A8AF> <20><> ⠩<><E2A0A9><EFBFBD><EFBFBD>
 je yield
-cmp eax,EV_REDRAW
+cmp eax,1 ; <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ᮢ<EFBFBD><E1AEA2><EFBFBD> <20><><EFBFBD><EFBFBD> ?
 je red ; <20>᫨ <20><> - <20><> <20><><EFBFBD><EFBFBD><EFBFBD> red
-cmp eax,EV_KEY
+cmp eax,2 ; <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ?
 je key ; <20>᫨ <20><> - <20><> key
-cmp eax,EV_BUTTON
+cmp eax,3 ; <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ?
 je button ; <20>᫨ <20><> - <20><> button
-cmp eax,EV_MOUSE
+cmp eax,6 ; ᮡ<>⨥ <20><><EFBFBD><EFBFBD>
 je mouse ; <20>᫨ <20><> - <20><> mouse
 
 jmp still ; <20>᫨ <20><>㣮<EFBFBD> ᮡ<>⨥ - <20> <20><>砫<EFBFBD> 横<><E6A8AA>
@@ -81,21 +81,21 @@ invoke tooltip_mouse, redbox_tt
 jmp still ; <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><>砫<EFBFBD> 横<><E6A8AA>
 
 key: ; <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-mcall SF_GET_KEY ; <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> ᨬ<><E1A8AC><EFBFBD><EFBFBD> (<28> ah)
+mcall 2 ; <20>㭪<EFBFBD><E3ADAA><EFBFBD> 2 - <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> ᨬ<><E1A8AC><EFBFBD><EFBFBD> (<28> ah)
 
 jmp still ; <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><>砫<EFBFBD> 横<><E6A8AA>
 
 ;---------------------------------------------------------------------
 
 button:
-mcall SF_GET_BUTTON ; <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>䨪<EFBFBD><E4A8AA><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>⮩ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+mcall 17 ; 17 - <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>䨪<EFBFBD><E4A8AA><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>⮩ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 
 cmp ah, 1 ; <20>᫨ <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD>஬ 1,
 jne still ; <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 
 pexit:
 invoke tooltip_delete, redbox_tt	; <20>᢮<EFBFBD><E1A2AE><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-mcall SF_TERMINATE_PROCESS
+mcall -1 ; <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20>ணࠬ<E0AEA3><E0A0AC>
 
 
 ;---------------------------------------------------------------------
@@ -104,20 +104,20 @@ mcall SF_TERMINATE_PROCESS
 
 draw_window:
 
-mcall SF_REDRAW, SSF_BEGIN_DRAW
+mcall 12, 1 ; <20>㭪<EFBFBD><E3ADAA><EFBFBD> 12: ᮮ<><E1AEAE><EFBFBD><EFBFBD><EFBFBD> <20><> <20> <20><>砫<EFBFBD> <20><><EFBFBD><EFBFBD>ᮢ<EFBFBD><E1AEA2>
 
-mcall SF_STYLE_SETTINGS, SSF_GET_COLORS, sc, sizeof.system_colors
+mcall 48, 3, sc,sizeof.system_colors
 
 mov edx, [sc.work] ; 梥<> 䮭<>
 or edx, 0x33000000 ; <20> ⨯ <20><><EFBFBD><EFBFBD> 3
-mcall SF_CREATE_WINDOW, <200,300>, <200,150>, , ,title
+mcall 0, <200,300>, <200,150>, , ,title
 
 ; <20>뢮<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>⨪<EFBFBD><E2A8AA>
-mcall SF_DRAW_RECT, <60,50>, <50,50>, $FF0000
+mcall 13, <60,50>, <50,50>, $FF0000
-mcall SF_DRAW_RECT, <140,50>, <50,50>, $FF
+mcall 13, <140,50>, <50,50>, $FF
 
 
-mcall SF_REDRAW, SSF_END_DRAW
+mcall 12, 2 ; <20>㭪<EFBFBD><E3ADAA><EFBFBD> 12.2, <20><><EFBFBD><EFBFBD><EFBFBD>稫<EFBFBD> <20><>ᮢ<EFBFBD><E1AEA2><EFBFBD>
 
 ret ; <20><>室<EFBFBD><E5AEA4> <20><> <20><><EFBFBD>楤<EFBFBD><E6A5A4><EFBFBD>
 
@@ -135,7 +135,22 @@ lib_name    db 'box_lib.obj',0
 cur_dir_path    rb 4096
 lib_path    rb 4096
 
-include '../../import.inc' ;import_box_lib
+myimport:
+				dd sz_lib_init ;<3B>㭪<EFBFBD><E3ADAA><EFBFBD> <20><><EFBFBD><EFBFBD>᪠<EFBFBD><E1AAA0><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>ᮬ 1 ࠧ <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>祭<EFBFBD><E7A5AD> 
+;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>⥪<EFBFBD>, <20><>⮬<EFBFBD> <20> <20>ணࠬ<E0AEA3><E0A0AC> <20><>⪠ <20><> <20><><EFBFBD> <20><> <20>㦭<EFBFBD>
+tooltip_init  	dd sz_tooltip_init
+tooltip_delete	dd sz_tooltip_delete
+tooltip_test_show	dd sz_tooltip_test_show
+tooltip_mouse	dd sz_tooltip_mouse
+get_font_size	dd sz_get_font_size
+    dd    0,0
+
+sz_lib_init 			db 'lib_init',0
+sz_tooltip_init			db 'tooltip_init', 0
+sz_tooltip_delete		db 'tooltip_delete', 0
+sz_tooltip_test_show	db 'tooltip_test_show', 0
+sz_tooltip_mouse		db 'tooltip_mouse', 0
+sz_get_font_size		db 'get_font_size', 0
 
 
 ;tooltip txt, next, zone_x, zone_w, zone_y, zone_h, col_txt, col_bkg, tm_wait

programs/develop/libraries/box_lib/export.inc

@@ -1,117 +0,0 @@
-;
-; Export functions
-;
-
-E_LIB lib_init
-E_LIB version
-
-E_LIB edit_box_draw
-E_LIB edit_box_key
-E_LIB edit_box_key_safe
-E_LIB edit_box_mouse
-E_LIB edit_box_set_text
-E_LIB version_ed
-
-E_LIB init_checkbox,   init_checkbox2
-E_LIB check_box_draw,  check_box_draw2
-E_LIB check_box_mouse, check_box_mouse2
-E_LIB version_ch,      version_ch2
-
-E_LIB option_box_draw
-E_LIB option_box_mouse
-E_LIB version_op
-
-E_LIB scrollbar_v_draw
-E_LIB scrollbar_v_mouse
-E_LIB scrollbar_h_draw
-E_LIB scrollbar_h_mouse
-E_LIB version_scrollbar
-
-E_LIB dbutton_draw
-E_LIB dbutton_mouse
-E_LIB version_dbutton
-
-E_LIB menu_bar_draw
-E_LIB menu_bar_mouse
-E_LIB menu_bar_activate
-E_LIB version_menu_bar
-
-E_LIB FileBrowser_draw
-E_LIB FileBrowser_mouse
-E_LIB FileBrowser_key
-E_LIB version_FileBrowser
-
-E_LIB tl_data_init
-E_LIB tl_data_clear
-E_LIB tl_info_clear
-E_LIB tl_key
-E_LIB tl_mouse
-E_LIB tl_draw
-E_LIB tl_info_undo
-E_LIB tl_info_redo
-E_LIB tl_node_add
-E_LIB tl_node_set_data
-E_LIB tl_node_get_data
-E_LIB tl_node_delete
-E_LIB tl_cur_beg
-E_LIB tl_cur_next
-E_LIB tl_cur_perv
-E_LIB tl_node_close_open
-E_LIB tl_node_lev_inc
-E_LIB tl_node_lev_dec
-E_LIB tl_node_move_up
-E_LIB tl_node_move_down
-E_LIB tl_node_poi_get_info
-E_LIB tl_node_poi_get_next_info
-E_LIB tl_node_poi_get_data
-E_LIB tl_save_mem
-E_LIB tl_load_mem
-E_LIB tl_get_mem_size
-E_LIB version_tree_list
-
-E_LIB PathShow_prepare
-E_LIB PathShow_draw
-E_LIB version_PathShow
-
-E_LIB ted_but_sumb_upper
-E_LIB ted_but_sumb_lover
-E_LIB ted_but_convert_by_table
-E_LIB ted_can_save
-E_LIB ted_clear
-E_LIB ted_delete
-E_LIB ted_draw
-E_LIB ted_init
-E_LIB ted_init_scroll_bars
-E_LIB ted_init_syntax_file
-E_LIB ted_is_select
-E_LIB ted_key
-E_LIB ted_mouse
-E_LIB ted_open_file
-E_LIB ted_save_file
-E_LIB ted_text_add
-E_LIB ted_but_select_word
-E_LIB ted_but_cut
-E_LIB ted_but_copy
-E_LIB ted_but_paste
-E_LIB ted_but_undo
-E_LIB ted_but_redo
-E_LIB ted_but_reverse
-E_LIB ted_but_find
-E_LIB ted_but_replace
-E_LIB ted_text_colored
-E_LIB ted_go_to_position
-E_LIB version_text_edit
-
-E_LIB frame_draw
-E_LIB version_frame
-
-E_LIB progressbar_draw
-E_LIB progressbar_progress
-
-E_LIB tooltip_init
-E_LIB tooltip_delete
-E_LIB tooltip_test_show
-E_LIB tooltip_mouse
-E_LIB get_font_size
-
-purge E_LIB

programs/develop/libraries/box_lib/import.inc

@@ -1,24 +0,0 @@
-align 4
-import_box_lib:
-
-macro E_LIB n, lfn
-{
-if n eq lib_init
-	dd strz_#n
-else if defined sz_#n
-	n dd sz_#n
-end if
-}
-include 'export.inc'
-	dd 0,0
-macro E_LIB n, lfn
-{
-if used n
-if lfn eq
-	sz_#n db `n,0
-else
-	sz_#n db `lfn,0
-end if
-end if
-}
-include 'export.inc'

programs/develop/libraries/buf2d/export.inc

@@ -1,48 +0,0 @@
-;
-; Export functions
-;
-
-E_LIB lib_init
-E_LIB buf2d_create
-E_LIB buf2d_create_f_img
-E_LIB buf2d_clear
-E_LIB buf2d_draw
-E_LIB buf2d_delete
-E_LIB buf2d_resize
-E_LIB buf2d_rotate
-E_LIB buf2d_line
-E_LIB buf2d_line_sm
-E_LIB buf2d_rect_by_size
-E_LIB buf2d_filled_rect_by_size
-E_LIB buf2d_circle
-E_LIB buf2d_img_hdiv2
-E_LIB buf2d_img_wdiv2
-E_LIB buf2d_conv_24_to_8
-E_LIB buf2d_conv_24_to_32
-E_LIB buf2d_bit_blt
-E_LIB buf2d_bit_blt_transp
-E_LIB buf2d_bit_blt_alpha
-E_LIB buf2d_curve_bezier
-E_LIB buf2d_convert_text_matrix
-E_LIB buf2d_draw_text
-E_LIB buf2d_crop_color
-E_LIB buf2d_offset_h
-E_LIB buf2d_flood_fill
-E_LIB buf2d_set_pixel
-E_LIB buf2d_get_pixel
-E_LIB buf2d_flip_h
-E_LIB buf2d_flip_v
-E_LIB buf2d_filter_dither
-
-E_LIB buf2d_vox_brush_create
-E_LIB buf2d_vox_brush_delete
-E_LIB buf2d_vox_obj_get_img_w_3g
-E_LIB buf2d_vox_obj_get_img_h_3g
-E_LIB buf2d_vox_obj_draw_1g
-E_LIB buf2d_vox_obj_draw_3g
-E_LIB buf2d_vox_obj_draw_3g_scaled
-E_LIB buf2d_vox_obj_draw_pl
-E_LIB buf2d_vox_obj_draw_pl_scaled
-E_LIB buf2d_vox_obj_draw_3g_shadows
-
-purge E_LIB

programs/develop/libraries/buf2d/import.inc

@@ -1,20 +0,0 @@
-align 4
-import_buf2d:
-
-macro E_LIB n
-{
-if n eq lib_init
-	dd strz_#n
-else if defined sz_#n
-	n dd sz_#n
-end if
-}
-include 'export.inc'
-	dd 0,0
-macro E_LIB n
-{
-if used n
-	sz_#n db `n,0
-end if
-}
-include 'export.inc'

programs/develop/libraries/crypt_des/example/crypt_files.asm

@@ -11,7 +11,7 @@ include '../../../../develop/libraries/box_lib/trunk/box_lib.mac'
 include '../../../../dll.inc'
 
 @use_library mem.Alloc,mem.Free,mem.ReAlloc,dll.Load
-caption db '<27><><EFBFBD>஢<EFBFBD><E0AEA2><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>⬮<EFBFBD> DES 21.05.25',0 ;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
+caption db '<27><><EFBFBD>஢<EFBFBD><E0AEA2><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>⬮<EFBFBD> DES 05.03.13',0 ;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
 
 struct FileInfoBlock
 	Function dd ?
@@ -112,13 +112,13 @@ align 4
 still:
 	mcall SF_WAIT_EVENT
 
-	cmp al,EV_REDRAW
+	cmp al,1
 	jz red_win
-	cmp al,EV_KEY
+	cmp al,2
 	jz key
-	cmp al,EV_BUTTON
+	cmp al,3
 	jz button
-	cmp al,EV_MOUSE
+	cmp al,6 ;<3B><><EFBFBD><EFBFBD>
 	jne @f
 		jmp mouse
 	@@:
@@ -410,7 +410,52 @@ l_libs_start:
 	lib_4 l_libs lib_name_4, library_path, system_dir_4, import_box_lib
 l_libs_end:
 
-include '../../libs-dev/libimg/import.inc'
+align 4
+import_libimg:
+	dd alib_init1
+	img_is_img  dd aimg_is_img
+	img_info    dd aimg_info
+	img_from_file dd aimg_from_file
+	img_to_file dd aimg_to_file
+	img_from_rgb dd aimg_from_rgb
+	img_to_rgb  dd aimg_to_rgb
+	img_to_rgb2 dd aimg_to_rgb2
+	img_decode  dd aimg_decode
+	img_encode  dd aimg_encode
+	img_create  dd aimg_create
+	img_destroy dd aimg_destroy
+	img_destroy_layer dd aimg_destroy_layer
+	img_count   dd aimg_count
+	img_lock_bits dd aimg_lock_bits
+	img_unlock_bits dd aimg_unlock_bits
+	img_flip    dd aimg_flip
+	img_flip_layer dd aimg_flip_layer
+	img_rotate  dd aimg_rotate
+	img_rotate_layer dd aimg_rotate_layer
+	img_draw    dd aimg_draw
+
+	dd 0,0
+	alib_init1   db 'lib_init',0
+	aimg_is_img  db 'img_is_img',0 ;<3B><>।<EFBFBD><E0A5A4><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>⥪<EFBFBD> ᤥ<><E1A4A5><EFBFBD><EFBFBD> <20><> <20><><EFBFBD> <20><><EFBFBD><EFBFBD>ࠦ<EFBFBD><E0A0A6><EFBFBD><EFBFBD>
+	aimg_info    db 'img_info',0
+	aimg_from_file db 'img_from_file',0
+	aimg_to_file db 'img_to_file',0
+	aimg_from_rgb db 'img_from_rgb',0
+	aimg_to_rgb  db 'img_to_rgb',0 ;<3B>८<EFBFBD>ࠧ<EFBFBD><E0A0A7><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>ࠦ<EFBFBD><E0A0A6><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> RGB
+	aimg_to_rgb2 db 'img_to_rgb2',0
+	aimg_decode  db 'img_decode',0 ;<3B><>⮬<EFBFBD><E2AEAC><EFBFBD><EFBFBD><EFBFBD>᪨ <20><>।<EFBFBD><E0A5A4><EFBFBD><EFBFBD><EFBFBD> <20><>ଠ<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>᪨<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+	aimg_encode  db 'img_encode',0
+	aimg_create  db 'img_create',0
+	aimg_destroy db 'img_destroy',0
+	aimg_destroy_layer db 'img_destroy_layer',0
+	aimg_count   db 'img_count',0
+	aimg_lock_bits db 'img_lock_bits',0
+	aimg_unlock_bits db 'img_unlock_bits',0
+	aimg_flip    db 'img_flip',0
+	aimg_flip_layer db 'img_flip_layer',0
+	aimg_rotate  db 'img_rotate',0
+	aimg_rotate_layer db 'img_rotate_layer',0
+	aimg_draw    db 'img_draw',0
 
 align 4
 import_proclib: ;<3B><><EFBFBD>ᠭ<EFBFBD><E1A0AD> <20><>ᯮ<EFBFBD><E1AFAE><EFBFBD><EFBFBD>㥬<EFBFBD><E3A5AC> <20>㭪権
@@ -420,7 +465,57 @@ dd 0,0
 	aOpenDialog_Init db 'OpenDialog_init',0
 	aOpenDialog_Start db 'OpenDialog_start',0
 
-include '../../buf2d/import.inc'
+align 4
+import_buf2d:
+	init dd sz_init
+	buf2d_create dd sz_buf2d_create
+	buf2d_create_f_img dd sz_buf2d_create_f_img
+	buf2d_clear dd sz_buf2d_clear
+	buf2d_draw dd sz_buf2d_draw
+	buf2d_delete dd sz_buf2d_delete
+	;buf2d_line dd sz_buf2d_line
+	;buf2d_rect_by_size dd sz_buf2d_rect_by_size
+	;buf2d_filled_rect_by_size dd sz_buf2d_filled_rect_by_size
+	;buf2d_circle dd sz_buf2d_circle
+	;buf2d_img_hdiv2 dd sz_buf2d_img_hdiv2
+	;buf2d_img_wdiv2 dd sz_buf2d_img_wdiv2
+	buf2d_conv_24_to_8 dd sz_buf2d_conv_24_to_8
+	;buf2d_conv_24_to_32 dd sz_buf2d_conv_24_to_32
+	;buf2d_bit_blt dd sz_buf2d_bit_blt
+	;buf2d_bit_blt_transp dd sz_buf2d_bit_blt_transp
+	;buf2d_bit_blt_alpha dd sz_buf2d_bit_blt_alpha
+	;buf2d_curve_bezier dd sz_buf2d_curve_bezier
+	buf2d_convert_text_matrix dd sz_buf2d_convert_text_matrix
+	buf2d_draw_text dd sz_buf2d_draw_text
+	;buf2d_crop_color dd sz_buf2d_crop_color
+	;buf2d_offset_h dd sz_buf2d_offset_h
+	;buf2d_flood_fill dd sz_buf2d_flood_fill
+	;buf2d_set_pixel dd sz_buf2d_set_pixel
+	dd 0,0
+	sz_init db 'lib_init',0
+	sz_buf2d_create db 'buf2d_create',0
+	sz_buf2d_create_f_img db 'buf2d_create_f_img',0
+	sz_buf2d_clear db 'buf2d_clear',0
+	sz_buf2d_draw db 'buf2d_draw',0
+	sz_buf2d_delete db 'buf2d_delete',0
+	;sz_buf2d_line db 'buf2d_line',0
+	;sz_buf2d_rect_by_size db 'buf2d_rect_by_size',0
+	;sz_buf2d_filled_rect_by_size db 'buf2d_filled_rect_by_size',0
+	;sz_buf2d_circle db 'buf2d_circle',0
+	;sz_buf2d_img_hdiv2 db 'buf2d_img_hdiv2',0
+	;sz_buf2d_img_wdiv2 db 'buf2d_img_wdiv2',0
+	sz_buf2d_conv_24_to_8 db 'buf2d_conv_24_to_8',0
+	;sz_buf2d_conv_24_to_32 db 'buf2d_conv_24_to_32',0
+	;sz_buf2d_bit_blt db 'buf2d_bit_blt',0
+	;sz_buf2d_bit_blt_transp db 'buf2d_bit_blt_transp',0
+	;sz_buf2d_bit_blt_alpha db 'buf2d_bit_blt_alpha',0
+	;sz_buf2d_curve_bezier db 'buf2d_curve_bezier',0
+	sz_buf2d_convert_text_matrix db 'buf2d_convert_text_matrix',0
+	sz_buf2d_draw_text db 'buf2d_draw_text',0
+	;sz_buf2d_crop_color db 'buf2d_crop_color',0
+	;sz_buf2d_offset_h db 'buf2d_offset_h',0
+	;sz_buf2d_flood_fill db 'buf2d_flood_fill',0
+	;sz_buf2d_set_pixel db 'buf2d_set_pixel',0
 
 align 4
 import_des: ;<3B><><EFBFBD>ᠭ<EFBFBD><E1A0AD> <20><>ᯮ<EFBFBD><E1AFAE><EFBFBD><EFBFBD>㥬<EFBFBD><E3A5AC> <20>㭪権
@@ -430,7 +525,22 @@ dd 0,0
 	sz_des_encryption db 'des_encryption',0
 	sz_des_decryption db 'des_decryption',0
 
-include '../../box_lib/import.inc'
+align 4
+import_box_lib:
+	;dd sz_init1
+	edit_box_draw dd sz_edit_box_draw
+	edit_box_key dd sz_edit_box_key
+	edit_box_mouse dd sz_edit_box_mouse
+	;edit_box_set_text dd sz_edit_box_set_text
+
+	dd 0,0
+	;sz_init1 db 'lib_init',0
+	sz_edit_box_draw db 'edit_box_draw',0
+	sz_edit_box_key db 'edit_box_key',0
+	sz_edit_box_mouse db 'edit_box_mouse',0
+	;sz_edit_box_set_text db 'edit_box_set_text',0
+
+mouse_dd dd 0x0
 
 align 4
 buf_0: dd 0 ;㪠<><E3AAA0>⥫<EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>ࠦ<EFBFBD><E0A0A6><EFBFBD><EFBFBD>
@@ -454,13 +564,12 @@ buf_1:
 edit1 edit_box 58, 140,8, 0xffffff, 0xff, 0x80ff, 0, 0x8000, 8, txt_key, mouse_dd, ed_focus+ed_always_focus,8,8
 
 txt_openfile db '<27><><EFBFBD>ன<EFBFBD><E0AEA9> 䠩<> <20><><EFBFBD> <20><><EFBFBD>஢<EFBFBD><E0AEA2><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>஢<EFBFBD><E0AEA2><EFBFBD><EFBFBD>.',0
+txt_buf rb 80
 txt_key db 'des_0123',0
+mem_key rb 120
 
 align 16
 i_end:
-	txt_buf rb 80
-	mem_key rb 120
-	mouse_dd rd 1
 	procinfo process_information
 	sc system_colors 
 	rb 2048

programs/develop/libraries/http/http.asm

@@ -100,10 +100,6 @@ lib_init: ;//////////////////////////////////////////////////////////////////;;
         mov     [mem.alloc], eax
         mov     [mem.free], ebx
         mov     [mem.realloc], ecx
-
-        cmp     [dll.load], edx
-        je      .ok
-
         mov     [dll.load], edx
 
         invoke  dll.load, @IMPORT
@@ -119,7 +115,6 @@ lib_init: ;//////////////////////////////////////////////////////////////////;;
         invoke  ini.get_str, inifile, sec_proxy, key_password, proxyPassword, 256, proxyPassword
         popa
 
-  .ok:
         DEBUGF  1, "HTTP library: init OK\n"
         xor     eax, eax
         ret

programs/develop/libraries/libs-dev/libimg/export.inc

@@ -1,34 +0,0 @@
-;
-; Export functions
-;
-
-E_LIB lib_init
-E_LIB version
-E_LIB img_is_img
-E_LIB img_info
-E_LIB img_from_file
-E_LIB img_to_file
-E_LIB img_from_rgb
-E_LIB img_to_rgb
-E_LIB img_to_rgb2
-E_LIB img_decode
-E_LIB img_encode ;supported formats: PNG 24 32, BMP 24 32, PNM 1 8g 24
-E_LIB img_create
-E_LIB img_destroy
-E_LIB img_destroy_layer
-E_LIB img_count
-E_LIB img_lock_bits
-E_LIB img_unlock_bits
-E_LIB img_flip
-E_LIB img_flip_layer
-E_LIB img_rotate
-E_LIB img_rotate_layer
-E_LIB img_draw
-E_LIB img_scale
-E_LIB img_get_scaled_size
-E_LIB img_convert
-E_LIB img_blend
-E_LIB img_resize_data
-E_LIB img_formats_table
-
-purge E_LIB

programs/develop/libraries/libs-dev/libimg/import.inc

@@ -1,20 +0,0 @@
-align 4
-import_libimg:
-
-macro E_LIB n
-{
-if n eq lib_init
-	dd strz_#n
-else if defined sz_#n
-	n dd sz_#n
-end if
-}
-include 'export.inc'
-	dd 0,0
-macro E_LIB n
-{
-if used n
-	sz_#n db `n,0
-end if
-}
-include 'export.inc'

programs/develop/libraries/libs-dev/libimg/libimg.asm

@@ -78,10 +78,6 @@ proc lib_init ;///////////////////////////////////////////////////////////////;;
         mov     [mem.alloc], eax
         mov     [mem.free], ebx
         mov     [mem.realloc], ecx
-
-        cmp     [dll.load], edx
-        je      .ok
-
         mov     [dll.load], edx
 
         or      edx, edx

programs/develop/libraries/libs-dev/libini/libini_p.asm

@@ -37,10 +37,6 @@ proc libini._.init ;////////////////////////////////////////////////////////////
 	mov	[mem.alloc], eax
 	mov	[mem.free], ebx
 	mov	[mem.realloc], ecx
-
-        cmp     [dll.load], edx
-        je      .ok
-
 	mov	[dll.load], edx
 
 	invoke	dll.load, @IMPORT

programs/develop/libraries/proc_lib/trunk/proc_lib.asm

@@ -33,8 +33,7 @@ use_ColorDialog
 ;--------------------------------------------------
 align 16
 lib_init:
-        xor     eax, eax
+ret
-        ret
 
 ;--------------------------------------------------
 align 16

programs/load_lib.mac

@@ -23,9 +23,6 @@ library_fun_memory_free equ mem_free
 library_fun_memory_realloc equ mem_realloc
 library_fun_dll_load equ dll_load
 
-align 4
-strz_lib_init db 'lib_init',0
-
 align 4
 arrea_xx dd 0
 file_name db '/sys/@notify',0
@@ -217,7 +214,7 @@ end if
 		jmp		i_error
 align 4
 	i_begin:
-		import_some_library myimport
+		import_boxlib myimport
 		test	eax,eax
 		jz		i_exit
 	i_error:
@@ -237,13 +234,13 @@ macro load_library library_name__, library_path__, system_path__, myimport, poin
 local i_begin
 local i_error
 local i_exit
+	push ebx
 if point_dir_name__ eq
 		copy_path   library_name__, [32], library_path__,0
 else
 		;the macros making way /current path a program/ + name system library
 		copy_path   library_name__, [32], library_path__,point_dir_name__
 end if
-	push ebx
 		mcall	SF_SYS_MISC,SSF_LOAD_DLL,library_path__ ; load of alternative
 		test	eax,eax
 		jnz		i_begin
@@ -254,7 +251,7 @@ end if
 		jmp		i_error
 align 4
 	i_begin:
-		import_some_library myimport
+		import_boxlib myimport
 		test	eax,eax
 		jz		i_exit
 	i_error:
@@ -312,7 +309,7 @@ align 4
 align 4
 	end_steep:
 		mov		adr_load_lib,eax        ;save adr lib in memory
-		import_some_library my_import
+		import_boxlib my_import
 		test	eax,eax
 		jz		cycle0n
 		or		status_lib,2          ; status of code - enable error - import error
@@ -390,7 +387,7 @@ align 4
 align 4
 	end_steep:
 		mov		adr_load_lib,eax        ;save adr lib in memory
-		import_some_library my_import
+		import_boxlib my_import
 		test	eax,eax
 		jz		cycle0n
 		or		status_lib,2          ; status of code - enable error - import error
@@ -454,7 +451,7 @@ pop ebx eax
 ;output:
 ; eax - <20>᫨ 㤠筮 <20><> 0 <20><><EFBFBD> 㪠<><E3AAA0>⥫<EFBFBD> <20><> <20><><EFBFBD> <20>㭪樨 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> 㤠<><E3A4A0><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>㧨<EFBFBD><E3A7A8>
 ; ebx - ࠧ<><E0A0A7>蠥<EFBFBD><E8A0A5><EFBFBD>
-macro import_some_library myimport
+macro import_boxlib myimport
 {
 local import_loop
 local import_find

programs/media/img_transform/img_transform.asm

@@ -1,7 +1,3 @@
-; SPDX-License-Identifier: GPL-2.0-only
-; ImgTransform - utility for creating textures from images
-; Copyright (C) 2020-2025 KolibriOS team
-
 use32
 	org 0
 	db 'MENUET01'
@@ -13,23 +9,23 @@ include '../../proc32.inc'
 include '../../KOSfuncs.inc'
 include '../../load_img.inc'
 include '../../load_lib.mac'
-include '../../develop/libraries/TinyGL/asm_fork/kosgl.inc'
 include '../../develop/libraries/TinyGL/asm_fork/opengl_const.inc'
 include '../../develop/libraries/TinyGL/asm_fork/zbuffer.inc'
 include '../../develop/libraries/libs-dev/libimg/libimg.inc'
 include '../../develop/info3ds/info_fun_float.inc'
 
 @use_library mem.Alloc,mem.Free,mem.ReAlloc,dll.Load
-caption db 'Image transform 21.05.25',0
+caption db 'Image transform 08.12.20',0 ;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
 
 BUF_STRUCT_SIZE equ 21
-buf2d_data equ dword[edi] ;image buffer data
+buf2d_data equ dword[edi] ;<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>ࠦ<EFBFBD><E0A0A6><EFBFBD><EFBFBD>
-buf2d_w equ dword[edi+8] ;buffer width
+buf2d_w equ dword[edi+8] ;<EFBFBD><EFBFBD>ਭ<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-buf2d_h equ dword[edi+12] ;buffer height
+buf2d_h equ dword[edi+12] ;<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-buf2d_l equ word[edi+4] ;left space
+buf2d_l equ word[edi+4]
-buf2d_t equ word[edi+6] ;top space
+buf2d_t equ word[edi+6] ;<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ᢥ<><E1A2A5><EFBFBD>
-buf2d_color equ dword[edi+16] ;buffer background color
+buf2d_size_lt equ dword[edi+4] ;<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ᫥<><E1ABA5> <20> <20><>ࠢ<EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-buf2d_bits equ byte[edi+20] ;number of bits in 1 image pixel
+buf2d_color equ dword[edi+16] ;梥<EFBFBD> 䮭<> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+buf2d_bits equ byte[edi+20] ;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>⢮ <20><><EFBFBD> <20> 1-<2D> <20><>窥 <20><><EFBFBD><EFBFBD>ࠦ<EFBFBD><E0A0A6><EFBFBD><EFBFBD>
 
 NAV_WND_L equ 145
 NAV_WND_T equ 1
@@ -92,13 +88,13 @@ still:
 	cmp eax,0
 	je timer_funct
 
-	cmp al,EV_REDRAW
+	cmp al,1
 	jz red_win
-	cmp al,EV_KEY
+	cmp al,2
 	jz key
-	cmp al,EV_BUTTON
+	cmp al,3
 	jz button
-	cmp al,EV_MOUSE
+	cmp al,6
 	jne @f
 		mcall SF_THREAD_INFO,procinfo,-1
 		cmp ax,word[procinfo.window_stack_position]
@@ -1432,9 +1428,56 @@ l_libs_start:
 	lib_0 l_libs lib_name_0, file_name, system_dir_0, import_proclib
 	lib_1 l_libs lib_name_1, file_name, system_dir_1, import_libimg
 	lib_2 l_libs lib_name_2, library_path, system_dir_2, import_buf2d
-	lib_3 l_libs lib_name_3, library_path, system_dir_3, import_tinygl
+	lib_3 l_libs lib_name_3, library_path, system_dir_3, import_lib_tinygl
 l_libs_end:
 
+align 4
+import_libimg:
+	dd alib_init1
+	img_is_img  dd aimg_is_img
+	img_info    dd aimg_info
+	img_from_file dd aimg_from_file
+	img_to_file dd aimg_to_file
+	img_from_rgb dd aimg_from_rgb
+	img_to_rgb  dd aimg_to_rgb
+	img_to_rgb2 dd aimg_to_rgb2
+	img_decode  dd aimg_decode
+	img_encode  dd aimg_encode
+	img_create  dd aimg_create
+	img_destroy dd aimg_destroy
+	img_destroy_layer dd aimg_destroy_layer
+	img_count   dd aimg_count
+	img_lock_bits dd aimg_lock_bits
+	img_unlock_bits dd aimg_unlock_bits
+	img_flip    dd aimg_flip
+	img_flip_layer dd aimg_flip_layer
+	img_rotate  dd aimg_rotate
+	img_rotate_layer dd aimg_rotate_layer
+	img_draw    dd aimg_draw
+
+	dd 0,0
+	alib_init1   db 'lib_init',0
+	aimg_is_img  db 'img_is_img',0 ;<3B><>।<EFBFBD><E0A5A4><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>⥪<EFBFBD> ᤥ<><E1A4A5><EFBFBD><EFBFBD> <20><> <20><><EFBFBD> <20><><EFBFBD><EFBFBD>ࠦ<EFBFBD><E0A0A6><EFBFBD><EFBFBD>
+	aimg_info    db 'img_info',0
+	aimg_from_file db 'img_from_file',0
+	aimg_to_file db 'img_to_file',0
+	aimg_from_rgb db 'img_from_rgb',0
+	aimg_to_rgb  db 'img_to_rgb',0 ;<3B>८<EFBFBD>ࠧ<EFBFBD><E0A0A7><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>ࠦ<EFBFBD><E0A0A6><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> RGB
+	aimg_to_rgb2 db 'img_to_rgb2',0
+	aimg_decode  db 'img_decode',0 ;<3B><>⮬<EFBFBD><E2AEAC><EFBFBD><EFBFBD><EFBFBD>᪨ <20><>।<EFBFBD><E0A5A4><EFBFBD><EFBFBD><EFBFBD> <20><>ଠ<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>᪨<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+	aimg_encode  db 'img_encode',0
+	aimg_create  db 'img_create',0
+	aimg_destroy db 'img_destroy',0
+	aimg_destroy_layer db 'img_destroy_layer',0
+	aimg_count   db 'img_count',0
+	aimg_lock_bits db 'img_lock_bits',0
+	aimg_unlock_bits db 'img_unlock_bits',0
+	aimg_flip    db 'img_flip',0
+	aimg_flip_layer db 'img_flip_layer',0
+	aimg_rotate  db 'img_rotate',0
+	aimg_rotate_layer db 'img_rotate_layer',0
+	aimg_draw    db 'img_draw',0
+
 align 4
 import_proclib:
 	OpenDialog_Init dd aOpenDialog_Init
@@ -1447,9 +1490,76 @@ dd 0,0
 	aOpenDialog_Set_file_name db 'OpenDialog_set_file_name',0
 	aOpenDialog_Set_file_ext db 'OpenDialog_set_file_ext',0
 
-include '../../develop/libraries/libs-dev/libimg/import.inc'
+align 4
-include '../../develop/libraries/buf2d/import.inc'
+import_buf2d:
-include '../../develop/libraries/TinyGL/asm_fork/import.inc'
+	init dd sz_init
+	buf2d_create dd sz_buf2d_create
+	buf2d_create_f_img dd sz_buf2d_create_f_img
+	buf2d_clear dd sz_buf2d_clear
+	buf2d_draw dd sz_buf2d_draw
+	buf2d_delete dd sz_buf2d_delete
+	buf2d_resize dd sz_buf2d_resize
+	buf2d_line dd sz_buf2d_line
+	buf2d_rect_by_size dd sz_buf2d_rect_by_size
+	buf2d_filled_rect_by_size dd sz_buf2d_filled_rect_by_size
+	buf2d_circle dd sz_buf2d_circle
+	buf2d_img_hdiv2 dd sz_buf2d_img_hdiv2
+	buf2d_img_wdiv2 dd sz_buf2d_img_wdiv2
+	buf2d_conv_24_to_8 dd sz_buf2d_conv_24_to_8
+	buf2d_conv_24_to_32 dd sz_buf2d_conv_24_to_32
+	buf2d_bit_blt dd sz_buf2d_bit_blt
+	buf2d_bit_blt_transp dd sz_buf2d_bit_blt_transp
+	buf2d_bit_blt_alpha dd sz_buf2d_bit_blt_alpha
+	buf2d_curve_bezier dd sz_buf2d_curve_bezier
+	buf2d_convert_text_matrix dd sz_buf2d_convert_text_matrix
+	buf2d_draw_text dd sz_buf2d_draw_text
+	buf2d_crop_color dd sz_buf2d_crop_color
+	buf2d_offset_h dd sz_buf2d_offset_h
+	buf2d_flood_fill dd sz_buf2d_flood_fill
+	buf2d_set_pixel dd sz_buf2d_set_pixel
+	buf2d_get_pixel dd sz_buf2d_get_pixel
+	dd 0,0
+	sz_init db 'lib_init',0
+	sz_buf2d_create db 'buf2d_create',0
+	sz_buf2d_create_f_img db 'buf2d_create_f_img',0
+	sz_buf2d_clear db 'buf2d_clear',0
+	sz_buf2d_draw db 'buf2d_draw',0
+	sz_buf2d_delete db 'buf2d_delete',0
+	sz_buf2d_resize db 'buf2d_resize',0
+	sz_buf2d_line db 'buf2d_line',0
+	sz_buf2d_rect_by_size db 'buf2d_rect_by_size',0
+	sz_buf2d_filled_rect_by_size db 'buf2d_filled_rect_by_size',0
+	sz_buf2d_circle db 'buf2d_circle',0
+	sz_buf2d_img_hdiv2 db 'buf2d_img_hdiv2',0
+	sz_buf2d_img_wdiv2 db 'buf2d_img_wdiv2',0
+	sz_buf2d_conv_24_to_8 db 'buf2d_conv_24_to_8',0
+	sz_buf2d_conv_24_to_32 db 'buf2d_conv_24_to_32',0
+	sz_buf2d_bit_blt db 'buf2d_bit_blt',0
+	sz_buf2d_bit_blt_transp db 'buf2d_bit_blt_transp',0
+	sz_buf2d_bit_blt_alpha db 'buf2d_bit_blt_alpha',0
+	sz_buf2d_curve_bezier db 'buf2d_curve_bezier',0
+	sz_buf2d_convert_text_matrix db 'buf2d_convert_text_matrix',0
+	sz_buf2d_draw_text db 'buf2d_draw_text',0
+	sz_buf2d_crop_color db 'buf2d_crop_color',0
+	sz_buf2d_offset_h db 'buf2d_offset_h',0
+	sz_buf2d_flood_fill db 'buf2d_flood_fill',0
+	sz_buf2d_set_pixel db 'buf2d_set_pixel',0
+	sz_buf2d_get_pixel db 'buf2d_get_pixel',0
+
+align 4
+import_lib_tinygl:
+
+macro E_LIB n
+{
+	n dd sz_#n
+}
+include '../../../programs/develop/libraries/TinyGL/asm_fork/export.inc'
+	dd 0,0
+macro E_LIB n
+{
+	sz_#n db `n,0
+}
+include '../../../programs/develop/libraries/TinyGL/asm_fork/export.inc'
 
 align 4
 buf_0: dd 0

programs/media/scrshoot/srectwin.inc

@@ -259,10 +259,99 @@ aOpenDialog_Init	db 'OpenDialog_init',0
 aOpenDialog_Start	db 'OpenDialog_start',0
 ;aOpenDialog_Version	db 'Version_OpenDialog',0
 ;---------------------------------------------------------------------
+align 4
+Box_lib_import:
+;init_lib		dd a_init
+;version_lib		dd a_version
 
-Box_lib_import equ import_box_lib
+edit_box_draw		dd aEdit_box_draw
-include '../../develop/libraries/box_lib/import.inc'
+edit_box_key		dd aEdit_box_key
-include '../../develop/libraries/libs-dev/libimg/import.inc'
+edit_box_mouse		dd aEdit_box_mouse
+edit_box_set_text	dd aEdit_box_set_text
+;version_ed		dd aVersion_ed
+
+init_checkbox		dd aInit_checkbox
+check_box_draw		dd aCheck_box_draw
+check_box_mouse 	dd aCheck_box_mouse
+;version_ch	dd	aVersion_ch
+
+option_box_draw	dd aOption_box_draw
+option_box_mouse	dd aOption_box_mouse
+;version_op		dd aVersion_op
+
+PathShow_prepare	dd sz_PathShow_prepare
+PathShow_draw		dd sz_PathShow_draw
+;Version_path_show	dd szVersion_path_show
+			dd 0,0
+
+;a_init			db 'lib_init',0
+;a_version		db 'version',0
+
+aEdit_box_draw		db 'edit_box_draw',0
+aEdit_box_key		db 'edit_box_key',0
+aEdit_box_mouse		db 'edit_box_mouse',0
+aEdit_box_set_text	db 'edit_box_set_text',0
+;aVersion_ed		db 'version_ed',0
+
+
+aInit_checkbox	 db 'init_checkbox2',0
+aCheck_box_draw  db 'check_box_draw2',0
+aCheck_box_mouse db 'check_box_mouse2',0
+;aVersion_ch	 db 'version_ch2',0
+
+aOption_box_draw	db 'option_box_draw',0
+aOption_box_mouse	db 'option_box_mouse',0
+;aVersion_op		db 'version_op',0
+
+sz_PathShow_prepare	db 'PathShow_prepare',0
+sz_PathShow_draw	db 'PathShow_draw',0
+;szVersion_path_show	db 'version_PathShow',0
+;---------------------------------------------------------------------
+align 4
+import_libimg:
+	dd alib_init1
+	img_is_img  dd aimg_is_img
+	img_info    dd aimg_info
+	img_from_file dd aimg_from_file
+	img_to_file dd aimg_to_file
+	img_from_rgb dd aimg_from_rgb
+	img_to_rgb  dd aimg_to_rgb
+	img_to_rgb2 dd aimg_to_rgb2
+	img_decode  dd aimg_decode
+	img_encode  dd aimg_encode
+	img_create  dd aimg_create
+	img_destroy dd aimg_destroy
+	img_destroy_layer dd aimg_destroy_layer
+	img_count   dd aimg_count
+	img_lock_bits dd aimg_lock_bits
+	img_unlock_bits dd aimg_unlock_bits
+	img_flip    dd aimg_flip
+	img_flip_layer dd aimg_flip_layer
+	img_rotate  dd aimg_rotate
+	img_rotate_layer dd aimg_rotate_layer
+	img_draw    dd aimg_draw
+dd 0,0
+	alib_init1   db 'lib_init',0
+	aimg_is_img  db 'img_is_img',0
+	aimg_info    db 'img_info',0
+	aimg_from_file db 'img_from_file',0
+	aimg_to_file db 'img_to_file',0
+	aimg_from_rgb db 'img_from_rgb',0
+	aimg_to_rgb  db 'img_to_rgb',0
+	aimg_to_rgb2 db 'img_to_rgb2',0
+	aimg_decode  db 'img_decode',0
+	aimg_encode  db 'img_encode',0
+	aimg_create  db 'img_create',0
+	aimg_destroy db 'img_destroy',0
+	aimg_destroy_layer db 'img_destroy_layer',0
+	aimg_count   db 'img_count',0
+	aimg_lock_bits db 'img_lock_bits',0
+	aimg_unlock_bits db 'img_unlock_bits',0
+	aimg_flip    db 'img_flip',0
+	aimg_flip_layer db 'img_flip_layer',0
+	aimg_rotate  db 'img_rotate',0
+	aimg_rotate_layer db 'img_rotate_layer',0
+	aimg_draw    db 'img_draw',0
 ;---------------------------------------------------------------------
 ;width,left,top,color,shift_color,focus_border_color,\
 ;       blur_border_color,text_color,max,text,mouse_variable,flags,size,pos

programs/other/cnc_control/cnc_control.asm

@@ -140,13 +140,13 @@ still:
 		jmp still
 	@@:
 
-	cmp al,EV_REDRAW
+	cmp al,1
 	jz red_win
-	cmp al,EV_KEY
+	cmp al,2
 	jz key
-	cmp al,EV_BUTTON
+	cmp al,3
 	jz button
-	cmp al,EV_MOUSE
+	cmp al,6
 	jne @f
 		mcall SF_THREAD_INFO,procinfo,-1
 		cmp ax,word[procinfo.window_stack_position]
@@ -757,6 +757,52 @@ l_libs_start:
 	lib_4 l_libs lib_name_4, file_name, system_dir_4, import_libkmenu
 l_libs_end:
 
+align 4
+import_libimg:
+	dd alib_init1
+	img_is_img  dd aimg_is_img
+	img_info    dd aimg_info
+	img_from_file dd aimg_from_file
+	img_to_file dd aimg_to_file
+	img_from_rgb dd aimg_from_rgb
+	img_to_rgb  dd aimg_to_rgb
+	img_to_rgb2 dd aimg_to_rgb2
+	img_decode  dd aimg_decode
+	img_encode  dd aimg_encode
+	img_create  dd aimg_create
+	img_destroy dd aimg_destroy
+	img_destroy_layer dd aimg_destroy_layer
+	img_count   dd aimg_count
+	img_lock_bits dd aimg_lock_bits
+	img_unlock_bits dd aimg_unlock_bits
+	img_flip    dd aimg_flip
+	img_flip_layer dd aimg_flip_layer
+	img_rotate  dd aimg_rotate
+	img_rotate_layer dd aimg_rotate_layer
+	img_draw    dd aimg_draw
+
+	dd 0,0
+	alib_init1   db 'lib_init',0
+	aimg_is_img  db 'img_is_img',0 ;<3B><>।<EFBFBD><E0A5A4><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>⥪<EFBFBD> ᤥ<><E1A4A5><EFBFBD><EFBFBD> <20><> <20><><EFBFBD> <20><><EFBFBD><EFBFBD>ࠦ<EFBFBD><E0A0A6><EFBFBD><EFBFBD>
+	aimg_info    db 'img_info',0
+	aimg_from_file db 'img_from_file',0
+	aimg_to_file db 'img_to_file',0
+	aimg_from_rgb db 'img_from_rgb',0
+	aimg_to_rgb  db 'img_to_rgb',0 ;<3B>८<EFBFBD>ࠧ<EFBFBD><E0A0A7><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>ࠦ<EFBFBD><E0A0A6><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> RGB
+	aimg_to_rgb2 db 'img_to_rgb2',0
+	aimg_decode  db 'img_decode',0 ;<3B><>⮬<EFBFBD><E2AEAC><EFBFBD><EFBFBD><EFBFBD>᪨ <20><>।<EFBFBD><E0A5A4><EFBFBD><EFBFBD><EFBFBD> <20><>ଠ<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>᪨<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+	aimg_encode  db 'img_encode',0
+	aimg_create  db 'img_create',0
+	aimg_destroy db 'img_destroy',0
+	aimg_destroy_layer db 'img_destroy_layer',0
+	aimg_count   db 'img_count',0
+	aimg_lock_bits db 'img_lock_bits',0
+	aimg_unlock_bits db 'img_unlock_bits',0
+	aimg_flip    db 'img_flip',0
+	aimg_flip_layer db 'img_flip_layer',0
+	aimg_rotate  db 'img_rotate',0
+	aimg_rotate_layer db 'img_rotate_layer',0
+	aimg_draw    db 'img_draw',0
 
 align 4
 import_proclib:
@@ -770,9 +816,110 @@ dd 0,0
 	aOpenDialog_Set_file_name db 'OpenDialog_set_file_name',0
 	;aOpenDialog_Set_file_ext db 'OpenDialog_set_file_ext',0
 
-include '../../develop/libraries/libs-dev/libimg/import.inc'
+align 4
-include '../../develop/libraries/buf2d/import.inc'
+import_buf2d:
-include '../../develop/libraries/box_lib/import.inc'
+	init dd sz_init
+	buf2d_create dd sz_buf2d_create
+	buf2d_create_f_img dd sz_buf2d_create_f_img
+	buf2d_clear dd sz_buf2d_clear
+	buf2d_draw dd sz_buf2d_draw
+	buf2d_delete dd sz_buf2d_delete
+	buf2d_resize dd sz_buf2d_resize
+	buf2d_line dd sz_buf2d_line
+	buf2d_line_sm dd sz_buf2d_line_sm
+	buf2d_rect_by_size dd sz_buf2d_rect_by_size
+	buf2d_filled_rect_by_size dd sz_buf2d_filled_rect_by_size
+	buf2d_circle dd sz_buf2d_circle
+	buf2d_img_hdiv2 dd sz_buf2d_img_hdiv2
+	buf2d_img_wdiv2 dd sz_buf2d_img_wdiv2
+	buf2d_conv_24_to_8 dd sz_buf2d_conv_24_to_8
+	buf2d_conv_24_to_32 dd sz_buf2d_conv_24_to_32
+	buf2d_bit_blt dd sz_buf2d_bit_blt
+	buf2d_bit_blt_transp dd sz_buf2d_bit_blt_transp
+	buf2d_bit_blt_alpha dd sz_buf2d_bit_blt_alpha
+	buf2d_curve_bezier dd sz_buf2d_curve_bezier
+	buf2d_convert_text_matrix dd sz_buf2d_convert_text_matrix
+	buf2d_draw_text dd sz_buf2d_draw_text
+	buf2d_crop_color dd sz_buf2d_crop_color
+	buf2d_flip_h dd sz_buf2d_flip_h
+	buf2d_flip_v dd sz_buf2d_flip_v
+	buf2d_offset_h dd sz_buf2d_offset_h
+	buf2d_flood_fill dd sz_buf2d_flood_fill
+	buf2d_set_pixel dd sz_buf2d_set_pixel
+	dd 0,0
+	sz_init db 'lib_init',0
+	sz_buf2d_create db 'buf2d_create',0
+	sz_buf2d_create_f_img db 'buf2d_create_f_img',0
+	sz_buf2d_clear db 'buf2d_clear',0
+	sz_buf2d_draw db 'buf2d_draw',0
+	sz_buf2d_delete db 'buf2d_delete',0
+	sz_buf2d_resize db 'buf2d_resize',0
+	sz_buf2d_line db 'buf2d_line',0
+	sz_buf2d_line_sm db 'buf2d_line_sm',0
+	sz_buf2d_rect_by_size db 'buf2d_rect_by_size',0
+	sz_buf2d_filled_rect_by_size db 'buf2d_filled_rect_by_size',0
+	sz_buf2d_circle db 'buf2d_circle',0
+	sz_buf2d_img_hdiv2 db 'buf2d_img_hdiv2',0
+	sz_buf2d_img_wdiv2 db 'buf2d_img_wdiv2',0
+	sz_buf2d_conv_24_to_8 db 'buf2d_conv_24_to_8',0
+	sz_buf2d_conv_24_to_32 db 'buf2d_conv_24_to_32',0
+	sz_buf2d_bit_blt db 'buf2d_bit_blt',0
+	sz_buf2d_bit_blt_transp db 'buf2d_bit_blt_transp',0
+	sz_buf2d_bit_blt_alpha db 'buf2d_bit_blt_alpha',0
+	sz_buf2d_curve_bezier db 'buf2d_curve_bezier',0
+	sz_buf2d_convert_text_matrix db 'buf2d_convert_text_matrix',0
+	sz_buf2d_draw_text db 'buf2d_draw_text',0
+	sz_buf2d_crop_color db 'buf2d_crop_color',0
+	sz_buf2d_flip_h db 'buf2d_flip_h',0
+	sz_buf2d_flip_v db 'buf2d_flip_v',0
+	sz_buf2d_offset_h db 'buf2d_offset_h',0
+	sz_buf2d_flood_fill db 'buf2d_flood_fill',0
+	sz_buf2d_set_pixel db 'buf2d_set_pixel',0
+
+align 4
+import_box_lib:
+	dd sz_init1
+
+	init_checkbox   dd sz_Init_checkbox
+	check_box_draw  dd sz_Check_box_draw
+	check_box_mouse dd sz_Check_box_mouse
+	;version_ch     dd sz_Version_ch
+
+	option_box_draw	 dd sz_Option_box_draw
+	option_box_mouse dd sz_Option_box_mouse
+	;version_op      dd sz_Version_op
+
+	edit_box_draw      dd sz_edit_box_draw
+	edit_box_key       dd sz_edit_box_key
+	edit_box_mouse     dd sz_edit_box_mouse
+	edit_box_set_text  dd sz_edit_box_set_text
+	scrollbar_ver_draw dd sz_scrollbar_ver_draw
+	scrollbar_hor_draw dd sz_scrollbar_hor_draw
+
+        progressbar_draw     dd sz_progressbar_draw
+        progressbar_progress dd sz_progressbar_progress
+
+	dd 0,0
+	sz_init1 db 'lib_init',0
+
+	sz_Init_checkbox   db 'init_checkbox2',0
+	sz_Check_box_draw  db 'check_box_draw2',0
+	sz_Check_box_mouse db 'check_box_mouse2',0
+	;sz_Version_ch     db 'version_ch2',0
+
+	sz_Option_box_draw	db 'option_box_draw',0
+	sz_Option_box_mouse	db 'option_box_mouse',0
+	;sz_Version_op      db 'version_op',0
+
+	sz_edit_box_draw      db 'edit_box_draw',0
+	sz_edit_box_key       db 'edit_box_key',0
+	sz_edit_box_mouse     db 'edit_box_mouse',0
+	sz_edit_box_set_text  db 'edit_box_set_text',0
+	sz_scrollbar_ver_draw db 'scrollbar_v_draw',0
+	sz_scrollbar_hor_draw db 'scrollbar_h_draw',0
+
+        sz_progressbar_draw     db 'progressbar_draw', 0
+        sz_progressbar_progress db 'progressbar_progress', 0
 
 align 4
 import_libkmenu:

programs/other/cnc_editor/cnc_editor.asm

@@ -15,16 +15,16 @@ include 'cnc_editor.inc'
 include '../../develop/info3ds/info_fun_float.inc'
 
 @use_library mem.Alloc,mem.Free,mem.ReAlloc,dll.Load
-caption db 'CNC editor 07.05.25',0 ;window signature
+caption db 'CNC editor 23.05.19',0 ;<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
 
 run_file_70 FileInfoBlock
 
 offs_last_timer dd 0 ;<3B><>᫥<EFBFBD><E1ABA5><EFBFBD><EFBFBD> ᤢ<><E1A4A2> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20>㭪樨 ⠩<><E2A0A9><EFBFBD><EFBFBD>
 
 IMAGE_TOOLBAR_ICON_SIZE equ 16*16*3
-image_data_toolbar dd 0 ;pointer to temporary memory, needed for image conversion
+image_data_toolbar dd 0 ;㪠<EFBFBD><EFBFBD>⥫<EFBFBD> <20><> <20>६<EFBFBD><E0A5AC><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>. <20><><EFBFBD> <20>㦥<EFBFBD> <20>८<EFBFBD>ࠧ<EFBFBD><E0A0A7><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>ࠦ<EFBFBD><E0A0A6><EFBFBD><EFBFBD>
-icon_tl_sys dd 0 ;pointer to memory for storing system icons
+icon_tl_sys dd 0 ;㪠<EFBFBD><EFBFBD>⥫<EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20>࠭<EFBFBD><E0A0AD><EFBFBD><EFBFBD> <20><><EFBFBD>⥬<EFBFBD><E2A5AC><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-icon_toolbar dd 0 ;pointer to memory for storing object icons
+icon_toolbar dd 0 ;㪠<EFBFBD><EFBFBD>⥫<EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20>࠭<EFBFBD><E0A0AD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>ꥪ⮢
 
 include 'wnd_point_coords.inc'
 include 'wnd_scale.inc'
@@ -111,13 +111,13 @@ still:
 		jmp still
 	@@:
 
-	cmp al,EV_REDRAW
+	cmp al,1
 	jz red_win
-	cmp al,EV_KEY
+	cmp al,2
 	jz key
-	cmp al,EV_BUTTON
+	cmp al,3
 	jz button
-	cmp al,EV_MOUSE
+	cmp al,6
 	jne @f
 		mcall SF_THREAD_INFO,procinfo,-1
 		cmp ax,word[procinfo.window_stack_position]
@@ -360,7 +360,8 @@ pushad
 	cmp eax,dword[buf_0.h] ;ᬮ<>ਬ ࠧ<><E0A0A7><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 	jne @f
 	cmp ebx,dword[buf_0.w]
-	je .end0
+	jne @f
+		jmp .end0
 	@@:
 		stdcall [buf2d_resize],buf_0,ebx,eax,1
 		mov eax,ObjData
@@ -2104,6 +2105,53 @@ l_libs_start:
 	lib_3 l_libs lib_name_3, file_name, system_dir_3, import_box_lib
 l_libs_end:
 
+align 4
+import_libimg:
+	dd alib_init1
+	img_is_img  dd aimg_is_img
+	img_info    dd aimg_info
+	img_from_file dd aimg_from_file
+	img_to_file dd aimg_to_file
+	img_from_rgb dd aimg_from_rgb
+	img_to_rgb  dd aimg_to_rgb
+	img_to_rgb2 dd aimg_to_rgb2
+	img_decode  dd aimg_decode
+	img_encode  dd aimg_encode
+	img_create  dd aimg_create
+	img_destroy dd aimg_destroy
+	img_destroy_layer dd aimg_destroy_layer
+	img_count   dd aimg_count
+	img_lock_bits dd aimg_lock_bits
+	img_unlock_bits dd aimg_unlock_bits
+	img_flip    dd aimg_flip
+	img_flip_layer dd aimg_flip_layer
+	img_rotate  dd aimg_rotate
+	img_rotate_layer dd aimg_rotate_layer
+	img_draw    dd aimg_draw
+
+	dd 0,0
+	alib_init1   db 'lib_init',0
+	aimg_is_img  db 'img_is_img',0 ;<3B><>।<EFBFBD><E0A5A4><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>⥪<EFBFBD> ᤥ<><E1A4A5><EFBFBD><EFBFBD> <20><> <20><><EFBFBD> <20><><EFBFBD><EFBFBD>ࠦ<EFBFBD><E0A0A6><EFBFBD><EFBFBD>
+	aimg_info    db 'img_info',0
+	aimg_from_file db 'img_from_file',0
+	aimg_to_file db 'img_to_file',0
+	aimg_from_rgb db 'img_from_rgb',0
+	aimg_to_rgb  db 'img_to_rgb',0 ;<3B>८<EFBFBD>ࠧ<EFBFBD><E0A0A7><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>ࠦ<EFBFBD><E0A0A6><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> RGB
+	aimg_to_rgb2 db 'img_to_rgb2',0
+	aimg_decode  db 'img_decode',0 ;<3B><>⮬<EFBFBD><E2AEAC><EFBFBD><EFBFBD><EFBFBD>᪨ <20><>।<EFBFBD><E0A5A4><EFBFBD><EFBFBD><EFBFBD> <20><>ଠ<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>᪨<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+	aimg_encode  db 'img_encode',0
+	aimg_create  db 'img_create',0
+	aimg_destroy db 'img_destroy',0
+	aimg_destroy_layer db 'img_destroy_layer',0
+	aimg_count   db 'img_count',0
+	aimg_lock_bits db 'img_lock_bits',0
+	aimg_unlock_bits db 'img_unlock_bits',0
+	aimg_flip    db 'img_flip',0
+	aimg_flip_layer db 'img_flip_layer',0
+	aimg_rotate  db 'img_rotate',0
+	aimg_rotate_layer db 'img_rotate_layer',0
+	aimg_draw    db 'img_draw',0
+
 align 4
 import_proclib:
 	OpenDialog_Init dd aOpenDialog_Init
@@ -2116,10 +2164,162 @@ dd 0,0
 	aOpenDialog_Set_file_name db 'OpenDialog_set_file_name',0
 	aOpenDialog_Set_file_ext db 'OpenDialog_set_file_ext',0
 
-include '../../develop/libraries/libs-dev/libimg/import.inc'
+align 4
-include '../../develop/libraries/buf2d/import.inc'
+import_buf2d:
-include '../../develop/libraries/box_lib/import.inc'
+	init dd sz_init
+	buf2d_create dd sz_buf2d_create
+	buf2d_create_f_img dd sz_buf2d_create_f_img
+	buf2d_clear dd sz_buf2d_clear
+	buf2d_draw dd sz_buf2d_draw
+	buf2d_delete dd sz_buf2d_delete
+	buf2d_resize dd sz_buf2d_resize
+	buf2d_line dd sz_buf2d_line
+	buf2d_line_sm dd sz_buf2d_line_sm
+	buf2d_rect_by_size dd sz_buf2d_rect_by_size
+	buf2d_filled_rect_by_size dd sz_buf2d_filled_rect_by_size
+	buf2d_circle dd sz_buf2d_circle
+	buf2d_img_hdiv2 dd sz_buf2d_img_hdiv2
+	buf2d_img_wdiv2 dd sz_buf2d_img_wdiv2
+	buf2d_conv_24_to_8 dd sz_buf2d_conv_24_to_8
+	buf2d_conv_24_to_32 dd sz_buf2d_conv_24_to_32
+	buf2d_bit_blt dd sz_buf2d_bit_blt
+	buf2d_bit_blt_transp dd sz_buf2d_bit_blt_transp
+	buf2d_bit_blt_alpha dd sz_buf2d_bit_blt_alpha
+	buf2d_curve_bezier dd sz_buf2d_curve_bezier
+	buf2d_convert_text_matrix dd sz_buf2d_convert_text_matrix
+	buf2d_draw_text dd sz_buf2d_draw_text
+	buf2d_crop_color dd sz_buf2d_crop_color
+	buf2d_flip_h dd sz_buf2d_flip_h
+	buf2d_flip_v dd sz_buf2d_flip_v
+	buf2d_offset_h dd sz_buf2d_offset_h
+	buf2d_flood_fill dd sz_buf2d_flood_fill
+	buf2d_set_pixel dd sz_buf2d_set_pixel
+	dd 0,0
+	sz_init db 'lib_init',0
+	sz_buf2d_create db 'buf2d_create',0
+	sz_buf2d_create_f_img db 'buf2d_create_f_img',0
+	sz_buf2d_clear db 'buf2d_clear',0
+	sz_buf2d_draw db 'buf2d_draw',0
+	sz_buf2d_delete db 'buf2d_delete',0
+	sz_buf2d_resize db 'buf2d_resize',0
+	sz_buf2d_line db 'buf2d_line',0
+	sz_buf2d_line_sm db 'buf2d_line_sm',0
+	sz_buf2d_rect_by_size db 'buf2d_rect_by_size',0
+	sz_buf2d_filled_rect_by_size db 'buf2d_filled_rect_by_size',0
+	sz_buf2d_circle db 'buf2d_circle',0
+	sz_buf2d_img_hdiv2 db 'buf2d_img_hdiv2',0
+	sz_buf2d_img_wdiv2 db 'buf2d_img_wdiv2',0
+	sz_buf2d_conv_24_to_8 db 'buf2d_conv_24_to_8',0
+	sz_buf2d_conv_24_to_32 db 'buf2d_conv_24_to_32',0
+	sz_buf2d_bit_blt db 'buf2d_bit_blt',0
+	sz_buf2d_bit_blt_transp db 'buf2d_bit_blt_transp',0
+	sz_buf2d_bit_blt_alpha db 'buf2d_bit_blt_alpha',0
+	sz_buf2d_curve_bezier db 'buf2d_curve_bezier',0
+	sz_buf2d_convert_text_matrix db 'buf2d_convert_text_matrix',0
+	sz_buf2d_draw_text db 'buf2d_draw_text',0
+	sz_buf2d_crop_color db 'buf2d_crop_color',0
+	sz_buf2d_flip_h db 'buf2d_flip_h',0
+	sz_buf2d_flip_v db 'buf2d_flip_v',0
+	sz_buf2d_offset_h db 'buf2d_offset_h',0
+	sz_buf2d_flood_fill db 'buf2d_flood_fill',0
+	sz_buf2d_set_pixel db 'buf2d_set_pixel',0
 
+align 4
+import_box_lib:
+	dd sz_init1
+
+	init_checkbox   dd sz_Init_checkbox
+	check_box_draw  dd sz_Check_box_draw
+	check_box_mouse dd sz_Check_box_mouse
+	;version_ch     dd sz_Version_ch
+
+	option_box_draw	 dd sz_Option_box_draw
+	option_box_mouse dd sz_Option_box_mouse
+	;version_op      dd sz_Version_op
+
+	edit_box_draw      dd sz_edit_box_draw
+	edit_box_key       dd sz_edit_box_key
+	edit_box_mouse     dd sz_edit_box_mouse
+	edit_box_set_text  dd sz_edit_box_set_text
+	scrollbar_ver_draw dd sz_scrollbar_ver_draw
+	scrollbar_hor_draw dd sz_scrollbar_hor_draw
+
+	tl_data_init dd sz_tl_data_init
+	tl_data_clear dd sz_tl_data_clear
+	tl_info_clear dd sz_tl_info_clear
+	tl_key dd sz_tl_key
+	tl_mouse dd sz_tl_mouse
+	tl_draw dd sz_tl_draw
+	tl_info_undo dd sz_tl_info_undo
+	tl_info_redo dd sz_tl_info_redo
+	tl_node_add dd sz_tl_node_add
+	tl_node_set_data dd sz_tl_node_set_data
+	tl_node_get_data dd sz_tl_node_get_data
+	tl_node_delete dd sz_tl_node_delete
+	tl_node_move_up dd sz_tl_node_move_up
+	tl_node_move_down dd sz_tl_node_move_down
+	tl_cur_beg dd sz_tl_cur_beg
+	tl_cur_next dd sz_tl_cur_next
+	tl_cur_perv dd sz_tl_cur_perv
+	tl_node_close_open dd sz_tl_node_close_open
+	tl_node_lev_inc dd sz_tl_node_lev_inc
+	tl_node_lev_dec dd sz_tl_node_lev_dec
+	tl_node_poi_get_info dd sz_tl_node_poi_get_info
+	tl_node_poi_get_next_info dd sz_tl_node_poi_get_next_info
+	tl_node_poi_get_data dd sz_tl_node_poi_get_data
+
+	dd 0,0
+	sz_init1 db 'lib_init',0
+
+	sz_Init_checkbox   db 'init_checkbox2',0
+	sz_Check_box_draw  db 'check_box_draw2',0
+	sz_Check_box_mouse db 'check_box_mouse2',0
+	;sz_Version_ch     db 'version_ch2',0
+
+	sz_Option_box_draw	db 'option_box_draw',0
+	sz_Option_box_mouse	db 'option_box_mouse',0
+	;sz_Version_op      db 'version_op',0
+
+	sz_edit_box_draw      db 'edit_box_draw',0
+	sz_edit_box_key       db 'edit_box_key',0
+	sz_edit_box_mouse     db 'edit_box_mouse',0
+	sz_edit_box_set_text  db 'edit_box_set_text',0
+	sz_scrollbar_ver_draw db 'scrollbar_v_draw',0
+	sz_scrollbar_hor_draw db 'scrollbar_h_draw',0
+
+	sz_tl_data_init db 'tl_data_init',0
+	sz_tl_data_clear db 'tl_data_clear',0
+	sz_tl_info_clear db 'tl_info_clear',0
+	sz_tl_key db 'tl_key',0
+	sz_tl_mouse db 'tl_mouse',0
+	sz_tl_draw db 'tl_draw',0
+	sz_tl_info_undo db 'tl_info_undo',0
+	sz_tl_info_redo db 'tl_info_redo',0
+	sz_tl_node_add db 'tl_node_add',0
+	sz_tl_node_set_data db 'tl_node_set_data',0
+	sz_tl_node_get_data db 'tl_node_get_data',0
+	sz_tl_node_delete db 'tl_node_delete',0
+	sz_tl_node_move_up db 'tl_node_move_up',0
+	sz_tl_node_move_down db 'tl_node_move_down',0
+	sz_tl_cur_beg db 'tl_cur_beg',0
+	sz_tl_cur_next db 'tl_cur_next',0
+	sz_tl_cur_perv db 'tl_cur_perv',0
+	sz_tl_node_close_open db 'tl_node_close_open',0
+	sz_tl_node_lev_inc db 'tl_node_lev_inc',0
+	sz_tl_node_lev_dec db 'tl_node_lev_dec',0
+	sz_tl_node_poi_get_info db 'tl_node_poi_get_info',0
+	sz_tl_node_poi_get_next_info db 'tl_node_poi_get_next_info',0
+	sz_tl_node_poi_get_data db 'tl_node_poi_get_data',0
+
+align 4
+mouse_dd dd 0
+last_time dd 0
+
+align 16
+sc system_colors 
+
+align 16
+procinfo process_information 
 
 align 4
 buf_0: dd 0 ;㪠<><E3AAA0>⥫<EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>ࠦ<EFBFBD><E0A0A6><EFBFBD><EFBFBD>
@@ -2148,7 +2348,7 @@ buf_png:
 align 4
 el_focus dd tree1
 tree1 tree_list size_one_list,1000+2, tl_key_no_edit+tl_draw_par_line,\
-	16,16, 0xffffff,0xb0d0ff,0x10400040, 5,35,195-16,340, 16,Figure.Caption,0,\
+	16,16, 0xffffff,0xb0d0ff,0x400040, 5,35,195-16,340, 16,Figure.Caption,0,\
 	el_focus,w_scr_t1,0
 
 align 4
@@ -2200,14 +2400,6 @@ endp
 
 align 16
 i_end:
-mouse_dd dd 0
-last_time dd 0
-
-align 16
-sc system_colors
-
-align 16
-procinfo process_information
 	rb 2048
 thread_coords:
 	rb 2048

programs/other/t_edit/t_data.inc

@@ -81,7 +81,148 @@ lib_name_5 db 'kmenu.obj',0
 
 
 ;---------------------------------------------------------------------
-include '../../develop/libraries/box_lib/import.inc'
+align 4
+import_box_lib:
+	dd alib_init0 ;<EFBFBD>㭪<EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD>᪠<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ᮬ 1 ࠧ <EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>祭<EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>⥪<EFBFBD>, <EFBFBD><EFBFBD>⮬<EFBFBD> <EFBFBD> <EFBFBD>ணࠬ<EFBFBD><EFBFBD> <EFBFBD><EFBFBD>⪠ <EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD> <EFBFBD>㦭<EFBFBD>
+
+	edit_box_draw  dd aEdit_box_draw
+	edit_box_key   dd aEdit_box_key
+	edit_box_mouse dd aEdit_box_mouse
+	;edit_box_set_text dd aEdit_box_set_text
+	;version_ed     dd aVersion_ed
+
+	init_checkbox	dd ainit_checkbox
+	check_box_draw	dd acheck_box_draw
+	check_box_mouse	dd acheck_box_mouse
+
+	option_box_draw	 dd aOption_box_draw
+	option_box_mouse dd aOption_box_mouse
+	;version_op      dd aVersion_op
+
+	scrollbar_ver_draw  dd aScrollbar_ver_draw
+	scrollbar_ver_mouse dd aScrollbar_ver_mouse
+	scrollbar_hor_draw  dd aScrollbar_hor_draw
+	scrollbar_hor_mouse dd aScrollbar_hor_mouse
+	;version_scrollbar   dd aVersion_scrollbar
+
+	tl_data_init dd sz_tl_data_init
+	tl_data_clear dd sz_tl_data_clear
+	tl_info_clear dd sz_tl_info_clear
+	tl_key dd sz_tl_key
+	tl_mouse dd sz_tl_mouse
+	tl_draw dd sz_tl_draw
+	tl_info_undo dd sz_tl_info_undo
+	tl_info_redo dd sz_tl_info_redo
+	tl_node_add dd sz_tl_node_add
+	tl_node_set_data dd sz_tl_node_set_data
+	tl_node_get_data dd sz_tl_node_get_data
+	tl_node_delete dd sz_tl_node_delete
+	tl_cur_beg dd sz_tl_cur_beg
+	tl_cur_next dd sz_tl_cur_next
+	tl_cur_perv dd sz_tl_cur_perv
+	;tl_node_close_open dd sz_tl_node_close_open
+	tl_node_lev_inc dd sz_tl_node_lev_inc
+	tl_node_lev_dec dd sz_tl_node_lev_dec
+
+	ted_but_sumb_upper dd sz_ted_but_sumb_upper
+	ted_but_sumb_lover dd sz_ted_but_sumb_lover
+	ted_but_convert_by_table dd sz_ted_but_convert_by_table
+	ted_can_save dd sz_ted_can_save
+	ted_clear dd sz_ted_clear
+	ted_delete dd sz_ted_delete
+	ted_draw dd sz_ted_draw
+	ted_init dd sz_ted_init
+	ted_init_scroll_bars dd sz_ted_init_scroll_bars
+	ted_init_syntax_file dd sz_ted_init_syntax_file
+	ted_is_select dd sz_ted_is_select
+	ted_key dd sz_ted_key
+	ted_mouse dd sz_ted_mouse
+	ted_open_file dd sz_ted_open_file
+	ted_save_file dd sz_ted_save_file
+	ted_text_add dd sz_ted_text_add
+	ted_but_select_word dd sz_ted_but_select_word
+	ted_but_cut dd sz_ted_but_cut
+	ted_but_copy dd sz_ted_but_copy
+	ted_but_paste dd sz_ted_but_paste
+	ted_but_undo dd sz_ted_but_undo
+	ted_but_redo dd sz_ted_but_redo
+	ted_but_reverse dd sz_ted_but_reverse
+	ted_but_find dd sz_ted_but_find
+	ted_but_replace dd sz_ted_but_replace
+	ted_text_colored dd sz_ted_text_colored
+	ted_go_to_position dd sz_ted_go_to_position
+	version_text_edit dd sz_ted_version
+
+dd 0,0
+	alib_init0 db 'lib_init',0
+
+	aEdit_box_draw	db 'edit_box_draw',0
+	aEdit_box_key	db 'edit_box_key',0
+	aEdit_box_mouse db 'edit_box_mouse',0
+	;aEdit_box_set_text db 'edit_box_set_text',0
+	;aVersion_ed    db 'version_ed',0
+
+	ainit_checkbox		db 'init_checkbox2',0
+	acheck_box_draw		db 'check_box_draw2',0
+	acheck_box_mouse	db 'check_box_mouse2',0
+
+	aOption_box_draw	db 'option_box_draw',0
+	aOption_box_mouse	db 'option_box_mouse',0
+	;aVersion_op      db 'version_op',0
+
+	aScrollbar_ver_draw  db 'scrollbar_v_draw',0
+	aScrollbar_ver_mouse db 'scrollbar_v_mouse',0
+	aScrollbar_hor_draw  db 'scrollbar_h_draw',0
+	aScrollbar_hor_mouse db 'scrollbar_h_mouse',0
+	;aVersion_scrollbar   db 'version_scrollbar',0
+
+	sz_tl_data_init db 'tl_data_init',0
+	sz_tl_data_clear db 'tl_data_clear',0
+	sz_tl_info_clear db 'tl_info_clear',0
+	sz_tl_key db 'tl_key',0
+	sz_tl_mouse db 'tl_mouse',0
+	sz_tl_draw db 'tl_draw',0
+	sz_tl_info_undo db 'tl_info_undo',0
+	sz_tl_info_redo db 'tl_info_redo',0
+	sz_tl_node_add db 'tl_node_add',0
+	sz_tl_node_set_data db 'tl_node_set_data',0
+	sz_tl_node_get_data db 'tl_node_get_data',0
+	sz_tl_node_delete db 'tl_node_delete',0
+	sz_tl_cur_beg db 'tl_cur_beg',0
+	sz_tl_cur_next db 'tl_cur_next',0
+	sz_tl_cur_perv db 'tl_cur_perv',0
+	;sz_tl_node_close_open db 'tl_node_close_open',0
+	sz_tl_node_lev_inc db 'tl_node_lev_inc',0
+	sz_tl_node_lev_dec db 'tl_node_lev_dec',0
+
+	sz_ted_but_sumb_upper	db 'ted_but_sumb_upper',0
+	sz_ted_but_sumb_lover	db 'ted_but_sumb_lover',0
+	sz_ted_but_convert_by_table db 'ted_but_convert_by_table',0
+	sz_ted_can_save 		db 'ted_can_save',0
+	sz_ted_clear			db 'ted_clear',0
+	sz_ted_delete			db 'ted_delete',0
+	sz_ted_draw				db 'ted_draw',0
+	sz_ted_init				db 'ted_init',0
+	sz_ted_init_scroll_bars db 'ted_init_scroll_bars',0
+	sz_ted_init_syntax_file db 'ted_init_syntax_file',0
+	sz_ted_is_select		db 'ted_is_select',0
+	sz_ted_key				db 'ted_key',0
+	sz_ted_mouse			db 'ted_mouse',0
+	sz_ted_open_file		db 'ted_open_file',0
+	sz_ted_save_file		db 'ted_save_file',0
+	sz_ted_text_add 		db 'ted_text_add',0
+	sz_ted_but_select_word	db 'ted_but_select_word',0
+	sz_ted_but_cut			db 'ted_but_cut',0
+	sz_ted_but_copy 		db 'ted_but_copy',0
+	sz_ted_but_paste		db 'ted_but_paste',0
+	sz_ted_but_undo 		db 'ted_but_undo',0
+	sz_ted_but_redo 		db 'ted_but_redo',0
+	sz_ted_but_reverse		db 'ted_but_reverse',0
+	sz_ted_but_find			db 'ted_but_find',0
+	sz_ted_but_replace		db 'ted_but_replace',0
+	sz_ted_text_colored		db 'ted_text_colored',0
+	sz_ted_go_to_position	db 'ted_go_to_position',0
+	sz_ted_version db 'version_text_edit',0
 
 align 4
 import_proclib:
@@ -101,7 +242,17 @@ dd 0,0
 	amb_reinit db 'mb_reinit',0
 	amb_setfunctions db 'mb_setfunctions',0
 
-include '../../develop/libraries/libs-dev/libimg/import.inc'
+align 4
+import_libimg:
+	dd alib_init1
+	img_to_rgb2 dd aimg_to_rgb2
+	img_decode  dd aimg_decode
+	img_destroy dd aimg_destroy
+dd 0,0
+	alib_init1   db 'lib_init',0
+	aimg_to_rgb2 db 'img_to_rgb2',0
+	aimg_decode  db 'img_decode',0 ;<EFBFBD><EFBFBD>⮬<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>᪨ <EFBFBD><EFBFBD>।<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD>ଠ<EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>᪨<EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+	aimg_destroy db 'img_destroy',0
 
 align 4
 import_libini:

programs/other/t_edit/t_draw.inc

@@ -394,11 +394,11 @@ p_syntax:
 	mov ecx,ted_wnd_t
 	shl ecx,16
 	mov cx,20
-	mcall SF_DRAW_RECT,TED_PANEL_WIDTH,,[sc.work] ;drawing the top background rectangle
+	mcall SF_DRAW_RECT,TED_PANEL_WIDTH,,[sc.work] ;<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 
 	stdcall [tl_draw], tree1
-	mov [ws_dir_lbox.all_redraw],1 ;for a complete redraw of the child scroll
+	mov [ws_dir_lbox.all_redraw],1 ;<EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-	stdcall [scrollbar_v_draw], ws_dir_lbox
+	stdcall [scrollbar_ver_draw], ws_dir_lbox
 
 	ror ecx,16
 	add ecx,[tree1.box_height]
@@ -411,7 +411,7 @@ p_syntax:
 	sub cx,20
 	sub ecx,[tree1.box_height]
 	inc cx
-	int 0x40 ;drawing the bottom background rectangle
+	int 0x40 ;<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 
 	mov ecx,ted_wnd_t
 	add ecx,25
@@ -436,7 +436,7 @@ p_syntax:
 	popad
 	ret
 
-MIN_M_WND_H equ 100 ;minimum height of main window
+MIN_M_WND_H equ 100 ;<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 ;input:
 ; edi = pointer to tedit struct
 align 4

programs/other/t_edit/wnd_k_words.inc

@@ -80,7 +80,7 @@ pushad
 	@@:
 
 	mov dword[w_scr_t3.all_redraw],1
-	stdcall [scrollbar_v_draw], w_scr_t3
+	stdcall [scrollbar_ver_draw], w_scr_t3
 	stdcall [tl_draw], tree3
 	stdcall [edit_box_draw], edit3
 	mcall SF_REDRAW,SSF_END_DRAW