From 4982b912eb98e97479c5b416cbffccec30617222 Mon Sep 17 00:00:00 2001 From: IgorA Date: Wed, 18 Nov 2020 18:11:43 +0000 Subject: [PATCH] update macros @use_library git-svn-id: svn://kolibrios.org@8219 a494cfbc-eb01-0410-851d-a64ba20cac60 --- .../develop/libraries/box_lib/load_lib.mac | 76 +++++++++---------- programs/games/life3/trunk/life3.asm | 62 ++++----------- 2 files changed, 47 insertions(+), 91 deletions(-) diff --git a/programs/develop/libraries/box_lib/load_lib.mac b/programs/develop/libraries/box_lib/load_lib.mac index 4df07e31c2..a668b769a9 100644 --- a/programs/develop/libraries/box_lib/load_lib.mac +++ b/programs/develop/libraries/box_lib/load_lib.mac @@ -1,7 +1,3 @@ -;13.03.2013 - use @notify -;08.06.2010 - new macros @use_library_mem -;08.05.2009 - bugfix -;14.04.2009 - a macros for code load library the box_lib.obj from '/sys/lib/' or current dirrectory. ; The macros for load any library/libraries: ; Copyright (c) 2009, ; All rights reserved. @@ -93,7 +89,7 @@ -macro @use_library +macro @use_library mem_alloc,mem_free,mem_realloc,dll_load { local lp1 local lp2 @@ -103,7 +99,10 @@ local lp5 local lp6 local file_name -library_fun_memory_alloc equ 0 ;не использовать в макросах проверку на функции 'lib_init' +library_fun_memory_alloc equ mem_alloc +library_fun_memory_free equ mem_free +library_fun_memory_realloc equ mem_realloc +library_fun_dll_load equ dll_load align 4 arrea_xx dd 0 @@ -245,11 +244,7 @@ align 4 macro @use_library_mem mem_alloc,mem_free,mem_realloc,dll_load { -@use_library -library_fun_memory_alloc equ mem_alloc -library_fun_memory_free equ mem_free -library_fun_memory_realloc equ mem_realloc -library_fun_dll_load equ dll_load +@use_library mem_alloc,mem_free,mem_realloc,dll_load } macro sys_load_library library_name__, cur_dir_path__, library_path__, system_path__, err_message_found_lib__, head_f_l__, myimport, err_message_import__, head_f_i__,point_dir_name__ @@ -263,10 +258,10 @@ local i_exit jnz i_begin if point_dir_name__ eq - copy_path library_name__, cur_dir_path__, library_path__,0 + copy_path library_name__, [32], library_path__,0 else ;the macros making way /current path a program/ + name system library - copy_path library_name__, cur_dir_path__, library_path__,point_dir_name__ + copy_path library_name__, [32], library_path__,point_dir_name__ end if mcall 68,19,library_path__ ; load of alternative test eax,eax @@ -297,10 +292,10 @@ local i_error local i_exit if point_dir_name__ eq - copy_path library_name__, cur_dir_path__, library_path__,0 + copy_path library_name__, [32], library_path__,0 else ;the macros making way /current path a program/ + name system library - copy_path library_name__, cur_dir_path__, library_path__,point_dir_name__ + copy_path library_name__, [32], library_path__,point_dir_name__ end if mcall 68,19,library_path__ ; load of alternative test eax,eax @@ -341,17 +336,16 @@ local cycle1n local cycle1e ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; library_name__ equ [ebp] -cur_dir_path__ equ [ebp+4] -library_path__ equ [ebp+8] -system_path__ equ [ebp+12] -err_message_found_lib__ equ [ebp+16] -head_f_l__ equ [ebp+20] -my_import equ [ebp+24] -err_message_import__ equ [ebp+28] -head_f_i__ equ [ebp+32] -point_dir_name__ equ [ebp+36] -adr_load_lib equ dword [ebp+40] -status_lib equ dword [ebp+44] +library_path__ equ [ebp+4] +system_path__ equ [ebp+8] +err_message_found_lib__ equ [ebp+12] +head_f_l__ equ [ebp+16] +my_import equ [ebp+20] +err_message_import__ equ [ebp+24] +head_f_i__ equ [ebp+28] +point_dir_name__ equ [ebp+32] +adr_load_lib equ dword [ebp+36] +status_lib equ dword [ebp+40] mov ebp,_start mov ecx,(_end-_start)/ll_struc_size @@ -363,7 +357,7 @@ align 4 jnz end_steep ;the macros making way /current path a program/ + name system library - copy_path library_name__, cur_dir_path__, library_path__,point_dir_name__ + copy_path library_name__, [32], library_path__,point_dir_name__ mcall 68,19,library_path__ ; load of alternative test eax,eax @@ -425,17 +419,16 @@ local cycle1n local cycle1e ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; library_name__ equ [ebp] -cur_dir_path__ equ [ebp+4] -library_path__ equ [ebp+8] -system_path__ equ [ebp+12] -err_message_found_lib__ equ [ebp+16] -head_f_l__ equ [ebp+20] -my_import equ [ebp+24] -err_message_import__ equ [ebp+28] -head_f_i__ equ [ebp+32] -point_dir_name__ equ [ebp+36] -adr_load_lib equ dword [ebp+40] -status_lib equ dword [ebp+44] +library_path__ equ [ebp+4] +system_path__ equ [ebp+8] +err_message_found_lib__ equ [ebp+12] +head_f_l__ equ [ebp+16] +my_import equ [ebp+20] +err_message_import__ equ [ebp+24] +head_f_i__ equ [ebp+28] +point_dir_name__ equ [ebp+32] +adr_load_lib equ dword [ebp+36] +status_lib equ dword [ebp+40] mov ebp,_start mov ecx,(_end-_start)/ll_struc_size @@ -444,7 +437,7 @@ align 4 push ecx ;the macros making way /current path a program/ + name system library - copy_path library_name__, cur_dir_path__, library_path__,point_dir_name__ + copy_path library_name__, [32], library_path__,point_dir_name__ mcall 68,19,library_path__ ; load of alternative test eax,eax @@ -573,7 +566,7 @@ import_found: mov [esi-4], eax ;копируем указатель (на функцию) в программу, -4 ставим потому что esi было сдвинуто командой lodsd pop edx ;устанавливаем edx на начало библиотечных функций ;--- проверяем совпадает ли имя экспортированной функции с 'lib_init' -if library_fun_memory_alloc eq 0 +if library_fun_memory_alloc eq else cmp dword[ebx],'lib_' jne import_loop @@ -602,11 +595,10 @@ exit: } ;--------------------------------------------------------------------- -ll_struc_size = 48;($-library_name__) ; constant size of struct +ll_struc_size = 44;($-library_name__) ; constant size of struct struc l_libs library_name__, cur_dir_path__, library_path__, system_path__, err_message_found_lib__, head_f_l__, my_import, err_message_import__, head_f_i__,point_dir_name; struct for loading libraries { .library_name__ dd library_name__ ; имя загружаемой библиотеки -.cur_dir_path__ dd cur_dir_path__ ; указатель на буфер в котором содержиться путь от куда была запущена программа .library_path__ dd library_path__ ; указатель на буфер в котором будет софоримирован путь к библиотеки, если нужно вычислить путь до либы с места запуска программы, обычно нужно, в случаях, если либа расположена в той же папке .complete_path dd system_path__ ; путь который четко содержит путь diff --git a/programs/games/life3/trunk/life3.asm b/programs/games/life3/trunk/life3.asm index e01a2951ba..bfca5efd4c 100644 --- a/programs/games/life3/trunk/life3.asm +++ b/programs/games/life3/trunk/life3.asm @@ -11,8 +11,8 @@ include '../../../develop/libraries/box_lib/load_lib.mac' ;include 'lang.inc' -@use_library_mem mem.Alloc,mem.Free,mem.ReAlloc,dll.Load -hed db 'Life 16.11.20',0 ;подпись окна +@use_library mem.Alloc,mem.Free,mem.ReAlloc,dll.Load +hed db 'Life 18.11.20',0 ;подпись окна run_file_70 FileInfoBlock image_data dd 0 ;указатель на временную память. для нужен преобразования изображения @@ -1663,78 +1663,43 @@ db 0 head_f_i: -head_f_l db 'Системная ошибка',0 +head_f_l db '"Системная ошибка',0 system_dir_0 db '/sys/lib/' lib_name_0 db 'proc_lib.obj',0 -err_message_found_lib_0 db 'Не найдена библиотека ',39,'proc_lib.obj',39,0 -err_message_import_0 db 'Ошибка при импорте библиотеки ',39,'proc_lib.obj',39,0 +err_message_found_lib_0 db 'Не найдена библиотека ',39,'proc_lib.obj',39,'" -tE',0 +err_message_import_0 db 'Ошибка при импорте библиотеки ',39,'proc_lib.obj',39,'" -tE',0 system_dir_1 db '/sys/lib/' lib_name_1 db 'libimg.obj',0 -err_message_found_lib_1 db 'Не найдена библиотека ',39,'libimg.obj',39,0 -err_message_import_1 db 'Ошибка при импорте библиотеки ',39,'libimg.obj',39,0 +err_message_found_lib_1 db 'Не найдена библиотека ',39,'libimg.obj',39,'" -tE',0 +err_message_import_1 db 'Ошибка при импорте библиотеки ',39,'libimg.obj',39,'" -tE',0 system_dir_2 db '/sys/lib/' lib_name_2 db 'buf2d.obj',0 -err_msg_found_lib_2 db 'Не найдена библиотека ',39,'buf2d.obj',39,0 -err_msg_import_2 db 'Ошибка при импорте библиотеки ',39,'buf2d',39,0 +err_msg_found_lib_2 db 'Не найдена библиотека ',39,'buf2d.obj',39,'" -tE',0 +err_msg_import_2 db 'Ошибка при импорте библиотеки ',39,'buf2d',39,'" -tE',0 l_libs_start: - lib0 l_libs lib_name_0, sys_path, file_name, system_dir_0,\ + lib0 l_libs lib_name_0, 0, file_name, system_dir_0,\ err_message_found_lib_0, head_f_l, proclib_import,err_message_import_0, head_f_i - lib1 l_libs lib_name_1, sys_path, file_name, system_dir_1,\ + lib1 l_libs lib_name_1, 0, file_name, system_dir_1,\ err_message_found_lib_1, head_f_l, import_libimg, err_message_import_1, head_f_i - lib2 l_libs lib_name_2, sys_path, library_path, system_dir_2,\ + lib2 l_libs lib_name_2, 0, file_name, system_dir_2,\ err_msg_found_lib_2,head_f_l,import_buf2d,err_msg_import_2,head_f_i 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 ;определяет по данным, может ли библиотека сделать из них изображение - 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 align 4 proclib_import: ;описание экспортируемых функций @@ -1783,8 +1748,7 @@ i_end: stacktop: sys_path rb 1024 file_name: - rb 1024 ;4096 - library_path rb 1024 + rb 2048 ;4096 plugin_path rb 4096 openfile_path rb 4096 filename_area rb 256