From b5cdb03dd84a93e09a1f66075254d41c5c8b0bc6 Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Wed, 14 Jun 2017 06:44:39 +0000 Subject: [PATCH] [DEVENUM_WINETEST] - Fix return value check for IEnumMoniker_Next. Fixes crash when running the test without renderers installed (as is the case on ROS). CORE-13421 #resolve svn path=/trunk/; revision=75030 --- rostests/winetests/devenum/devenum.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/rostests/winetests/devenum/devenum.c b/rostests/winetests/devenum/devenum.c index 394ba311b73..fc6759da840 100644 --- a/rostests/winetests/devenum/devenum.c +++ b/rostests/winetests/devenum/devenum.c @@ -159,8 +159,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); @@ -182,8 +182,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); @@ -206,8 +206,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);