Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-05 12:15:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

[win32k]

Browse source 
- merge r53215 and r53221 from themes branch
- Fixes drawing apps that use SetWindowRgn and also fixes a gdi object leak
See issue #1239 for more details.

svn path=/trunk/; revision=53548
This commit is contained in:
Giannis Adamopoulos 2011-09-03 16:22:32 +00:00
parent 9fda7d5f01
commit d8a49ddd85
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
reactos/subsystems/win32/win32k/ntuser/winpos.c
View file

@ -1026,7 +1026,7 @@ co_WinPosSetWindowPos(
WvrFlags = co_WinPosDoNCCALCSize(Window, &WinPos, &NewWindowRect, &NewClientRect);
TRACE("co_WinPosDoNCCALCSize");
TRACE("co_WinPosDoNCCALCSize returned %d\n", WvrFlags);
/* Relink windows. (also take into account shell window in hwndShellWindow) */
if (!(WinPos.flags & SWP_NOZORDER) && WinPos.hwnd != UserGetShellWindow())
@ -2088,6 +2088,9 @@ NtUserSetWindowRgn(
hrgnCopy = NULL;
}
/* Delete the region passed by the caller */
GreDeleteObject(hRgn);
if (Window->hrgnClip)
{
/* Delete no longer needed region handle */
@ -2097,9 +2100,6 @@ NtUserSetWindowRgn(
if (hrgnCopy)
{
if (Window->fnid != FNID_DESKTOP)
NtGdiOffsetRgn(hrgnCopy, Window->rcWindow.left, Window->rcWindow.top);
/* Set public ownership */
IntGdiSetRegionOwner(hrgnCopy, GDI_OBJ_HMGR_PUBLIC);
}