ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ntdll: Don't fixup imports when a dll is already loaded.

This commit is contained in:
Alexandre Julliard 2014-02-17 16:25:13 +01:00
parent a4c8943c70
commit 7307298ac3
2 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/kernel32/tests/loader.c
View File

@ -1297,7 +1297,6 @@ static void test_import_resolution(void)
(void *)ptr->thunks[0].u1.Function, data.module, data.function.name ); (void *)ptr->thunks[0].u1.Function, data.module, data.function.name );
mod2 = LoadLibraryA( dll_name ); mod2 = LoadLibraryA( dll_name );
ok( mod2 == mod, "loaded twice %p / %p\n", mod, mod2 ); ok( mod2 == mod, "loaded twice %p / %p\n", mod, mod2 );
todo_wine
ok( ptr->thunks[0].u1.Function == 0xdeadbeef, "thunk resolved to %p for %s.%s\n", ok( ptr->thunks[0].u1.Function == 0xdeadbeef, "thunk resolved to %p for %s.%s\n",
(void *)ptr->thunks[0].u1.Function, data.module, data.function.name ); (void *)ptr->thunks[0].u1.Function, data.module, data.function.name );
FreeLibrary( mod ); FreeLibrary( mod );

2
dlls/ntdll/loader.c
View File

@ -2018,8 +2018,6 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_
{ {
if ((*pwm)->ldr.LoadCount != -1) (*pwm)->ldr.LoadCount++; if ((*pwm)->ldr.LoadCount != -1) (*pwm)->ldr.LoadCount++;
if (!(flags & DONT_RESOLVE_DLL_REFERENCES)) fixup_imports( *pwm, load_path );
TRACE("Found %s for %s at %p, count=%d\n", TRACE("Found %s for %s at %p, count=%d\n",
debugstr_w((*pwm)->ldr.FullDllName.Buffer), debugstr_w(libname), debugstr_w((*pwm)->ldr.FullDllName.Buffer), debugstr_w(libname),
(*pwm)->ldr.BaseAddress, (*pwm)->ldr.LoadCount); (*pwm)->ldr.BaseAddress, (*pwm)->ldr.LoadCount);