Module: wine Branch: oldstable Commit: 1d7c98bcc143860a4ea09ce0df1fac8a868d7b39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d7c98bcc143860a4ea09ce0d...
Author: Dmitry Timoshkov dmitry@baikal.ru Date: Mon Oct 1 14:47:45 2018 +0800
user32: Fix the pointer to custom dialog control data.
Suggested by vendor2013@herdsoft.com.
Signed-off-by: Dmitry Timoshkov dmitry@baikal.ru Signed-off-by: Alexandre Julliard julliard@winehq.org (cherry picked from commit 5277aa8f64ae614c75fb32e3db135a49f3f83b3a) Signed-off-by: Michael Stefaniuc mstefani@winehq.org
---
dlls/user32/dialog.c | 2 +- dlls/user32/tests/dialog.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 46220b0..eeb5146 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -197,7 +197,7 @@ static const WORD *DIALOG_GetControl32( const WORD *p, DLG_CONTROL_INFO *info, TRACE("\n"); TRACE(" END\n" ); } - info->data = p + 1; + info->data = p; p += GET_WORD(p) / sizeof(WORD); } else info->data = NULL; diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 8d30377..f57271c 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -548,7 +548,6 @@ static LRESULT CALLBACK test_control_procA(HWND hwnd, UINT msg, WPARAM wparam, L static const short sample[] = { 10,1,2,3,4,5 }; CREATESTRUCTA *cs = (CREATESTRUCTA *)lparam; short *data = cs->lpCreateParams; -todo_wine ok(!memcmp(data, sample, sizeof(sample)), "data mismatch: %d,%d,%d,%d,%d\n", data[0], data[1], data[2], data[3], data[4]); } return 0;