[PATCH 1/4] setupapi: Use SetupGetSourceFileLocation() in get_source_info().

[Zebediah Figura]

From: Zebediah Figura

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48455
---
 dlls/setupapi/queue.c | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c
index 40e106fffcd..6ee4e0af9e1 100644
--- a/dlls/setupapi/queue.c
+++ b/dlls/setupapi/queue.c
@@ -293,13 +293,16 @@ 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)
 {
-    INFCONTEXT file_ctx, disk_ctx;
-    INT id, diskid;
+    INFCONTEXT disk_ctx;
+    UINT diskid;
+    INT id;
     DWORD len;

-    /* find the SourceDisksFiles entry */
-    if (!SetupFindFirstLineW( hinf, L"SourceDisksFiles", src_file, &file_ctx )) return;
-    if (!SetupGetIntField( &file_ctx, 1, &diskid )) return;
+    if (!SetupGetSourceFileLocationW( hinf, NULL, src_file, &diskid, src_path, MAX_PATH, &len ))
+        return;
+
+    if (len > sizeof(WCHAR))
+        params->SourcePath = src_path;

/* now find the diskid in the SourceDisksNames section */
     if (!SetupFindFirstLineW( hinf, L"SourceDisksNames", NULL, &disk_ctx )) return;
@@ -324,12 +327,6 @@ static void get_source_info( HINF hinf, const WCHAR *src_file, SP_FILE_COPY_PARA
         SetupGetStringFieldW( &disk_ctx, 4, src_root + lstrlenW( src_root ),
                               MAX_PATH - lstrlenW( src_root ), NULL );
     }
-
-    if (SetupGetStringFieldW( &file_ctx, 2, NULL, 0, &len ) && len > sizeof(WCHAR) && len < MAX_PATH)
-    {
-        SetupGetStringFieldW( &file_ctx, 2, src_path, MAX_PATH, NULL );
-        params->SourcePath = src_path;
-    }
 }

/***********************************************************************