[PATCH 3/3] user32: Fix the pointer to custom dialog control data.
Dmitry Timoshkov
dmitry at baikal.ru
Mon Oct 1 01:47:45 CDT 2018
The fix is suggested by vendor2013 at herdsoft.com.
Signed-off-by: Dmitry Timoshkov <dmitry at baikal.ru>
---
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 7b918193fd..c5c646e0b1 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 b75759ba0a..631f3d3b2b 100644
--- a/dlls/user32/tests/dialog.c
+++ b/dlls/user32/tests/dialog.c
@@ -553,7 +553,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;
--
2.17.1
More information about the wine-devel
mailing list