October 2022 - Wine-commits

Connor McAdams : uiautomationcore/tests: Add tests for boolean UIA ConditionTypes.
by Alexandre Julliard 25 Oct '22

25 Oct '22

Module: wine Branch: master Commit: 65bca11b9511db10e8f7a2d386c3c56aacbaa81a URL: https://gitlab.winehq.org/wine/wine/-/commit/65bca11b9511db10e8f7a2d386c3c5… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Tue Oct 25 07:55:08 2022 -0400 uiautomationcore/tests: Add tests for boolean UIA ConditionTypes. Add tests for ConditionType_Not, ConditionType_And, and ConditionType_Or. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 155 +++++++++++++++++++++++++++++ 1 file changed, 155 insertions(+) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 96c2c128906..8846cd89ed2 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -6732,6 +6732,20 @@ static void set_cache_request(struct UiaCacheRequest *req, struct UiaCondition * req->automationElementMode = elem_mode; } +static void set_and_or_condition(struct UiaAndOrCondition *cond, int cond_type, + struct UiaCondition **conds, int cond_count) +{ + cond->ConditionType = cond_type; + cond->ppConditions = conds; + cond->cConditions = cond_count; +} + +static void set_not_condition(struct UiaNotCondition *cond, struct UiaCondition *not_cond) +{ + cond->ConditionType = ConditionType_Not; + cond->pConditions = not_cond; +} + #define MAX_NODE_PROVIDERS 4 struct node_provider_desc { DWORD pid; @@ -6879,8 +6893,11 @@ static const struct UiaCondition UiaFalseCondition = { ConditionType_False }; static void test_UiaGetUpdatedCache(void) { struct node_provider_desc exp_node_desc[2]; + struct UiaAndOrCondition and_or_cond; LONG exp_lbound[2], exp_elems[2], i; struct UiaCacheRequest cache_req; + struct UiaCondition *cond_arr[2]; + struct UiaNotCondition not_cond; SAFEARRAY *out_req; BSTR tree_struct; HUIANODE node; @@ -7045,6 +7062,144 @@ static void test_UiaGetUpdatedCache(void) SafeArrayDestroy(out_req); SysFreeString(tree_struct); + /* + * ConditionType_And tests. + */ + for (i = 0; i < ARRAY_SIZE(exp_node_desc); i++) + init_node_provider_desc(&exp_node_desc[i], GetCurrentProcessId(), NULL); + add_provider_desc(&exp_node_desc[0], L"Main", L"Provider", TRUE); + cond_arr[0] = (struct UiaCondition *)&UiaTrueCondition; + cond_arr[1] = (struct UiaCondition *)&UiaTrueCondition; + set_and_or_condition(&and_or_cond, ConditionType_And, cond_arr, ARRAY_SIZE(cond_arr)); + set_cache_request(&cache_req, (struct UiaCondition *)&and_or_cond, TreeScope_Element, NULL, 0, NULL, 0, + AutomationElementMode_Full); + tree_struct = NULL; out_req = NULL; + + /* Equivalent to: if (1 && 1) */ + hr = UiaGetUpdatedCache(node, &cache_req, NormalizeState_View, NULL, &out_req, &tree_struct); + todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine ok(!!out_req, "out_req == NULL\n"); + todo_wine ok(!!tree_struct, "tree_struct == NULL\n"); + if (out_req) + { + exp_lbound[0] = exp_lbound[1] = 0; + exp_elems[0] = exp_elems[1] = 1; + test_cache_req_sa(out_req, exp_lbound, exp_elems, exp_node_desc); + ok(!wcscmp(tree_struct, L"P)"), "tree structure %s\n", debugstr_w(tree_struct)); + ok_method_sequence(cache_req_seq1, NULL); + } + + SafeArrayDestroy(out_req); + SysFreeString(tree_struct); + + cond_arr[0] = (struct UiaCondition *)&UiaTrueCondition; + cond_arr[1] = (struct UiaCondition *)&UiaFalseCondition; + set_and_or_condition(&and_or_cond, ConditionType_And, cond_arr, ARRAY_SIZE(cond_arr)); + set_cache_request(&cache_req, (struct UiaCondition *)&and_or_cond, TreeScope_Element, NULL, 0, NULL, 0, + AutomationElementMode_Full); + tree_struct = NULL; out_req = NULL; + + /* Equivalent to: if (1 && 0) */ + hr = UiaGetUpdatedCache(node, &cache_req, NormalizeState_View, NULL, &out_req, &tree_struct); + todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + if (SUCCEEDED(hr)) + ok_method_sequence(cache_req_seq2, NULL); + + ok(!out_req, "out_req != NULL\n"); + todo_wine ok(!!tree_struct, "tree_struct == NULL\n"); + if (tree_struct) + ok(!wcscmp(tree_struct, L""), "tree structure %s\n", debugstr_w(tree_struct)); + SysFreeString(tree_struct); + + /* + * ConditionType_Or tests. + */ + cond_arr[0] = (struct UiaCondition *)&UiaTrueCondition; + cond_arr[1] = (struct UiaCondition *)&UiaFalseCondition; + set_and_or_condition(&and_or_cond, ConditionType_Or, cond_arr, ARRAY_SIZE(cond_arr)); + set_cache_request(&cache_req, (struct UiaCondition *)&and_or_cond, TreeScope_Element, NULL, 0, NULL, 0, + AutomationElementMode_Full); + tree_struct = NULL; out_req = NULL; + + /* Equivalent to: if (1 || 0) */ + hr = UiaGetUpdatedCache(node, &cache_req, NormalizeState_View, NULL, &out_req, &tree_struct); + todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine ok(!!out_req, "out_req == NULL\n"); + todo_wine ok(!!tree_struct, "tree_struct == NULL\n"); + if (out_req) + { + exp_lbound[0] = exp_lbound[1] = 0; + exp_elems[0] = exp_elems[1] = 1; + test_cache_req_sa(out_req, exp_lbound, exp_elems, exp_node_desc); + ok(!wcscmp(tree_struct, L"P)"), "tree structure %s\n", debugstr_w(tree_struct)); + ok_method_sequence(cache_req_seq1, NULL); + } + + SafeArrayDestroy(out_req); + SysFreeString(tree_struct); + + cond_arr[0] = (struct UiaCondition *)&UiaFalseCondition; + cond_arr[1] = (struct UiaCondition *)&UiaFalseCondition; + set_and_or_condition(&and_or_cond, ConditionType_Or, cond_arr, ARRAY_SIZE(cond_arr)); + set_cache_request(&cache_req, (struct UiaCondition *)&and_or_cond, TreeScope_Element, NULL, 0, NULL, 0, + AutomationElementMode_Full); + tree_struct = NULL; out_req = NULL; + + /* Equivalent to: if (0 || 0) */ + hr = UiaGetUpdatedCache(node, &cache_req, NormalizeState_View, NULL, &out_req, &tree_struct); + todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + if (SUCCEEDED(hr)) + ok_method_sequence(cache_req_seq2, NULL); + + ok(!out_req, "out_req != NULL\n"); + todo_wine ok(!!tree_struct, "tree_struct == NULL\n"); + if (tree_struct) + ok(!wcscmp(tree_struct, L""), "tree structure %s\n", debugstr_w(tree_struct)); + SysFreeString(tree_struct); + + /* + * ConditionType_Not tests. + */ + set_not_condition(&not_cond, (struct UiaCondition *)&UiaFalseCondition); + set_cache_request(&cache_req, (struct UiaCondition *)&not_cond, TreeScope_Element, NULL, 0, NULL, 0, + AutomationElementMode_Full); + tree_struct = NULL; out_req = NULL; + + /* Equivalent to: if (!0) */ + hr = UiaGetUpdatedCache(node, &cache_req, NormalizeState_View, NULL, &out_req, &tree_struct); + todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine ok(!!out_req, "out_req == NULL\n"); + todo_wine ok(!!tree_struct, "tree_struct == NULL\n"); + if (out_req) + { + exp_lbound[0] = exp_lbound[1] = 0; + exp_elems[0] = exp_elems[1] = 1; + test_cache_req_sa(out_req, exp_lbound, exp_elems, exp_node_desc); + ok(!wcscmp(tree_struct, L"P)"), "tree structure %s\n", debugstr_w(tree_struct)); + ok_method_sequence(cache_req_seq1, NULL); + } + + SafeArrayDestroy(out_req); + SysFreeString(tree_struct); + + set_not_condition(&not_cond, (struct UiaCondition *)&UiaTrueCondition); + set_cache_request(&cache_req, (struct UiaCondition *)&not_cond, TreeScope_Element, NULL, 0, NULL, 0, + AutomationElementMode_Full); + tree_struct = NULL; out_req = NULL; + + /* Equivalent to: if (!1) */ + hr = UiaGetUpdatedCache(node, &cache_req, NormalizeState_View, NULL, &out_req, &tree_struct); + todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + if (SUCCEEDED(hr)) + ok_method_sequence(cache_req_seq2, NULL); + + ok(!out_req, "out_req != NULL\n"); + todo_wine ok(!!tree_struct, "tree_struct == NULL\n"); + if (tree_struct) + ok(!wcscmp(tree_struct, L""), "tree structure %s\n", debugstr_w(tree_struct)); + SysFreeString(tree_struct); + + ok(UiaNodeRelease(node), "UiaNodeRelease returned FALSE\n"); ok(Provider.ref == 1, "Unexpected refcnt %ld\n", Provider.ref);

1 0

Connor McAdams : uiautomationcore/tests: Add ConditionType_Property tests.
by Alexandre Julliard 25 Oct '22

25 Oct '22

Module: wine Branch: master Commit: 94e0c663c3dd4d1b0b9903968ef8cecf9491f16c URL: https://gitlab.winehq.org/wine/wine/-/commit/94e0c663c3dd4d1b0b9903968ef8ce… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Tue Oct 25 08:04:04 2022 -0400 uiautomationcore/tests: Add ConditionType_Property tests. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 203 +++++++++++++++++++++++++++++ 1 file changed, 203 insertions(+)

1 0

Connor McAdams : uiautomationcore: Add support for ConditionType_Not conditions.
by Alexandre Julliard 25 Oct '22

25 Oct '22

Module: wine Branch: master Commit: 9967d214561be5b2e10f877cbdb9b97dd7ff24cb URL: https://gitlab.winehq.org/wine/wine/-/commit/9967d214561be5b2e10f877cbdb9b9… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Oct 24 12:34:25 2022 -0400 uiautomationcore: Add support for ConditionType_Not conditions. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 31 +++++++++++++----------------- dlls/uiautomationcore/uia_client.c | 16 ++++++++++++++- 2 files changed, 28 insertions(+), 19 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index c837e1093d7..32ae4cb9b5f 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -7222,17 +7222,15 @@ static void test_UiaGetUpdatedCache(void) /* Equivalent to: if (!0) */ hr = UiaGetUpdatedCache(node, &cache_req, NormalizeState_View, NULL, &out_req, &tree_struct); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine ok(!!out_req, "out_req == NULL\n"); - todo_wine ok(!!tree_struct, "tree_struct == NULL\n"); - if (out_req) - { - exp_lbound[0] = exp_lbound[1] = 0; - exp_elems[0] = exp_elems[1] = 1; - test_cache_req_sa(out_req, exp_lbound, exp_elems, exp_node_desc); - ok(!wcscmp(tree_struct, L"P)"), "tree structure %s\n", debugstr_w(tree_struct)); - ok_method_sequence(cache_req_seq1, NULL); - } + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!!out_req, "out_req == NULL\n"); + ok(!!tree_struct, "tree_struct == NULL\n"); + + exp_lbound[0] = exp_lbound[1] = 0; + exp_elems[0] = exp_elems[1] = 1; + test_cache_req_sa(out_req, exp_lbound, exp_elems, exp_node_desc); + ok(!wcscmp(tree_struct, L"P)"), "tree structure %s\n", debugstr_w(tree_struct)); + ok_method_sequence(cache_req_seq1, NULL); SafeArrayDestroy(out_req); SysFreeString(tree_struct); @@ -7244,15 +7242,12 @@ static void test_UiaGetUpdatedCache(void) /* Equivalent to: if (!1) */ hr = UiaGetUpdatedCache(node, &cache_req, NormalizeState_View, NULL, &out_req, &tree_struct); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - if (SUCCEEDED(hr)) - ok_method_sequence(cache_req_seq2, NULL); - + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!out_req, "out_req != NULL\n"); - todo_wine ok(!!tree_struct, "tree_struct == NULL\n"); - if (tree_struct) - ok(!wcscmp(tree_struct, L""), "tree structure %s\n", debugstr_w(tree_struct)); + ok(!!tree_struct, "tree_struct == NULL\n"); + ok(!wcscmp(tree_struct, L""), "tree structure %s\n", debugstr_w(tree_struct)); SysFreeString(tree_struct); + ok_method_sequence(cache_req_seq2, NULL); /* * ConditionType_Property tests. diff --git a/dlls/uiautomationcore/uia_client.c b/dlls/uiautomationcore/uia_client.c index 12b53891dcd..3897b036e09 100644 --- a/dlls/uiautomationcore/uia_client.c +++ b/dlls/uiautomationcore/uia_client.c @@ -1930,10 +1930,24 @@ static HRESULT uia_condition_check(HUIANODE node, struct UiaCondition *condition case ConditionType_False: return S_FALSE; + case ConditionType_Not: + { + struct UiaNotCondition *not_cond = (struct UiaNotCondition *)condition; + HRESULT hr; + + hr = uia_condition_check(node, not_cond->pConditions); + if (FAILED(hr)) + return hr; + + if (uia_condition_matched(hr)) + return S_FALSE; + else + return S_OK; + } + case ConditionType_Property: case ConditionType_And: case ConditionType_Or: - case ConditionType_Not: FIXME("Unhandled condition type %d\n", condition->ConditionType); return E_NOTIMPL;

1 0

Michael Stefaniuc : ntdll: Use ARRAY_SIZE instead of open coding it.
by Alexandre Julliard 25 Oct '22

25 Oct '22

Module: wine Branch: master Commit: f5c573b199f3a6dfa57c59393fd7bf940774cf15 URL: https://gitlab.winehq.org/wine/wine/-/commit/f5c573b199f3a6dfa57c59393fd7bf… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Jul 1 19:56:55 2022 +0200 ntdll: Use ARRAY_SIZE instead of open coding it. --- dlls/ntdll/unix/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index c21d32ea811..0ed7a524db6 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -635,7 +635,7 @@ static void init_paths( char *argv[] ) static int pathname[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; size_t path_size = PATH_MAX; char *path = malloc( path_size ); - if (path && !sysctl( pathname, sizeof(pathname)/sizeof(pathname[0]), path, &path_size, NULL, 0 )) + if (path && !sysctl( pathname, ARRAY_SIZE(pathname), path, &path_size, NULL, 0 )) bin_dir = realpath_dirname( path ); free( path ); }

1 0

Michael Stefaniuc : riched20/tests: Use ARRAY_SIZE instead of open coding it.
by Alexandre Julliard 25 Oct '22

25 Oct '22

Module: wine Branch: master Commit: 90b6288f54afdc4430dac146779a92b89f4d1219 URL: https://gitlab.winehq.org/wine/wine/-/commit/90b6288f54afdc4430dac146779a92… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Jul 1 19:58:42 2022 +0200 riched20/tests: Use ARRAY_SIZE instead of open coding it. --- dlls/riched20/tests/editor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 1661654aa11..9551f490a2d 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -9030,7 +9030,7 @@ static void test_window_classes(void) int i; HWND hwnd; - for (i = 0; i < sizeof(test)/sizeof(test[0]); i++) + for (i = 0; i < ARRAY_SIZE(test); i++) { SetLastError(0xdeadbeef); hwnd = CreateWindowExA(0, test[i].class, NULL, WS_POPUP, 0, 0, 0, 0, 0, 0, 0, NULL);

1 0

Michael Stefaniuc : kernel32/tests: Use ARRAY_SIZE instead of open coding it.
by Alexandre Julliard 25 Oct '22

25 Oct '22

Module: wine Branch: master Commit: 03edb068deb46b7ec3825c4f01ba5b49fb7ce391 URL: https://gitlab.winehq.org/wine/wine/-/commit/03edb068deb46b7ec3825c4f01ba5b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Oct 18 18:58:18 2022 +0200 kernel32/tests: Use ARRAY_SIZE instead of open coding it. --- dlls/kernel32/tests/drive.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/drive.c b/dlls/kernel32/tests/drive.c index db9f626aaab..253638cd321 100644 --- a/dlls/kernel32/tests/drive.c +++ b/dlls/kernel32/tests/drive.c @@ -159,8 +159,7 @@ static void test_GetDiskFreeSpaceA(void) ret = GetDiskFreeSpaceA("C:\\", &sectors_per_cluster, &bytes_per_sector, &free_clusters, &total_clusters); ok(ret, "GetDiskFreeSpaceA error %ld\n", GetLastError()); - ret = GetVolumeNameForVolumeMountPointA("C:\\", volume_guid_path, - sizeof(volume_guid_path) / sizeof(volume_guid_path[0])); + ret = GetVolumeNameForVolumeMountPointA("C:\\", volume_guid_path, ARRAY_SIZE(volume_guid_path)); ok(ret, "GetVolumeNameForVolumeMountPointA error %ld\n", GetLastError()); ret = GetDiskFreeSpaceA(volume_guid_path, &sectors_per_cluster, &bytes_per_sector, &free_clusters, &total_clusters); @@ -251,8 +250,7 @@ static void test_GetDiskFreeSpaceW(void) ret = GetDiskFreeSpaceW(c_drive_pathW, &sectors_per_cluster, &bytes_per_sector, &free_clusters, &total_clusters); ok(ret, "GetDiskFreeSpaceW error %ld\n", GetLastError()); - ret = GetVolumeNameForVolumeMountPointW(c_drive_pathW, volume_guid_path, - sizeof(volume_guid_path) / sizeof(volume_guid_path[0])); + ret = GetVolumeNameForVolumeMountPointW(c_drive_pathW, volume_guid_path, ARRAY_SIZE(volume_guid_path)); ok(ret, "GetVolumeNameForVolumeMountPointW error %ld\n", GetLastError()); ret = GetDiskFreeSpaceW(volume_guid_path, &sectors_per_cluster, &bytes_per_sector, &free_clusters, &total_clusters);

1 0

Michael Stefaniuc : server: Use ARRAY_SIZE instead of open coding it.
by Alexandre Julliard 25 Oct '22

25 Oct '22

Module: wine Branch: master Commit: c2d800f1dbf83c8f0599db6d831e3246eb89fee3 URL: https://gitlab.winehq.org/wine/wine/-/commit/c2d800f1dbf83c8f0599db6d831e32… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Oct 18 19:01:11 2022 +0200 server: Use ARRAY_SIZE instead of open coding it. --- server/unicode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/unicode.c b/server/unicode.c index 86a1217b01f..edb296be0c8 100644 --- a/server/unicode.c +++ b/server/unicode.c @@ -249,7 +249,7 @@ static char *get_nls_dir(void) dir = malloc( dir_size ); if (dir) { - if (sysctl( pathname, sizeof(pathname)/sizeof(pathname[0]), dir, &dir_size, NULL, 0 )) + if (sysctl( pathname, ARRAY_SIZE( pathname ), dir, &dir_size, NULL, 0 )) { free( dir ); dir = NULL;

1 0

Michael Stefaniuc : loader: Use ARRAY_SIZE instead of open coding it.
by Alexandre Julliard 25 Oct '22

25 Oct '22

Module: wine Branch: master Commit: af996344a815baa1278d32181ddfda5e889a16d9 URL: https://gitlab.winehq.org/wine/wine/-/commit/af996344a815baa1278d32181ddfda… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Oct 18 19:02:59 2022 +0200 loader: Use ARRAY_SIZE instead of open coding it. --- loader/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/main.c b/loader/main.c index 242ff15accd..36e1f5f0967 100644 --- a/loader/main.c +++ b/loader/main.c @@ -90,7 +90,7 @@ static const char *get_self_exe( char *argv0 ) static int pathname[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; size_t path_size = PATH_MAX; char *path = malloc( path_size ); - if (path && !sysctl( pathname, sizeof(pathname)/sizeof(pathname[0]), path, &path_size, NULL, 0 )) + if (path && !sysctl( pathname, ARRAY_SIZE( pathname ), path, &path_size, NULL, 0 )) return path; free( path ); #endif

1 0

Michael Stefaniuc : libs/wine: Use ARRAY_SIZE instead of open coding it.
by Alexandre Julliard 25 Oct '22

25 Oct '22

Module: wine Branch: master Commit: 24a7497bab1a8c0ab3b0575f21e42726603e1b17 URL: https://gitlab.winehq.org/wine/wine/-/commit/24a7497bab1a8c0ab3b0575f21e427… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Oct 18 19:04:49 2022 +0200 libs/wine: Use ARRAY_SIZE instead of open coding it. --- libs/wine/config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/wine/config.c b/libs/wine/config.c index 23c76fda128..4eb446258cc 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -147,7 +147,7 @@ static char *get_runtime_exedir(void) static int pathname[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; size_t dir_size = PATH_MAX; char *dir = malloc( dir_size ); - if (dir && !sysctl( pathname, sizeof(pathname)/sizeof(pathname[0]), dir, &dir_size, NULL, 0 )) + if (dir && !sysctl( pathname, ARRAY_SIZE( pathname ), dir, &dir_size, NULL, 0 )) return dir; free( dir ); return NULL;

1 0

Michael Stefaniuc : widl: Use ARRAY_SIZE instead of open coding it.
by Alexandre Julliard 25 Oct '22

25 Oct '22

Module: wine Branch: master Commit: 7029bba31a9df08a7e188bbbd5e820b115a0a2fa URL: https://gitlab.winehq.org/wine/wine/-/commit/7029bba31a9df08a7e188bbbd5e820… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Jul 1 20:01:30 2022 +0200 widl: Use ARRAY_SIZE instead of open coding it. --- tools/widl/widl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 7b2276b0a41..1a0b57f8f88 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -490,7 +490,7 @@ static void init_argv0_dir( const char *argv0 ) static int pathname[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; size_t path_size = PATH_MAX; char *path = xmalloc( path_size ); - if (!sysctl( pathname, sizeof(pathname)/sizeof(pathname[0]), path, &path_size, NULL, 0 )) + if (!sysctl( pathname, ARRAY_SIZE(pathname), path, &path_size, NULL, 0 )) dir = realpath( path, NULL ); free( path ); #else

1 0