[PATCH 3/3] user32: Fix the pointer to custom dialog control data.

[Dmitry Timoshkov]

The fix is suggested by vendor2013(a)herdsoft.com.

Signed-off-by: Dmitry Timoshkov <dmitry(a)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

[Marvin]

Hi,

While running your changed tests on Windows, 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=42736

Your paranoid android.


=== build (build log) ===

Makefile:805: recipe for target 'user32_test.exe' failed
Makefile:7471: recipe for target 'dlls/user32/tests' failed
Task: The exe32 Wine crossbuild failed