Skip to content

W
wine-cw
Commit 2ae85119 authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard
Browse files
Options

riched20: Use MAKELPARAM instead of "(LPARAM) MAKELONG".

parent 9f92f6bc
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
dlls/riched20/tests/editor.c
View file @ 2ae85119
...@@ -3821,7 +3821,7 @@ static void test_WM_SETFONT(void) ...@@ -3821,7 +3821,7 @@ static void test_WM_SETFONT(void)
returnedCF2A.cbSize = sizeof(returnedCF2A); returnedCF2A.cbSize = sizeof(returnedCF2A);
SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) "x"); SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) "x");
SendMessage(hwndRichEdit, WM_SETFONT, (WPARAM)testFont1,(LPARAM) MAKELONG((WORD) TRUE, 0)); SendMessage(hwndRichEdit, WM_SETFONT, (WPARAM)testFont1, MAKELPARAM(TRUE, 0));
SendMessage(hwndRichEdit, EM_GETCHARFORMAT, SCF_DEFAULT, (LPARAM) &returnedCF2A); SendMessage(hwndRichEdit, EM_GETCHARFORMAT, SCF_DEFAULT, (LPARAM) &returnedCF2A);
GetObjectA(testFont1, sizeof(LOGFONTA), &sentLogFont); GetObjectA(testFont1, sizeof(LOGFONTA), &sentLogFont);
...@@ -3829,14 +3829,14 @@ static void test_WM_SETFONT(void) ...@@ -3829,14 +3829,14 @@ static void test_WM_SETFONT(void)
"EM_GETCHARFORMAT: Returned wrong font on test 1. Sent: %s, Returned: %s\n", "EM_GETCHARFORMAT: Returned wrong font on test 1. Sent: %s, Returned: %s\n",
sentLogFont.lfFaceName,returnedCF2A.szFaceName); sentLogFont.lfFaceName,returnedCF2A.szFaceName);
SendMessage(hwndRichEdit, WM_SETFONT, (WPARAM)testFont2,(LPARAM) MAKELONG((WORD) TRUE, 0)); SendMessage(hwndRichEdit, WM_SETFONT, (WPARAM)testFont2, MAKELPARAM(TRUE, 0));
SendMessage(hwndRichEdit, EM_GETCHARFORMAT, SCF_DEFAULT, (LPARAM) &returnedCF2A); SendMessage(hwndRichEdit, EM_GETCHARFORMAT, SCF_DEFAULT, (LPARAM) &returnedCF2A);
GetObjectA(testFont2, sizeof(LOGFONTA), &sentLogFont); GetObjectA(testFont2, sizeof(LOGFONTA), &sentLogFont);
ok (!strcmp(sentLogFont.lfFaceName,returnedCF2A.szFaceName), ok (!strcmp(sentLogFont.lfFaceName,returnedCF2A.szFaceName),
"EM_GETCHARFORMAT: Returned wrong font on test 2. Sent: %s, Returned: %s\n", "EM_GETCHARFORMAT: Returned wrong font on test 2. Sent: %s, Returned: %s\n",
sentLogFont.lfFaceName,returnedCF2A.szFaceName); sentLogFont.lfFaceName,returnedCF2A.szFaceName);
SendMessage(hwndRichEdit, WM_SETFONT, (WPARAM)testFont3,(LPARAM) MAKELONG((WORD) TRUE, 0)); SendMessage(hwndRichEdit, WM_SETFONT, (WPARAM)testFont3, MAKELPARAM(TRUE, 0));
SendMessage(hwndRichEdit, EM_GETCHARFORMAT, SCF_DEFAULT, (LPARAM) &returnedCF2A); SendMessage(hwndRichEdit, EM_GETCHARFORMAT, SCF_DEFAULT, (LPARAM) &returnedCF2A);
GetObjectA(testFont3, sizeof(LOGFONTA), &sentLogFont); GetObjectA(testFont3, sizeof(LOGFONTA), &sentLogFont);
ok (!strcmp(sentLogFont.lfFaceName,returnedCF2A.szFaceName), ok (!strcmp(sentLogFont.lfFaceName,returnedCF2A.szFaceName),
...@@ -3923,7 +3923,7 @@ static void test_EM_GETMODIFY(void) ...@@ -3923,7 +3923,7 @@ static void test_EM_GETMODIFY(void)
/* setting font doesn't change modify flag */ /* setting font doesn't change modify flag */
SendMessage(hwndRichEdit, EM_SETMODIFY, FALSE, 0); SendMessage(hwndRichEdit, EM_SETMODIFY, FALSE, 0);
SendMessage(hwndRichEdit, WM_SETFONT, (WPARAM)testFont,(LPARAM) MAKELONG((WORD) TRUE, 0)); SendMessage(hwndRichEdit, WM_SETFONT, (WPARAM)testFont, MAKELPARAM(TRUE, 0));
result = SendMessage(hwndRichEdit, EM_GETMODIFY, 0, 0); result = SendMessage(hwndRichEdit, EM_GETMODIFY, 0, 0);
ok (result == 0, ok (result == 0,
"EM_GETMODIFY returned non-zero, instead of zero on setting font\n"); "EM_GETMODIFY returned non-zero, instead of zero on setting font\n");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment