Rebase against b6a4b2f593503a105dde01e7bd11ffdde243117a.

This commit is contained in:
Sebastian Lackner
2017-05-09 05:33:36 +02:00
parent a36a97233a
commit c542f2432d
6 changed files with 54 additions and 56 deletions

View File

@@ -1,4 +1,4 @@
From a0fec83a02fde13d4486ee1ea7ff61513b6f4fc1 Mon Sep 17 00:00:00 2001
From 5d4889932af882323b5a3199abf73a1b4166360c Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dmitry@baikal.ru>
Date: Tue, 15 Mar 2016 12:31:22 +0800
Subject: user32/tests: Add a test for custom dialog control data.
@@ -9,7 +9,7 @@ Subject: user32/tests: Add a test for custom dialog control data.
2 files changed, 47 insertions(+)
diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c
index a6cd1be..2715b6b 100644
index 6b9d7046aa..e901e27b97 100644
--- a/dlls/user32/tests/dialog.c
+++ b/dlls/user32/tests/dialog.c
@@ -539,6 +539,27 @@ static LRESULT CALLBACK testDlgWinProc (HWND hwnd, UINT uiMsg, WPARAM wParam,
@@ -51,8 +51,8 @@ index a6cd1be..2715b6b 100644
if (!RegisterClassA (&cls)) return FALSE;
GetClassInfoA(0, "#32770", &cls);
@@ -1472,12 +1496,26 @@ static void test_timer_message(void)
DialogBoxA(g_hinst, "RADIO_TEST_DIALOG", NULL, timer_message_dlg_proc);
@@ -1563,12 +1587,26 @@ static void test_MessageBox(void)
UnhookWindowsHookEx(hook);
}
+static INT_PTR CALLBACK custom_test_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam)
@@ -79,7 +79,7 @@ index a6cd1be..2715b6b 100644
test_IsDialogMessage();
test_WM_NEXTDLGCTL();
diff --git a/dlls/user32/tests/resource.rc b/dlls/user32/tests/resource.rc
index f116b85..bfe8b9c 100644
index f116b85825..bfe8b9c5fd 100644
--- a/dlls/user32/tests/resource.rc
+++ b/dlls/user32/tests/resource.rc
@@ -200,6 +200,15 @@ FONT 8, "MS Shell Dlg"
@@ -99,5 +99,5 @@ index f116b85..bfe8b9c 100644
100 BITMAP test_mono.bmp
--
2.7.1
2.12.2