diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index d78f6434989..d189d1dbacc 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -43,8 +43,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); -#define ARRAYSIZE(array) (sizeof(array)/sizeof((array)[0])) - typedef struct FilterMapper3Impl { IUnknown IUnknown_inner; @@ -264,7 +262,7 @@ static HRESULT WINAPI FilterMapper3_CreateCategory( { LPWSTR wClsidAMCat = NULL; LPWSTR wClsidCategory = NULL; - WCHAR wszKeyName[ARRAYSIZE(wszClsidSlash)-1 + ARRAYSIZE(wszSlashInstance)-1 + (CHARS_IN_GUID-1) * 2 + 1]; + WCHAR wszKeyName[ARRAY_SIZE(wszClsidSlash)-1 + ARRAY_SIZE(wszSlashInstance)-1 + (CHARS_IN_GUID-1) * 2 + 1]; HKEY hKey = NULL; LONG lRet; HRESULT hr; @@ -1268,7 +1266,7 @@ static HRESULT WINAPI FilterMapper_RegisterFilter(IFilterMapper * iface, CLSID c LPWSTR wszClsid = NULL; HKEY hKey; LONG lRet; - WCHAR wszKeyName[ARRAYSIZE(wszFilterSlash)-1 + (CHARS_IN_GUID-1) + 1]; + WCHAR wszKeyName[ARRAY_SIZE(wszFilterSlash)-1 + (CHARS_IN_GUID-1) + 1]; TRACE("(%p)->(%s, %s, %x)\n", iface, debugstr_guid(&clsid), debugstr_w(szName), dwMerit); @@ -1337,7 +1335,7 @@ static HRESULT WINAPI FilterMapper_RegisterPin( HKEY hKey = NULL; HKEY hPinsKey = NULL; WCHAR * wszPinsKeyName; - WCHAR wszKeyName[ARRAYSIZE(wszClsidSlash)-1 + (CHARS_IN_GUID-1) + 1]; + WCHAR wszKeyName[ARRAY_SIZE(wszClsidSlash)-1 + (CHARS_IN_GUID-1) + 1]; TRACE("(%p)->(%s, %s, %d, %d, %d, %d, %s, %s)\n", iface, debugstr_guid(&Filter), debugstr_w(szName), bRendered, bOutput, bZero, bMany, debugstr_guid(&ConnectsToFilter), debugstr_w(ConnectsToPin)); @@ -1498,7 +1496,7 @@ static HRESULT WINAPI FilterMapper_UnregisterFilter(IFilterMapper * iface, CLSID LONG lRet; LPWSTR wszClsid = NULL; HKEY hKey; - WCHAR wszKeyName[ARRAYSIZE(wszClsidSlash)-1 + (CHARS_IN_GUID-1) + 1]; + WCHAR wszKeyName[ARRAY_SIZE(wszClsidSlash)-1 + (CHARS_IN_GUID-1) + 1]; TRACE("(%p)->(%s)\n", iface, debugstr_guid(&Filter)); @@ -1563,7 +1561,7 @@ static HRESULT WINAPI FilterMapper_UnregisterPin(IFilterMapper * iface, CLSID Fi LPWSTR wszClsid = NULL; HKEY hKey = NULL; WCHAR * wszPinNameKey; - WCHAR wszKeyName[ARRAYSIZE(wszClsidSlash)-1 + (CHARS_IN_GUID-1) + 1]; + WCHAR wszKeyName[ARRAY_SIZE(wszClsidSlash)-1 + (CHARS_IN_GUID-1) + 1]; TRACE("(%p)->(%s, %s)\n", iface, debugstr_guid(&Filter), debugstr_w(Name));