WebSVN – Kolibri OS – Diff – /kernel/trunk/core/dll.inc

 ;; Copyright (C) KolibriOS team 2004-2012. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 3786 $
+$Revision: 3827 $
              fileinfo  rb 40
              coff      dd ?
              img_base  dd ?
            endl
-        cli
 ; resolve file name
         mov     ebx, [file_name]
         lea     edi, [fullname+1]
         mov     byte [edi-1], '/'
         stdcall get_full_file_name, edi, 259
         test    al, al
         jz      .fail
+; scan for required DLL in list of already loaded for this process,
+; ignore timestamp
-; scan for required DLL in list of already loaded for this process,
+        cli
 ; ignore timestamp
         mov     esi, [CURRENT_TASK]
         shl     esi, 8
         lea     edi, [fullname]
         mov     ecx, [esi+HDLL.parent]
         inc     [ecx+DLLDESCR.refcount]
         mov     eax, [ecx+DLLDESCR.exports]
         sub     eax, [ecx+DLLDESCR.defaultbase]
         add     eax, [esi+HDLL.base]
+        sti
         ret
 .next_in_process:
         mov     esi, [esi+HDLL.fd]
         jmp     .scan_in_process
 .not_in_process:
+; scan in full list, compare timestamp
-; scan in full list, compare timestamp
+        sti
         lea     eax, [fileinfo]
         stdcall get_fileinfo, edi, eax
         test    eax, eax
+        jnz     .fail
-        jnz     .fail
+        cli
         mov     esi, [dll_list.fd]
 .scan_for_dlls:
         cmp     esi, dll_list
         jz      .load_new
         mov     esi, [esi+DLLDESCR.fd]
         jmp     .scan_for_dlls
 ; new DLL
+.load_new:
-.load_new:
+        sti
 ; load file
         stdcall load_file, edi
         test    eax, eax
         jz      .fail
         mov     esi, eax
         mov     eax, dword [fileinfo+24]
         mov     dword [esi+DLLDESCR.timestamp], eax
         mov     eax, dword [fileinfo+28]
         mov     dword [esi+DLLDESCR.timestamp+4], eax
-; initialize DLLDESCR struct
-        and     dword [esi+DLLDESCR.refcount], 0; no HDLLs yet; later it will be incremented
-        mov     [esi+DLLDESCR.fd], dll_list
-        mov     eax, [dll_list.bk]
-        mov     [dll_list.bk], esi
-        mov     [esi+DLLDESCR.bk], eax
-        mov     [eax+DLLDESCR.fd], esi
 ; calculate size of loaded DLL
         mov     edx, [coff]
         movzx   ecx, [edx+COFF_HEADER.nSections]
         sub     eax, [esi+DLLDESCR.defaultbase]
         stdcall fix_coff_relocs, ebx, [esi+DLLDESCR.symbols_ptr], eax
+        stdcall kernel_free, [coff]
+        cli
+; initialize DLLDESCR struct
+        and     dword [esi+DLLDESCR.refcount], 0; no HDLLs yet; later it will be incremented
+        mov     [esi+DLLDESCR.fd], dll_list
+        mov     eax, [dll_list.bk]
+        mov     [dll_list.bk], esi
-        stdcall kernel_free, [coff]
+        mov     [esi+DLLDESCR.bk], eax
         mov     [eax+DLLDESCR.fd], esi
 .dll_already_loaded:
         inc     [esi+DLLDESCR.refcount]
         push    esi
 @@:
         mov     eax, [esi+DLLDESCR.exports]
         sub     eax, [esi+DLLDESCR.defaultbase]
+        add     eax, [img_base]
-        add     eax, [img_base]
+        sti
         ret
 .fail_and_free_data:
         stdcall kernel_free, [esi+DLLDESCR.data]
 .fail_and_free_dll:
 .fail_and_free_user:
         stdcall user_free, [img_base]
 .fail_and_dereference:
         mov     eax, 1  ; delete 1 reference
         call    dereference_dll
+        sti
         xor     eax, eax
         ret
 endp

Subversion Repositories Kolibri OS

(root)/kernel/trunk/core/dll.inc – Rev 3786 → 3827