Thomas Faber : devenum/tests: Fix return value check for IEnumMoniker_Next.

Alexandre Julliard julliard at winehq.org
Tue Jun 13 16:14:51 CDT 2017


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

Author: Thomas Faber <thomas.faber at reactos.org>
Date:   Tue Jun 13 11:50:01 2017 +0200

devenum/tests: Fix return value check for IEnumMoniker_Next.

IEnumMoniker::Next returns S_FALSE when there are no (more) items, so
checking SUCCEEDED does not make sense.

Signed-off-by: Thomas Faber <thomas.faber at reactos.org>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/devenum/tests/devenum.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c
index c2173fe..5a41183 100644
--- a/dlls/devenum/tests/devenum.c
+++ b/dlls/devenum/tests/devenum.c
@@ -154,8 +154,8 @@ static void test_moniker_isequal(void)
     ok(SUCCEEDED(res), "Cannot create enum moniker (res = %x)\n", res);
     if (SUCCEEDED(res))
     {
-        if (SUCCEEDED(IEnumMoniker_Next(enum_moniker0, 1, &moniker0, NULL)) &&
-            SUCCEEDED(IEnumMoniker_Next(enum_moniker0, 1, &moniker1, NULL)))
+        if (IEnumMoniker_Next(enum_moniker0, 1, &moniker0, NULL) == S_OK &&
+            IEnumMoniker_Next(enum_moniker0, 1, &moniker1, NULL) == S_OK)
         {
             res = IMoniker_IsEqual(moniker0, moniker1);
             ok(res == S_FALSE, "IMoniker_IsEqual should fail (res = %x)\n", res);
@@ -177,8 +177,8 @@ static void test_moniker_isequal(void)
     ok(SUCCEEDED(res), "Cannot create enum moniker (res = %x)\n", res);
     if (SUCCEEDED(res))
     {
-        if (SUCCEEDED(IEnumMoniker_Next(enum_moniker0, 1, &moniker0, NULL)) &&
-            SUCCEEDED(IEnumMoniker_Next(enum_moniker1, 1, &moniker1, NULL)))
+        if (IEnumMoniker_Next(enum_moniker0, 1, &moniker0, NULL) == S_OK &&
+            IEnumMoniker_Next(enum_moniker1, 1, &moniker1, NULL) == S_OK)
         {
             res = IMoniker_IsEqual(moniker0, moniker1);
             ok(res == S_FALSE, "IMoniker_IsEqual should failed (res = %x)\n", res);
@@ -201,8 +201,8 @@ static void test_moniker_isequal(void)
     ok(SUCCEEDED(res), "Cannot create enum moniker (res = %x)\n", res);
     if (SUCCEEDED(res))
     {
-         if (SUCCEEDED(IEnumMoniker_Next(enum_moniker0, 1, &moniker0, NULL)) &&
-             SUCCEEDED(IEnumMoniker_Next(enum_moniker1, 1, &moniker1, NULL)))
+        if (IEnumMoniker_Next(enum_moniker0, 1, &moniker0, NULL) == S_OK &&
+            IEnumMoniker_Next(enum_moniker1, 1, &moniker1, NULL) == S_OK)
         {
             res = IMoniker_IsEqual(moniker0, moniker1);
             ok(res == S_OK, "IMoniker_IsEqual failed (res = %x)\n", res);




More information about the wine-cvs mailing list