mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-14 15:07:57 +00:00
winecfg: Use the ARRAY_SIZE() macro.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
2600ecd4ed
commit
f051aa6774
|
@ -440,7 +440,7 @@ static void update_controls(HWND dialog)
|
||||||
type = current_drive->type;
|
type = current_drive->type;
|
||||||
SendDlgItemMessageW(dialog, IDC_COMBO_TYPE, CB_RESETCONTENT, 0, 0);
|
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];
|
WCHAR driveDesc[64];
|
||||||
LoadStringW(GetModuleHandleW(NULL), type_pairs[i].idDesc, driveDesc, ARRAY_SIZE(driveDesc));
|
LoadStringW(GetModuleHandleW(NULL), type_pairs[i].idDesc, driveDesc, ARRAY_SIZE(driveDesc));
|
||||||
|
|
|
@ -635,7 +635,7 @@ static void on_theme_install(HWND dialog)
|
||||||
ofn.nFilterIndex = 0;
|
ofn.nFilterIndex = 0;
|
||||||
ofn.lpstrFile = file;
|
ofn.lpstrFile = file;
|
||||||
ofn.lpstrFile[0] = '\0';
|
ofn.lpstrFile[0] = '\0';
|
||||||
ofn.nMaxFile = sizeof(file)/sizeof(filetitle[0]);
|
ofn.nMaxFile = ARRAY_SIZE(file);
|
||||||
ofn.lpstrFileTitle = filetitle;
|
ofn.lpstrFileTitle = filetitle;
|
||||||
ofn.lpstrFileTitle[0] = '\0';
|
ofn.lpstrFileTitle[0] = '\0';
|
||||||
ofn.nMaxFileTitle = ARRAY_SIZE(filetitle);
|
ofn.nMaxFileTitle = ARRAY_SIZE(filetitle);
|
||||||
|
@ -729,8 +729,6 @@ static struct ShellFolderInfo asfiInfo[] = {
|
||||||
|
|
||||||
static struct ShellFolderInfo *psfiSelected = NULL;
|
static struct ShellFolderInfo *psfiSelected = NULL;
|
||||||
|
|
||||||
#define NUM_ELEMS(x) (sizeof(x)/sizeof(*(x)))
|
|
||||||
|
|
||||||
static void init_shell_folder_listview_headers(HWND dialog) {
|
static void init_shell_folder_listview_headers(HWND dialog) {
|
||||||
LVCOLUMNW listColumn;
|
LVCOLUMNW listColumn;
|
||||||
RECT viewRect;
|
RECT viewRect;
|
||||||
|
@ -764,7 +762,7 @@ static void read_shell_folder_link_targets(void) {
|
||||||
HRESULT hr;
|
HRESULT hr;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
for (i=0; i<NUM_ELEMS(asfiInfo); i++) {
|
for (i=0; i<ARRAY_SIZE(asfiInfo); i++) {
|
||||||
asfiInfo[i].szLinkTarget[0] = '\0';
|
asfiInfo[i].szLinkTarget[0] = '\0';
|
||||||
hr = SHGetFolderPathW(NULL, asfiInfo[i].nFolder|CSIDL_FLAG_DONT_VERIFY, NULL,
|
hr = SHGetFolderPathW(NULL, asfiInfo[i].nFolder|CSIDL_FLAG_DONT_VERIFY, NULL,
|
||||||
SHGFP_TYPE_CURRENT, wszPath);
|
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);
|
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];
|
WCHAR buffer[MAX_PATH];
|
||||||
HRESULT hr;
|
HRESULT hr;
|
||||||
LPITEMIDLIST pidlCurrent;
|
LPITEMIDLIST pidlCurrent;
|
||||||
|
@ -905,7 +903,7 @@ static void apply_shell_folder_changes(void) {
|
||||||
struct stat statPath;
|
struct stat statPath;
|
||||||
HRESULT hr;
|
HRESULT hr;
|
||||||
|
|
||||||
for (i=0; i<NUM_ELEMS(asfiInfo); i++) {
|
for (i=0; i<ARRAY_SIZE(asfiInfo); i++) {
|
||||||
/* Ignore nonexistent link targets */
|
/* Ignore nonexistent link targets */
|
||||||
if (asfiInfo[i].szLinkTarget[0] && stat(asfiInfo[i].szLinkTarget, &statPath))
|
if (asfiInfo[i].szLinkTarget[0] && stat(asfiInfo[i].szLinkTarget, &statPath))
|
||||||
continue;
|
continue;
|
||||||
|
|
|
@ -623,7 +623,7 @@ static void process_setting(struct setting *s)
|
||||||
static const WCHAR softwareW[] = {'S','o','f','t','w','a','r','e','\\'};
|
static const WCHAR softwareW[] = {'S','o','f','t','w','a','r','e','\\'};
|
||||||
HKEY key;
|
HKEY key;
|
||||||
BOOL needs_wow64 = (is_win64 && s->root == HKEY_LOCAL_MACHINE && s->path &&
|
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)
|
if (s->value)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue