Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 04:33:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed passing a wrong parameter to GetWindowLong()

Browse source 
svn path=/trunk/; revision=6190
This commit is contained in:
Thomas Bluemel 2003-09-29 19:00:44 +00:00
parent f67ae3636f
commit 34d43b1c8a
1 changed files with 67 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
/* $Id: defwnd.c,v 1.89 2003/09/26 20:58:06 gvg Exp $ /* $Id: defwnd.c,v 1.90 2003/09/29 19:00:44 weiden 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
@ -658,7 +658,7 @@ DefWndDoPaintNC(HWND hWnd, HRGN clip)
{ {
BOOL Active = FALSE; BOOL Active = FALSE;
HDC hDC; HDC hDC;
RECT rect; RECT rect, clientrect;
ULONG Style; ULONG Style;
ULONG ExStyle; ULONG ExStyle;
int wFrame = 0; int wFrame = 0;
@ -680,6 +680,7 @@ DefWndDoPaintNC(HWND hWnd, HRGN clip)
rect.right = rect.right - rect.left; rect.right = rect.right - rect.left;
rect.bottom = rect.bottom - rect.top; rect.bottom = rect.bottom - rect.top;
rect.top = rect.left = 0; rect.top = rect.left = 0;
clientrect = rect;
SelectObject(hDC, GetSysColorPen(COLOR_WINDOWFRAME)); SelectObject(hDC, GetSysColorPen(COLOR_WINDOWFRAME));
if (UserHasThickFrameStyle(Style, ExStyle)) if (UserHasThickFrameStyle(Style, ExStyle))
{ {
@ -711,9 +712,9 @@ DefWndDoPaintNC(HWND hWnd, HRGN clip)
} }
/* Draw scrollbars */ /* Draw scrollbars */
if (Style & WS_VSCROLL) if (Style & WS_VSCROLL && (clientrect.right - clientrect.left > GetSystemMetrics(SM_CXVSCROLL)))
SCROLL_DrawScrollBar(hWnd, hDC, SB_VERT, TRUE, TRUE); SCROLL_DrawScrollBar(hWnd, hDC, SB_VERT, TRUE, TRUE);
if (Style & WS_HSCROLL) if (Style & WS_HSCROLL && (clientrect.bottom - clientrect.top > GetSystemMetrics(SM_CYHSCROLL)))
SCROLL_DrawScrollBar(hWnd, hDC, SB_HORZ, TRUE, TRUE); SCROLL_DrawScrollBar(hWnd, hDC, SB_HORZ, TRUE, TRUE);
/* FIXME: Draw size box.*/ /* FIXME: Draw size box.*/
@ -744,6 +745,7 @@ LRESULT
DefWndHitTestNC(HWND hWnd, POINT Point) DefWndHitTestNC(HWND hWnd, POINT Point)
{ {
RECT WindowRect; RECT WindowRect;
LONG ScrollXY;
ULONG Style = GetWindowLongW(hWnd, GWL_STYLE); ULONG Style = GetWindowLongW(hWnd, GWL_STYLE);
ULONG ExStyle = GetWindowLongW(hWnd, GWL_EXSTYLE); ULONG ExStyle = GetWindowLongW(hWnd, GWL_EXSTYLE);
@ -881,25 +883,34 @@ DefWndHitTestNC(HWND hWnd, POINT Point)
if (Style & WS_VSCROLL) if (Style & WS_VSCROLL)
{ {
WindowRect.right += GetSystemMetrics(SM_CXVSCROLL); ScrollXY = GetSystemMetrics(SM_CXVSCROLL);
if (PtInRect(&WindowRect, Point)) if(WindowRect.right - WindowRect.left > ScrollXY)
{ {
return(HTVSCROLL); WindowRect.right += ScrollXY;
} if (PtInRect(&WindowRect, Point))
{
return(HTVSCROLL);
}
}
} }
if (Style & WS_HSCROLL) if (Style & WS_HSCROLL)
{ {
WindowRect.bottom += GetSystemMetrics(SM_CYHSCROLL); ScrollXY = GetSystemMetrics(SM_CYHSCROLL);
if (PtInRect(&WindowRect, Point)) if(WindowRect.bottom - WindowRect.top > ScrollXY)
{ {
if ((Style & WS_VSCROLL) && WindowRect.bottom += ScrollXY;
(Point.x >= (WindowRect.right - GetSystemMetrics(SM_CXVSCROLL)))) if (PtInRect(&WindowRect, Point))
{ {
return(HTBOTTOMRIGHT); ScrollXY = GetSystemMetrics(SM_CXVSCROLL);
} if ((Style & WS_VSCROLL) && (WindowRect.right - WindowRect.left > ScrollXY) &&
return(HTHSCROLL); (Point.x >= (WindowRect.right - ScrollXY)))
} {
return(HTBOTTOMRIGHT);
}
return(HTHSCROLL);
}
}
} }
if (UserHasMenu(hWnd, Style)) if (UserHasMenu(hWnd, Style))
@ -1113,7 +1124,7 @@ DefWndHandleSetCursor(HWND hWnd, WPARAM wParam, LPARAM lParam)
{ {
WORD Msg = HIWORD(lParam); WORD Msg = HIWORD(lParam);
if (Msg == WM_LBUTTONDOWN || Msg == WM_MBUTTONDOWN || if (Msg == WM_LBUTTONDOWN || Msg == WM_MBUTTONDOWN ||
Msg == WM_RBUTTONDOWN) Msg == WM_RBUTTONDOWN || Msg == WM_XBUTTONDOWN)
{ {
MessageBeep(0); MessageBeep(0);
} }
@ -1588,7 +1599,7 @@ DefWndHandleSysCommand(HWND hWnd, WPARAM wParam, POINT Pt)
VOID VOID
DefWndAdjustRect(RECT* Rect, ULONG Style, BOOL Menu, ULONG ExStyle) DefWndAdjustRect(RECT* Rect, ULONG Style, BOOL Menu, ULONG ExStyle)
{ {
if (Style & WS_ICONIC) if (Style & WS_ICONIC)
{ {
@ -1619,30 +1630,16 @@ DefWndAdjustRect(RECT* Rect, ULONG Style, BOOL Menu, ULONG ExStyle)
{ {
Rect->top -= GetSystemMetrics(SM_CYMENU) + GetSystemMetrics(SM_CYBORDER); Rect->top -= GetSystemMetrics(SM_CYMENU) + GetSystemMetrics(SM_CYBORDER);
} }
if (Style & WS_VSCROLL)
{
Rect->right += GetSystemMetrics(SM_CXVSCROLL) - 1;
if (UserHasAnyFrameStyle(Style, ExStyle))
{
Rect->right++;
}
}
if (Style & WS_HSCROLL)
{
Rect->bottom += GetSystemMetrics(SM_CYHSCROLL) - 1;
if (UserHasAnyFrameStyle(Style, ExStyle))
{
Rect->bottom++;
}
}
} }
LRESULT STDCALL LRESULT STDCALL
DefWndNCCalcSize(HWND hWnd, RECT* Rect) DefWndNCCalcSize(HWND hWnd, RECT* Rect)
{ {
LRESULT Result = 0; LRESULT Result = 0;
LONG Style = GetClassLongW(hWnd, GCL_STYLE); LONG ScrollXY;
RECT TmpRect = {0, 0, 0, 0}; RECT TmpRect = {0, 0, 0, 0};
ULONG ExStyle = GetWindowLongW(hWnd, GWL_EXSTYLE);
LONG Style = GetClassLongW(hWnd, GCL_STYLE);
if (Style & CS_VREDRAW) if (Style & CS_VREDRAW)
{ {
@ -1653,15 +1650,41 @@ DefWndNCCalcSize(HWND hWnd, RECT* Rect)
Result |= WVR_HREDRAW; Result |= WVR_HREDRAW;
} }
if (!(GetWindowLongW(hWnd, GWL_STYLE) & WS_MINIMIZE)) Style = GetWindowLongW(hWnd, GWL_STYLE);
if (!(Style & WS_MINIMIZE))
{ {
DefWndAdjustRect(&TmpRect, GetWindowLongW(hWnd, GWL_STYLE), DefWndAdjustRect(&TmpRect, Style, FALSE, ExStyle);
FALSE, GetWindowLongW(hWnd, GWL_EXSTYLE)); if (Style & WS_VSCROLL)
{
ScrollXY = GetSystemMetrics(SM_CXVSCROLL);
DbgPrint("@! %d > %d (%d, %d, %d ,%d)\n", Rect->right - Rect->left, ScrollXY, Rect->left, Rect->top, Rect->right, Rect->bottom);
if(Rect->right - Rect->left > ScrollXY)
{
TmpRect.right += ScrollXY - 1;
if (UserHasAnyFrameStyle(Style, ExStyle))
{
TmpRect.right++;
}
}
}
if (Style & WS_HSCROLL)
{
ScrollXY = GetSystemMetrics(SM_CYHSCROLL);
if(Rect->bottom - Rect->top > ScrollXY)
{
TmpRect.bottom += ScrollXY - 1;
if (UserHasAnyFrameStyle(Style, ExStyle))
{
TmpRect.bottom++;
}
}
}
Rect->left -= TmpRect.left; Rect->left -= TmpRect.left;
Rect->top -= TmpRect.top; Rect->top -= TmpRect.top;
Rect->right -= TmpRect.right; Rect->right -= TmpRect.right;
Rect->bottom -= TmpRect.bottom; Rect->bottom -= TmpRect.bottom;
if (UserHasMenu(hWnd, GetWindowLongW(hWnd, GWL_STYLE))) if (UserHasMenu(hWnd, Style))
{ {
Rect->top += MenuGetMenuBarHeight(hWnd, Rect->right - Rect->left, Rect->top += MenuGetMenuBarHeight(hWnd, Rect->right - Rect->left,
-TmpRect.left, -TmpRect.top) + 1; -TmpRect.left, -TmpRect.top) + 1;
@ -1994,7 +2017,7 @@ User32DefWindowProc(HWND hWnd,
case WM_MOUSEWHEEL: case WM_MOUSEWHEEL:
{ {
if (GetWindowLongW(hWnd, GWL_STYLE & WS_CHILD)) if (GetWindowLongW(hWnd, GWL_STYLE) & WS_CHILD)
{ {
if (bUnicode) if (bUnicode)
{ {
@ -2426,3 +2449,4 @@ DefWindowProcW(HWND hWnd,
return User32DefWindowProc(hWnd, Msg, wParam, lParam, TRUE); return User32DefWindowProc(hWnd, Msg, wParam, lParam, TRUE);
} }