Michael Stefaniuc : oleacc: Use the ARRAY_SIZE() macro.
Alexandre Julliard
julliard at winehq.org
Thu Jul 19 16:47:57 CDT 2018
Module: wine
Branch: master
Commit: 3a61d1d51ee976969436cc8cfa98db54ebab8736
URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a61d1d51ee976969436cc8cfa98db54ebab8736
Author: Michael Stefaniuc <mstefani at winehq.org>
Date: Wed Jul 18 23:01:30 2018 +0200
oleacc: Use the ARRAY_SIZE() macro.
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/oleacc/client.c | 4 ++--
dlls/oleacc/main.c | 18 +++++++++---------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c
index 5b1f0ee..40e7fbd 100644
--- a/dlls/oleacc/client.c
+++ b/dlls/oleacc/client.c
@@ -168,7 +168,7 @@ static HRESULT WINAPI Client_get_accName(IAccessible *iface, VARIANT varID, BSTR
if(convert_child_id(&varID) != CHILDID_SELF || !IsWindow(This->hwnd))
return E_INVALIDARG;
- len = SendMessageW(This->hwnd, WM_GETTEXT, sizeof(name)/sizeof(WCHAR), (LPARAM)name);
+ len = SendMessageW(This->hwnd, WM_GETTEXT, ARRAY_SIZE(name), (LPARAM)name);
if(!len)
return S_FALSE;
@@ -286,7 +286,7 @@ static HRESULT WINAPI Client_get_accKeyboardShortcut(IAccessible *iface,
if(convert_child_id(&varID) != CHILDID_SELF)
return E_INVALIDARG;
- len = SendMessageW(This->hwnd, WM_GETTEXT, sizeof(name)/sizeof(WCHAR), (LPARAM)name);
+ len = SendMessageW(This->hwnd, WM_GETTEXT, ARRAY_SIZE(name), (LPARAM)name);
for(i=0; i<len; i++) {
if(name[i] == '&')
break;
diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c
index 3cfe7c1..b90bc2c 100644
--- a/dlls/oleacc/main.c
+++ b/dlls/oleacc/main.c
@@ -109,11 +109,11 @@ static accessible_create get_builtin_accessible_obj(HWND hwnd, LONG objid)
WCHAR class_name[64];
int i, idx;
- if(!RealGetWindowClassW(hwnd, class_name, sizeof(class_name)/sizeof(WCHAR)))
+ if(!RealGetWindowClassW(hwnd, class_name, ARRAY_SIZE(class_name)))
return NULL;
TRACE("got window class: %s\n", debugstr_w(class_name));
- for(i=0; i<sizeof(builtin_classes)/sizeof(builtin_classes[0]); i++) {
+ for(i=0; i<ARRAY_SIZE(builtin_classes); i++) {
if(!strcmpiW(class_name, builtin_classes[i].name)) {
accessible_create ret;
@@ -128,7 +128,7 @@ static accessible_create get_builtin_accessible_obj(HWND hwnd, LONG objid)
idx = SendMessageW(hwnd, WM_GETOBJECT, 0, OBJID_QUERYCLASSNAMEIDX);
if(idx) {
- for(i=0; i<sizeof(builtin_classes)/sizeof(builtin_classes[0]); i++) {
+ for(i=0; i<ARRAY_SIZE(builtin_classes); i++) {
if(idx == builtin_classes[i].idx) {
accessible_create ret;
@@ -172,7 +172,7 @@ HRESULT WINAPI CreateStdAccessibleObject( HWND hwnd, LONG idObject,
HRESULT WINAPI ObjectFromLresult( LRESULT result, REFIID riid, WPARAM wParam, void **ppObject )
{
- WCHAR atom_str[sizeof(lresult_atom_prefix)/sizeof(WCHAR)+3*8+3];
+ WCHAR atom_str[ARRAY_SIZE(lresult_atom_prefix)+3*8+3];
HANDLE server_proc, server_mapping, mapping;
DWORD proc_id, size;
IStream *stream;
@@ -193,11 +193,11 @@ HRESULT WINAPI ObjectFromLresult( LRESULT result, REFIID riid, WPARAM wParam, vo
if(result != (ATOM)result)
return E_FAIL;
- if(!GlobalGetAtomNameW(result, atom_str, sizeof(atom_str)/sizeof(WCHAR)))
+ if(!GlobalGetAtomNameW(result, atom_str, ARRAY_SIZE(atom_str)))
return E_FAIL;
if(memcmp(atom_str, lresult_atom_prefix, sizeof(lresult_atom_prefix)))
return E_FAIL;
- p = atom_str + sizeof(lresult_atom_prefix)/sizeof(WCHAR);
+ p = atom_str + ARRAY_SIZE(lresult_atom_prefix);
proc_id = strtoulW(p, &p, 16);
if(*p != ':')
return E_FAIL;
@@ -247,7 +247,7 @@ LRESULT WINAPI LresultFromObject( REFIID riid, WPARAM wParam, LPUNKNOWN pAcc )
static const WCHAR atom_fmt[] = {'%','0','8','x',':','%','0','8','x',':','%','0','8','x',0};
static const LARGE_INTEGER seek_zero = {{0}};
- WCHAR atom_str[sizeof(lresult_atom_prefix)/sizeof(WCHAR)+3*8+3];
+ WCHAR atom_str[ARRAY_SIZE(lresult_atom_prefix)+3*8+3];
IStream *stream;
HANDLE mapping;
STATSTG stat;
@@ -320,8 +320,8 @@ LRESULT WINAPI LresultFromObject( REFIID riid, WPARAM wParam, LPUNKNOWN pAcc )
}
memcpy(atom_str, lresult_atom_prefix, sizeof(lresult_atom_prefix));
- sprintfW(atom_str+sizeof(lresult_atom_prefix)/sizeof(WCHAR),
- atom_fmt, GetCurrentProcessId(), HandleToUlong(mapping), stat.cbSize.u.LowPart);
+ sprintfW(atom_str+ARRAY_SIZE(lresult_atom_prefix), atom_fmt, GetCurrentProcessId(),
+ HandleToUlong(mapping), stat.cbSize.u.LowPart);
atom = GlobalAddAtomW(atom_str);
if(!atom) {
CloseHandle(mapping);
More information about the wine-cvs
mailing list