Zebediah Figura : setupapi: Avoid passing a NULL source root path to SetupQueueDefaultCopy() and SetupQueueCopySection().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: cedbdf438770970ea5d1e32b10667d736a06c01a
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=cedbdf438770970ea5d1e32b1...

Author: Zebediah Figura <z.figura12(a)gmail.com>
Date:   Wed May  1 18:24:02 2019 -0500

setupapi: Avoid passing a NULL source root path to SetupQueueDefaultCopy() and SetupQueueCopySection().

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/setupapi/install.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c
index 0abd716..265fbd0 100644
--- a/dlls/setupapi/install.c
+++ b/dlls/setupapi/install.c
@@ -155,11 +155,20 @@ static WCHAR *dup_section_line_field( HINF hinf, const WCHAR *section, const WCH
 static BOOL copy_files_callback( HINF hinf, PCWSTR field, void *arg )
 {
     struct files_callback_info *info = arg;
+    WCHAR src_root[MAX_PATH], *p;
+
+    if (!info->src_root)
+    {
+        strcpyW( src_root, PARSER_get_inf_filename( hinf ) );
+        if ((p = strrchrW( src_root, '\\' ))) *p = 0;
+    }
 
     if (field[0] == '@')  /* special case: copy single file */
-        SetupQueueDefaultCopyW( info->queue, info->layout ? info->layout : hinf, info->src_root, NULL, field+1, info->copy_flags );
+        SetupQueueDefaultCopyW( info->queue, info->layout ? info->layout : hinf,
+                info->src_root ? info->src_root : src_root, NULL, field+1, info->copy_flags );
     else
-        SetupQueueCopySectionW( info->queue, info->src_root, info->layout ? info->layout : hinf, hinf, field, info->copy_flags );
+        SetupQueueCopySectionW( info->queue, info->src_root ? info->src_root : src_root,
+                info->layout ? info->layout : hinf, hinf, field, info->copy_flags );
     return TRUE;
 }