Rob Shearman : setupapi: The inf file containing the SourceDisksFiles and SourceDisksNames sections is the same as hinf if there is no layout file specified .

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 66d5cb2967b89fe98076948917070a0d3f4b925d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=66d5cb2967b89fe98076948917...

Author: Rob Shearman <rob(a)codeweavers.com>
Date:   Thu May  3 22:39:44 2007 +0100

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.

---

 dlls/setupapi/install.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c
index 46f1b94..902216e 100644
--- 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;
 }