lywsvip/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2026-06-02 17:31:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

[User32]

Browse Source 
- Fix bug that was uncovered by r72143. See CORE-11810.
- Move System Commands to server side. Leaving Alt-Tab and Scrolls.

svn path=/trunk/; revision=72155
This commit is contained in:
James Tabor
2016-08-07 23:52:43 +00:00
parent 6b265ca585
commit f2e1baa17e
1 changed files with 5 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
reactos/win32ss/user/user32/windows/defwnd.c
View File

@@ -163,6 +163,11 @@ DefWndHandleSysCommand(HWND hWnd, WPARAM wParam, LPARAM lParam)
case SC_MOUSEMENU:
case SC_KEYMENU:
case SC_SCREENSAVE:
case SC_MINIMIZE:
case SC_MAXIMIZE:
case SC_RESTORE:
case SC_CLOSE:
case SC_HOTKEY:
NtUserMessageCall( hWnd, WM_SYSCOMMAND, wParam, lParam, (ULONG_PTR)&lResult, FNID_DEFWINDOWPROC, FALSE);
return 0;
@@ -179,27 +184,6 @@ DefWndHandleSysCommand(HWND hWnd, WPARAM wParam, LPARAM lParam)
switch (wParam & 0xfff0)
{
case SC_MINIMIZE:
if (hWnd == GetActiveWindow())
ShowOwnedPopups(hWnd,FALSE);
ShowWindow( hWnd, SW_MINIMIZE );
break;
case SC_MAXIMIZE:
if (IsIconic(hWnd) && hWnd == GetActiveWindow())
ShowOwnedPopups(hWnd,TRUE);
ShowWindow( hWnd, SW_MAXIMIZE );
break;
case SC_RESTORE:
if (IsIconic(hWnd) && hWnd == GetActiveWindow())
ShowOwnedPopups(hWnd,TRUE);
ShowWindow( hWnd, SW_RESTORE );
break;
case SC_CLOSE:
return SendMessageW(hWnd, WM_CLOSE, 0, 0);
case SC_VSCROLL:
case SC_HSCROLL:
{
@@ -219,30 +203,6 @@ DefWndHandleSysCommand(HWND hWnd, WPARAM wParam, LPARAM lParam)
DoAppSwitch( wParam, lParam);
break;
case SC_HOTKEY:
{
HWND hwnd, hWndLastActive;
PWND pWnd;
hwnd = (HWND)lParam;
pWnd = ValidateHwnd(hwnd);
if (pWnd)
{
hWndLastActive = GetLastActivePopup(hwnd);
if (hWndLastActive)
{
hwnd = hWndLastActive;
pWnd = ValidateHwnd(hwnd);
}
SetForegroundWindow(hwnd);
if (pWnd->style & WS_MINIMIZE)
{
PostMessage(hwnd, WM_SYSCOMMAND, SC_RESTORE, 0);
}
}
}
break;
default:
FIXME("Unimplemented DefWndHandleSysCommand wParam 0x%x\n",wParam);
break;