system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-05 18:01:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

win32u: Move more WM_SYSCOMMAND implementation from user32.

Browse source 
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
This commit is contained in:
Jacek Caban 2022-06-16 21:15:39 +02:00 committed by Alexandre Julliard
parent 19e8cc96b5
commit 4663446fe4
2 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
dlls/user32/nonclient.c
View file

@ -267,16 +267,11 @@ static void NC_TrackScrollBar( HWND hwnd, WPARAM wParam, POINT pt )
*/ */
LRESULT NC_HandleSysCommand( HWND hwnd, WPARAM wParam, LPARAM lParam ) LRESULT NC_HandleSysCommand( HWND hwnd, WPARAM wParam, LPARAM lParam )
{ {
TRACE("hwnd %p WM_SYSCOMMAND %Ix %Ix\n", hwnd, wParam, lParam );
if (!NtUserMessageCall( hwnd, WM_SYSCOMMAND, wParam, lParam, 0, NtUserDefWindowProc, FALSE )) if (!NtUserMessageCall( hwnd, WM_SYSCOMMAND, wParam, lParam, 0, NtUserDefWindowProc, FALSE ))
return 0; return 0;
switch (wParam & 0xfff0) switch (wParam & 0xfff0)
{ {
case SC_CLOSE:
return SendMessageW( hwnd, WM_CLOSE, 0, 0 );
case SC_VSCROLL: case SC_VSCROLL:
case SC_HSCROLL: case SC_HSCROLL:
{ {
@ -308,13 +303,6 @@ LRESULT NC_HandleSysCommand( HWND hwnd, WPARAM wParam, LPARAM lParam )
} }
} }
break; break;
case SC_HOTKEY:
case SC_ARRANGE:
case SC_NEXTWINDOW:
case SC_PREVWINDOW:
FIXME("unimplemented WM_SYSCOMMAND %04Ix!\n", wParam);
break;
} }
return 0; return 0;
} }

20
dlls/win32u/defwnd.c
View file

@ -892,6 +892,8 @@ static void sys_command_size_move( HWND hwnd, WPARAM wparam )
static LRESULT handle_sys_command( HWND hwnd, WPARAM wparam, LPARAM lparam ) static LRESULT handle_sys_command( HWND hwnd, WPARAM wparam, LPARAM lparam )
{ {
TRACE( "hwnd %p WM_SYSCOMMAND %lx %lx\n", hwnd, wparam, lparam );
if (!is_window_enabled( hwnd )) return 0; if (!is_window_enabled( hwnd )) return 0;
if (call_hooks( WH_CBT, HCBT_SYSCOMMAND, wparam, lparam, TRUE )) if (call_hooks( WH_CBT, HCBT_SYSCOMMAND, wparam, lparam, TRUE ))
@ -917,6 +919,13 @@ static LRESULT handle_sys_command( HWND hwnd, WPARAM wparam, LPARAM lparam )
NtUserShowWindow( hwnd, SW_MAXIMIZE ); NtUserShowWindow( hwnd, SW_MAXIMIZE );
break; break;
case SC_CLOSE:
return send_message( hwnd, WM_CLOSE, 0, 0 );
case SC_VSCROLL:
case SC_HSCROLL:
return 1; /* FIXME: handle on client side */
case SC_MOUSEMENU: case SC_MOUSEMENU:
track_mouse_menu_bar( hwnd, wparam & 0x000F, (short)LOWORD(lparam), (short)HIWORD(lparam) ); track_mouse_menu_bar( hwnd, wparam & 0x000F, (short)LOWORD(lparam), (short)HIWORD(lparam) );
break; break;
@ -930,6 +939,17 @@ static LRESULT handle_sys_command( HWND hwnd, WPARAM wparam, LPARAM lparam )
NtUserShowWindow( hwnd, SW_RESTORE ); NtUserShowWindow( hwnd, SW_RESTORE );
break; break;
case SC_TASKLIST:
case SC_SCREENSAVE:
return 1; /* FIXME: handle on client side */
case SC_HOTKEY:
case SC_ARRANGE:
case SC_NEXTWINDOW:
case SC_PREVWINDOW:
FIXME( "unimplemented WM_SYSCOMMAND %04lx\n", wparam );
break;
default: default:
return 1; /* handle on client side */ return 1; /* handle on client side */
} }