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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: a1dbf4d78bba04db411908fb994cc28d0095b4e4
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a1dbf4d78bba04db411908fb99...

Author: Bernhard Übelacker 
Date:   Tue Jun 30 14:38:00 2015 +0200

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

---

dlls/msi/source.c       | 7 -------
 dlls/msi/tests/source.c | 2 --
 2 files changed, 9 deletions(-)

diff --git a/dlls/msi/source.c b/dlls/msi/source.c
index f4c139f..8f5d165 100644
--- a/dlls/msi/source.c
+++ b/dlls/msi/source.c
@@ -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)
diff --git a/dlls/msi/tests/source.c b/dlls/msi/tests/source.c
index 3b3ba40..94e168d 100644
--- a/dlls/msi/tests/source.c
+++ b/dlls/msi/tests/source.c
@@ -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 */