Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

2003-07-05 Casper S. Hornstrup <chorns@users.sourceforge.net>

Browse source 
* lib/user32/windows/defwnd.c (DefWndHandleLButtonUpNC,
	User32DefWindowProc): Only send WM_SYSCOMMAND message, not WM_CLOSE.
	(DefWndHandleSysCommand): Handle SC_CLOSE message.

svn path=/trunk/; revision=5001
This commit is contained in:
Casper Hornstrup 2003-07-05 17:57:22 +00:00
parent 9826d4e679
commit 4ac70b6bbb
3 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
reactos/ChangeLog
View file

@ -1,3 +1,9 @@
2003-07-05 Casper S. Hornstrup <chorns@users.sourceforge.net>
* lib/user32/windows/defwnd.c (DefWndHandleLButtonUpNC,
User32DefWindowProc): Only send WM_SYSCOMMAND message, not WM_CLOSE.
(DefWndHandleSysCommand): Handle SC_CLOSE message.
2003-07-05 Casper S. Hornstrup <chorns@users.sourceforge.net> 2003-07-05 Casper S. Hornstrup <chorns@users.sourceforge.net>
* include/win32k/ntuser.h (NtUserSetFocus): Correct prototype. * include/win32k/ntuser.h (NtUserSetFocus): Correct prototype.

15
reactos/lib/user32/windows/defwnd.c
View file

@ -1,4 +1,4 @@
/* $Id: defwnd.c,v 1.53 2003/07/05 16:04:01 chorns Exp $ /* $Id: defwnd.c,v 1.54 2003/07/05 17:57:22 chorns Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS user32.dll * PROJECT: ReactOS user32.dll
@ -792,7 +792,6 @@ DefWndHandleLButtonUpNC(HWND hWnd, WPARAM wParam, LPARAM lParam)
} }
case HTCLOSE: case HTCLOSE:
{ {
SendMessageA(hWnd, WM_CLOSE, 0, 0);
SendMessageA(hWnd, WM_SYSCOMMAND, SC_CLOSE, 0); SendMessageA(hWnd, WM_SYSCOMMAND, SC_CLOSE, 0);
break; break;
} }
@ -876,7 +875,17 @@ DefWndHandleSetCursor(HWND hWnd, WPARAM wParam, LPARAM lParam)
LRESULT LRESULT
DefWndHandleSysCommand(HWND hWnd, WPARAM wParam, POINT Pt) DefWndHandleSysCommand(HWND hWnd, WPARAM wParam, POINT Pt)
{ {
switch (wParam)
{
case SC_CLOSE:
SendMessageA(hWnd, WM_CLOSE, 0, 0);
break;
default:
/* FIXME: Implement */
UNIMPLEMENTED; UNIMPLEMENTED;
break;
}
return(0); return(0);
} }
@ -1385,12 +1394,10 @@ User32DefWindowProc(HWND hWnd,
{ {
if (bUnicode) if (bUnicode)
{ {
PostMessageW(hTopWnd, WM_CLOSE, 0, 0);
PostMessageW(hTopWnd, WM_SYSCOMMAND, SC_CLOSE, 0); PostMessageW(hTopWnd, WM_SYSCOMMAND, SC_CLOSE, 0);
} }
else else
{ {
PostMessageA(hTopWnd, WM_CLOSE, 0, 0);
PostMessageA(hTopWnd, WM_SYSCOMMAND, SC_CLOSE, 0); PostMessageA(hTopWnd, WM_SYSCOMMAND, SC_CLOSE, 0);
} }
} }

3
reactos/lib/user32/windows/window.c
View file

@ -1,4 +1,4 @@
/* $Id: window.c,v 1.39 2003/06/16 13:46:26 gvg Exp $ /* $Id: window.c,v 1.40 2003/07/05 17:57:22 chorns Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS user32.dll * PROJECT: ReactOS user32.dll
@ -411,7 +411,6 @@ ChildWindowFromPointEx(HWND hwndParent,
WINBOOL STDCALL WINBOOL STDCALL
CloseWindow(HWND hWnd) CloseWindow(HWND hWnd)
{ {
SendMessageA(hWnd, WM_CLOSE, 0, 0);
SendMessageA(hWnd, WM_SYSCOMMAND, SC_CLOSE, 0); SendMessageA(hWnd, WM_SYSCOMMAND, SC_CLOSE, 0);
return (WINBOOL)(hWnd); return (WINBOOL)(hWnd);