ntdll: Skip unused import descriptors when loading libraries.

Alexandre Julliard julliard at winehq.org
Wed Feb 10 08:05:04 CST 2016


Sebastian Lackner <sebastian at fds-team.de> writes:

> @@ -901,7 +901,18 @@ static NTSTATUS fixup_imports( WINE_MODREF *wm, LPCWSTR load_path )
>      status = STATUS_SUCCESS;
>      for (i = 0; i < nb_imports; i++)
>      {
> -        if (!(wm->deps[i] = import_dll( wm->ldr.BaseAddress, &imports[i], load_path )))
> +        const IMAGE_IMPORT_DESCRIPTOR *descr = &imports[i];
> +        const IMAGE_THUNK_DATA *import_list = get_rva( wm->ldr.BaseAddress, descr->u.OriginalFirstThunk ?
> +                                                       (DWORD)descr->u.OriginalFirstThunk : (DWORD)descr->FirstThunk );
> +        if (!import_list->u1.Ordinal)

I feel it would be cleaner to do these checks inside import_dll().

-- 
Alexandre Julliard
julliard at winehq.org



More information about the wine-devel mailing list