Egor00f/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

'info3ds' load library in sub folder '../../lib/'

Browse Source 
git-svn-id: svn://kolibrios.org@6245 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
IgorA 2016-02-18 13:08:33 +00:00
parent 50e97c60fa
commit 4973638f8d
3 changed files with 41 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
programs/develop/info3ds/info3ds.asm
View File

@ -1073,9 +1073,9 @@ end if
align 4 align 4
l_libs_start: l_libs_start:
lib_0 l_libs lib_name_0, sys_path, file_name, system_dir_0,\ lib_0 l_libs lib_name_0, sys_path, file_name, system_dir_0,\
err_msg_found_lib_0, head_f_l, proclib_import,err_msg_import_0, head_f_i err_msg_found_lib_0, head_f_l, proclib_import,err_msg_import_0,head_f_i
lib_1 l_libs lib_name_1, sys_path, file_name, system_dir_1,\ lib_1 l_libs lib_name_1, sys_path, file_name, system_dir_1,\
err_msg_found_lib_1, head_f_l, import_libimg, err_msg_import_1, head_f_i err_msg_found_lib_1, head_f_l, import_libimg, err_msg_import_1,head_f_i
lib_2 l_libs lib_name_2, sys_path, file_name, system_dir_2,\ lib_2 l_libs lib_name_2, sys_path, file_name, system_dir_2,\
err_msg_found_lib_2, head_f_l, import_box_lib,err_msg_import_2,head_f_i err_msg_found_lib_2, head_f_l, import_box_lib,err_msg_import_2,head_f_i
lib_3 l_libs lib_name_3, sys_path, file_name, system_dir_3,\ lib_3 l_libs lib_name_3, sys_path, file_name, system_dir_3,\
@ -1083,7 +1083,7 @@ l_libs_start:
lib_4 l_libs lib_name_4, sys_path, file_name, system_dir_4,\ lib_4 l_libs lib_name_4, sys_path, file_name, system_dir_4,\
err_msg_found_lib_4, head_f_l, import_libkmenu,err_msg_import_4,head_f_i err_msg_found_lib_4, head_f_l, import_libkmenu,err_msg_import_4,head_f_i
lib_5 l_libs lib_name_5, sys_path, file_name, system_dir_5,\ lib_5 l_libs lib_name_5, sys_path, file_name, system_dir_5,\
err_msg_found_lib_5, head_f_l, import_lib_tinygl,err_msg_import_5,head_f_i err_msg_found_lib_5, head_f_l, import_lib_tinygl,err_msg_import_5,head_f_i,lib_sub_folder
lib_6 l_libs lib_name_6, sys_path, file_name, system_dir_6,\ lib_6 l_libs lib_name_6, sys_path, file_name, system_dir_6,\
err_msg_found_lib_6, head_f_l, import_libini, err_msg_import_6,head_f_i err_msg_found_lib_6, head_f_l, import_libini, err_msg_import_6,head_f_i
l_libs_end: l_libs_end:
@ -1362,11 +1362,13 @@ white_light dd 0.8, 0.8, 0.8, 1.0 ;
lmodel_ambient dd 0.3, 0.3, 0.3, 1.0 ; <20> à ¬¥âàë ä®­®¢®£® ®á¢¥é¥­¨ï lmodel_ambient dd 0.3, 0.3, 0.3, 1.0 ; <20> à ¬¥âàë ä®­®¢®£® ®á¢¥é¥­¨ï
if lang eq ru if lang eq ru
capt db 'info 3ds ¢¥àá¨ï 16.02.16',0 ;¯®¤¯¨áì ®ª­  capt db 'info 3ds ¢¥àá¨ï 18.02.16',0 ;¯®¤¯¨áì ®ª­ 
else else
capt db 'info 3ds version 16.02.16',0 ;window caption capt db 'info 3ds version 18.02.16',0 ;window caption
end if end if
lib_sub_folder db '../../lib/',0
align 16 align 16
i_end: i_end:
procinfo process_information procinfo process_information

12
programs/develop/info3ds/info3ds_u.asm
View File

