WebSVN – Kolibri OS – Diff – /programs/develop/libraries/box_lib/load_lib.mac

 local __sc
 local lp
 local lp1
-local correction
-;local end_tr
+local correction
 local exit_
 ;/equ
 err_message1     equ    dword [esp+8]
 arrea_xx dd     0x0
 rb      0x50
 end_tr:
+;---------------------------------------------------------------------
-;---------------------------------------------------------------------
-@library_name     equ    dword [esp+12]
+@library_name     equ    dword [esp+16]
-@cur_dir_path     equ    dword [esp+8]
+@cur_dir_path     equ    dword [esp+12]
+@library_path     equ    dword [esp+8]
-@library_path     equ    dword [esp+4]
+@point_dir_name   equ    dword [esp+4]
 align 4
 @copy_path:
-        mov     ebx,@library_name
+;        mov     ebx,@library_name
         mov     esi,@cur_dir_path
         mov     edi,@library_path
         xor     eax,eax
-        xor     eax,eax
+        cld
-        cld
+align 4
 .lp1:
         lodsb
         stosb
         test    eax,eax
+        jnz     .lp1
-        jnz     .lp1
+        mov     esi,edi
         mov     esi,edi
         std
-        std
+align 4
 .lp2:
-        lodsb
+        lodsb
         cmp     al,'/'
+        jnz     .lp2
+        mov     edi,esi
+        add     edi,2
+        cld
-        jnz     .lp2
+;	mov     esi,@library_name
         mov     edi,esi
-        mov     esi,ebx
+	mov	esi,@point_dir_name
-        add     edi,2
+	test	esi,esi
 	jz      .str_lp4
+align 4
+.lp3:
+        lodsb
+        stosb
+        test    eax,eax
+        jnz     .lp3
+	dec 	edi
+.str_lp4:
+	mov     esi,@library_name
-        cld
+align 4
-.lp3:
+.lp4:
         lodsb
         stosb
         test    eax,eax
-        jnz     .lp3
+        jnz     .lp4
 ;---------------------------------------------------------------------
         ret
+}
+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__
+{
+local end_steep
-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__
+local exit
+;---------------------------------------------------------------------
 ; loading Box_Lib library
 local end_steep
-local exit
+        mcall   68,19,system_path__   ; load of sys directory
-;---------------------------------------------------------------------
+        test    eax,eax
 ;---------------------------------------------------------------------
 }
-macro 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__
+macro 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__
+{
 local end_steep
+local exit
+;---------------------------------------------------------------------
+; loading Box_Lib library
-local exit
+if point_dir_name__ eq
-;---------------------------------------------------------------------
+  copy_path   library_name__, cur_dir_path__, library_path__,0x0
-; loading Box_Lib library
+else
   copy_path   library_name__, cur_dir_path__, library_path__,point_dir_name__    ;the macros making way /current pach a program/+ name system library
 err_message_found_lib__   equ [ebp+16]
 head_f_l__                equ [ebp+20]
-my_import               equ [ebp+24]
+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+36]
+adr_load_lib              equ dword [ebp+40]
-status_lib              equ dword [ebp+40]
+status_lib                equ dword [ebp+44]
         mov     ebp,_start
         mov     ecx,((_end-_start)/ll_struc_size)
 align 4
 lp:     push    ecx
         mcall   68,19,system_path__   ; load of sys directory
         test    eax,eax
         jnz     end_steep
-        copy_path  library_name__, cur_dir_path__, library_path__     ;the macros making way /current pach a program/+ name system library
+        copy_path  library_name__, cur_dir_path__, library_path__,point_dir_name__     ;the macros making way /current pach a program/+ name system library
         mcall   68,19,library_path__ ; load of alternative
         test    eax,eax
         jnz     end_steep
         or      status_lib,0x1          ; status of code - enable error - not found library
 err_message_found_lib__   equ [ebp+16]
 head_f_l__                equ [ebp+20]
-my_import               equ [ebp+24]
+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+36]
+adr_load_lib              equ dword [ebp+40]
-status_lib              equ dword [ebp+40]
+status_lib                equ dword [ebp+44]
         mov     ebp,_start
         mov     ecx,((_end-_start)/ll_struc_size)
 align 4
 lp:     push    ecx
-        copy_path    library_name__, cur_dir_path__, library_path__   ;the macros making way /current pach a program/+ name system library
+        copy_path    library_name__, cur_dir_path__, library_path__,point_dir_name__   ;the macros making way /current pach a program/+ name system library
 exit_lp2:
 }
-macro copy_path lib_name,dir_path,lib_path
+macro copy_path lib_name,dir_path,lib_path,point_dir_name
+{
         pushad  ;save all registers
-        push    dword lib_name
+        push    dword lib_name
         push    dword dir_path
         push    dword lib_path
         push	dword point_dir_name
         call    @copy_path
-        add     esp,12
+        add     esp,16
 import_done:
         xor     eax,eax
 e.exit:
 ;---------------------------------------------------------------------
+}
-ll_struc_size = 44;($-library_name__)    ; constant   size of struct
+ll_struc_size = 48;($-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__; struct for loading libraries
+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__        ; óêàçàòåëü íà áóôåð â êîòîðîì ñîäåðæèòüñÿ ïóòü îò êóäà áûëà çàïóùåíà ïðîãðàììà
 .err_message_found_lib__  dd err_message_found_lib__
 .head_f_l__               dd head_f_l__
-.my_import              dd my_import
+.my_import                dd my_import
 .err_message_import__     dd err_message_import__
 .head_f_i__               dd head_f_i__
+if point_dir_name eq
+.point_dir_name__	dd 0x0
+else
+.point_dir_name__	dd point_dir_name	   ; èìÿ âëîæåííîé äèððåêòîðèè â êòîðîé õðàíÿòüñÿ ïîäãðóæàåìûå ìîäóëè.
+end if
 .adr_load_lib           dd 0x0
 .status_lib             dd 0x0          ;status of load library
+;
+}

Subversion Repositories Kolibri OS

(root)/programs/develop/libraries/box_lib/load_lib.mac – Rev 1127 → 1204