From 45f369f4181f42ac2688f33c17278905666cac46 Mon Sep 17 00:00:00 2001 From: "Sergey Semyonov (Serge)" Date: Mon, 10 Nov 2008 06:18:02 +0000 Subject: [PATCH] fix load_library git-svn-id: svn://kolibrios.org@916 a494cfbc-eb01-0410-851d-a64ba20cac60 --- kernel/trunk/core/dll.inc | 8 ++++++-- kernel/trunk/data32.inc | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/kernel/trunk/core/dll.inc b/kernel/trunk/core/dll.inc index d54157fc61..f49521991c 100644 --- a/kernel/trunk/core/dll.inc +++ b/kernel/trunk/core/dll.inc @@ -653,7 +653,7 @@ proc get_proc_ex stdcall, proc_name:dword, imports:dword jz .next_table push edx - stdcall strncmp, eax, [proc_name], 16 + stdcall strncmp, eax, [proc_name], 256 pop edx test eax, eax jz .ok @@ -1011,7 +1011,6 @@ proc load_library stdcall, file_name:dword jmp .next .copy: add esi, edx - ; add edi, new_app_base mov ecx, [eax+CFS.SizeOfRawData] cld rep movsb @@ -1054,6 +1053,11 @@ proc load_library stdcall, file_name:dword mov ebx, [coff] stdcall get_coff_sym,[sym],[ebx+CFH.nSymbols],szEXPORTS + test eax, eax + jnz @F + + mov ebx, [coff] + stdcall get_coff_sym,[sym],[ebx+CFH.nSymbols],sz_EXPORTS mov [exports], eax stdcall kernel_free, [coff] diff --git a/kernel/trunk/data32.inc b/kernel/trunk/data32.inc index bc45e1221c..f2cd452918 100644 --- a/kernel/trunk/data32.inc +++ b/kernel/trunk/data32.inc @@ -94,6 +94,8 @@ szAtiHW db '/rd/1/drivers/ati2d.drv',0 szSTART db 'START',0 szEXPORTS db 'EXPORTS',0 +sz_EXPORTS db '_EXPORTS',0 + szIMPORTS db 'IMPORTS',0 read_firstapp db '/sys/'