setupapi: The inf file containing the SourceDisksFiles and SourceDisksNames…

setupapi: The inf file containing the SourceDisksFiles and SourceDisksNames sections is the same as hinf if there is no layout file specified. So pass the correct inf handle to SetupQueueDefaultCopyW and SetupQueueCopySectionW.

setupapi: The inf file containing the SourceDisksFiles and SourceDisksNames…
66d5cb29 · Rob Shearman · Alexandre Julliard · 3d57dd3f · 66d5cb29
Commit 66d5cb29 authored May 03, 2007 by Rob Shearman Committed by Alexandre Julliard May 04, 2007
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

install.c dlls/setupapi/install.c +2 -2

No files found.
--- a/dlls/setupapi/install.c
+++ b/dlls/setupapi/install.c
@@ -113,9 +113,9 @@ static BOOL copy_files_callback( HINF hinf, PCWSTR field, void *arg )
    struct files_callback_info *info = arg;

    if (field[0] == '@')  /* special case: copy single file */
-        SetupQueueDefaultCopyW( info->queue, info->layout, info->src_root, NULL, field+1, info->copy_flags );
+        SetupQueueDefaultCopyW( info->queue, info->layout ? info->layout : hinf, info->src_root, NULL, field+1, info->copy_flags );
    else
-        SetupQueueCopySectionW( info->queue, info->src_root, info->layout, hinf, field, info->copy_flags );
+        SetupQueueCopySectionW( info->queue, info->src_root, info->layout ? info->layout : hinf, hinf, field, info->copy_flags );
    return TRUE;
 }