[PATCH 4/4] setupapi: Fix error handling in SetupInstallServicesFromInfSection().

[Zebediah Figura]

Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
 dlls/setupapi/install.c       | 40 ++++++++++++++++++-----------------
 dlls/setupapi/tests/install.c | 14 ++++++++++++
 2 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c
index 6a3213ce7c3..dae0bc13de0 100644
--- a/dlls/setupapi/install.c
+++ b/dlls/setupapi/install.c
@@ -1458,36 +1458,38 @@ BOOL WINAPI SetupInstallServicesFromInfSectionW( HINF hinf, PCWSTR section, DWOR
     SC_HANDLE scm;
     INFCONTEXT context;
     INT section_flags;
-    BOOL ok, ret = TRUE;
+    BOOL ret = TRUE;
 
-    if (!(ok = SetupFindFirstLineW( hinf, section, NULL, &context )))
+    if (!SetupFindFirstLineW( hinf, section, NULL, &context ))
     {
         SetLastError( ERROR_SECTION_NOT_FOUND );
         return FALSE;
     }
     if (!(scm = OpenSCManagerW( NULL, NULL, SC_MANAGER_ALL_ACCESS ))) return FALSE;
 
-    ok = SetupFindFirstLineW( hinf, section, AddService, &context );
-    while (ok)
+    if (SetupFindFirstLineW( hinf, section, AddService, &context ))
     {
-        if (!SetupGetStringFieldW( &context, 1, service_name, MAX_INF_STRING_LENGTH, NULL ))
-            continue;
-        if (!SetupGetIntField( &context, 2, &section_flags )) section_flags = 0;
-        if (!SetupGetStringFieldW( &context, 3, service_section, MAX_INF_STRING_LENGTH, NULL ))
-            continue;
-        if (!(ret = add_service( scm, hinf, service_name, service_section, section_flags | flags )))
-            goto done;
-        ok = SetupFindNextMatchLineW( &context, AddService, &context );
+        do
+        {
+            if (!SetupGetStringFieldW( &context, 1, service_name, MAX_INF_STRING_LENGTH, NULL ))
+                continue;
+            if (!SetupGetIntField( &context, 2, &section_flags )) section_flags = 0;
+            if (!SetupGetStringFieldW( &context, 3, service_section, MAX_INF_STRING_LENGTH, NULL ))
+                continue;
+            if (!(ret = add_service( scm, hinf, service_name, service_section, section_flags | flags )))
+                goto done;
+        } while (SetupFindNextMatchLineW( &context, AddService, &context ));
     }
 
-    ok = SetupFindFirstLineW( hinf, section, DelService, &context );
-    while (ok)
+    if (SetupFindFirstLineW( hinf, section, DelService, &context ))
     {
-        if (!SetupGetStringFieldW( &context, 1, service_name, MAX_INF_STRING_LENGTH, NULL ))
-            continue;
-        if (!SetupGetIntField( &context, 2, &section_flags )) section_flags = 0;
-        if (!(ret = del_service( scm, hinf, service_name, section_flags | flags ))) goto done;
-        ok = SetupFindNextMatchLineW( &context, AddService, &context );
+        do
+        {
+            if (!SetupGetStringFieldW( &context, 1, service_name, MAX_INF_STRING_LENGTH, NULL ))
+                continue;
+            if (!SetupGetIntField( &context, 2, &section_flags )) section_flags = 0;
+            if (!(ret = del_service( scm, hinf, service_name, section_flags | flags ))) goto done;
+        } while (SetupFindNextMatchLineW( &context, AddService, &context ));
     }
     if (ret) SetLastError( ERROR_SUCCESS );
  done:
diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c
index a0a45969a42..f9e55929f2e 100644
--- a/dlls/setupapi/tests/install.c
+++ b/dlls/setupapi/tests/install.c
@@ -574,6 +574,20 @@ static void test_install_svc_from(void)
     SetupCloseInfFile(infhandle);
     DeleteFileA(inffile);
 
+    strcpy(inf, "[Version]\nSignature=\"$Chicago$\"\n");
+    strcat(inf, "[Winetest.Services]\n");
+    strcat(inf, "AddService=,2\n");
+    create_inf_file(inffile, inf);
+    sprintf(path, "%s\\%s", CURR_DIR, inffile);
+    infhandle = SetupOpenInfFileA(path, NULL, INF_STYLE_WIN4, NULL);
+
+    SetLastError(0xdeadbeef);
+    ret = SetupInstallServicesFromInfSectionA(infhandle, "Winetest.Services", 0);
+    ok(ret, "Expected success\n");
+    ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %08x\n", GetLastError());
+    SetupCloseInfFile(infhandle);
+    DeleteFileA(inffile);
+
     /* TODO: Test the Flags */
 }
 
-- 
2.21.0