Libraries (box_lib, buf2d, libimg, tinygl): optimize function import

Рrograms updated:
- gears, test3, test_glu1, test_glu2,
- test_array1, textures0, textures1, textures2,
- crypt_files, img_transform, scrshoot, t_edit,
- cnc_control, cnc_editor

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

@@ -490,8 +490,6 @@ white_light dd 0.8, 0.8, 0.8, 1.0 ; Цвет и интенсивность ос
 lmodel_ambient dd 0.2, 0.2, 0.2, 1.0 ; Параметры фонового освещения
 
 ;--------------------------------------------------
-sz_lib_init db 'lib_init',0
-
 include '../import.inc' ;tinygl
 include '../../../buf2d/import.inc'
 include '../../../libs-dev/libimg/import.inc'

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

@@ -473,8 +473,6 @@ white_light dd 0.8, 0.8, 0.8, 1.0 ; Цвет и интенсивность ос
 lmodel_ambient dd 0.2, 0.2, 0.2, 1.0 ; Параметры фонового освещения
 
 ;--------------------------------------------------
-sz_lib_init db 'lib_init',0
-
 include '../import.inc' ;tinygl
 include '../../../buf2d/import.inc'
 include '../../../libs-dev/libimg/import.inc'

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

@@ -433,8 +433,6 @@ white_light dd 0.8, 0.8, 0.8, 1.0 ; Цвет и интенсивность ос
 lmodel_ambient dd 0.2, 0.2, 0.2, 1.0 ; Параметры фонового освещения
 
 ;--------------------------------------------------
-sz_lib_init db 'lib_init',0
-
 include '../import.inc' ;tinygl
 include '../../../buf2d/import.inc'
 include '../../../libs-dev/libimg/import.inc'

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

@@ -364,8 +364,6 @@ angle_y dd 0.0
 delt_size dd 3.0
 
 ;--------------------------------------------------
-sz_lib_init db 'lib_init',0
-
 include '../import.inc' ;tinygl
 include '../../../buf2d/import.inc'
 include '../../../libs-dev/libimg/import.inc'

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

@@ -315,8 +315,6 @@ angle_y dd 0.0
 delt_size dd 3.0
 
 ;--------------------------------------------------
-sz_lib_init db 'lib_init',0
-
 include '../import.inc' ;tinygl
 include '../../../buf2d/import.inc'
 include '../../../libs-dev/libimg/import.inc'

programs/develop/libraries/box_lib/import.inc

@@ -4,7 +4,7 @@ import_box_lib:
 macro E_LIB n, lfn
 {
 if n eq lib_init
-	dd sz_#n
+	dd strz_#n
 else if defined sz_#n
 	n dd sz_#n
 end if

programs/develop/libraries/buf2d/import.inc

@@ -4,7 +4,7 @@ import_buf2d:
 macro E_LIB n
 {
 if n eq lib_init
-	dd sz_#n
+	dd strz_#n
 else if defined sz_#n
 	n dd sz_#n
 end if

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 06.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 21.05.25',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,1
+	cmp al,EV_REDRAW
 	jz red_win
-	cmp al,2
+	cmp al,EV_KEY
 	jz key
-	cmp al,3
+	cmp al,EV_BUTTON
 	jz button
-	cmp al,6 ;<3B><><EFBFBD><EFBFBD>
+	cmp al,EV_MOUSE
 	jne @f
 		jmp mouse
 	@@:
@@ -410,8 +410,6 @@ l_libs_start:
 	lib_4 l_libs lib_name_4, library_path, system_dir_4, import_box_lib
 l_libs_end:
 
-sz_lib_init db 'lib_init',0
-
 include '../../libs-dev/libimg/import.inc'
 
 align 4

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

@@ -4,7 +4,7 @@ import_libimg:
 macro E_LIB n
 {
 if n eq lib_init
-	dd sz_#n
+	dd strz_#n
 else if defined sz_#n
 	n dd sz_#n
 end if

programs/load_lib.mac

@@ -23,6 +23,12 @@ library_fun_memory_free equ mem_free
 library_fun_memory_realloc equ mem_realloc
 library_fun_dll_load equ dll_load
 
+if library_fun_memory_alloc eq
+else
+align 4
+strz_lib_init db 'lib_init',0
+end if
+
 align 4
 arrea_xx dd 0
 file_name db '/sys/@notify',0
@@ -214,7 +220,7 @@ end if
 		jmp		i_error
 align 4
 	i_begin:
-		import_boxlib myimport
+		import_some_library myimport
 		test	eax,eax
 		jz		i_exit
 	i_error:
@@ -234,13 +240,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
@@ -251,7 +257,7 @@ end if
 		jmp		i_error
 align 4
 	i_begin:
-		import_boxlib myimport
+		import_some_library myimport
 		test	eax,eax
 		jz		i_exit
 	i_error:
@@ -309,7 +315,7 @@ align 4
 align 4
 	end_steep:
 		mov		adr_load_lib,eax        ;save adr lib in memory
-		import_boxlib my_import
+		import_some_library my_import
 		test	eax,eax
 		jz		cycle0n
 		or		status_lib,2          ; status of code - enable error - import error
@@ -387,7 +393,7 @@ align 4
 align 4
 	end_steep:
 		mov		adr_load_lib,eax        ;save adr lib in memory
-		import_boxlib my_import
+		import_some_library my_import
 		test	eax,eax
 		jz		cycle0n
 		or		status_lib,2          ; status of code - enable error - import error
@@ -451,7 +457,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_boxlib myimport
+macro import_some_library myimport
 {
 local import_loop
 local import_find

programs/media/img_transform/img_transform.asm

@@ -20,7 +20,7 @@ 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 07.05.25',0
+caption db 'Image transform 21.05.25',0
 
 BUF_STRUCT_SIZE equ 21
 buf2d_data equ dword[edi] ;image buffer data
@@ -1447,7 +1447,6 @@ dd 0,0
 	aOpenDialog_Set_file_name db 'OpenDialog_set_file_name',0
 	aOpenDialog_Set_file_ext db 'OpenDialog_set_file_ext',0
 
-sz_lib_init db 'lib_init',0
 include '../../develop/libraries/libs-dev/libimg/import.inc'
 include '../../develop/libraries/buf2d/import.inc'
 include '../../develop/libraries/TinyGL/asm_fork/import.inc'

programs/media/scrshoot/srectwin.inc

@@ -259,11 +259,9 @@ aOpenDialog_Init	db 'OpenDialog_init',0
 aOpenDialog_Start	db 'OpenDialog_start',0
 ;aOpenDialog_Version	db 'Version_OpenDialog',0
 ;---------------------------------------------------------------------
-sz_lib_init db 'lib_init',0
 
 Box_lib_import equ import_box_lib
 include '../../develop/libraries/box_lib/import.inc'
-
 include '../../develop/libraries/libs-dev/libimg/import.inc'
 ;---------------------------------------------------------------------
 ;width,left,top,color,shift_color,focus_border_color,\

programs/other/cnc_control/cnc_control.asm

@@ -770,7 +770,6 @@ dd 0,0
 	aOpenDialog_Set_file_name db 'OpenDialog_set_file_name',0
 	;aOpenDialog_Set_file_ext db 'OpenDialog_set_file_ext',0
 
-sz_lib_init db 'lib_init',0
 include '../../develop/libraries/libs-dev/libimg/import.inc'
 include '../../develop/libraries/buf2d/import.inc'
 include '../../develop/libraries/box_lib/import.inc'

programs/other/cnc_editor/cnc_editor.asm

@@ -2116,7 +2116,6 @@ dd 0,0
 	aOpenDialog_Set_file_name db 'OpenDialog_set_file_name',0
 	aOpenDialog_Set_file_ext db 'OpenDialog_set_file_ext',0
 
-sz_lib_init db 'lib_init',0
 include '../../develop/libraries/libs-dev/libimg/import.inc'
 include '../../develop/libraries/buf2d/import.inc'
 include '../../develop/libraries/box_lib/import.inc'

programs/other/t_edit/t_data.inc

@@ -81,7 +81,6 @@ lib_name_5 db 'kmenu.obj',0
 
 
 ;---------------------------------------------------------------------
-sz_lib_init db 'lib_init',0
 include '../../develop/libraries/box_lib/import.inc'
 
 align 4