Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-31 19:42:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fix NtUserScroll[WindowEx/DC]

Browse source 
- Minor correction in NtUserBeginPaint
- Added check for NULL handle in IntPaintWindows

svn path=/trunk/; revision=8016
This commit is contained in:
Filip Navara 2004-02-03 17:53:55 +00:00
parent 44f54f5ec0
commit 2b54029e8b
1 changed files with 43 additions and 94 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

137
reactos/subsys/win32k/ntuser/painting.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
* *
* $Id: painting.c,v 1.65 2004/02/01 08:07:07 navaraf Exp $ * $Id: painting.c,v 1.66 2004/02/03 17:53:55 navaraf Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -54,8 +54,6 @@
#define NDEBUG #define NDEBUG
#include <debug.h> #include <debug.h>
/* #define FIN_DEBUG */
/* PRIVATE FUNCTIONS **********************************************************/ /* PRIVATE FUNCTIONS **********************************************************/
VOID FASTCALL VOID FASTCALL
@ -64,14 +62,6 @@ IntValidateParent(PWINDOW_OBJECT Child, HRGN ValidRegion)
HWND Parent; HWND Parent;
PWINDOW_OBJECT ParentWindow; PWINDOW_OBJECT ParentWindow;
#ifdef FIN_DEBUG
{
RECT TempRect;
UnsafeIntGetRgnBox(ValidRegion, &TempRect);
DPRINT1("IntValidateParent ('%wZ', %d,%d-%d,%d)\n",
&Child->WindowName, TempRect.left, TempRect.top, TempRect.right, TempRect.bottom);
}
#endif
Parent = NtUserGetAncestor(Child->Self, GA_PARENT); Parent = NtUserGetAncestor(Child->Self, GA_PARENT);
while (Parent) while (Parent)
{ {
@ -173,7 +163,10 @@ IntPaintWindows(PWINDOW_OBJECT Window, ULONG Flags)
{ {
if (Window->Flags & WINDOWOBJECT_NEED_NCPAINT) if (Window->Flags & WINDOWOBJECT_NEED_NCPAINT)
{ {
IntValidateParent(Window, Window->NCUpdateRegion); if (Window->NCUpdateRegion)
{
IntValidateParent(Window, Window->NCUpdateRegion);
}
IntSendMessage(hWnd, WM_NCPAINT, (WPARAM)Window->NCUpdateRegion, 0); IntSendMessage(hWnd, WM_NCPAINT, (WPARAM)Window->NCUpdateRegion, 0);
Window->NCUpdateRegion = NULL; Window->NCUpdateRegion = NULL;
Window->Flags &= ~WINDOWOBJECT_NEED_NCPAINT; Window->Flags &= ~WINDOWOBJECT_NEED_NCPAINT;
@ -184,14 +177,6 @@ IntPaintWindows(PWINDOW_OBJECT Window, ULONG Flags)
{ {
if (Window->UpdateRegion) if (Window->UpdateRegion)
{ {
#ifdef FIN_DEBUG
{
RECT TempRect;
UnsafeIntGetRgnBox(Window->UpdateRegion, &TempRect);
DPRINT1("Sending WM_ERASEBKGND[1]: %d,%d-%d,%d\n",
TempRect.left, TempRect.top, TempRect.right, TempRect.bottom);
}
#endif
IntValidateParent(Window, Window->UpdateRegion); IntValidateParent(Window, Window->UpdateRegion);
hDC = NtUserGetDCEx(hWnd, 0, DCX_CACHE | DCX_USESTYLE | hDC = NtUserGetDCEx(hWnd, 0, DCX_CACHE | DCX_USESTYLE |
DCX_INTERSECTUPDATE); DCX_INTERSECTUPDATE);
@ -211,14 +196,6 @@ IntPaintWindows(PWINDOW_OBJECT Window, ULONG Flags)
if (Window->UpdateRegion != NULL || if (Window->UpdateRegion != NULL ||
Window->Flags & WINDOWOBJECT_NEED_INTERNALPAINT) Window->Flags & WINDOWOBJECT_NEED_INTERNALPAINT)
{ {
#ifdef FIN_DEBUG
{
RECT TempRect;
UnsafeIntGetRgnBox(Window->UpdateRegion, &TempRect);
DPRINT1("Sending WM_PAINT[1]: %d,%d-%d,%d\n",
TempRect.left, TempRect.top, TempRect.right, TempRect.bottom);
}
#endif
IntSendMessage(hWnd, WM_PAINT, 0, 0); IntSendMessage(hWnd, WM_PAINT, 0, 0);
if (Window->Flags & WINDOWOBJECT_NEED_INTERNALPAINT) if (Window->Flags & WINDOWOBJECT_NEED_INTERNALPAINT)
{ {
@ -659,14 +636,6 @@ IntGetPaintMessage(HWND hWnd, PW32THREAD Thread, MSG *Message,
} }
} else } else
{ {
#ifdef FIN_DEBUG
{
RECT TempRect;
UnsafeIntGetRgnBox(Window->UpdateRegion, &TempRect);
DPRINT1("Sending WM_PAINT[2]: %d,%d-%d,%d\n",
TempRect.left, TempRect.top, TempRect.right, TempRect.bottom);
}
#endif
Message->message = WM_PAINT; Message->message = WM_PAINT;
Message->wParam = Message->lParam = 0; Message->wParam = Message->lParam = 0;
if (Remove && Window->Flags & WINDOWOBJECT_NEED_INTERNALPAINT) if (Remove && Window->Flags & WINDOWOBJECT_NEED_INTERNALPAINT)
@ -689,34 +658,35 @@ IntGetPaintMessage(HWND hWnd, PW32THREAD Thread, MSG *Message,
HWND FASTCALL HWND FASTCALL
IntFixCaret(HWND hWnd, LPRECT lprc, UINT flags) IntFixCaret(HWND hWnd, LPRECT lprc, UINT flags)
{ {
GUITHREADINFO info; PDESKTOP_OBJECT Desktop;
PTHRDCARETINFO CaretInfo;
HWND hWndCaret;
if (!NtUserGetGUIThreadInfo(0, &info)) Desktop = PsGetCurrentThread()->Win32Thread->Desktop;
return 0; CaretInfo = ((PUSER_MESSAGE_QUEUE)Desktop->ActiveMessageQueue)->CaretInfo;
if (!info.hwndCaret) hWndCaret = CaretInfo->hWnd;
return 0; if (hWndCaret == hWnd ||
if (info.hwndCaret == hWnd || ((flags & SW_SCROLLCHILDREN) && IntIsChildWindow(hWnd, hWndCaret)))
((flags & SW_SCROLLCHILDREN) && IntIsChildWindow(hWnd, info.hwndCaret)))
{ {
POINT pt, FromOffset, ToOffset, Offset; POINT pt, FromOffset, ToOffset, Offset;
RECT rcCaret;
pt.x = info.rcCaret.left; pt.x = CaretInfo->Pos.x;
pt.y = info.rcCaret.top; pt.y = CaretInfo->Pos.y;
IntGetClientOrigin(hWndCaret, &FromOffset);
IntGetClientOrigin(info.hwndCaret, &FromOffset);
IntGetClientOrigin(hWnd, &ToOffset); IntGetClientOrigin(hWnd, &ToOffset);
Offset.x = FromOffset.x - ToOffset.x; Offset.x = FromOffset.x - ToOffset.x;
Offset.y = FromOffset.y - ToOffset.y; Offset.y = FromOffset.y - ToOffset.y;
info.rcCaret.left += Offset.x; rcCaret.left = pt.x;
info.rcCaret.top += Offset.y; rcCaret.top = pt.y;
info.rcCaret.right += Offset.x; rcCaret.right = pt.x + CaretInfo->Size.cx;
info.rcCaret.bottom += Offset.y; rcCaret.bottom = pt.y + CaretInfo->Size.cy;
if (NtGdiIntersectRect(lprc, lprc, &info.rcCaret)) if (NtGdiIntersectRect(lprc, lprc, &rcCaret))
{ {
NtUserHideCaret(0); NtUserHideCaret(0);
lprc->left = pt.x; lprc->left = pt.x;
lprc->top = pt.y; lprc->top = pt.y;
return info.hwndCaret; return hWndCaret;
} }
} }
@ -736,10 +706,6 @@ HDC STDCALL
NtUserBeginPaint(HWND hWnd, PAINTSTRUCT* lPs) NtUserBeginPaint(HWND hWnd, PAINTSTRUCT* lPs)
{ {
PWINDOW_OBJECT Window; PWINDOW_OBJECT Window;
RECT ClientRect;
RECT ClipRect;
INT DcxFlags;
PDC DC;
if (!(Window = IntGetWindowObject(hWnd))) if (!(Window = IntGetWindowObject(hWnd)))
{ {
@ -749,9 +715,8 @@ NtUserBeginPaint(HWND hWnd, PAINTSTRUCT* lPs)
NtUserHideCaret(hWnd); NtUserHideCaret(hWnd);
DcxFlags = DCX_INTERSECTUPDATE | DCX_WINDOWPAINT | DCX_USESTYLE; lPs->hdc = NtUserGetDCEx(hWnd, 0, DCX_INTERSECTUPDATE | DCX_WINDOWPAINT |
DCX_USESTYLE);
lPs->hdc = NtUserGetDCEx(hWnd, 0, DcxFlags);
if (!lPs->hdc) if (!lPs->hdc)
{ {
@ -759,34 +724,21 @@ NtUserBeginPaint(HWND hWnd, PAINTSTRUCT* lPs)
return NULL; return NULL;
} }
#ifdef FIN_DEBUG
if (Window->Flags & WINDOWOBJECT_NEED_ERASEBKGND)
{
RECT TempRect;
UnsafeIntGetRgnBox(Window->UpdateRegion, &TempRect);
DPRINT1("Sending WM_ERASEBKGND[2]: %d,%d-%d,%d\n",
TempRect.left, TempRect.top, TempRect.right, TempRect.bottom);
}
#endif
if (Window->UpdateRegion != NULL) if (Window->UpdateRegion != NULL)
{ {
MsqDecPaintCountQueue(Window->MessageQueue); MsqDecPaintCountQueue(Window->MessageQueue);
IntValidateParent(Window, Window->UpdateRegion); IntValidateParent(Window, Window->UpdateRegion);
NtGdiGetRgnBox(Window->UpdateRegion, &lPs->rcPaint);
NtGdiOffsetRect(&lPs->rcPaint,
Window->WindowRect.left - Window->ClientRect.left,
Window->WindowRect.top - Window->ClientRect.top);
NtGdiDeleteObject(Window->UpdateRegion); NtGdiDeleteObject(Window->UpdateRegion);
Window->UpdateRegion = NULL; Window->UpdateRegion = NULL;
} }
else
IntGetClientRect(Window, &ClientRect); {
IntGdiGetClipBox(lPs->hdc, &ClipRect); NtUserGetClientRect(Window, &lPs->rcPaint);
DC = DC_LockDc(lPs->hdc); }
if (NULL == DC)
{
IntReleaseWindowObject(Window);
return NULL;
}
DC_UnlockDc(lPs->hdc);
NtGdiIntersectRect(&lPs->rcPaint, &ClientRect, &ClipRect);
if (Window->Flags & WINDOWOBJECT_NEED_ERASEBKGND) if (Window->Flags & WINDOWOBJECT_NEED_ERASEBKGND)
{ {
@ -1026,7 +978,6 @@ NtUserScrollDC(HDC hDC, INT dx, INT dy, const RECT *lprcScroll,
IntLPtoDP(DC, (LPPOINT)&offset, 2); IntLPtoDP(DC, (LPPOINT)&offset, 2);
NtGdiOffsetRect(&rDst, offset.right - offset.left, offset.bottom - offset.top); NtGdiOffsetRect(&rDst, offset.right - offset.left, offset.bottom - offset.top);
NtGdiIntersectRect(&rDst, &rDst, &rClip); NtGdiIntersectRect(&rDst, &rDst, &rClip);
DC_UnlockDc(hDC);
/* /*
* Copy bits, if possible. * Copy bits, if possible.
@ -1037,14 +988,19 @@ NtUserScrollDC(HDC hDC, INT dx, INT dy, const RECT *lprcScroll,
RECT rDst_lp = rDst, rSrc_lp = rDst; RECT rDst_lp = rDst, rSrc_lp = rDst;
NtGdiOffsetRect(&rSrc_lp, offset.left - offset.right, offset.top - offset.bottom); NtGdiOffsetRect(&rSrc_lp, offset.left - offset.right, offset.top - offset.bottom);
NtGdiDPtoLP(hDC, (LPPOINT)&rDst_lp, 2); IntDPtoLP(DC, (LPPOINT)&rDst_lp, 2);
NtGdiDPtoLP(hDC, (LPPOINT)&rSrc_lp, 2); IntDPtoLP(DC, (LPPOINT)&rSrc_lp, 2);
DC_UnlockDc(hDC);
if (!NtGdiBitBlt(hDC, rDst_lp.left, rDst_lp.top, rDst_lp.right - rDst_lp.left, if (!NtGdiBitBlt(hDC, rDst_lp.left, rDst_lp.top, rDst_lp.right - rDst_lp.left,
rDst_lp.bottom - rDst_lp.top, hDC, rSrc_lp.left, rSrc_lp.top, rDst_lp.bottom - rDst_lp.top, hDC, rSrc_lp.left, rSrc_lp.top,
SRCCOPY)) SRCCOPY))
return FALSE; return FALSE;
} }
else
{
DC_UnlockDc(hDC);
}
/* /*
* Compute update areas. This is the clipped source or'ed with the * Compute update areas. This is the clipped source or'ed with the
@ -1061,7 +1017,7 @@ NtUserScrollDC(HDC hDC, INT dx, INT dy, const RECT *lprcScroll,
else else
hRgn = NtGdiCreateRectRgn(rClipped_src.left, rClipped_src.top, rClipped_src.right, rClipped_src.bottom); hRgn = NtGdiCreateRectRgn(rClipped_src.left, rClipped_src.top, rClipped_src.right, rClipped_src.bottom);
hRgn2 = NtGdiCreateRectRgnIndirect(&rSrc); hRgn2 = UnsafeIntCreateRectRgnIndirect(&rSrc);
NtGdiOffsetRgn(hRgn2, offset.right - offset.left, offset.bottom - offset.top); NtGdiOffsetRgn(hRgn2, offset.right - offset.left, offset.bottom - offset.top);
NtGdiCombineRgn(hRgn, hRgn, hRgn2, RGN_OR); NtGdiCombineRgn(hRgn, hRgn, hRgn2, RGN_OR);
@ -1135,18 +1091,11 @@ NtUserScrollWindowEx(HWND hWnd, INT dx, INT dy, const RECT *rect,
else if (bUpdate) else if (bUpdate)
hrgnUpdate = NtGdiCreateRectRgn(0, 0, 0, 0); hrgnUpdate = NtGdiCreateRectRgn(0, 0, 0, 0);
hDC = NtUserGetDCEx( hWnd, 0, DCX_CACHE | DCX_USESTYLE ); hDC = NtUserGetDCEx(hWnd, 0, DCX_CACHE | DCX_USESTYLE);
if (hDC) if (hDC)
{ {
HRGN hRgn = NtGdiCreateRectRgn( 0, 0, 0, 0 );
NtUserScrollDC(hDC, dx, dy, &rc, &cliprc, hrgnUpdate, rcUpdate); NtUserScrollDC(hDC, dx, dy, &rc, &cliprc, hrgnUpdate, rcUpdate);
NtUserReleaseDC(hWnd, hDC); NtUserReleaseDC(hWnd, hDC);
if (bUpdate)
NtGdiCombineRgn(hrgnUpdate, hrgnUpdate, hRgn, RGN_OR);
else
NtUserRedrawWindow(hWnd, NULL, hRgn, RDW_INVALIDATE | RDW_ERASE);
NtGdiDeleteObject(hRgn);
} }
/* /*
@ -1158,7 +1107,7 @@ NtUserScrollWindowEx(HWND hWnd, INT dx, INT dy, const RECT *rect,
Result = NtUserGetUpdateRgn(hWnd, hrgnTemp, FALSE); Result = NtUserGetUpdateRgn(hWnd, hrgnTemp, FALSE);
if (Result != NULLREGION) if (Result != NULLREGION)
{ {
HRGN hrgnClip = NtGdiCreateRectRgnIndirect(&cliprc); HRGN hrgnClip = UnsafeIntCreateRectRgnIndirect(&cliprc);
NtGdiOffsetRgn(hrgnTemp, dx, dy); NtGdiOffsetRgn(hrgnTemp, dx, dy);
NtGdiCombineRgn(hrgnTemp, hrgnTemp, hrgnClip, RGN_AND); NtGdiCombineRgn(hrgnTemp, hrgnTemp, hrgnClip, RGN_AND);
NtUserRedrawWindow(hWnd, NULL, hrgnTemp, RDW_INVALIDATE | RDW_ERASE); NtUserRedrawWindow(hWnd, NULL, hrgnTemp, RDW_INVALIDATE | RDW_ERASE);