June 2022 - Wine-Devel - list.winehq.org

Re: ntdll: Fix the return value of NtQueryKey.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=116931 Your paranoid android. === debian11 (32 bit WoW report) === ntdll: change.c:241: Test failed: should be ready

June 14, 2022

ntdll: Fix the return value of NtQueryKey.

by 杨堃

Signed-off-by: Kun Yang <yangkun(a)uniontech.com> --- dlls/ntdll/tests/reg.c | 2 +- dlls/ntdll/unix/registry.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 2c158be17b4..ab6f7914e4b 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -1831,7 +1831,7 @@ static void test_NtQueryKey(void) pNtClose(key); return; } - todo_wine ok(status == STATUS_BUFFER_TOO_SMALL, "NtQueryKey Failed: 0x%08lx\n", status); + ok(status == STATUS_BUFFER_TOO_SMALL, "NtQueryKey Failed: 0x%08lx\n", status); info = HeapAlloc(GetProcessHeap(), 0, length); /* non-zero buffer size, but insufficient */ diff --git a/dlls/ntdll/unix/registry.c b/dlls/ntdll/unix/registry.c index 6628454440a..767fa36302d 100644 --- a/dlls/ntdll/unix/registry.c +++ b/dlls/ntdll/unix/registry.c @@ -321,7 +321,12 @@ static NTSTATUS enumerate_key( HANDLE handle, int index, KEY_INFORMATION_CLASS i break; } *result_len = fixed_size + reply->total; - if (length < *result_len) ret = STATUS_BUFFER_OVERFLOW; + if (length < *result_len){ + if(min(length, fixed_size) == 0) + ret = STATUS_BUFFER_TOO_SMALL; + else + ret = STATUS_BUFFER_OVERFLOW; + } } } SERVER_END_REQ; -- 2.20.1

June 14, 2022

Re: [PATCH] ntdll: Fix the return value of NtQueryKey.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=116930 Your paranoid android. === build (build log) === error: patch failed: dlls/ntdll/tests/reg.c:1831 error: patch failed: dlls/ntdll/unix/registry.c:321 Task: Patch failed to apply === debian11 (build log) === error: patch failed: dlls/ntdll/tests/reg.c:1831 error: patch failed: dlls/ntdll/unix/registry.c:321 Task: Patch failed to apply === debian11 (build log) === error: patch failed: dlls/ntdll/tests/reg.c:1831 error: patch failed: dlls/ntdll/unix/registry.c:321 Task: Patch failed to apply

June 14, 2022

[PATCH] ntdll: Fix the return value of NtQueryKey.

by 杨堃

>From bc084bfcf6c342e483f77090593261ac76b6f513 Mon Sep 17 00:00:00 2001 From: Kun Yang <yangkun(a)uniontech.com> Date: Tue, 14 Jun 2022 16:16:53 +0800 Subject: [PATCH] ntdll: Fix the return value of NtQueryKey. Signed-off-by: Kun Yang <yangkun(a)uniontech.com> --- dlls/ntdll/tests/reg.c | 2 +- dlls/ntdll/unix/registry.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 2c158be17b4..ab6f7914e4b 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -1831,7 +1831,7 @@ static void test_NtQueryKey(void) pNtClose(key); return; } - todo_wine ok(status == STATUS_BUFFER_TOO_SMALL, "NtQueryKey Failed: 0x%08lx\n", status); + ok(status == STATUS_BUFFER_TOO_SMALL, "NtQueryKey Failed: 0x%08lx\n", status); info = HeapAlloc(GetProcessHeap(), 0, length); /* non-zero buffer size, but insufficient */ diff --git a/dlls/ntdll/unix/registry.c b/dlls/ntdll/unix/registry.c index 6628454440a..767fa36302d 100644 --- a/dlls/ntdll/unix/registry.c +++ b/dlls/ntdll/unix/registry.c @@ -321,7 +321,12 @@ static NTSTATUS enumerate_key( HANDLE handle, int index, KEY_INFORMATION_CLASS i break; } *result_len = fixed_size + reply->total; - if (length < *result_len) ret = STATUS_BUFFER_OVERFLOW; + if (length < *result_len){ + if(min(length, fixed_size) == 0) + ret = STATUS_BUFFER_TOO_SMALL; + else + ret = STATUS_BUFFER_OVERFLOW; + } } } SERVER_END_REQ; -- 2.20.1

June 14, 2022

Re: [PATCH v2 5/5] user32: Reimplement GetMenuContextHelpId on top of GetMenuInfo.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=116922 Your paranoid android. === debian11 (64 bit WoW report) === user32: msg.c:6881: Test failed: SetFocus(hwnd) on a button: 5: the msg 0x0138 was expected, but got msg 0x030f instead msg.c:6881: Test failed: SetFocus(hwnd) on a button: 8: the msg 0x8000 was expected, but got msg 0x0086 instead msg.c:6881: Test failed: SetFocus(hwnd) on a button: 9: the msg sequence is not complete: expected 0000 - actual 0006

June 14, 2022

Re: How to identify the primary battery (for Wine)

by Benjamin Berg

Hi all, On Mon, 2022-06-13 at 19:54 -0600, Alex Henrie wrote: > I've been working to improve battery status reporting for applications > running on Wine on Linux. However, we Wine developers are not sure > what the best way is to determine which battery is the computer's > primary battery. Could you take a look at > https://gitlab.winehq.org/wine/wine/-/merge_requests/134 and leave a > comment there or on the wine-devel mailing list? Wouldn't it make sense for Wine to use the UPower provided DisplayDevice that can be queried through DBus? Benjamin

June 14, 2022

Re: [PATCH v2 4/5] win32u: Move PopupMenuWndProc implementation from user32.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=116921 Your paranoid android. === debian11 (32 bit report) === user32: menu.c:2324: Test failed: test 25

June 14, 2022

Re: [PATCH] ntdll: Fix the return value of NtQueryKey

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=116928 Your paranoid android. === build (build log) === error: patch failed: dlls/ntdll/tests/reg.c:1831 error: patch failed: dlls/ntdll/unix/registry.c:321 Task: Patch failed to apply === debian11 (build log) === error: patch failed: dlls/ntdll/tests/reg.c:1831 error: patch failed: dlls/ntdll/unix/registry.c:321 Task: Patch failed to apply === debian11 (build log) === error: patch failed: dlls/ntdll/tests/reg.c:1831 error: patch failed: dlls/ntdll/unix/registry.c:321 Task: Patch failed to apply

June 14, 2022

[PATCH] ntdll: Fix the return value of NtQueryKey

by 杨堃

diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 2c158be17b4..ab6f7914e4b 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -1831,7 +1831,7 @@ static void test_NtQueryKey(void) pNtClose(key); return; } - todo_wine ok(status == STATUS_BUFFER_TOO_SMALL, "NtQueryKey Failed: 0x%08lx\n", status); + ok(status == STATUS_BUFFER_TOO_SMALL, "NtQueryKey Failed: 0x%08lx\n", status); info = HeapAlloc(GetProcessHeap(), 0, length); /* non-zero buffer size, but insufficient */ diff --git a/dlls/ntdll/unix/registry.c b/dlls/ntdll/unix/registry.c index 6628454440a..767fa36302d 100644 --- a/dlls/ntdll/unix/registry.c +++ b/dlls/ntdll/unix/registry.c @@ -321,7 +321,12 @@ static NTSTATUS enumerate_key( HANDLE handle, int index, KEY_INFORMATION_CLASS i break; } *result_len = fixed_size + reply->total; - if (length < *result_len) ret = STATUS_BUFFER_OVERFLOW; + if (length < *result_len){ + if(min(length, fixed_size) == 0) + ret = STATUS_BUFFER_TOO_SMALL; + else + ret = STATUS_BUFFER_OVERFLOW; + } } } SERVER_END_REQ;

June 14, 2022

Re: [PATCH 0/3] MR241: uiautomationcore: Test fix and MSAA provider navigation patches.

by Huw Davies (＠huw)

Huw Davies (@huw) commented about dlls/uiautomationcore/uia_provider.c: > + while (1) > + { > + hr = IAccessible_get_accChildCount(acc, &child_count); > + if (FAILED(hr) || (cur_pos > child_count)) > + break; > + > + variant_init_i4(&cid, cur_pos); > + hr = IAccessible_get_accChild(acc, cid, &disp); > + if (FAILED(hr)) > + break; > + > + if (hr == S_FALSE) > + { > + if (!msaa_check_acc_state(acc, cid, STATE_SYSTEM_INVISIBLE)) > + { > + *child = acc; It would be cleaner to addref `acc` here, then unconditional release the returned child in the callers. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/241#note_2022

June 14, 2022