Michael Stefaniuc : comctl32/tests: Use MAKELPARAM instead of "(LPARAM) MAKELONG".
Alexandre Julliard
julliard at winehq.org
Tue Nov 4 07:29:14 CST 2008
Module: wine
Branch: master
Commit: 06c4de04612851f9112878010739950daf8bb856
URL: http://source.winehq.org/git/wine.git/?a=commit;h=06c4de04612851f9112878010739950daf8bb856
Author: Michael Stefaniuc <mstefani at redhat.de>
Date: Mon Nov 3 22:32:30 2008 +0100
comctl32/tests: Use MAKELPARAM instead of "(LPARAM) MAKELONG".
---
dlls/comctl32/tests/listview.c | 16 ++++++++--------
dlls/comctl32/tests/tooltips.c | 2 +-
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c
index 7f7d7cb..56d9bf0 100644
--- a/dlls/comctl32/tests/listview.c
+++ b/dlls/comctl32/tests/listview.c
@@ -78,9 +78,9 @@ static const struct message redraw_listview_seq[] = {
};
static const struct message listview_icon_spacing_seq[] = {
- { LVM_SETICONSPACING, sent|lparam, 0, (LPARAM) MAKELONG(20, 30) },
- { LVM_SETICONSPACING, sent|lparam, 0, (LPARAM) MAKELONG(25, 35) },
- { LVM_SETICONSPACING, sent|lparam, 0, (LPARAM) MAKELONG(-1, -1) },
+ { LVM_SETICONSPACING, sent|lparam, 0, MAKELPARAM(20, 30) },
+ { LVM_SETICONSPACING, sent|lparam, 0, MAKELPARAM(25, 35) },
+ { LVM_SETICONSPACING, sent|lparam, 0, MAKELPARAM(-1, -1) },
{ 0 }
};
@@ -866,10 +866,10 @@ static void test_icon_spacing(void)
expect(NFR_ANSI, r);
/* reset the icon spacing to defaults */
- SendMessage(hwnd, LVM_SETICONSPACING, 0, (LPARAM) MAKELONG(-1, -1));
+ SendMessage(hwnd, LVM_SETICONSPACING, 0, MAKELPARAM(-1, -1));
/* now we can request what the defaults are */
- r = SendMessage(hwnd, LVM_SETICONSPACING, 0, (LPARAM) MAKELONG(-1, -1));
+ r = SendMessage(hwnd, LVM_SETICONSPACING, 0, MAKELPARAM(-1, -1));
w = LOWORD(r);
h = HIWORD(r);
@@ -877,15 +877,15 @@ static void test_icon_spacing(void)
trace("test icon spacing\n");
- r = SendMessage(hwnd, LVM_SETICONSPACING, 0, (LPARAM) MAKELONG(20, 30));
+ r = SendMessage(hwnd, LVM_SETICONSPACING, 0, MAKELPARAM(20, 30));
ok(r == MAKELONG(w, h) ||
broken(r == MAKELONG(w, w)), /* win98 */
"Expected %d, got %d\n", MAKELONG(w, h), r);
- r = SendMessage(hwnd, LVM_SETICONSPACING, 0, (LPARAM) MAKELONG(25, 35));
+ r = SendMessage(hwnd, LVM_SETICONSPACING, 0, MAKELPARAM(25, 35));
expect(MAKELONG(20,30), r);
- r = SendMessage(hwnd, LVM_SETICONSPACING, 0, (LPARAM) MAKELONG(-1,-1));
+ r = SendMessage(hwnd, LVM_SETICONSPACING, 0, MAKELPARAM(-1,-1));
expect(MAKELONG(25,35), r);
ok_sequence(sequences, LISTVIEW_SEQ_INDEX, listview_icon_spacing_seq, "test icon spacing seq", FALSE);
diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c
index 7454b6f..1ce8ae0 100644
--- a/dlls/comctl32/tests/tooltips.c
+++ b/dlls/comctl32/tests/tooltips.c
@@ -213,7 +213,7 @@ static void test_customdraw(void) {
ok(lResult, "Adding the tool to the tooltip failed\n");
/* Make tooltip appear quickly */
- SendMessage(hwndTip, TTM_SETDELAYTIME, (WPARAM)TTDT_INITIAL, (LPARAM)MAKELONG(1,0));
+ SendMessage(hwndTip, TTM_SETDELAYTIME, TTDT_INITIAL, MAKELPARAM(1,0));
/* Put cursor inside window, tooltip will appear immediately */
SetCursorPos(100, 100);
More information about the wine-cvs
mailing list