[PATCH 1/8] msi/tests: Test MsiSourceListEnumMediaDisks with volumeLabel and diskPrompt as NULL.

Bernhard Übelacker bernhardu at vr-web.de
Tue Jun 30 07:37:59 CDT 2015


Bug #38796 (preparation)
This should get a special case covered by tests when RegEnumValueA
is called with NULL as value and val_count.
---
 dlls/msi/tests/source.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/dlls/msi/tests/source.c b/dlls/msi/tests/source.c
index 1ef3c9d..3b3ba40 100644
--- a/dlls/msi/tests/source.c
+++ b/dlls/msi/tests/source.c
@@ -2888,6 +2888,26 @@ static void test_MsiSourceListEnumMediaDisks(void)
     ok(labelsz == MAX_PATH, "Expected MAX_PATH, got %d\n", labelsz);
     ok(!lstrcmpA(prompt, "bbb"), "Expected \"bbb\", got \"%s\"\n", prompt);
 
+    /* pcchVolumeLabel, szDiskPrompt and pcchDiskPrompt are NULL */
+    id = 0;
+    lstrcpyA(label, "aaa");
+    r = pMsiSourceListEnumMediaDisksA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED,
+                                      MSICODE_PRODUCT, 0, &id, label, NULL,
+                                      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 */
+    id = 0;
+    r = pMsiSourceListEnumMediaDisksA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED,
+                                      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 */
     lstrcpyA(label, "aaa");
     labelsz = 5;
-- 
2.1.4




More information about the wine-patches mailing list