From: Jacek Caban jacek@codeweavers.com
--- dlls/ntdll/loader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index d8ea6750cbc..0a7eddfb4e5 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -734,11 +734,11 @@ static NTSTATUS get_apiset_target( const API_SET_NAMESPACE *map, const API_SET_N /********************************************************************** * build_import_name */ -static NTSTATUS build_import_name( WCHAR buffer[256], const char *import, int len ) +static NTSTATUS build_import_name( WINE_MODREF *wm, WCHAR buffer[256], const char *import, int len ) { const API_SET_NAMESPACE *map = NtCurrentTeb()->Peb->ApiSetMap; const API_SET_NAMESPACE_ENTRY *entry; - const WCHAR *host = current_modref ? current_modref->ldr.BaseDllName.Buffer : NULL; + const WCHAR *host = wm->ldr.BaseDllName.Buffer; UNICODE_STRING str;
while (len && import[len-1] == ' ') len--; /* remove trailing spaces */ @@ -913,7 +913,7 @@ static FARPROC find_forwarded_export( WINE_MODREF *imp, const char *forward, LPC FARPROC proc = NULL;
if (!end) return NULL; - if (build_import_name( mod_name, forward, end - forward )) return NULL; + if (build_import_name( imp, mod_name, forward, end - forward )) return NULL;
if (!(wm = find_basename_module( mod_name ))) { @@ -1119,7 +1119,7 @@ static BOOL import_dll( WINE_MODREF *wm, const IMAGE_IMPORT_DESCRIPTOR *descr, L return TRUE; }
- status = build_import_name( buffer, name, len ); + status = build_import_name( wm, buffer, name, len ); if (!status) status = load_dll( load_path, buffer, 0, &wmImp, system );
if (status)