James Hawkins : comctl32: Fix several test failures in win98.
Alexandre Julliard
julliard at winehq.org
Fri Aug 29 07:30:19 CDT 2008
Module: wine
Branch: master
Commit: eb86c5bb123a252c3ea269a750f8212896f5dac7
URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb86c5bb123a252c3ea269a750f8212896f5dac7
Author: James Hawkins <jhawkins at codeweavers.com>
Date: Thu Aug 28 21:17:44 2008 -0500
comctl32: Fix several test failures in win98.
---
dlls/comctl32/tests/comboex.c | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/dlls/comctl32/tests/comboex.c b/dlls/comctl32/tests/comboex.c
index 321b2a7..d0e0bb6 100644
--- a/dlls/comctl32/tests/comboex.c
+++ b/dlls/comctl32/tests/comboex.c
@@ -228,7 +228,8 @@ static void test_WM_LBUTTONDOWN(void)
result = SendMessage(hCombo, WM_LBUTTONDOWN, 0, MAKELPARAM(x, y));
ok(result, "WM_LBUTTONDOWN was not processed. LastError=%d\n",
GetLastError());
- ok(GetFocus() == hCombo,
+ ok(GetFocus() == hCombo ||
+ broken(GetFocus() != hCombo), /* win98 */
"Focus not on ComboBoxEx's ComboBox Control, instead on %p\n",
GetFocus());
ok(SendMessage(hComboEx, CB_GETDROPPEDSTATE, 0, 0),
@@ -239,7 +240,8 @@ static void test_WM_LBUTTONDOWN(void)
result = SendMessage(hCombo, WM_LBUTTONUP, 0, MAKELPARAM(x, y));
ok(result, "WM_LBUTTONUP was not processed. LastError=%d\n",
GetLastError());
- ok(GetFocus() == hCombo,
+ ok(GetFocus() == hCombo ||
+ broken(GetFocus() != hCombo), /* win98 */
"Focus not on ComboBoxEx's ComboBox Control, instead on %p\n",
GetFocus());
@@ -251,14 +253,16 @@ static void test_WM_LBUTTONDOWN(void)
result = SendMessage(hList, WM_MOUSEMOVE, 0, MAKELPARAM(x, y));
ok(!result, "WM_MOUSEMOVE was not processed. LastError=%d\n",
GetLastError());
- ok(GetFocus() == hCombo,
+ ok(GetFocus() == hCombo ||
+ broken(GetFocus() != hCombo), /* win98 */
"Focus not on ComboBoxEx's ComboBox Control, instead on %p\n",
GetFocus());
result = SendMessage(hList, WM_LBUTTONDOWN, 0, MAKELPARAM(x, y));
ok(!result, "WM_LBUTTONDOWN was not processed. LastError=%d\n",
GetLastError());
- ok(GetFocus() == hCombo,
+ ok(GetFocus() == hCombo ||
+ broken(GetFocus() != hCombo), /* win98 */
"Focus not on ComboBoxEx's ComboBox Control, instead on %p\n",
GetFocus());
ok(SendMessage(hComboEx, CB_GETDROPPEDSTATE, 0, 0),
@@ -270,10 +274,15 @@ static void test_WM_LBUTTONDOWN(void)
todo_wine ok(GetFocus() == hEdit,
"Focus not on ComboBoxEx's Edit Control, instead on %p\n",
GetFocus());
- ok(!SendMessage(hCombo, CB_GETDROPPEDSTATE, 0, 0),
+
+ result = SendMessage(hCombo, CB_GETDROPPEDSTATE, 0, 0);
+ ok(!result ||
+ broken(result != 0), /* win98 */
"The dropdown list should have been rolled up.\n");
idx = SendMessage(hComboEx, CB_GETCURSEL, 0, 0);
- ok(idx == 4, "Current Selection: expected %d, got %d\n", 4, idx);
+ ok(idx == 4 ||
+ broken(idx == -1), /* win98 */
+ "Current Selection: expected %d, got %d\n", 4, idx);
DestroyWindow(hComboEx);
}
More information about the wine-cvs
mailing list