Commit 8e9a0511 authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard

amstream: Use the ARRAY_SIZE() macro.

parent 22184d12
...@@ -174,13 +174,13 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) ...@@ -174,13 +174,13 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
&& ! IsEqualGUID( &IID_IUnknown, riid) ) && ! IsEqualGUID( &IID_IUnknown, riid) )
return E_NOINTERFACE; return E_NOINTERFACE;
for (i=0; i < sizeof(object_creation)/sizeof(object_creation[0]); i++) for (i = 0; i < ARRAY_SIZE(object_creation); i++)
{ {
if (IsEqualGUID(object_creation[i].clsid, rclsid)) if (IsEqualGUID(object_creation[i].clsid, rclsid))
break; break;
} }
if (i == sizeof(object_creation)/sizeof(object_creation[0])) if (i == ARRAY_SIZE(object_creation))
{ {
FIXME("%s: no class found.\n", debugstr_guid(rclsid)); FIXME("%s: no class found.\n", debugstr_guid(rclsid));
return CLASS_E_CLASSNOTAVAILABLE; return CLASS_E_CLASSNOTAVAILABLE;
......
...@@ -479,7 +479,7 @@ static void test_media_streams(void) ...@@ -479,7 +479,7 @@ static void test_media_streams(void)
ok(!lstrcmpW(info.achName, id), "Pin name is %s instead of %s\n", wine_dbgstr_w(info.achName), wine_dbgstr_w(id)); ok(!lstrcmpW(info.achName, id), "Pin name is %s instead of %s\n", wine_dbgstr_w(info.achName), wine_dbgstr_w(id));
hr = IPin_EnumMediaTypes(pins[i], &enum_media_types); hr = IPin_EnumMediaTypes(pins[i], &enum_media_types);
ok(hr == S_OK, "IPin_EnumMediaTypes returned: %x\n", hr); ok(hr == S_OK, "IPin_EnumMediaTypes returned: %x\n", hr);
hr = IEnumMediaTypes_Next(enum_media_types, sizeof(media_types) / sizeof(media_types[0]), media_types, &nb_media_types); hr = IEnumMediaTypes_Next(enum_media_types, ARRAY_SIZE(media_types), media_types, &nb_media_types);
ok(SUCCEEDED(hr), "IEnumMediaTypes_Next returned: %x\n", hr); ok(SUCCEEDED(hr), "IEnumMediaTypes_Next returned: %x\n", hr);
ok(nb_media_types > 0, "nb_media_types should be >0\n"); ok(nb_media_types > 0, "nb_media_types should be >0\n");
IEnumMediaTypes_Release(enum_media_types); IEnumMediaTypes_Release(enum_media_types);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment