From: Sven Baars <sbaars@codeweavers.com> --- dlls/comctl32/tests/updown.c | 8 ++++++++ dlls/comctl32/updown.c | 14 ++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/tests/updown.c b/dlls/comctl32/tests/updown.c index 750813eccd9..f86597dc7d8 100644 --- a/dlls/comctl32/tests/updown.c +++ b/dlls/comctl32/tests/updown.c @@ -1075,6 +1075,14 @@ static void test_accel(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); + r = SendMessageA(updown, UDM_GETACCEL, 0, (LPARAM)accel); + expect(3, r); + + r = SendMessageA(updown, UDM_GETACCEL, 1, (LPARAM)accel); + expect(3, r); + expect(0, accel[0].nSec); + expect(1, accel[0].nInc); + r = SendMessageA(updown, UDM_GETACCEL, 4, (LPARAM)accel); expect(3, r); expect(0, accel[0].nSec); diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index b136db153a0..ba7c89a822c 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -1145,14 +1145,12 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L case WM_PAINT: return UPDOWN_Paint (infoPtr, (HDC)wParam); - case UDM_GETACCEL: - if (wParam==0 && lParam==0) return infoPtr->AccelCount; - if (wParam && lParam) { - int temp = min(infoPtr->AccelCount, wParam); - memcpy((void *)lParam, infoPtr->AccelVect, temp*sizeof(UDACCEL)); - return temp; - } - return 0; + case UDM_GETACCEL: + if (wParam && lParam) { + int temp = min(infoPtr->AccelCount, wParam); + memcpy((void *)lParam, infoPtr->AccelVect, temp * sizeof(UDACCEL)); + } + return infoPtr->AccelCount; case UDM_SETACCEL: { -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9795