mirror of
https://github.com/KolibriOS/kolibrios.git
synced 2025-09-16 15:38:01 -04:00
Libraries: fixed a bug in lib_init functions
added verification of the second initialization attempt
This commit is contained in:
parent
e423bfb2d1
commit
4a5c577952
@ -100,6 +100,10 @@ lib_init: ;//////////////////////////////////////////////////////////////////;;
|
|||||||
mov [mem.alloc], eax
|
mov [mem.alloc], eax
|
||||||
mov [mem.free], ebx
|
mov [mem.free], ebx
|
||||||
mov [mem.realloc], ecx
|
mov [mem.realloc], ecx
|
||||||
|
|
||||||
|
cmp [dll.load], edx
|
||||||
|
je .ok
|
||||||
|
|
||||||
mov [dll.load], edx
|
mov [dll.load], edx
|
||||||
|
|
||||||
invoke dll.load, @IMPORT
|
invoke dll.load, @IMPORT
|
||||||
@ -115,6 +119,7 @@ lib_init: ;//////////////////////////////////////////////////////////////////;;
|
|||||||
invoke ini.get_str, inifile, sec_proxy, key_password, proxyPassword, 256, proxyPassword
|
invoke ini.get_str, inifile, sec_proxy, key_password, proxyPassword, 256, proxyPassword
|
||||||
popa
|
popa
|
||||||
|
|
||||||
|
.ok:
|
||||||
DEBUGF 1, "HTTP library: init OK\n"
|
DEBUGF 1, "HTTP library: init OK\n"
|
||||||
xor eax, eax
|
xor eax, eax
|
||||||
ret
|
ret
|
||||||
|
@ -78,6 +78,10 @@ proc lib_init ;///////////////////////////////////////////////////////////////;;
|
|||||||
mov [mem.alloc], eax
|
mov [mem.alloc], eax
|
||||||
mov [mem.free], ebx
|
mov [mem.free], ebx
|
||||||
mov [mem.realloc], ecx
|
mov [mem.realloc], ecx
|
||||||
|
|
||||||
|
cmp [dll.load], edx
|
||||||
|
je .ok
|
||||||
|
|
||||||
mov [dll.load], edx
|
mov [dll.load], edx
|
||||||
|
|
||||||
or edx, edx
|
or edx, edx
|
||||||
|
@ -37,6 +37,10 @@ proc libini._.init ;////////////////////////////////////////////////////////////
|
|||||||
mov [mem.alloc], eax
|
mov [mem.alloc], eax
|
||||||
mov [mem.free], ebx
|
mov [mem.free], ebx
|
||||||
mov [mem.realloc], ecx
|
mov [mem.realloc], ecx
|
||||||
|
|
||||||
|
cmp [dll.load], edx
|
||||||
|
je .ok
|
||||||
|
|
||||||
mov [dll.load], edx
|
mov [dll.load], edx
|
||||||
|
|
||||||
invoke dll.load, @IMPORT
|
invoke dll.load, @IMPORT
|
||||||
|
@ -33,7 +33,8 @@ use_ColorDialog
|
|||||||
;--------------------------------------------------
|
;--------------------------------------------------
|
||||||
align 16
|
align 16
|
||||||
lib_init:
|
lib_init:
|
||||||
ret
|
xor eax, eax
|
||||||
|
ret
|
||||||
|
|
||||||
;--------------------------------------------------
|
;--------------------------------------------------
|
||||||
align 16
|
align 16
|
||||||
|
Loading…
x
Reference in New Issue
Block a user