Michael Stefaniuc : shell32: Avoid ARRAY_SIZE-like macros.
Alexandre Julliard
julliard at winehq.org
Mon Jul 9 16:00:33 CDT 2018
Module: wine
Branch: master
Commit: 1e469c95e63a02df701342fc8eb8b7d252a00fc6
URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e469c95e63a02df701342fc8eb8b7d252a00fc6
Author: Michael Stefaniuc <mstefani at winehq.org>
Date: Sat Jul 7 23:39:07 2018 +0200
shell32: Avoid ARRAY_SIZE-like macros.
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/shell32/shfldr_mycomp.c | 8 +++-----
dlls/shell32/shfldr_printers.c | 8 +++-----
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c
index b5b9ff2..60f32f1 100644
--- a/dlls/shell32/shfldr_mycomp.c
+++ b/dlls/shell32/shfldr_mycomp.c
@@ -87,8 +87,6 @@ static const shvheader mycomputer_header[] =
{ NULL, 0, IDS_SHV_COLUMN7, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 10 },
};
-#define MYCOMPUTERSHELLVIEWCOLUMNS sizeof(mycomputer_header)/sizeof(shvheader)
-
/**************************************************************************
* ISF_MyComputer_Constructor
*/
@@ -799,7 +797,7 @@ static HRESULT WINAPI ISF_MyComputer_fnGetDefaultColumnState (
TRACE ("(%p)->(%d %p)\n", This, iColumn, pcsFlags);
- if (!pcsFlags || iColumn >= MYCOMPUTERSHELLVIEWCOLUMNS)
+ if (!pcsFlags || iColumn >= ARRAY_SIZE(mycomputer_header))
return E_INVALIDARG;
*pcsFlags = mycomputer_header[iColumn].pcsFlags;
@@ -826,7 +824,7 @@ static HRESULT WINAPI ISF_MyComputer_fnGetDetailsOf (IShellFolder2 *iface,
TRACE ("(%p)->(%p %i %p)\n", This, pidl, iColumn, psd);
- if (!psd || iColumn >= MYCOMPUTERSHELLVIEWCOLUMNS)
+ if (!psd || iColumn >= ARRAY_SIZE(mycomputer_header))
return E_INVALIDARG;
if (!pidl)
@@ -871,7 +869,7 @@ static HRESULT WINAPI ISF_MyComputer_fnMapColumnToSCID (IShellFolder2 *iface, UI
TRACE("(%p)->(%u %p)\n", This, column, scid);
- if (column >= MYCOMPUTERSHELLVIEWCOLUMNS)
+ if (column >= ARRAY_SIZE(mycomputer_header))
return E_INVALIDARG;
return shellfolder_map_column_to_scid(mycomputer_header, column, scid);
diff --git a/dlls/shell32/shfldr_printers.c b/dlls/shell32/shfldr_printers.c
index 66260ac..8e25e58 100644
--- a/dlls/shell32/shfldr_printers.c
+++ b/dlls/shell32/shfldr_printers.c
@@ -63,8 +63,6 @@ static const shvheader printers_header[] = {
{ NULL, 0, IDS_SHV_COL_MODEL, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 20 }
};
-#define PRINTERS_FOLDER_COL_NUM sizeof(printers_header)/sizeof(shvheader)
-
static HRESULT WINAPI IShellFolder_Printers_fnQueryInterface(IShellFolder2 *iface,
REFIID riid, LPVOID *ppvObj)
{
@@ -283,7 +281,7 @@ static HRESULT WINAPI IShellFolder_Printers_fnGetDefaultColumnState (
TRACE("(%p)->(%d %p)\n", This, iColumn, pcsFlags);
- if (iColumn >= PRINTERS_FOLDER_COL_NUM)
+ if (iColumn >= ARRAY_SIZE(printers_header))
return E_INVALIDARG;
*pcsFlags = printers_header[iColumn].pcsFlags;
@@ -306,7 +304,7 @@ static HRESULT WINAPI IShellFolder_Printers_fnGetDetailsOf (IShellFolder2 *iface
TRACE("(%p)->(%p %i %p)\n", This, pidl, iColumn, psd);
- if (iColumn >= PRINTERS_FOLDER_COL_NUM)
+ if (iColumn >= ARRAY_SIZE(printers_header))
return E_NOTIMPL;
if (!pidl)
@@ -323,7 +321,7 @@ static HRESULT WINAPI IShellFolder_Printers_fnMapColumnToSCID (IShellFolder2 *if
TRACE("(%p)->(%u %p)\n", This, column, scid);
- if (column >= PRINTERS_FOLDER_COL_NUM)
+ if (column >= ARRAY_SIZE(printers_header))
return E_INVALIDARG;
return shellfolder_map_column_to_scid(printers_header, column, scid);
More information about the wine-cvs
mailing list