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

Moved the loaddll trace into the load_builtin_dll function so that it 

gets printed even when we don't get the expected so file.
This commit is contained in:
Alexandre Julliard 2005-05-23 10:33:34 +00:00
parent c5bc264706
commit 7016b99972
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/ntdll/loader.c
View File

@ -1357,6 +1357,8 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file,
if (TRACE_ON(snoop)) SNOOP_SetupDLL( module ); if (TRACE_ON(snoop)) SNOOP_SetupDLL( module );
TRACE_(loaddll)( " Loaded module %s : native\n", debugstr_w(wm->ldr.FullDllName.Buffer) );
*pwm = wm; *pwm = wm;
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
@ -1424,6 +1426,8 @@ static NTSTATUS load_builtin_dll( LPCWSTR load_path, LPCWSTR path, DWORD flags,
return STATUS_INVALID_IMAGE_FORMAT; return STATUS_INVALID_IMAGE_FORMAT;
} }
TRACE_(loaddll)( "Loaded module %s : builtin\n", debugstr_w(info.wm->ldr.FullDllName.Buffer) );
info.wm->ldr.SectionHandle = handle; info.wm->ldr.SectionHandle = handle;
if (strcmpiW( info.wm->ldr.BaseDllName.Buffer, name )) if (strcmpiW( info.wm->ldr.BaseDllName.Buffer, name ))
{ {
@ -1621,9 +1625,6 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_
/* Initialize DLL just loaded */ /* Initialize DLL just loaded */
TRACE("Loaded module %s (%s) at %p\n", TRACE("Loaded module %s (%s) at %p\n",
debugstr_w(filename), filetype, (*pwm)->ldr.BaseAddress); debugstr_w(filename), filetype, (*pwm)->ldr.BaseAddress);
if (!TRACE_ON(module))
TRACE_(loaddll)("Loaded module %s : %s\n",
debugstr_w((*pwm)->ldr.FullDllName.Buffer), filetype);
/* Set the ldr.LoadCount here so that an attach failure will */ /* Set the ldr.LoadCount here so that an attach failure will */
/* decrement the dependencies through the MODULE_FreeLibrary call. */ /* decrement the dependencies through the MODULE_FreeLibrary call. */
(*pwm)->ldr.LoadCount = 1; (*pwm)->ldr.LoadCount = 1;