Alexandre Julliard : user: Prefer SendMessageW over SendMessageA where possible.
Module: wine Branch: refs/heads/master Commit: 6ebbfd49590e0fe244b36101037d0fcdd39f66d2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6ebbfd49590e0fe244b36101... Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 10 21:33:33 2006 +0200 user: Prefer SendMessageW over SendMessageA where possible. --- dlls/user/defdlg.c | 16 ++++++++-------- dlls/user/icontitle.c | 4 ++-- dlls/user/mdi.c | 4 ++-- dlls/user/nonclient.c | 8 ++++---- dlls/user/winpos.c | 8 ++++---- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/user/defdlg.c b/dlls/user/defdlg.c index abd19b1..28780ab 100644 --- a/dlls/user/defdlg.c +++ b/dlls/user/defdlg.c @@ -159,15 +159,15 @@ static BOOL DEFDLG_SetDefId( HWND hwndDl /* Make sure the old default control is a valid push button ID */ hwndOld = GetDlgItem( hwndDlg, old_id ); - if (!hwndOld || !(SendMessageA( hwndOld, WM_GETDLGCODE, 0, 0) & DLGC_DEFPUSHBUTTON)) + if (!hwndOld || !(SendMessageW( hwndOld, WM_GETDLGCODE, 0, 0) & DLGC_DEFPUSHBUTTON)) hwndOld = DEFDLG_FindDefButton( hwndDlg ); if (hwndOld && hwndOld != hwndNew) - SendMessageA( hwndOld, BM_SETSTYLE, BS_PUSHBUTTON, TRUE ); + SendMessageW( hwndOld, BM_SETSTYLE, BS_PUSHBUTTON, TRUE ); if (hwndNew) { if(dlgcode & DLGC_UNDEFPUSHBUTTON) - SendMessageA( hwndNew, BM_SETSTYLE, BS_DEFPUSHBUTTON, TRUE ); + SendMessageW( hwndNew, BM_SETSTYLE, BS_DEFPUSHBUTTON, TRUE ); } return TRUE; } @@ -197,15 +197,15 @@ static BOOL DEFDLG_SetDefButton( HWND hw } /* Make sure the old default control is a valid push button ID */ - if (!hwndOld || !(SendMessageA( hwndOld, WM_GETDLGCODE, 0, 0) & DLGC_DEFPUSHBUTTON)) + if (!hwndOld || !(SendMessageW( hwndOld, WM_GETDLGCODE, 0, 0) & DLGC_DEFPUSHBUTTON)) hwndOld = DEFDLG_FindDefButton( hwndDlg ); if (hwndOld && hwndOld != hwndNew) - SendMessageA( hwndOld, BM_SETSTYLE, BS_PUSHBUTTON, TRUE ); + SendMessageW( hwndOld, BM_SETSTYLE, BS_PUSHBUTTON, TRUE ); if (hwndNew) { if(dlgcode & DLGC_UNDEFPUSHBUTTON) - SendMessageA( hwndNew, BM_SETSTYLE, BS_DEFPUSHBUTTON, TRUE ); + SendMessageW( hwndNew, BM_SETSTYLE, BS_DEFPUSHBUTTON, TRUE ); } return TRUE; } @@ -300,8 +300,8 @@ static LRESULT DEFDLG_Proc( HWND hwnd, U if (hwndFocus) { /* always make combo box hide its listbox control */ - if (!SendMessageA( hwndFocus, CB_SHOWDROPDOWN, FALSE, 0 )) - SendMessageA( GetParent(hwndFocus), CB_SHOWDROPDOWN, FALSE, 0 ); + if (!SendMessageW( hwndFocus, CB_SHOWDROPDOWN, FALSE, 0 )) + SendMessageW( GetParent(hwndFocus), CB_SHOWDROPDOWN, FALSE, 0 ); } } return DefWindowProcA( hwnd, msg, wParam, lParam ); diff --git a/dlls/user/icontitle.c b/dlls/user/icontitle.c index b4aafe2..9b9878b 100644 --- a/dlls/user/icontitle.c +++ b/dlls/user/icontitle.c @@ -228,8 +228,8 @@ LRESULT WINAPI IconTitleWndProc( HWND hW if (wParam) ICONTITLE_SetTitlePos( hWnd, owner ); return 0; case WM_ERASEBKGND: - if( GetWindowLongA( owner, GWL_STYLE ) & WS_CHILD ) - lParam = SendMessageA( owner, WM_ISACTIVEICON, 0, 0 ); + if( GetWindowLongW( owner, GWL_STYLE ) & WS_CHILD ) + lParam = SendMessageW( owner, WM_ISACTIVEICON, 0, 0 ); else lParam = (owner == GetActiveWindow()); if( ICONTITLE_Paint( hWnd, owner, (HDC)wParam, (BOOL)lParam ) ) diff --git a/dlls/user/mdi.c b/dlls/user/mdi.c index 7978eed..9fba332 100644 --- a/dlls/user/mdi.c +++ b/dlls/user/mdi.c @@ -671,7 +671,7 @@ static LONG MDICascade( HWND client, MDI int i, total; if (IsZoomed(ci->hwndActiveChild)) - SendMessageA(client, WM_MDIRESTORE, (WPARAM)ci->hwndActiveChild, 0); + SendMessageW(client, WM_MDIRESTORE, (WPARAM)ci->hwndActiveChild, 0); if (ci->nActiveChildren == 0) return 0; @@ -724,7 +724,7 @@ static void MDITile( HWND client, MDICLI BOOL has_icons = FALSE; if (IsZoomed(ci->hwndActiveChild)) - SendMessageA(client, WM_MDIRESTORE, (WPARAM)ci->hwndActiveChild, 0); + SendMessageW(client, WM_MDIRESTORE, (WPARAM)ci->hwndActiveChild, 0); if (ci->nActiveChildren == 0) return; diff --git a/dlls/user/nonclient.c b/dlls/user/nonclient.c index edadaa7..2732cc2 100644 --- a/dlls/user/nonclient.c +++ b/dlls/user/nonclient.c @@ -1318,9 +1318,9 @@ static void NC_TrackMinMaxBox( HWND hwnd return; if (wParam == HTMINBUTTON) - SendMessageA( hwnd, WM_SYSCOMMAND, SC_MINIMIZE, MAKELONG(msg.pt.x,msg.pt.y) ); + SendMessageW( hwnd, WM_SYSCOMMAND, SC_MINIMIZE, MAKELONG(msg.pt.x,msg.pt.y) ); else - SendMessageA( hwnd, WM_SYSCOMMAND, + SendMessageW( hwnd, WM_SYSCOMMAND, IsZoomed(hwnd) ? SC_RESTORE:SC_MAXIMIZE, MAKELONG(msg.pt.x,msg.pt.y) ); } @@ -1377,7 +1377,7 @@ static void NC_TrackCloseButton (HWND hw ReleaseDC( hwnd, hdc ); if (!pressed) return; - SendMessageA( hwnd, WM_SYSCOMMAND, SC_CLOSE, MAKELONG(msg.pt.x,msg.pt.y) ); + SendMessageW( hwnd, WM_SYSCOMMAND, SC_CLOSE, MAKELONG(msg.pt.x,msg.pt.y) ); } @@ -1573,7 +1573,7 @@ LRESULT NC_HandleSysCommand( HWND hwnd, break; case SC_CLOSE: - return SendMessageA( hwnd, WM_CLOSE, 0, 0 ); + return SendMessageW( hwnd, WM_CLOSE, 0, 0 ); case SC_VSCROLL: case SC_HSCROLL: diff --git a/dlls/user/winpos.c b/dlls/user/winpos.c index 15adf2f..ceaa57b 100644 --- a/dlls/user/winpos.c +++ b/dlls/user/winpos.c @@ -385,7 +385,7 @@ HWND WINPOS_WindowFromPoint( HWND hwndSc *hittest = HTCLIENT; break; } - res = SendMessageA( list[i], WM_NCHITTEST, 0, MAKELONG(pt.x,pt.y) ); + res = SendMessageW( list[i], WM_NCHITTEST, 0, MAKELONG(pt.x,pt.y) ); if (res != HTTRANSPARENT) { *hittest = res; /* Found the window */ @@ -679,7 +679,7 @@ BOOL WINPOS_RedrawIconTitle( HWND hWnd ) { if( lpPos->hwndIconTitle ) { - SendMessageA( lpPos->hwndIconTitle, WM_SHOWWINDOW, TRUE, 0); + SendMessageW( lpPos->hwndIconTitle, WM_SHOWWINDOW, TRUE, 0); InvalidateRect( lpPos->hwndIconTitle, NULL, TRUE ); return TRUE; } @@ -706,7 +706,7 @@ BOOL WINPOS_ShowIconTitle( HWND hwnd, BO { if (!IsWindowVisible(title)) { - SendMessageA( title, WM_SHOWWINDOW, TRUE, 0 ); + SendMessageW( title, WM_SHOWWINDOW, TRUE, 0 ); SetWindowPos( title, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER | SWP_SHOWWINDOW ); } @@ -795,7 +795,7 @@ void WINPOS_GetMinMaxInfo( HWND hwnd, PO MinMax.ptMaxPosition.y = -yinc; } - SendMessageA( hwnd, WM_GETMINMAXINFO, 0, (LPARAM)&MinMax ); + SendMessageW( hwnd, WM_GETMINMAXINFO, 0, (LPARAM)&MinMax ); /* Some sanity checks */
participants (1)
-
Alexandre Julliard