[PATCH v3] setupapi: Handle arch-specific SourceDisks{Names, Files} .inf sections in get_source_info.

[Alexandre Julliard]

Gijs Vermeulen <gijsvrm at gmail.com> writes:

> diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c
> index 2d2c833474..29a76f1b8c 100644
> --- a/dlls/setupapi/queue.c
> +++ b/dlls/setupapi/queue.c
> @@ -289,21 +289,20 @@ UINT CALLBACK QUEUE_callback_WtoA( void *context, UINT notification,
>  static void get_source_info( HINF hinf, const WCHAR *src_file, SP_FILE_COPY_PARAMS_W *params,
>                               WCHAR *src_root, WCHAR *src_path)
>  {
> -    static const WCHAR SourceDisksNames[] =
> -        {'S','o','u','r','c','e','D','i','s','k','s','N','a','m','e','s',0};
> -    static const WCHAR SourceDisksFiles[] =
> -        {'S','o','u','r','c','e','D','i','s','k','s','F','i','l','e','s',0};
> -
>      INFCONTEXT file_ctx, disk_ctx;
>      INT id, diskid;
>      DWORD len;
>  
>      /* find the SourceDisksFiles entry */
> -    if (!SetupFindFirstLineW( hinf, SourceDisksFiles, src_file, &file_ctx )) return;
> +    if (!search_for_source_disks_files( hinf, src_file, &file_ctx ))
> +        return;
> +
>      if (!SetupGetIntField( &file_ctx, 1, &diskid )) return;
>  
>      /* now find the diskid in the SourceDisksNames section */
> -    if (!SetupFindFirstLineW( hinf, SourceDisksNames, NULL, &disk_ctx )) return;
> +    if (!search_for_source_disks_names( hinf, NULL, &disk_ctx ))
> +        return;
> +

Couldn't get_source_info() simply call get_source_id()?

-- 
Alexandre Julliard
julliard at winehq.org