@ -1113,9 +1113,9 @@ end if
align 4 align 4
l_libs_start: l_libs_start:
lib_0 l_libs lib_name_0, sys_path, file_name, system_dir_0,\ lib_0 l_libs lib_name_0, sys_path, file_name, system_dir_0,\
err_msg_found_lib_0, head_f_l, proclib_import,err_msg_import_0, head_f_i err_msg_found_lib_0, head_f_l, proclib_import,err_msg_import_0,head_f_i
lib_1 l_libs lib_name_1, sys_path, file_name, system_dir_1,\ lib_1 l_libs lib_name_1, sys_path, file_name, system_dir_1,\
err_msg_found_lib_1, head_f_l, import_libimg, err_msg_import_1, head_f_i err_msg_found_lib_1, head_f_l, import_libimg, err_msg_import_1,head_f_i
lib_2 l_libs lib_name_2, sys_path, file_name, system_dir_2,\ lib_2 l_libs lib_name_2, sys_path, file_name, system_dir_2,\
err_msg_found_lib_2, head_f_l, import_box_lib,err_msg_import_2,head_f_i err_msg_found_lib_2, head_f_l, import_box_lib,err_msg_import_2,head_f_i
lib_3 l_libs lib_name_3, sys_path, file_name, system_dir_3,\ lib_3 l_libs lib_name_3, sys_path, file_name, system_dir_3,\
@ -1123,7 +1123,7 @@ l_libs_start:
lib_4 l_libs lib_name_4, sys_path, file_name, system_dir_4,\ lib_4 l_libs lib_name_4, sys_path, file_name, system_dir_4,\
err_msg_found_lib_4, head_f_l, import_libkmenu,err_msg_import_4,head_f_i err_msg_found_lib_4, head_f_l, import_libkmenu,err_msg_import_4,head_f_i
lib_5 l_libs lib_name_5, sys_path, file_name, system_dir_5,\ lib_5 l_libs lib_name_5, sys_path, file_name, system_dir_5,\
err_msg_found_lib_5, head_f_l, import_lib_tinygl,err_msg_import_5,head_f_i err_msg_found_lib_5, head_f_l, import_lib_tinygl,err_msg_import_5,head_f_i,lib_sub_folder
lib_6 l_libs lib_name_6, sys_path, file_name, system_dir_6,\ lib_6 l_libs lib_name_6, sys_path, file_name, system_dir_6,\
err_msg_found_lib_6, head_f_l, import_libini, err_msg_import_6,head_f_i err_msg_found_lib_6, head_f_l, import_libini, err_msg_import_6,head_f_i
l_libs_end: l_libs_end:
@ -1397,11 +1397,13 @@ white_light dd 0.8, 0.8, 0.8, 1.0 ;
lmodel_ambient dd 0.3, 0.3, 0.3, 1.0 ; <20> à ¬¥âàë ä®­®¢®£® ®á¢¥é¥­¨ï lmodel_ambient dd 0.3, 0.3, 0.3, 1.0 ; <20> à ¬¥âàë ä®­®¢®£® ®á¢¥é¥­¨ï
if lang eq ru if lang eq ru
capt db 'info 3ds [user] ¢¥àá¨ï 13.02.16',0 ;¯®¤¯¨áì ®ª­  capt db 'info 3ds [user] ¢¥àá¨ï 18.02.16',0 ;¯®¤¯¨áì ®ª­ 
else else
capt db 'info 3ds [user] version 13.02.16',0 ;window caption capt db 'info 3ds [user] version 18.02.16',0 ;window caption
end if end if
lib_sub_folder db '../../lib/',0
align 16 align 16
i_end: i_end:
procinfo process_information procinfo process_information

34
programs/develop/libraries/box_lib/load_lib.mac
View File

@ -117,6 +117,8 @@ local lp1
local lp2 local lp2
local lp3 local lp3
local lp4 local lp4
local lp5
local lp6
local file_name local file_name
library_fun_memory_alloc equ 0 ;­¥ ¨á¯®«ì§®¢ âì ¢ ¬ ªà®á å ¯à®¢¥àªã ­  ä㭪樨 'lib_init' library_fun_memory_alloc equ 0 ;­¥ ¨á¯®«ì§®¢ âì ¢ ¬ ªà®á å ¯à®¢¥àªã ­  ä㭪樨 'lib_init'
@ -168,6 +170,21 @@ align 4
test esi,esi test esi,esi
jz .str_lp4 jz .str_lp4
;¯à®¢¥àª  ®â­®á¨â¥«ì­ëå ¯ã⥩ c ¤¢ã¬ï â®çª ¬¨ '../'
cmp word[esi],'..'
jne .lp3
dec edi ;¤«ï ¯¥à¥å®¤  ­  '/'
.lp6:
add esi,3 ;¯à®¯ã᪠¥¬ ®¤­® ¯®¤­ï⨥ '../'
.lp5:
dec edi ;¨¤¥¬ ¯® ¯ ¯ª ¬
cmp byte[edi],'/'
jnz .lp5
cmp word[esi],'..'
je .lp6
inc edi ;¤«ï ¯¥à¥å®¤  ­  '/'
;ª®¯¨à®¢ ­¨¥ ®â­®á¨â¥«ì­®£® ¯ãâ¨
align 4 align 4
.lp3: .lp3:
lodsb lodsb
@ -439,15 +456,16 @@ exit_lp2:
macro copy_path lib_name,dir_path,lib_path,point_dir_name macro copy_path lib_name,dir_path,lib_path,point_dir_name
{ {
pushad ;save all registers pushad ;save all registers
push dword lib_name push dword lib_name
push dword dir_path push dword dir_path
push dword lib_path push dword lib_path
push dword point_dir_name push dword point_dir_name
call @copy_path call @copy_path
add esp,16 add esp,16
popad ;restore all registers ;notify_window_run lib_path ;unblok for test load path
popad ;restore all registers
} }
; £®â®¢¨¬ ⥪áâ ¤«ï ¯®ª §  ç¥à¥§ @notify: ; £®â®¢¨¬ ⥪áâ ¤«ï ¯®ª §  ç¥à¥§ @notify: