Author: tfaber
Date: Wed Jun 14 06:44:39 2017
New Revision: 75030
URL:
http://svn.reactos.org/svn/reactos?rev=75030&view=rev
Log:
[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
Modified:
trunk/rostests/winetests/devenum/devenum.c
Modified: trunk/rostests/winetests/devenum/devenum.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/devenum/devenum…
==============================================================================
--- trunk/rostests/winetests/devenum/devenum.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/devenum/devenum.c [iso-8859-1] Wed Jun 14 06:44:39 2017
@@ -159,8 +159,8 @@
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 @@
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 @@
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);