forked from Mirrors/wine-wine
shell32: Use the available ARRAY_SIZE() macro.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org> Signed-off-by: Alexandre Julliard <julliard@winehq.org>oldstable
parent
51b065c5c9
commit
250e8437d7
|
@ -2088,7 +2088,7 @@ static HRESULT ShellLink_SetAdvertiseInfo(IShellLinkImpl *This, LPCWSTR str)
|
||||||
|
|
||||||
static BOOL ShellLink_GetVolumeInfo(LPCWSTR path, volume_info *volume)
|
static BOOL ShellLink_GetVolumeInfo(LPCWSTR path, volume_info *volume)
|
||||||
{
|
{
|
||||||
const int label_sz = sizeof volume->label/sizeof volume->label[0];
|
const int label_sz = ARRAY_SIZE(volume->label);
|
||||||
WCHAR drive[] = { path[0], ':', '\\', 0 };
|
WCHAR drive[] = { path[0], ':', '\\', 0 };
|
||||||
BOOL r;
|
BOOL r;
|
||||||
|
|
||||||
|
|
|
@ -327,7 +327,7 @@ static BOOL CreateMyCompEnumList(IEnumIDListImpl *list, DWORD dwFlags)
|
||||||
DWORD size;
|
DWORD size;
|
||||||
LONG r;
|
LONG r;
|
||||||
|
|
||||||
size = sizeof(iid) / sizeof(iid[0]);
|
size = ARRAY_SIZE(iid);
|
||||||
r = RegEnumKeyExW(hkey, i, iid, &size, 0, NULL, NULL, NULL);
|
r = RegEnumKeyExW(hkey, i, iid, &size, 0, NULL, NULL, NULL);
|
||||||
if (ERROR_SUCCESS == r)
|
if (ERROR_SUCCESS == r)
|
||||||
{
|
{
|
||||||
|
@ -700,8 +700,8 @@ static HRESULT WINAPI ISF_MyComputer_fnGetDisplayNameOf (IShellFolder2 *iface,
|
||||||
static const WCHAR wszCloseBracket[] = {')',0};
|
static const WCHAR wszCloseBracket[] = {')',0};
|
||||||
WCHAR wszDrive[32 /* label */ + 6 /* ' (C:)'\0 */] = {0};
|
WCHAR wszDrive[32 /* label */ + 6 /* ' (C:)'\0 */] = {0};
|
||||||
|
|
||||||
GetVolumeInformationW (pszPath, wszDrive, sizeof(wszDrive)/sizeof(wszDrive[0]) - 5,
|
GetVolumeInformationW (pszPath, wszDrive, ARRAY_SIZE(wszDrive) - 5, NULL, NULL,
|
||||||
NULL, NULL, NULL, NULL, 0);
|
NULL, NULL, 0);
|
||||||
strcatW (wszDrive, wszOpenBracket);
|
strcatW (wszDrive, wszOpenBracket);
|
||||||
lstrcpynW (wszDrive + strlenW(wszDrive), pszPath, 3);
|
lstrcpynW (wszDrive + strlenW(wszDrive), pszPath, 3);
|
||||||
strcatW (wszDrive, wszCloseBracket);
|
strcatW (wszDrive, wszCloseBracket);
|
||||||
|
|
|
@ -805,13 +805,13 @@ static unsigned dde_connect(const WCHAR* key, const WCHAR* start, WCHAR* ddeexec
|
||||||
unsigned ret = SE_ERR_NOASSOC;
|
unsigned ret = SE_ERR_NOASSOC;
|
||||||
BOOL unicode = !(GetVersion() & 0x80000000);
|
BOOL unicode = !(GetVersion() & 0x80000000);
|
||||||
|
|
||||||
if (strlenW(key) + 1 > sizeof(regkey) / sizeof(regkey[0]))
|
if (strlenW(key) + 1 > ARRAY_SIZE(regkey))
|
||||||
{
|
{
|
||||||
FIXME("input parameter %s larger than buffer\n", debugstr_w(key));
|
FIXME("input parameter %s larger than buffer\n", debugstr_w(key));
|
||||||
return 2;
|
return 2;
|
||||||
}
|
}
|
||||||
strcpyW(regkey, key);
|
strcpyW(regkey, key);
|
||||||
endkeyLen = sizeof(regkey) / sizeof(regkey[0]) - (endkey - regkey);
|
endkeyLen = ARRAY_SIZE(regkey) - (endkey - regkey);
|
||||||
if (strlenW(wApplication) + 1 > endkeyLen)
|
if (strlenW(wApplication) + 1 > endkeyLen)
|
||||||
{
|
{
|
||||||
FIXME("endkey %s overruns buffer\n", debugstr_w(wApplication));
|
FIXME("endkey %s overruns buffer\n", debugstr_w(wApplication));
|
||||||
|
@ -830,7 +830,7 @@ static unsigned dde_connect(const WCHAR* key, const WCHAR* start, WCHAR* ddeexec
|
||||||
/* Get application command from start string and find filename of application */
|
/* Get application command from start string and find filename of application */
|
||||||
if (*start == '"')
|
if (*start == '"')
|
||||||
{
|
{
|
||||||
if (strlenW(start + 1) + 1 > sizeof(command) / sizeof(command[0]))
|
if (strlenW(start + 1) + 1 > ARRAY_SIZE(command))
|
||||||
{
|
{
|
||||||
FIXME("size of input parameter %s larger than buffer\n",
|
FIXME("size of input parameter %s larger than buffer\n",
|
||||||
debugstr_w(start + 1));
|
debugstr_w(start + 1));
|
||||||
|
@ -839,7 +839,7 @@ static unsigned dde_connect(const WCHAR* key, const WCHAR* start, WCHAR* ddeexec
|
||||||
strcpyW(command, start+1);
|
strcpyW(command, start+1);
|
||||||
if ((ptr = strchrW(command, '"')))
|
if ((ptr = strchrW(command, '"')))
|
||||||
*ptr = 0;
|
*ptr = 0;
|
||||||
ret = SearchPathW(NULL, command, wszExe, sizeof(fullpath)/sizeof(WCHAR), fullpath, &ptr);
|
ret = SearchPathW(NULL, command, wszExe, ARRAY_SIZE(fullpath), fullpath, &ptr);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -850,11 +850,11 @@ static unsigned dde_connect(const WCHAR* key, const WCHAR* start, WCHAR* ddeexec
|
||||||
int idx = space-start;
|
int idx = space-start;
|
||||||
memcpy(command, start, idx*sizeof(WCHAR));
|
memcpy(command, start, idx*sizeof(WCHAR));
|
||||||
command[idx] = '\0';
|
command[idx] = '\0';
|
||||||
if ((ret = SearchPathW(NULL, command, wszExe, sizeof(fullpath)/sizeof(WCHAR), fullpath, &ptr)))
|
if ((ret = SearchPathW(NULL, command, wszExe, ARRAY_SIZE(fullpath), fullpath, &ptr)))
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (!ret)
|
if (!ret)
|
||||||
ret = SearchPathW(NULL, start, wszExe, sizeof(fullpath)/sizeof(WCHAR), fullpath, &ptr);
|
ret = SearchPathW(NULL, start, wszExe, ARRAY_SIZE(fullpath), fullpath, &ptr);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!ret)
|
if (!ret)
|
||||||
|
@ -862,7 +862,7 @@ static unsigned dde_connect(const WCHAR* key, const WCHAR* start, WCHAR* ddeexec
|
||||||
ERR("Unable to find application path for command %s\n", debugstr_w(start));
|
ERR("Unable to find application path for command %s\n", debugstr_w(start));
|
||||||
return ERROR_ACCESS_DENIED;
|
return ERROR_ACCESS_DENIED;
|
||||||
}
|
}
|
||||||
if (strlenW(ptr) + 1 > sizeof(app) / sizeof(app[0]))
|
if (strlenW(ptr) + 1 > ARRAY_SIZE(app))
|
||||||
{
|
{
|
||||||
FIXME("size of found path %s larger than buffer\n", debugstr_w(ptr));
|
FIXME("size of found path %s larger than buffer\n", debugstr_w(ptr));
|
||||||
return 2;
|
return 2;
|
||||||
|
@ -940,8 +940,8 @@ static unsigned dde_connect(const WCHAR* key, const WCHAR* start, WCHAR* ddeexec
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
SHELL_ArgifyW(static_res, sizeof(static_res)/sizeof(WCHAR), exec, lpFile, pidl, szCommandline, &resultLen);
|
SHELL_ArgifyW(static_res, ARRAY_SIZE(static_res), exec, lpFile, pidl, szCommandline, &resultLen);
|
||||||
if (resultLen > sizeof(static_res)/sizeof(WCHAR))
|
if (resultLen > ARRAY_SIZE(static_res))
|
||||||
{
|
{
|
||||||
res = dynamic_res = heap_alloc(resultLen * sizeof(WCHAR));
|
res = dynamic_res = heap_alloc(resultLen * sizeof(WCHAR));
|
||||||
SHELL_ArgifyW(dynamic_res, resultLen, exec, lpFile, pidl, szCommandline, NULL);
|
SHELL_ArgifyW(dynamic_res, resultLen, exec, lpFile, pidl, szCommandline, NULL);
|
||||||
|
@ -1010,11 +1010,11 @@ static UINT_PTR execute_from_key(LPCWSTR key, LPCWSTR lpFile, WCHAR *env, LPCWST
|
||||||
|
|
||||||
/* Is there a replace() function anywhere? */
|
/* Is there a replace() function anywhere? */
|
||||||
cmdlen /= sizeof(WCHAR);
|
cmdlen /= sizeof(WCHAR);
|
||||||
if (cmdlen >= sizeof(cmd)/sizeof(WCHAR))
|
if (cmdlen >= ARRAY_SIZE(cmd))
|
||||||
cmdlen = sizeof(cmd)/sizeof(WCHAR)-1;
|
cmdlen = ARRAY_SIZE(cmd) - 1;
|
||||||
cmd[cmdlen] = '\0';
|
cmd[cmdlen] = '\0';
|
||||||
SHELL_ArgifyW(param, sizeof(param)/sizeof(WCHAR), cmd, lpFile, psei->lpIDList, szCommandline, &resultLen);
|
SHELL_ArgifyW(param, ARRAY_SIZE(param), cmd, lpFile, psei->lpIDList, szCommandline, &resultLen);
|
||||||
if (resultLen > sizeof(param)/sizeof(WCHAR))
|
if (resultLen > ARRAY_SIZE(param))
|
||||||
ERR("Argify buffer not large enough, truncating\n");
|
ERR("Argify buffer not large enough, truncating\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1101,7 +1101,7 @@ HINSTANCE WINAPI FindExecutableW(LPCWSTR lpFile, LPCWSTR lpDirectory, LPWSTR lpR
|
||||||
|
|
||||||
if (lpDirectory)
|
if (lpDirectory)
|
||||||
{
|
{
|
||||||
GetCurrentDirectoryW(sizeof(old_dir)/sizeof(WCHAR), old_dir);
|
GetCurrentDirectoryW(ARRAY_SIZE(old_dir), old_dir);
|
||||||
SetCurrentDirectoryW(lpDirectory);
|
SetCurrentDirectoryW(lpDirectory);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1352,7 +1352,7 @@ static LONG ShellExecute_FromContextMenu( LPSHELLEXECUTEINFOW sei )
|
||||||
i = 0;
|
i = 0;
|
||||||
while ( 1 )
|
while ( 1 )
|
||||||
{
|
{
|
||||||
r = RegEnumKeyW( hkeycm, i++, szguid, sizeof(szguid)/sizeof(szguid[0]) );
|
r = RegEnumKeyW( hkeycm, i++, szguid, ARRAY_SIZE(szguid));
|
||||||
if ( r != ERROR_SUCCESS )
|
if ( r != ERROR_SUCCESS )
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -1401,7 +1401,7 @@ static UINT_PTR SHELL_execute_class( LPCWSTR wszApplicationName, LPSHELLEXECUTEI
|
||||||
TRACE("SEE_MASK_CLASSNAME->%s, doc->%s\n", debugstr_w(execCmd), debugstr_w(wszApplicationName));
|
TRACE("SEE_MASK_CLASSNAME->%s, doc->%s\n", debugstr_w(execCmd), debugstr_w(wszApplicationName));
|
||||||
|
|
||||||
wcmd[0] = '\0';
|
wcmd[0] = '\0';
|
||||||
done = SHELL_ArgifyW(wcmd, sizeof(wcmd)/sizeof(WCHAR), execCmd, wszApplicationName, psei->lpIDList, NULL, &resultLen);
|
done = SHELL_ArgifyW(wcmd, ARRAY_SIZE(wcmd), execCmd, wszApplicationName, psei->lpIDList, NULL, &resultLen);
|
||||||
if (!done && wszApplicationName[0])
|
if (!done && wszApplicationName[0])
|
||||||
{
|
{
|
||||||
strcatW(wcmd, wSpace);
|
strcatW(wcmd, wSpace);
|
||||||
|
@ -1414,7 +1414,7 @@ static UINT_PTR SHELL_execute_class( LPCWSTR wszApplicationName, LPSHELLEXECUTEI
|
||||||
else
|
else
|
||||||
strcatW(wcmd, wszApplicationName);
|
strcatW(wcmd, wszApplicationName);
|
||||||
}
|
}
|
||||||
if (resultLen > sizeof(wcmd)/sizeof(WCHAR))
|
if (resultLen > ARRAY_SIZE(wcmd))
|
||||||
ERR("Argify buffer not large enough... truncating\n");
|
ERR("Argify buffer not large enough... truncating\n");
|
||||||
return execfunc(wcmd, NULL, FALSE, psei, psei_out);
|
return execfunc(wcmd, NULL, FALSE, psei, psei_out);
|
||||||
}
|
}
|
||||||
|
@ -1437,7 +1437,7 @@ static void SHELL_translate_idlist( LPSHELLEXECUTEINFOW sei, LPWSTR wszParameter
|
||||||
WCHAR buffer[MAX_PATH];
|
WCHAR buffer[MAX_PATH];
|
||||||
|
|
||||||
/* last chance to translate IDList: now also allow CLSID paths */
|
/* last chance to translate IDList: now also allow CLSID paths */
|
||||||
if (SUCCEEDED(SHELL_GetPathFromIDListForExecuteW(sei->lpIDList, buffer, sizeof(buffer)/sizeof(WCHAR)))) {
|
if (SUCCEEDED(SHELL_GetPathFromIDListForExecuteW(sei->lpIDList, buffer, ARRAY_SIZE(buffer)))) {
|
||||||
if (buffer[0]==':' && buffer[1]==':') {
|
if (buffer[0]==':' && buffer[1]==':') {
|
||||||
/* open shell folder for the specified class GUID */
|
/* open shell folder for the specified class GUID */
|
||||||
if (strlenW(buffer) + 1 > parametersLen)
|
if (strlenW(buffer) + 1 > parametersLen)
|
||||||
|
@ -1550,9 +1550,9 @@ static void do_error_dialog( UINT_PTR retval, HWND hwnd )
|
||||||
int error_code=GetLastError();
|
int error_code=GetLastError();
|
||||||
|
|
||||||
if (retval == SE_ERR_NOASSOC)
|
if (retval == SE_ERR_NOASSOC)
|
||||||
LoadStringW(shell32_hInstance, IDS_SHLEXEC_NOASSOC, msg, sizeof(msg)/sizeof(WCHAR));
|
LoadStringW(shell32_hInstance, IDS_SHLEXEC_NOASSOC, msg, ARRAY_SIZE(msg));
|
||||||
else
|
else
|
||||||
FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM, NULL, error_code, 0, msg, sizeof(msg)/sizeof(WCHAR), NULL);
|
FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM, NULL, error_code, 0, msg, ARRAY_SIZE(msg), NULL);
|
||||||
|
|
||||||
MessageBoxW(hwnd, msg, NULL, MB_ICONERROR);
|
MessageBoxW(hwnd, msg, NULL, MB_ICONERROR);
|
||||||
}
|
}
|
||||||
|
@ -1572,8 +1572,8 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc )
|
||||||
WCHAR parametersBuffer[1024], dirBuffer[MAX_PATH], wcmdBuffer[1024];
|
WCHAR parametersBuffer[1024], dirBuffer[MAX_PATH], wcmdBuffer[1024];
|
||||||
WCHAR *wszApplicationName, *wszParameters, *wszDir, *wcmd;
|
WCHAR *wszApplicationName, *wszParameters, *wszDir, *wcmd;
|
||||||
DWORD dwApplicationNameLen = MAX_PATH+2;
|
DWORD dwApplicationNameLen = MAX_PATH+2;
|
||||||
DWORD parametersLen = sizeof(parametersBuffer) / sizeof(WCHAR);
|
DWORD parametersLen = ARRAY_SIZE(parametersBuffer);
|
||||||
DWORD wcmdLen = sizeof(wcmdBuffer) / sizeof(WCHAR);
|
DWORD wcmdLen = ARRAY_SIZE(wcmdBuffer);
|
||||||
DWORD len;
|
DWORD len;
|
||||||
SHELLEXECUTEINFOW sei_tmp; /* modifiable copy of SHELLEXECUTEINFO struct */
|
SHELLEXECUTEINFOW sei_tmp; /* modifiable copy of SHELLEXECUTEINFO struct */
|
||||||
WCHAR *env;
|
WCHAR *env;
|
||||||
|
@ -1632,7 +1632,7 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc )
|
||||||
if (sei_tmp.lpDirectory)
|
if (sei_tmp.lpDirectory)
|
||||||
{
|
{
|
||||||
len = lstrlenW(sei_tmp.lpDirectory) + 1;
|
len = lstrlenW(sei_tmp.lpDirectory) + 1;
|
||||||
if (len > sizeof(dirBuffer) / sizeof(WCHAR))
|
if (len > ARRAY_SIZE(dirBuffer))
|
||||||
wszDir = heap_alloc(len * sizeof(WCHAR));
|
wszDir = heap_alloc(len * sizeof(WCHAR));
|
||||||
strcpyW(wszDir, sei_tmp.lpDirectory);
|
strcpyW(wszDir, sei_tmp.lpDirectory);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1307,7 +1307,7 @@ static BOOL confirm_delete_list(HWND hWnd, DWORD fFlags, BOOL fTrash, const FILE
|
||||||
static const WCHAR format[] = {'%','d',0};
|
static const WCHAR format[] = {'%','d',0};
|
||||||
WCHAR tmp[8];
|
WCHAR tmp[8];
|
||||||
|
|
||||||
wnsprintfW(tmp, sizeof(tmp)/sizeof(tmp[0]), format, flFrom->dwNumFiles);
|
wnsprintfW(tmp, ARRAY_SIZE(tmp), format, flFrom->dwNumFiles);
|
||||||
return SHELL_ConfirmDialogW(hWnd, (fTrash?ASK_TRASH_MULTIPLE_ITEM:ASK_DELETE_MULTIPLE_ITEM), tmp, NULL);
|
return SHELL_ConfirmDialogW(hWnd, (fTrash?ASK_TRASH_MULTIPLE_ITEM:ASK_DELETE_MULTIPLE_ITEM), tmp, NULL);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
|
@ -221,7 +221,7 @@ noicon:
|
||||||
if (data->uFlags & NIF_MESSAGE)
|
if (data->uFlags & NIF_MESSAGE)
|
||||||
data->uCallbackMessage = nid->uCallbackMessage;
|
data->uCallbackMessage = nid->uCallbackMessage;
|
||||||
if (data->uFlags & NIF_TIP)
|
if (data->uFlags & NIF_TIP)
|
||||||
lstrcpynW( data->szTip, nid->szTip, sizeof(data->szTip)/sizeof(WCHAR) );
|
lstrcpynW( data->szTip, nid->szTip, ARRAY_SIZE(data->szTip));
|
||||||
if (data->uFlags & NIF_STATE)
|
if (data->uFlags & NIF_STATE)
|
||||||
{
|
{
|
||||||
data->dwState = nid->dwState;
|
data->dwState = nid->dwState;
|
||||||
|
|
Loading…
Reference in New Issue