marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winecfg: Use the ARRAY_SIZE() macro. 

Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
oldstable
Michael Stefaniuc 2018-10-29 20:10:42 +01:00 committed by Alexandre Julliard
parent 2600ecd4ed
commit f051aa6774
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
programs/winecfg/driveui.c
View File

@ -440,7 +440,7 @@ static void update_controls(HWND dialog)
type = current_drive->type;
SendDlgItemMessageW(dialog, IDC_COMBO_TYPE, CB_RESETCONTENT, 0, 0);
for (i = 0; i < sizeof(type_pairs) / sizeof(struct drive_typemap); i++)
for (i = 0; i < ARRAY_SIZE(type_pairs); i++)
{
WCHAR driveDesc[64];
LoadStringW(GetModuleHandleW(NULL), type_pairs[i].idDesc, driveDesc, ARRAY_SIZE(driveDesc));

12
programs/winecfg/theme.c
View File

@ -635,7 +635,7 @@ static void on_theme_install(HWND dialog)
ofn.nFilterIndex = 0;
ofn.lpstrFile = file;
ofn.lpstrFile[0] = '\0';
ofn.nMaxFile = sizeof(file)/sizeof(filetitle[0]);
ofn.nMaxFile = ARRAY_SIZE(file);
ofn.lpstrFileTitle = filetitle;
ofn.lpstrFileTitle[0] = '\0';
ofn.nMaxFileTitle = ARRAY_SIZE(filetitle);
@ -729,8 +729,6 @@ static struct ShellFolderInfo asfiInfo[] = {
static struct ShellFolderInfo *psfiSelected = NULL;
#define NUM_ELEMS(x) (sizeof(x)/sizeof(*(x)))
static void init_shell_folder_listview_headers(HWND dialog) {
LVCOLUMNW listColumn;
RECT viewRect;
@ -763,8 +761,8 @@ static void read_shell_folder_link_targets(void) {
WCHAR wszPath[MAX_PATH];
HRESULT hr;
int i;
for (i=0; i<NUM_ELEMS(asfiInfo); i++) {
for (i=0; i<ARRAY_SIZE(asfiInfo); i++) {
asfiInfo[i].szLinkTarget[0] = '\0';
hr = SHGetFolderPathW(NULL, asfiInfo[i].nFolder|CSIDL_FLAG_DONT_VERIFY, NULL,
SHGFP_TYPE_CURRENT, wszPath);
@ -790,7 +788,7 @@ static void update_shell_folder_listview(HWND dialog) {
SendDlgItemMessageW(dialog, IDC_LIST_SFPATHS, LVM_DELETEALLITEMS, 0, 0);
for (i=0; i<NUM_ELEMS(asfiInfo); i++) {
for (i=0; i<ARRAY_SIZE(asfiInfo); i++) {
WCHAR buffer[MAX_PATH];
HRESULT hr;
LPITEMIDLIST pidlCurrent;
@ -905,7 +903,7 @@ static void apply_shell_folder_changes(void) {
struct stat statPath;
HRESULT hr;
for (i=0; i<NUM_ELEMS(asfiInfo); i++) {
for (i=0; i<ARRAY_SIZE(asfiInfo); i++) {
/* Ignore nonexistent link targets */
if (asfiInfo[i].szLinkTarget[0] && stat(asfiInfo[i].szLinkTarget, &statPath))
continue;

2
programs/winecfg/winecfg.c
View File

@ -623,7 +623,7 @@ static void process_setting(struct setting *s)
static const WCHAR softwareW[] = {'S','o','f','t','w','a','r','e','\\'};
HKEY key;
BOOL needs_wow64 = (is_win64 && s->root == HKEY_LOCAL_MACHINE && s->path &&
!strncmpiW( s->path, softwareW, sizeof(softwareW)/sizeof(WCHAR) ));
!strncmpiW(s->path, softwareW, ARRAY_SIZE(softwareW)));
if (s->value)
{