Commit a1dbf4d7 authored by Bernhard Übelacker's avatar Bernhard Übelacker Committed by Alexandre Julliard

msi: Remove shortcut which calls RegEnumValueW with value and val_count as NULL.

parent db5f235a
......@@ -258,13 +258,6 @@ UINT WINAPI MsiSourceListEnumMediaDisksW(LPCWSTR szProductCodeOrPatchCode,
return ERROR_NO_MORE_ITEMS;
}
if (!pcchVolumeLabel && !pcchDiskPrompt)
{
r = RegEnumValueW(media, dwIndex, NULL, NULL, NULL,
&type, NULL, NULL);
goto done;
}
res = RegQueryInfoKeyW(media, NULL, NULL, NULL, NULL, NULL,
NULL, &numvals, &valuesz, &datasz, NULL, NULL);
if (res != ERROR_SUCCESS)
......
......@@ -2896,7 +2896,6 @@ static void test_MsiSourceListEnumMediaDisks(void)
NULL, NULL);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmpA(label, "aaa"), "Expected \"aaa\", got \"%s\"\n", label);
todo_wine
ok(id == 1, "Expected 1, got %d\n", id);
/* szVolumeLabel, pcchVolumeLabel, szDiskPrompt and pcchDiskPrompt are NULL */
......@@ -2905,7 +2904,6 @@ static void test_MsiSourceListEnumMediaDisks(void)
MSICODE_PRODUCT, 0, &id, NULL, NULL,
NULL, NULL);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
todo_wine
ok(id == 1, "Expected 1, got %d\n", id);
/* pcchVolumeLabel is exactly 5 */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment