Commit af996344a815baa1278d32181ddfda5e889a16d9 used ARRAY_SIZE in FreeBSD-specifc code which, alas, is not available here, so revert that change.
From: Gerald Pfeifer gerald@pfeifer.com
Commit af996344a815baa1278d32181ddfda5e889a16d9 used ARRAY_SIZE in FreeBSD-specifc code which, alas, is not available here, so revert that change. --- loader/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/loader/main.c b/loader/main.c index 36e1f5f0967..242ff15accd 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, ARRAY_SIZE( pathname ), path, &path_size, NULL, 0 )) + if (path && !sysctl( pathname, sizeof(pathname)/sizeof(pathname[0]), path, &path_size, NULL, 0 )) return path; free( path ); #endif
Hi,
It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated.
The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details:
The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=125497
Your paranoid android.
=== debian11 (32 bit report) ===
user32: win.c:11636: Test failed: 00490138: expected prev 01550104, got 00000000 win.c:11650: Test failed: hwnd should NOT be topmost win.c:11596: Test failed: 1: hwnd 00490138 is still topmost
On Thu Oct 27 23:41:10 2022 +0000, **** wrote:
Marvin replied on the mailing list:
Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details: The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=125497 Your paranoid android. === debian11 (32 bit report) === user32: win.c:11636: Test failed: 00490138: expected prev 01550104, got 00000000 win.c:11650: Test failed: hwnd should NOT be topmost win.c:11596: Test failed: 1: hwnd 00490138 is still topmost
False positive: The code I changed is #if defined (__FreeBSD__) and fixes a build failure there.
This merge request was approved by Michael Stefaniuc.
-
Gerald Pfeifer -
Gerald Pfeifer (＠gerald)
-
Marvin -
Michael Stefaniuc (＠mstefani)