[PATCH] ole32: Use the more common ARRAY_SIZE spelling

[Michael Stefaniuc]

Signed-off-by: Michael Stefaniuc 
---
 dlls/ole32/compobj.c | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c
index fb69a66746..3487cca572 100644
--- a/dlls/ole32/compobj.c
+++ b/dlls/ole32/compobj.c
@@ -70,8 +70,6 @@

WINE_DEFAULT_DEBUG_CHANNEL(ole);

-#define ARRAYSIZE(array) (sizeof(array)/sizeof((array)[0]))
-
 /****************************************************************************
  * This section defines variables internal to the COM module.
  */
@@ -1477,7 +1475,7 @@ static HRESULT apartment_hostobject(struct apartment *apt,

TRACE("clsid %s, iid %s\n", debugstr_guid(&params->clsid), debugstr_guid(&params->iid));

-    if (COM_RegReadPath(&params->regdata, dllpath, ARRAYSIZE(dllpath)) != ERROR_SUCCESS)
+    if (COM_RegReadPath(&params->regdata, dllpath, ARRAY_SIZE(dllpath)) != ERROR_SUCCESS)
     {
         /* failure: CLSID is not found in registry */
         WARN("class %s not registered inproc\n", debugstr_guid(&params->clsid));
@@ -2356,7 +2354,7 @@ INT WINAPI StringFromGUID2(REFGUID id, LPOLESTR str, INT cmax)
 HRESULT COM_OpenKeyForCLSID(REFCLSID clsid, LPCWSTR keyname, REGSAM access, HKEY *subkey)
 {
     static const WCHAR wszCLSIDSlash[] = {'C','L','S','I','D','\',0};
-    WCHAR path[CHARS_IN_GUID + ARRAYSIZE(wszCLSIDSlash) - 1];
+    WCHAR path[CHARS_IN_GUID + ARRAY_SIZE(wszCLSIDSlash) - 1];
     LONG res;
     HKEY key;

@@ -2391,7 +2389,7 @@ HRESULT COM_OpenKeyForAppIdFromCLSID(REFCLSID clsid, REGSAM access, HKEY *subkey
     static const WCHAR szAppIdKey[] = { 'A','p','p','I','d','\',0 };
     DWORD res;
     WCHAR buf[CHARS_IN_GUID];
-    WCHAR keyname[ARRAYSIZE(szAppIdKey) + CHARS_IN_GUID];
+    WCHAR keyname[ARRAY_SIZE(szAppIdKey) + CHARS_IN_GUID];
     DWORD size;
     HKEY hkey;
     DWORD type;
@@ -2599,7 +2597,7 @@ HRESULT WINAPI CoGetPSClsid(REFIID riid, CLSID *pclsid)
 {
     static const WCHAR wszInterface[] = {'I','n','t','e','r','f','a','c','e','\',0};
     static const WCHAR wszPSC[] = {'\','P','r','o','x','y','S','t','u','b','C','l','s','i','d','3','2',0};
-    WCHAR path[ARRAYSIZE(wszInterface) - 1 + CHARS_IN_GUID - 1 + ARRAYSIZE(wszPSC)];
+    WCHAR path[ARRAY_SIZE(wszInterface) - 1 + CHARS_IN_GUID - 1 + ARRAY_SIZE(wszPSC)];
     APARTMENT *apt;
     struct registered_psclsid *registered_psclsid;
     ACTCTX_SECTION_KEYED_DATA data;
@@ -2642,8 +2640,8 @@ HRESULT WINAPI CoGetPSClsid(REFIID riid, CLSID *pclsid)

/* Interface\{string form of riid}\ProxyStubClsid32 */
     strcpyW(path, wszInterface);
-    StringFromGUID2(riid, path + ARRAYSIZE(wszInterface) - 1, CHARS_IN_GUID);
-    strcpyW(path + ARRAYSIZE(wszInterface) - 1 + CHARS_IN_GUID - 1, wszPSC);
+    StringFromGUID2(riid, path + ARRAY_SIZE(wszInterface) - 1, CHARS_IN_GUID);
+    strcpyW(path + ARRAY_SIZE(wszInterface) - 1 + CHARS_IN_GUID - 1, wszPSC);

hr = get_ps_clsid_from_registry(path, 0, pclsid);
     if (FAILED(hr) && (opposite == KEY_WOW64_32KEY ||
@@ -2971,7 +2969,7 @@ static HRESULT get_inproc_class_object(APARTMENT *apt, const struct class_reg_da
     else
         apartment_threaded = !apt->multi_threaded;

-    if (COM_RegReadPath(regdata, dllpath, ARRAYSIZE(dllpath)) != ERROR_SUCCESS)
+    if (COM_RegReadPath(regdata, dllpath, ARRAY_SIZE(dllpath)) != ERROR_SUCCESS)
     {
         /* failure: CLSID is not found in registry */
         WARN("class %s not registered inproc\n", debugstr_guid(rclsid));
@@ -3829,7 +3827,7 @@ HRESULT WINAPI CoTreatAsClass(REFCLSID clsidOld, REFCLSID clsidNew)
         if(IsEqualGUID(clsidNew, &CLSID_NULL)){
            RegDeleteKeyW(hkey, wszTreatAs);
         }else{
-            if(!StringFromGUID2(clsidNew, szClsidNew, ARRAYSIZE(szClsidNew))){
+            if(!StringFromGUID2(clsidNew, szClsidNew, ARRAY_SIZE(szClsidNew))){
                 WARN("StringFromGUID2 failed\n");
                 res = E_FAIL;
                 goto done;
@@ -5087,7 +5085,7 @@ HRESULT Handler_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
         regdata.u.hkey = hkey;
         regdata.hkey = TRUE;

-        if (COM_RegReadPath(&regdata, dllpath, ARRAYSIZE(dllpath)) == ERROR_SUCCESS)
+        if (COM_RegReadPath(&regdata, dllpath, ARRAY_SIZE(dllpath)) == ERROR_SUCCESS)
         {
             static const WCHAR wszOle32[] = {'o','l','e','3','2','.','d','l','l',0};
             if (!strcmpiW(dllpath, wszOle32))

[Huw Davies]

Signed-off-by: Huw Davies