quartz: Don't use strlenW in array size declaration.
Use ARRAYSIZE() on the constant string arrays instead.
This commit is contained in:
parent
2c37baba0a
commit
e7ecfe28a1
|
@ -1384,7 +1384,7 @@ static HRESULT WINAPI FilterMapper_RegisterFilter(IFilterMapper * iface, CLSID c
|
||||||
LPWSTR wszClsid = NULL;
|
LPWSTR wszClsid = NULL;
|
||||||
HKEY hKey;
|
HKEY hKey;
|
||||||
LONG lRet;
|
LONG lRet;
|
||||||
WCHAR wszKeyName[strlenW(wszFilterSlash) + (CHARS_IN_GUID-1) + 1];
|
WCHAR wszKeyName[ARRAYSIZE(wszFilterSlash)-1 + (CHARS_IN_GUID-1) + 1];
|
||||||
|
|
||||||
TRACE("(%p)->(%s, %s, %x)\n", iface, debugstr_guid(&clsid), debugstr_w(szName), dwMerit);
|
TRACE("(%p)->(%s, %s, %x)\n", iface, debugstr_guid(&clsid), debugstr_w(szName), dwMerit);
|
||||||
|
|
||||||
|
@ -1453,7 +1453,7 @@ static HRESULT WINAPI FilterMapper_RegisterPin(
|
||||||
HKEY hKey = NULL;
|
HKEY hKey = NULL;
|
||||||
HKEY hPinsKey = NULL;
|
HKEY hPinsKey = NULL;
|
||||||
WCHAR * wszPinsKeyName;
|
WCHAR * wszPinsKeyName;
|
||||||
WCHAR wszKeyName[strlenW(wszClsidSlash) + (CHARS_IN_GUID-1) + 1];
|
WCHAR wszKeyName[ARRAYSIZE(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,
|
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));
|
bOutput, bZero, bMany, debugstr_guid(&ConnectsToFilter), debugstr_w(ConnectsToPin));
|
||||||
|
@ -1614,7 +1614,7 @@ static HRESULT WINAPI FilterMapper_UnregisterFilter(IFilterMapper * iface, CLSID
|
||||||
LONG lRet;
|
LONG lRet;
|
||||||
LPWSTR wszClsid = NULL;
|
LPWSTR wszClsid = NULL;
|
||||||
HKEY hKey;
|
HKEY hKey;
|
||||||
WCHAR wszKeyName[strlenW(wszClsidSlash) + (CHARS_IN_GUID-1) + 1];
|
WCHAR wszKeyName[ARRAYSIZE(wszClsidSlash)-1 + (CHARS_IN_GUID-1) + 1];
|
||||||
|
|
||||||
TRACE("(%p)->(%s)\n", iface, debugstr_guid(&Filter));
|
TRACE("(%p)->(%s)\n", iface, debugstr_guid(&Filter));
|
||||||
|
|
||||||
|
@ -1676,7 +1676,7 @@ static HRESULT WINAPI FilterMapper_UnregisterPin(IFilterMapper * iface, CLSID Fi
|
||||||
LPWSTR wszClsid = NULL;
|
LPWSTR wszClsid = NULL;
|
||||||
HKEY hKey = NULL;
|
HKEY hKey = NULL;
|
||||||
WCHAR * wszPinNameKey;
|
WCHAR * wszPinNameKey;
|
||||||
WCHAR wszKeyName[strlenW(wszClsidSlash) + (CHARS_IN_GUID-1) + 1];
|
WCHAR wszKeyName[ARRAYSIZE(wszClsidSlash)-1 + (CHARS_IN_GUID-1) + 1];
|
||||||
|
|
||||||
TRACE("(%p)->(%s, %s)\n", iface, debugstr_guid(&Filter), debugstr_w(Name));
|
TRACE("(%p)->(%s, %s)\n", iface, debugstr_guid(&Filter), debugstr_w(Name));
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue