system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-19 13:40:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

shell32: Avoid ARRAY_SIZE-like macros.

Browse source 
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Michael Stefaniuc 2018-07-07 23:39:07 +02:00 committed by Alexandre Julliard
parent 9cad95d198
commit 1e469c95e6
2 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
dlls/shell32/shfldr_mycomp.c
View file

@ -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);

8
dlls/shell32/shfldr_printers.c
View file

@ -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);