Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 17:34:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

small fixes

Browse source 
svn path=/trunk/; revision=7253
This commit is contained in:
Thomas Bluemel 2003-12-26 16:19:15 +00:00
parent ca543d98b9
commit dd7349f037
3 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
/* $Id: defwnd.c,v 1.117 2003/12/26 12:37:53 weiden Exp $
/* $Id: defwnd.c,v 1.118 2003/12/26 16:19:15 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS user32.dll
@ -468,7 +468,7 @@ DefWndDoSizeMove(HWND hwnd, WORD wParam)
POINT capturePoint, pt;
ULONG Style = GetWindowLongW(hwnd, GWL_STYLE);
ULONG ExStyle = GetWindowLongW(hwnd, GWL_EXSTYLE);
BOOL thickframe = UserHasThickFrameStyle(Style, ExStyle);
BOOL thickframe;
BOOL iconic = Style & WS_MINIMIZE;
BOOL moved = FALSE;
DWORD dwPoint = GetMessagePos();
@ -486,6 +486,7 @@ DefWndDoSizeMove(HWND hwnd, WORD wParam)
return;
}
thickframe = UserHasThickFrameStyle(Style, ExStyle) && !(Style & WS_MINIMIZE);
if ((wParam & 0xfff0) == SC_MOVE)
{
if (!hittest)
@ -596,7 +597,7 @@ DefWndDoSizeMove(HWND hwnd, WORD wParam)
UserDrawMovingFrame( hdc, &sizingRect, thickframe );
}
while(1)
for(;;)
{
int dx = 0, dy = 0;

2
reactos/lib/user32/windows/nonclient.c
View file

@ -799,7 +799,7 @@ DefWndDoButton(HWND hWnd, WPARAM wParam)
UserDrawCaptionButtonWnd(hWnd, WindowDC, HasBtn , Btn);
}
while(1)
for(;;)
{
GetMessageW(&Msg, 0, 0, 0);
switch(Msg.message)

12
reactos/subsys/win32k/ntuser/winpos.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
/* $Id: winpos.c,v 1.72 2003/12/26 14:50:29 weiden Exp $
/* $Id: winpos.c,v 1.73 2003/12/26 16:19:15 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@ -67,14 +67,14 @@
#define HAS_DLGFRAME(Style, ExStyle) \
(((ExStyle) & WS_EX_DLGMODALFRAME) || \
(((Style) & WS_DLGFRAME) && (!((Style) & (WS_THICKFRAME | WS_MINIMIZE)))))
(((Style) & WS_DLGFRAME) && (!((Style) & WS_THICKFRAME))))
#define HAS_THICKFRAME(Style, ExStyle) \
(((Style) & WS_THICKFRAME) && !((Style) & WS_MINIMIZE) && \
(((Style) & WS_THICKFRAME) && \
(!(((Style) & (WS_DLGFRAME | WS_BORDER)) == WS_DLGFRAME)))
#define HAS_THINFRAME(Style, ExStyle) \
(((Style) & (WS_BORDER | WS_MINIMIZE)) || (!((Style) & (WS_CHILD | WS_POPUP))))
(((Style) & WS_BORDER) || (!((Style) & (WS_CHILD | WS_POPUP))))
BOOL FASTCALL
IntGetClientOrigin(HWND hWnd, LPPOINT Point)
@ -164,7 +164,7 @@ WinPosInitInternalPos(PWINDOW_OBJECT WindowObject, POINT pt, PRECT RestoreRect)
return NULL;
}
WindowObject->InternalPos->NormalRect = WindowObject->WindowRect;
if (HAS_DLGFRAME(WindowObject->Style, WindowObject->ExStyle))
if (HAS_DLGFRAME(WindowObject->Style, WindowObject->ExStyle) && !(WindowObject->Style & WS_MINIMIZE))
{
XInc = NtUserGetSystemMetrics(SM_CXDLGFRAME);
YInc = NtUserGetSystemMetrics(SM_CYDLGFRAME);
@ -172,7 +172,7 @@ WinPosInitInternalPos(PWINDOW_OBJECT WindowObject, POINT pt, PRECT RestoreRect)
else
{
XInc = YInc = 0;
if (HAS_THICKFRAME(WindowObject->Style, WindowObject->ExStyle))
if (HAS_THICKFRAME(WindowObject->Style, WindowObject->ExStyle)&& !(WindowObject->Style & WS_MINIMIZE))
{
XInc += NtUserGetSystemMetrics(SM_CXFRAME);
YInc += NtUserGetSystemMetrics(SM_CYFRAME);