From 23320d05b628575ab9ccb44e4482a30268e9a93e Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Fri, 17 May 2019 00:21:10 -0500 Subject: [PATCH] setupapi: Return the section name in SetupDiGetActualSectionToInstall() even if it doesn't exist. Signed-off-by: Zebediah Figura Signed-off-by: Alexandre Julliard --- dlls/setupapi/devinst.c | 12 +----------- dlls/setupapi/tests/devinst.c | 4 ---- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index e41389b85c9..943f7bb86dc 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1879,17 +1879,7 @@ BOOL WINAPI SetupDiGetActualSectionToInstallW( } if (lLineCount == -1) - { - /* Test section name without extension */ - szBuffer[dwLength] = 0; - lLineCount = SetupGetLineCountW(InfHandle, szBuffer); - } - - if (lLineCount == -1) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } + szBuffer[dwLength] = 0; dwFullLength = lstrlenW(szBuffer); diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 8372a7b2aef..afb431f8d0d 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -2074,7 +2074,6 @@ static void test_get_actual_section(void) ok(!strcasecmp(section, "section7"), "Got unexpected section %s.\n", section); ok(!extptr || !*extptr /* Windows 10 1809 */, "Got extension %s.\n", extptr); -todo_wine { extptr = section; ret = SetupDiGetActualSectionToInstallA(hinf, "section8", section, ARRAY_SIZE(section), NULL, &extptr); ok(ret, "Failed to get section, error %#x.\n", GetLastError()); @@ -2086,7 +2085,6 @@ todo_wine { ok(ret, "Failed to get section, error %#x.\n", GetLastError()); ok(!strcasecmp(section, "nonexistent"), "Got unexpected section %s.\n", section); ok(!extptr || !*extptr /* Windows 10 1809 */, "Got extension %s.\n", extptr); -} extptr = section; ret = SetupDiGetActualSectionToInstallA(hinf, "section9", section, ARRAY_SIZE(section), NULL, &extptr); @@ -2094,7 +2092,6 @@ todo_wine { ok(!strcasecmp(section, "section9.NT" MYEXT), "Got unexpected section %s.\n", section); ok(extptr == section + 8, "Got extension %s.\n", extptr); -todo_wine { if (0) { /* For some reason, this call hangs on Windows 10 1809. */ @@ -2104,7 +2101,6 @@ todo_wine { ok(!strcasecmp(section, "section10"), "Got unexpected section %s.\n", section); ok(!extptr, "Got extension %s.\n", extptr); } -} SetupCloseInfFile(hinf); ret = DeleteFileA(inf_path);