Ros-diffs December 2014

ros-diffs@reactos.org

17 participants
387 discussions

[tkreuzer] 65723: [WIN32K] Move NtGdiInvertRgn to bitblt.c

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Dec 18 08:11:36 2014 New Revision: 65723 URL: http://svn.reactos.org/svn/reactos?rev=65723&view=rev Log: [WIN32K] Move NtGdiInvertRgn to bitblt.c Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c trunk/reactos/win32ss/gdi/ntgdi/region.c Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/bitblt.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] Thu Dec 18 08:11:36 2014 @@ -1010,6 +1010,38 @@ return Ret; } +BOOL +APIENTRY +NtGdiInvertRgn( + HDC hDC, + HRGN hRgn) +{ + PREGION RgnData; + ULONG i; + PRECTL rc; + + RgnData = RGNOBJAPI_Lock(hRgn, NULL); + if (RgnData == NULL) + { + EngSetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + rc = RgnData->Buffer; + for (i = 0; i < RgnData->rdh.nCount; i++) + { + + if (!NtGdiPatBlt(hDC, rc->left, rc->top, rc->right - rc->left, rc->bottom - rc->top, DSTINVERT)) + { + RGNOBJAPI_Unlock(RgnData); + return FALSE; + } + rc++; + } + + RGNOBJAPI_Unlock(RgnData); + return TRUE; +} COLORREF APIENTRY Modified: trunk/reactos/win32ss/gdi/ntgdi/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/region.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/region.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/region.c [iso-8859-1] Thu Dec 18 08:11:36 2014 @@ -3853,39 +3853,6 @@ return ret; } -BOOL -APIENTRY -NtGdiInvertRgn( - HDC hDC, - HRGN hRgn) -{ - PREGION RgnData; - ULONG i; - PRECTL rc; - - RgnData = RGNOBJAPI_Lock(hRgn, NULL); - if (RgnData == NULL) - { - EngSetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - - rc = RgnData->Buffer; - for (i = 0; i < RgnData->rdh.nCount; i++) - { - - if (!NtGdiPatBlt(hDC, rc->left, rc->top, rc->right - rc->left, rc->bottom - rc->top, DSTINVERT)) - { - RGNOBJAPI_Unlock(RgnData); - return FALSE; - } - rc++; - } - - RGNOBJAPI_Unlock(RgnData); - return TRUE; -} - INT APIENTRY NtGdiOffsetRgn(

10 years

[tkreuzer] 65722: [WIN32K] - Remove useless offset part in REGION_CropAndOffsetRegion

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Dec 18 08:11:31 2014 New Revision: 65722 URL: http://svn.reactos.org/svn/reactos?rev=65722&view=rev Log: [WIN32K] - Remove useless offset part in REGION_CropAndOffsetRegion Modified: trunk/reactos/win32ss/gdi/ntgdi/cliprgn.c trunk/reactos/win32ss/gdi/ntgdi/region.c trunk/reactos/win32ss/gdi/ntgdi/region.h Modified: trunk/reactos/win32ss/gdi/ntgdi/cliprgn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/cliprgn.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/cliprgn.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/cliprgn.c [iso-8859-1] Thu Dec 18 08:11:31 2014 @@ -294,10 +294,9 @@ if (pdc->dclevel.prgnClip != NULL) { /* We have a region, crop it */ - iComplexity = REGION_CropAndOffsetRegion(pdc->dclevel.prgnClip, - pdc->dclevel.prgnClip, - &rect, - NULL); + iComplexity = REGION_CropRegion(pdc->dclevel.prgnClip, + pdc->dclevel.prgnClip, + &rect); } else { Modified: trunk/reactos/win32ss/gdi/ntgdi/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/region.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/region.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/region.c [iso-8859-1] Thu Dec 18 08:11:31 2014 @@ -601,182 +601,119 @@ */ INT FASTCALL -REGION_CropAndOffsetRegion( +REGION_CropRegion( PREGION rgnDst, PREGION rgnSrc, - const RECTL *rect, - const POINTL *offset) // FIXME: we should probably remove offset from here -{ - POINT pt = {0,0}; - const POINT *off = offset; - - if (off == NULL) - off = &pt; - - /* Just copy and offset */ - if (rect == NULL) - { - PRECTL xrect; - - if (rgnDst == rgnSrc) - { - if (off->x || off->y) - xrect = rgnDst->Buffer; - else - return REGION_Complexity(rgnDst); - } - else - { - xrect = ExAllocatePoolWithTag(PagedPool, - rgnSrc->rdh.nCount * sizeof(RECT), - TAG_REGION); - if (xrect == NULL) - return ERROR; - - /* Free the old buffer. Will be assigned to xrect below. */ - if (rgnDst->Buffer && (rgnDst->Buffer != &rgnDst->rdh.rcBound)) - ExFreePoolWithTag(rgnDst->Buffer, TAG_REGION); - } - - if (rgnDst != rgnSrc) - { - *rgnDst = *rgnSrc; - } - - if (off->x || off->y) - { - ULONG i; - - for (i = 0; i < rgnDst->rdh.nCount; i++) - { - xrect[i].left = (rgnSrc->Buffer + i)->left + off->x; - xrect[i].right = (rgnSrc->Buffer + i)->right + off->x; - xrect[i].top = (rgnSrc->Buffer + i)->top + off->y; - xrect[i].bottom = (rgnSrc->Buffer + i)->bottom + off->y; - } - - rgnDst->rdh.rcBound.left += off->x; - rgnDst->rdh.rcBound.right += off->x; - rgnDst->rdh.rcBound.top += off->y; - rgnDst->rdh.rcBound.bottom += off->y; - } - else - { - COPY_RECTS(xrect, rgnSrc->Buffer, rgnDst->rdh.nCount); - } - - rgnDst->Buffer = xrect; - } - else if ((rect->left >= rect->right) || - (rect->top >= rect->bottom) || - (EXTENTCHECK(rect, &rgnSrc->rdh.rcBound) == 0)) + const RECTL *rect) +{ + PRECTL lpr, rpr; + ULONG i, j, clipa, clipb, nRgnSize; + INT left = MAXLONG; + INT right = MINLONG; + INT top = MAXLONG; + INT bottom = MINLONG; + + if ((rect->left >= rect->right) || + (rect->top >= rect->bottom) || + (EXTENTCHECK(rect, &rgnSrc->rdh.rcBound) == 0)) { goto empty; } - else // Region box and clipping rect appear to intersect - { - PRECTL lpr, rpr; - ULONG i, j, clipa, clipb, nRgnSize; - INT left = MAXLONG; - INT right = MINLONG; - INT top = MAXLONG; - INT bottom = MINLONG; - - /* Skip all rects that are completely above our intersect rect */ - for (clipa = 0; clipa < rgnSrc->rdh.nCount; clipa++) - { - /* bottom is exclusive, so break when we go above it */ - if (rgnSrc->Buffer[clipa].bottom > rect->top) break; - } - - /* Bail out, if there is nothing left */ - if (clipa == rgnSrc->rdh.nCount) goto empty; - - /* Find the last rect that is still within the intersect rect (exclusive) */ - for (clipb = clipa; clipb < rgnSrc->rdh.nCount; clipb++) - { - /* bottom is exclusive, so stop, when we start at that y pos */ - if (rgnSrc->Buffer[clipb].top >= rect->bottom) break; - } - - /* Bail out, if there is nothing left */ - if (clipb == clipa) goto empty; - - // clipa - index of the first rect in the first intersecting band - // clipb - index of the last rect in the last intersecting band plus 1 - - /* Check if the buffer in the dest region is large enough, - otherwise allocate a new one */ - nRgnSize = (clipb - clipa) * sizeof(RECT); - if ((rgnDst != rgnSrc) && (rgnDst->rdh.nRgnSize < nRgnSize)) - { - PRECTL temp; - temp = ExAllocatePoolWithTag(PagedPool, nRgnSize, TAG_REGION); - if (temp == NULL) - return ERROR; - - /* Free the old buffer */ - if (rgnDst->Buffer && (rgnDst->Buffer != &rgnDst->rdh.rcBound)) - ExFreePoolWithTag(rgnDst->Buffer, TAG_REGION); - - rgnDst->Buffer = temp; - rgnDst->rdh.nCount = 0; - rgnDst->rdh.nRgnSize = nRgnSize; - rgnDst->rdh.iType = RDH_RECTANGLES; - } - - /* Loop all rects within the intersect rect from the y perspective */ - for (i = clipa, j = 0; i < clipb ; i++) - { - // i - src index, j - dst index, j is always <= i for obvious reasons - - lpr = &rgnSrc->Buffer[i]; - - /* Make sure the source rect is not retarded */ + + /* Skip all rects that are completely above our intersect rect */ + for (clipa = 0; clipa < rgnSrc->rdh.nCount; clipa++) + { + /* bottom is exclusive, so break when we go above it */ + if (rgnSrc->Buffer[clipa].bottom > rect->top) break; + } + + /* Bail out, if there is nothing left */ + if (clipa == rgnSrc->rdh.nCount) goto empty; + + /* Find the last rect that is still within the intersect rect (exclusive) */ + for (clipb = clipa; clipb < rgnSrc->rdh.nCount; clipb++) + { + /* bottom is exclusive, so stop, when we start at that y pos */ + if (rgnSrc->Buffer[clipb].top >= rect->bottom) break; + } + + /* Bail out, if there is nothing left */ + if (clipb == clipa) goto empty; + + // clipa - index of the first rect in the first intersecting band + // clipb - index of the last rect in the last intersecting band plus 1 + + /* Check if the buffer in the dest region is large enough, + otherwise allocate a new one */ + nRgnSize = (clipb - clipa) * sizeof(RECT); + if ((rgnDst != rgnSrc) && (rgnDst->rdh.nRgnSize < nRgnSize)) + { + PRECTL temp; + temp = ExAllocatePoolWithTag(PagedPool, nRgnSize, TAG_REGION); + if (temp == NULL) + return ERROR; + + /* Free the old buffer */ + if (rgnDst->Buffer && (rgnDst->Buffer != &rgnDst->rdh.rcBound)) + ExFreePoolWithTag(rgnDst->Buffer, TAG_REGION); + + rgnDst->Buffer = temp; + rgnDst->rdh.nCount = 0; + rgnDst->rdh.nRgnSize = nRgnSize; + rgnDst->rdh.iType = RDH_RECTANGLES; + } + + /* Loop all rects within the intersect rect from the y perspective */ + for (i = clipa, j = 0; i < clipb ; i++) + { + /* i - src index, j - dst index, j is always <= i for obvious reasons */ + + lpr = &rgnSrc->Buffer[i]; + + /* Make sure the source rect is not retarded */ + ASSERT(lpr->bottom > rect->top); + ASSERT(lpr->right > rect->left); + + /* We already checked above, this should hold true */ + ASSERT(lpr->bottom > rect->top); + ASSERT(lpr->top < rect->bottom); + + /* Check if this rect is really inside the intersect rect */ + if ((lpr->left < rect->right) && (lpr->right > rect->left)) + { + rpr = &rgnDst->Buffer[j]; + + /* Crop the rect with the intersect rect and add offset */ + rpr->top = max(lpr->top, rect->top); + rpr->bottom = min(lpr->bottom, rect->bottom); + rpr->left = max(lpr->left, rect->left); + rpr->right = min(lpr->right, rect->right); + + /* Make sure the resulting rect is not retarded */ ASSERT(lpr->bottom > rect->top); ASSERT(lpr->right > rect->left); - /* We already checked above, this should hold true */ - ASSERT(lpr->bottom > rect->top); - ASSERT(lpr->top < rect->bottom); - - /* Check if this rect is really inside the intersect rect */ - if ((lpr->left < rect->right) && (lpr->right > rect->left)) - { - rpr = &rgnDst->Buffer[j]; - - /* Crop the rect with the intersect rect and add offset */ - rpr->top = max(lpr->top, rect->top) + off->y; - rpr->bottom = min(lpr->bottom, rect->bottom) + off->y; - rpr->left = max(lpr->left, rect->left) + off->x; - rpr->right = min(lpr->right, rect->right) + off->y; - - /* Make sure the resulting rect is not retarded */ - ASSERT(lpr->bottom > rect->top); - ASSERT(lpr->right > rect->left); - - /* Track new bounds */ - if (rpr->left < left) left = rpr->left; - if (rpr->right > right) right = rpr->right; - if (rpr->top < top) top = rpr->top; - if (rpr->bottom > bottom) bottom = rpr->bottom; - - /* Next target rect */ - j++; - } - } - - if (j == 0) goto empty; - - /* Update the bounds rect */ - rgnDst->rdh.rcBound.left = left; - rgnDst->rdh.rcBound.right = right; - rgnDst->rdh.rcBound.top = top; - rgnDst->rdh.rcBound.bottom = bottom; - - /* Set new rect count */ - rgnDst->rdh.nCount = j; - } + /* Track new bounds */ + if (rpr->left < left) left = rpr->left; + if (rpr->right > right) right = rpr->right; + if (rpr->top < top) top = rpr->top; + if (rpr->bottom > bottom) bottom = rpr->bottom; + + /* Next target rect */ + j++; + } + } + + if (j == 0) goto empty; + + /* Update the bounds rect */ + rgnDst->rdh.rcBound.left = left; + rgnDst->rdh.rcBound.right = right; + rgnDst->rdh.rcBound.top = top; + rgnDst->rdh.rcBound.bottom = bottom; + + /* Set new rect count */ + rgnDst->rdh.nCount = j; return REGION_Complexity(rgnDst); Modified: trunk/reactos/win32ss/gdi/ntgdi/region.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/region.h… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/region.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/region.h [iso-8859-1] Thu Dec 18 08:11:31 2014 @@ -29,7 +29,7 @@ INT FASTCALL REGION_GetRgnBox(PREGION Rgn, RECTL *pRect); BOOL FASTCALL REGION_RectInRegion(PREGION Rgn, const RECTL *rc); BOOL FASTCALL REGION_PtInRegion(PREGION, INT, INT); -INT FASTCALL REGION_CropAndOffsetRegion(PREGION rgnDst, PREGION rgnSrc, const RECTL *rect, const POINT *off); +INT FASTCALL REGION_CropRegion(PREGION rgnDst, PREGION rgnSrc, const RECTL *rect); VOID FASTCALL REGION_SetRectRgn(PREGION pRgn, INT LeftRect, INT TopRect, INT RightRect, INT BottomRect); VOID NTAPI REGION_vCleanup(PVOID ObjectBody);

10 years

[tkreuzer] 65721: [WIN32K] Fix MSVC warnings

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Dec 18 08:11:25 2014 New Revision: 65721 URL: http://svn.reactos.org/svn/reactos?rev=65721&view=rev Log: [WIN32K] Fix MSVC warnings Modified: trunk/reactos/win32ss/user/ntuser/cursoricon.h trunk/reactos/win32ss/user/ntuser/defwnd.c trunk/reactos/win32ss/user/ntuser/menu.c trunk/reactos/win32ss/user/ntuser/prop.c Modified: trunk/reactos/win32ss/user/ntuser/cursoricon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/cursor… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/cursoricon.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/cursoricon.h [iso-8859-1] Thu Dec 18 08:11:25 2014 @@ -31,8 +31,8 @@ USHORT atomModName; USHORT rt; ULONG CURSORF_flags; - INT cpcur; - INT cicur; + UINT cpcur; + UINT cicur; PCURICON_OBJECT * aspcur; DWORD * aicur; INT * ajifRate; Modified: trunk/reactos/win32ss/user/ntuser/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/defwnd… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] Thu Dec 18 08:11:25 2014 @@ -128,8 +128,8 @@ HBRUSH hbrush = NtGdiSelectBrush( hdc, gpsi->hbrGray ); NtGdiPatBlt( hdc, rect->left, rect->top, rect->right - rect->left - width, height, PATINVERT ); NtGdiPatBlt( hdc, rect->left, rect->top + height, width, rect->bottom - rect->top - height, PATINVERT ); - NtGdiPatBlt( hdc, rect->left + width, rect->bottom - 1, rect->right - rect->left - width, -height, PATINVERT ); - NtGdiPatBlt( hdc, rect->right - 1, rect->top, -width, rect->bottom - rect->top - height, PATINVERT ); + NtGdiPatBlt( hdc, rect->left + width, rect->bottom - 1, rect->right - rect->left - width, -(LONG)height, PATINVERT ); + NtGdiPatBlt( hdc, rect->right - 1, rect->top, -(LONG)width, rect->bottom - rect->top - height, PATINVERT ); NtGdiSelectBrush( hdc, hbrush ); } @@ -1023,7 +1023,7 @@ return (DefWndHandleWindowPosChanging(Wnd, (WINDOWPOS*)lParam)); } - case WM_WINDOWPOSCHANGED: + case WM_WINDOWPOSCHANGED: { return (DefWndHandleWindowPosChanged(Wnd, (WINDOWPOS*)lParam)); } Modified: trunk/reactos/win32ss/user/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/menu.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] Thu Dec 18 08:11:25 2014 @@ -209,7 +209,7 @@ } /* Free the Item */ DesktopHeapFree(pMenu->head.rpdesk, pMenu->rgItems ); - pMenu->rgItems = NULL; + pMenu->rgItems = NULL; pMenu->cItems = 0; } return TRUE; @@ -462,7 +462,7 @@ SubMenu = MenuObject; if(!(MenuItem = MENU_InsertItem( SubMenu, uItem, fByPosition ? MF_BYPOSITION : MF_BYCOMMAND, &SubMenu, &uItem ))) return FALSE; - + if(!IntSetMenuItemInfo(SubMenu, MenuItem, ItemInfo, lpstr)) { IntRemoveMenuItem(SubMenu, uItem, fByPosition ? MF_BYPOSITION : MF_BYCOMMAND, FALSE); @@ -684,7 +684,7 @@ { IntSetMenuInfo( item->spSubMenu, lpmi); } - } + } } if (sizeof(MENUINFO) < lpmi->cbSize) { @@ -761,8 +761,8 @@ if (sizeof(ROSMENUITEMINFO) == lpmii->cbSize) { - lpmii->Rect.left = MenuItem->xItem; - lpmii->Rect.top = MenuItem->yItem; + lpmii->Rect.left = MenuItem->xItem; + lpmii->Rect.top = MenuItem->yItem; lpmii->Rect.right = MenuItem->cxItem; // Do this for now...... lpmii->Rect.bottom = MenuItem->cyItem; lpmii->dxTab = MenuItem->dxTab; @@ -829,7 +829,7 @@ if (MenuItem->hbmp <= HBMMENU_POPUP_MINIMIZE && MenuItem->hbmp >= HBMMENU_CALLBACK) MenuItem->fState |= MFS_HBMMENUBMP; else - MenuItem->fState &= ~MFS_HBMMENUBMP; + MenuItem->fState &= ~MFS_HBMMENUBMP; } if(lpmii->fMask & MIIM_CHECKMARKS) { @@ -939,8 +939,8 @@ if (sizeof(ROSMENUITEMINFO) == lpmii->cbSize) { - MenuItem->xItem = lpmii->Rect.left; - MenuItem->yItem = lpmii->Rect.top; + MenuItem->xItem = lpmii->Rect.left; + MenuItem->yItem = lpmii->Rect.top; MenuItem->cxItem = lpmii->Rect.right; // Do this for now...... MenuItem->cyItem = lpmii->Rect.bottom; MenuItem->dxTab = lpmii->dxTab; @@ -1025,7 +1025,7 @@ UINT i; PITEM MenuItem = MenuObject->rgItems; - if (!MenuItem) return FALSE; + if (!MenuItem) return FALSE; /* reset all default-item flags */ for (i = 0; MenuItem, i < MenuObject->cItems; i++, MenuItem++) @@ -1324,7 +1324,7 @@ return (pItem->spSubMenu->cItems << 8) | ((pItem->fState|pItem->fType) & 0xff); } else - return (pItem->fType | pItem->fState); + return (pItem->fType | pItem->fState); } HMENU FASTCALL IntGetSubMenu( HMENU hMenu, int nPos) @@ -1369,7 +1369,7 @@ { return i; } - else + else { HMENU hsubmenu = hSubMenu; UINT pos = IntFindSubMenu( &hsubmenu, hSubTarget ); @@ -1610,8 +1610,8 @@ if ((MenuItem = MENU_FindItem (&Menu, &uItem, MF_BYPOSITION))) { - Rect->left = MenuItem->xItem; - Rect->top = MenuItem->yItem; + Rect->left = MenuItem->xItem; + Rect->top = MenuItem->yItem; Rect->right = MenuItem->cxItem; // Do this for now...... Rect->bottom = MenuItem->cyItem; } @@ -1659,7 +1659,7 @@ UserDestroyMenu(hSysMenu); return NULL; } - + SysMenu->fFlags |= MNF_SYSMENU; SysMenu->hWnd = Window->head.h; @@ -1811,7 +1811,7 @@ if (Menu && Window != Menu->spwndNotify) { Menu->spwndNotify = Window; - } + } return TRUE; } @@ -2198,7 +2198,7 @@ if (!Menu) RETURN(FALSE); - if (idItem < 0 || idItem > Menu->cItems) + if ((idItem < 0) || ((ULONG)idItem > Menu->cItems)) RETURN(FALSE); RECTL_vSetEmptyRect(&kmbi.rcBar); @@ -2320,8 +2320,8 @@ if ((MenuItem = MENU_FindItem (&Menu, &uItem, MF_BYPOSITION))) { - Rect.left = MenuItem->xItem; - Rect.top = MenuItem->yItem; + Rect.left = MenuItem->xItem; + Rect.top = MenuItem->yItem; Rect.right = MenuItem->cxItem; // Do this for now...... Rect.bottom = MenuItem->cyItem; } @@ -2427,7 +2427,7 @@ PMENU Menu; PWND Window = NULL; PITEM mi; - int i; + ULONG i; DECLARE_RETURN(int); TRACE("Enter NtUserMenuItemFromPoint\n"); @@ -2450,8 +2450,8 @@ for (i = 0; i < Menu->cItems; i++, mi++) { RECTL Rect; - Rect.left = mi->xItem; - Rect.top = mi->yItem; + Rect.left = mi->xItem; + Rect.top = mi->yItem; Rect.right = mi->cxItem; // Do this for now...... Rect.bottom = mi->cyItem; //MENU_AdjustMenuItemRect(Menu, &Rect); Need gpsi OBMI via callback! Modified: trunk/reactos/win32ss/user/ntuser/prop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/prop.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/prop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/prop.c [iso-8859-1] Thu Dec 18 08:11:25 2014 @@ -5,7 +5,7 @@ * FILE: subsys/win32k/ntuser/prop.c * PROGRAMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) */ - + #include <win32k.h> DBG_DEFAULT_CHANNEL(UserProp); @@ -16,7 +16,7 @@ { PLIST_ENTRY ListEntry; PPROPERTY Property; - int i; + UINT i; ListEntry = Window->PropListHead.Flink;

10 years

[tkreuzer] 65720: [WIN32K] More improvements to region.c: - PROSRGNDATA -> REGION, void -> VOID, int -> INT, uppercase struct names - do not put assignments into if statements - !x -> x == NULL for...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Dec 18 08:11:19 2014 New Revision: 65720 URL: http://svn.reactos.org/svn/reactos?rev=65720&view=rev Log: [WIN32K] More improvements to region.c: - PROSRGNDATA -> REGION, void -> VOID, int -> INT, uppercase struct names - do not put assignments into if statements - !x -> x == NULL for pointers - Add additional parentheses / curly braces - rename RGN_ATTR::Flags to iComplexity Modified: trunk/reactos/win32ss/gdi/eng/engwindow.c trunk/reactos/win32ss/gdi/gdi32/objects/region.c trunk/reactos/win32ss/gdi/ntgdi/dcutil.c trunk/reactos/win32ss/gdi/ntgdi/region.c trunk/reactos/win32ss/gdi/ntgdi/region.h trunk/reactos/win32ss/include/ntgdihdl.h trunk/reactos/win32ss/user/ntuser/painting.c Modified: trunk/reactos/win32ss/gdi/eng/engwindow.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/engwindow.… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/engwindow.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/engwindow.c [iso-8859-1] Thu Dec 18 08:11:19 2014 @@ -52,7 +52,7 @@ XCLIPOBJ* Clip, PWND Window) { - PROSRGNDATA visRgn; + PREGION visRgn; TRACE("IntEngWndUpdateClipObj\n"); Modified: trunk/reactos/win32ss/gdi/gdi32/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/region.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/region.c [iso-8859-1] Thu Dec 18 08:11:19 2014 @@ -212,13 +212,13 @@ if ( !Ret || !pRgn_Attr_Dest || !pRgn_Attr_Src1 || - pRgn_Attr_Src1->Flags > SIMPLEREGION ) + pRgn_Attr_Src1->iComplexity > SIMPLEREGION ) return NtGdiCombineRgn(hDest, hSrc1, hSrc2, CombineMode); /* Handle COPY and use only src1. */ if ( CombineMode == RGN_COPY ) { - switch (pRgn_Attr_Src1->Flags) + switch (pRgn_Attr_Src1->iComplexity) { case NULLREGION: Ret = SetRectRgn( hDest, 0, 0, 0, 0); @@ -245,7 +245,7 @@ Ret = GdiGetHandleUserData((HGDIOBJ) hSrc2, GDI_OBJECT_TYPE_REGION, (PVOID) &pRgn_Attr_Src2); if ( !Ret || !pRgn_Attr_Src2 || - pRgn_Attr_Src2->Flags > SIMPLEREGION ) + pRgn_Attr_Src2->iComplexity > SIMPLEREGION ) return NtGdiCombineRgn(hDest, hSrc1, hSrc2, CombineMode); /* All but AND. */ @@ -270,14 +270,14 @@ return NtGdiCombineRgn(hDest, hSrc1, hSrc2, CombineMode); } /* Now handle DIFF. */ - if ( pRgn_Attr_Src1->Flags == NULLREGION ) + if ( pRgn_Attr_Src1->iComplexity == NULLREGION ) { if (SetRectRgn( hDest, 0, 0, 0, 0)) return NULLREGION; goto ERROR_Exit; } - if ( pRgn_Attr_Src2->Flags != NULLREGION ) + if ( pRgn_Attr_Src2->iComplexity != NULLREGION ) { Complexity = ComplexityFromRects( &pRgn_Attr_Src1->Rect, &pRgn_Attr_Src2->Rect); @@ -295,9 +295,9 @@ } else /* Handle OR or XOR. */ { - if ( pRgn_Attr_Src1->Flags == NULLREGION ) - { - if ( pRgn_Attr_Src2->Flags != NULLREGION ) + if ( pRgn_Attr_Src1->iComplexity == NULLREGION ) + { + if ( pRgn_Attr_Src2->iComplexity != NULLREGION ) { /* Src1 null and not NULL, set from src2. */ Ret = SetRectRgn( hDest, @@ -315,7 +315,7 @@ goto ERROR_Exit; } /* Src1 is not NULL. */ - if ( pRgn_Attr_Src2->Flags != NULLREGION ) + if ( pRgn_Attr_Src2->iComplexity != NULLREGION ) { if ( CombineMode != RGN_OR ) /* Filter XOR, so go K. */ return NtGdiCombineRgn(hDest, hSrc1, hSrc2, CombineMode); @@ -350,8 +350,8 @@ } /* Handle AND. */ - if ( pRgn_Attr_Src1->Flags != NULLREGION && - pRgn_Attr_Src2->Flags != NULLREGION ) + if ( pRgn_Attr_Src1->iComplexity != NULLREGION && + pRgn_Attr_Src2->iComplexity != NULLREGION ) { Complexity = ComplexityFromRects( &pRgn_Attr_Src1->Rect, &pRgn_Attr_Src2->Rect); @@ -491,13 +491,13 @@ if (( x1 == x2) || (y1 == y2)) { - pRgn_Attr->Flags = NULLREGION; + pRgn_Attr->iComplexity = NULLREGION; pRgn_Attr->Rect.left = pRgn_Attr->Rect.top = pRgn_Attr->Rect.right = pRgn_Attr->Rect.bottom = 0; } else { - pRgn_Attr->Flags = SIMPLEREGION; + pRgn_Attr->iComplexity = SIMPLEREGION; pRgn_Attr->Rect.left = x1; pRgn_Attr->Rect.top = y1; pRgn_Attr->Rect.right = x2; @@ -642,7 +642,7 @@ !(pEntry->Flags & GDI_ENTRY_VALIDATE_VIS) ) { if (!hrgn || - (hrgn && pRgn_Attr && pRgn_Attr->Flags <= SIMPLEREGION) ) + (hrgn && pRgn_Attr && pRgn_Attr->iComplexity <= SIMPLEREGION) ) { if ((pTeb->GdiTebBatch.Offset + sizeof(GDIBSEXTSELCLPRGN)) <= GDIBATCHBUFSIZE) { @@ -655,7 +655,7 @@ if ( hrgn && pRgn_Attr ) { - Ret = pRgn_Attr->Flags; + Ret = pRgn_Attr->iComplexity; if ( pDc_Attr->VisRectRegion.Rect.left >= pRgn_Attr->Rect.right || pDc_Attr->VisRectRegion.Rect.top >= pRgn_Attr->Rect.bottom || @@ -670,7 +670,7 @@ } else { - Ret = pDc_Attr->VisRectRegion.Flags; + Ret = pDc_Attr->VisRectRegion.iComplexity; pgO->fnMode |= 0x80000000; // Set no hrgn mode. } pTeb->GdiTebBatch.Offset += sizeof(GDIBSEXTSELCLPRGN); @@ -763,7 +763,7 @@ //if (!GdiGetHandleUserData((HGDIOBJ) hrgn, GDI_OBJECT_TYPE_REGION, (PVOID) &Rgn_Attr)) return NtGdiGetRgnBox(hrgn, prcOut); - if (Rgn_Attr->Flags == NULLREGION) + if (Rgn_Attr->iComplexity == NULLREGION) { prcOut->left = 0; prcOut->top = 0; @@ -772,12 +772,12 @@ } else { - if (Rgn_Attr->Flags != SIMPLEREGION) + if (Rgn_Attr->iComplexity != SIMPLEREGION) return NtGdiGetRgnBox(hrgn, prcOut); /* WARNING! prcOut is never checked newbies! */ RtlCopyMemory( prcOut, &Rgn_Attr->Rect, sizeof(RECT)); } - return Rgn_Attr->Flags; + return Rgn_Attr->iComplexity; } /* @@ -875,10 +875,10 @@ // if (!GdiGetHandleUserData((HGDIOBJ) hrgn, GDI_OBJECT_TYPE_REGION, (PVOID) &pRgn_Attr)) return NtGdiOffsetRgn(hrgn,nXOffset,nYOffset); - if ( pRgn_Attr->Flags == NULLREGION) - return pRgn_Attr->Flags; - - if ( pRgn_Attr->Flags != SIMPLEREGION) + if ( pRgn_Attr->iComplexity == NULLREGION) + return pRgn_Attr->iComplexity; + + if ( pRgn_Attr->iComplexity != SIMPLEREGION) return NtGdiOffsetRgn(hrgn,nXOffset,nYOffset); nLeftRect = pRgn_Attr->Rect.left; @@ -911,7 +911,7 @@ pRgn_Attr->AttrFlags |= ATTR_RGN_DIRTY; } } - return pRgn_Attr->Flags; + return pRgn_Attr->iComplexity; } /* @@ -929,10 +929,10 @@ //if (!GdiGetHandleUserData((HGDIOBJ) hrgn, GDI_OBJECT_TYPE_REGION, (PVOID) &pRgn_Attr)) return NtGdiPtInRegion(hrgn,x,y); - if ( pRgn_Attr->Flags == NULLREGION) + if ( pRgn_Attr->iComplexity == NULLREGION) return FALSE; - if ( pRgn_Attr->Flags != SIMPLEREGION) + if ( pRgn_Attr->iComplexity != SIMPLEREGION) return NtGdiPtInRegion(hrgn,x,y); return INRECT( pRgn_Attr->Rect, x, y); @@ -953,10 +953,10 @@ //if (!GdiGetHandleUserData((HGDIOBJ) hrgn, GDI_OBJECT_TYPE_REGION, (PVOID) &pRgn_Attr)) return NtGdiRectInRegion(hrgn, (LPRECT) prcl); - if ( pRgn_Attr->Flags == NULLREGION) + if ( pRgn_Attr->iComplexity == NULLREGION) return FALSE; - if ( pRgn_Attr->Flags != SIMPLEREGION) + if ( pRgn_Attr->iComplexity != SIMPLEREGION) return NtGdiRectInRegion(hrgn, (LPRECT) prcl); /* swap the coordinates to make right >= left and bottom >= top */ @@ -1019,7 +1019,7 @@ if ((nLeftRect == nRightRect) || (nTopRect == nBottomRect)) { Rgn_Attr->AttrFlags |= ATTR_RGN_DIRTY; - Rgn_Attr->Flags = NULLREGION; + Rgn_Attr->iComplexity = NULLREGION; Rgn_Attr->Rect.left = Rgn_Attr->Rect.top = Rgn_Attr->Rect.right = Rgn_Attr->Rect.bottom = 0; return TRUE; @@ -1042,7 +1042,7 @@ } Rgn_Attr->AttrFlags |= ATTR_RGN_DIRTY ; - Rgn_Attr->Flags = SIMPLEREGION; + Rgn_Attr->iComplexity = SIMPLEREGION; return TRUE; } Modified: trunk/reactos/win32ss/gdi/ntgdi/dcutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dcutil.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dcutil.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dcutil.c [iso-8859-1] Thu Dec 18 08:11:19 2014 @@ -274,7 +274,7 @@ IntSetDefaultRegion(PDC pdc) { PSURFACE pSurface; - PROSRGNDATA prgn; + PREGION prgn; RECTL rclWnd, rclClip; IntGdiReleaseRaoRgn(pdc); Modified: trunk/reactos/win32ss/gdi/ntgdi/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/region.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/region.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/region.c [iso-8859-1] Thu Dec 18 08:11:19 2014 @@ -119,21 +119,21 @@ #define NDEBUG #include <debug.h> -PROSRGNDATA prgnDefault = NULL; -HRGN hrgnDefault = NULL; +PREGION prgnDefault = NULL; +HRGN hrgnDefault = NULL; // Internal Functions #if 1 #define COPY_RECTS(dest, src, nRects) \ do { \ - PRECTL xDest = (dest); \ - PRECTL xSrc = (src); \ + PRECTL xDest = (dest); \ + PRECTL xSrc = (src); \ UINT xRects = (nRects); \ - while(xRects-- > 0) { \ + while (xRects-- > 0) { \ *(xDest++) = *(xSrc++); \ } \ - } while(0) + } while (0) #else #define COPY_RECTS(dest, src, nRects) RtlCopyMemory(dest, src, (nRects) * sizeof(RECTL)) #endif @@ -230,11 +230,11 @@ } /* - * This structure contains all of the information needed - * to run the bresenham algorithm. - * The variables may be hardcoded into the declarations - * instead of using this structure to make use of - * register declarations. + * This structure contains all of the information needed + * to run the bresenham algorithm. + * The variables may be hardcoded into the declarations + * instead of using this structure to make use of + * register declarations. */ typedef struct { @@ -284,16 +284,16 @@ * We also keep a data structure known as the Edge Table (ET), * which keeps track of all the edges which the current * scanline has not yet reached. The ET is basically a - * list of ScanLineList structures containing a list of + * list of SCANLINE_LIST structures containing a list of * edges which are entered at a given scanline. There is one - * ScanLineList per scanline at which an edge is entered. + * SCANLINE_LIST per scanline at which an edge is entered. * When we enter a new edge, we move it from the ET to the AET. * * From the AET, we can implement the even-odd rule as in * (Foley/Van Dam). * The winding number rule is a little trickier. We also - * keep the EdgeTableEntries in the AET linked by the - * nextWETE (winding EdgeTableEntry) link. This allows + * keep the EDGE_TABLEEntries in the AET linked by the + * nextWETE (winding EDGE_TABLE_ENTRY) link. This allows * the edges to be linked just as before for updating * purposes, but only uses the edges linked by the nextWETE * link as edges representing spans of the polygon to @@ -306,31 +306,31 @@ #define CLOCKWISE 1 #define COUNTERCLOCKWISE -1 -typedef struct _EdgeTableEntry +typedef struct _EDGE_TABLE_ENTRY { INT ymax; /* ycoord at which we exit this edge. */ BRESINFO bres; /* Bresenham info to run the edge */ - struct _EdgeTableEntry *next; /* Next in the list */ - struct _EdgeTableEntry *back; /* For insertion sort */ - struct _EdgeTableEntry *nextWETE; /* For winding num rule */ - int ClockWise; /* Flag for winding number rule */ -} EdgeTableEntry; - - -typedef struct _ScanLineList + struct _EDGE_TABLE_ENTRY *next; /* Next in the list */ + struct _EDGE_TABLE_ENTRY *back; /* For insertion sort */ + struct _EDGE_TABLE_ENTRY *nextWETE; /* For winding num rule */ + INT ClockWise; /* Flag for winding number rule */ +} EDGE_TABLE_ENTRY; + + +typedef struct _SCANLINE_LIST { INT scanline; /* The scanline represented */ - EdgeTableEntry *edgelist; /* Header node */ - struct _ScanLineList *next; /* Next in the list */ -} ScanLineList; + EDGE_TABLE_ENTRY *edgelist; /* Header node */ + struct _SCANLINE_LIST *next; /* Next in the list */ +} SCANLINE_LIST; typedef struct { INT ymax; /* ymax for the polygon */ INT ymin; /* ymin for the polygon */ - ScanLineList scanlines; /* Header node */ -} EdgeTable; + SCANLINE_LIST scanlines; /* Header node */ +} EDGE_TABLE; /* @@ -340,11 +340,11 @@ */ #define SLLSPERBLOCK 25 -typedef struct _ScanLineListBlock -{ - ScanLineList SLLs[SLLSPERBLOCK]; - struct _ScanLineListBlock *next; -} ScanLineListBlock; +typedef struct _SCANLINE_LISTBLOCK +{ + SCANLINE_LIST SLLs[SLLSPERBLOCK]; + struct _SCANLINE_LISTBLOCK *next; +} SCANLINE_LISTBLOCK; /* @@ -408,18 +408,19 @@ /* * Check to see if there is enough memory in the present region. */ -static __inline int xmemcheck(ROSRGNDATA *reg, PRECTL *rect, PRECTL *firstrect) -{ - if ( (reg->rdh.nCount+1) * sizeof(RECT) >= reg->rdh.nRgnSize ) +static __inline INT xmemcheck(PREGION reg, PRECTL *rect, PRECTL *firstrect) +{ + if ((reg->rdh.nCount+1) * sizeof(RECT) >= reg->rdh.nRgnSize) { PRECTL temp; DWORD NewSize = 2 * reg->rdh.nRgnSize; + if (NewSize < (reg->rdh.nCount + 1) * sizeof(RECT)) { NewSize = (reg->rdh.nCount + 1) * sizeof(RECT); } + temp = ExAllocatePoolWithTag(PagedPool, NewSize, TAG_REGION); - if (temp == NULL) { return 0; @@ -433,16 +434,17 @@ { ExFreePoolWithTag(*firstrect, TAG_REGION); } + *firstrect = temp; - *rect = (*firstrect)+reg->rdh.nCount; + *rect = (*firstrect) + reg->rdh.nCount; } return 1; } #define MEMCHECK(reg, rect, firstrect) xmemcheck(reg,&(rect),(PRECTL *)&(firstrect)) -typedef void (FASTCALL *overlapProcp)(PROSRGNDATA, PRECT, PRECT, PRECT, PRECT, INT, INT); -typedef void (FASTCALL *nonOverlapProcp)(PROSRGNDATA, PRECT, PRECT, INT, INT); +typedef VOID (FASTCALL *overlapProcp)(PREGION, PRECT, PRECT, PRECT, PRECT, INT, INT); +typedef VOID (FASTCALL *nonOverlapProcp)(PREGION, PRECT, PRECT, INT, INT); // Number of points to buffer before sending them off to scanlines() : Must be an even number #define NUMPTSTOBUFFER 200 @@ -464,7 +466,7 @@ FASTCALL IntDumpRegion(HRGN hRgn) { - ROSRGNDATA *Data; + PREGION Data; Data = RGNOBJAPI_Lock(hRgn, NULL); if (Data == NULL) @@ -490,12 +492,12 @@ FASTCALL REGION_Complexity(PREGION prgn) { - if (!prgn) + if (prgn == NULL) return NULLREGION; + DPRINT("Region Complexity -> %lu", prgn->rdh.nCount); switch (prgn->rdh.nCount) { - DPRINT("Region Complexity -> %lu", prgn->rdh.nCount); case 0: return NULLREGION; case 1: @@ -509,26 +511,34 @@ BOOL FASTCALL REGION_CopyRegion( - PROSRGNDATA dst, - PROSRGNDATA src) -{ - if (dst != src) // Don't want to copy to itself - { + PREGION dst, + PREGION src) +{ + /* Only copy if source and dest are equal */ + if (dst != src) + { + /* Check if we need to increase our buffer */ if (dst->rdh.nRgnSize < src->rdh.nCount * sizeof(RECT)) { PRECTL temp; - temp = ExAllocatePoolWithTag(PagedPool, src->rdh.nCount * sizeof(RECT), TAG_REGION ); - if (!temp) + /* Allocate a new buffer */ + temp = ExAllocatePoolWithTag(PagedPool, + src->rdh.nCount * sizeof(RECT), + TAG_REGION); + if (temp == NULL) return FALSE; - if (dst->Buffer && dst->Buffer != &dst->rdh.rcBound) - ExFreePoolWithTag(dst->Buffer, TAG_REGION); // Free the old buffer + /* Free the old buffer */ + if ((dst->Buffer != NULL) && (dst->Buffer != &dst->rdh.rcBound)) + ExFreePoolWithTag(dst->Buffer, TAG_REGION); + + /* Set the new buffer and the size */ dst->Buffer = temp; - dst->rdh.nRgnSize = src->rdh.nCount * sizeof(RECT); // Size of region buffer - } - - dst->rdh.nCount = src->rdh.nCount; // Number of rectangles present in Buffer + dst->rdh.nRgnSize = src->rdh.nCount * sizeof(RECT); + } + + dst->rdh.nCount = src->rdh.nCount; dst->rdh.rcBound.left = src->rdh.rcBound.left; dst->rdh.rcBound.top = src->rdh.rcBound.top; dst->rdh.rcBound.right = src->rdh.rcBound.right; @@ -541,13 +551,14 @@ } static -void +VOID FASTCALL REGION_SetExtents( - ROSRGNDATA *pReg) + PREGION pReg) { RECTL *pRect, *pRectEnd, *pExtents; + /* Quick check for NULLREGION */ if (pReg->rdh.nCount == 0) { pReg->rdh.rcBound.left = 0; @@ -599,12 +610,14 @@ POINT pt = {0,0}; const POINT *off = offset; - if (!off) off = &pt; + if (off == NULL) + off = &pt; /* Just copy and offset */ - if (!rect) + if (rect == NULL) { PRECTL xrect; + if (rgnDst == rgnSrc) { if (off->x || off->y) @@ -617,7 +630,7 @@ xrect = ExAllocatePoolWithTag(PagedPool, rgnSrc->rdh.nCount * sizeof(RECT), TAG_REGION); - if(!xrect) + if (xrect == NULL) return ERROR; /* Free the old buffer. Will be assigned to xrect below. */ @@ -633,6 +646,7 @@ if (off->x || off->y) { ULONG i; + for (i = 0; i < rgnDst->rdh.nCount; i++) { xrect[i].left = (rgnSrc->Buffer + i)->left + off->x; @@ -655,7 +669,7 @@ } else if ((rect->left >= rect->right) || (rect->top >= rect->bottom) || - !EXTENTCHECK(rect, &rgnSrc->rdh.rcBound)) + (EXTENTCHECK(rect, &rgnSrc->rdh.rcBound) == 0)) { goto empty; } @@ -698,7 +712,7 @@ { PRECTL temp; temp = ExAllocatePoolWithTag(PagedPool, nRgnSize, TAG_REGION); - if (!temp) + if (temp == NULL) return ERROR; /* Free the old buffer */ @@ -767,7 +781,7 @@ return REGION_Complexity(rgnDst); empty: - if (!rgnDst->Buffer) + if (rgnDst->Buffer == NULL) { rgnDst->Buffer = &rgnDst->rdh.rcBound; } @@ -795,16 +809,16 @@ INT FASTCALL REGION_Coalesce( - PROSRGNDATA pReg, /* Region to coalesce */ - INT prevStart, /* Index of start of previous band */ - INT curStart) /* Index of start of current band */ -{ - RECTL *pPrevRect; /* Current rect in previous band */ - RECTL *pCurRect; /* Current rect in current band */ - RECTL *pRegEnd; /* End of region */ - INT curNumRects; /* Number of rectangles in current band */ - INT prevNumRects; /* Number of rectangles in previous band */ - INT bandtop; /* Top coordinate for current band */ + PREGION pReg, /* Region to coalesce */ + INT prevStart, /* Index of start of previous band */ + INT curStart) /* Index of start of current band */ +{ + RECTL *pPrevRect; /* Current rect in previous band */ + RECTL *pCurRect; /* Current rect in current band */ + RECTL *pRegEnd; /* End of region */ + INT curNumRects; /* Number of rectangles in current band */ + INT prevNumRects; /* Number of rectangles in previous band */ + INT bandtop; /* Top coordinate for current band */ pRegEnd = pReg->Buffer + pReg->rdh.nCount; pPrevRect = pReg->Buffer + prevStart; @@ -833,6 +847,7 @@ { pRegEnd--; } + curStart = pRegEnd - pReg->Buffer; pRegEnd = pReg->Buffer + pReg->rdh.nCount; } @@ -840,6 +855,7 @@ if ((curNumRects == prevNumRects) && (curNumRects != 0)) { pCurRect -= curNumRects; + /* The bands may only be coalesced if the bottom of the previous * matches the top scanline of the current. */ if (pPrevRect->bottom == pCurRect->top) @@ -928,12 +944,12 @@ * */ static -void +VOID FASTCALL REGION_RegionOp( - ROSRGNDATA *newReg, /* Place to store result */ - ROSRGNDATA *reg1, /* First region in operation */ - ROSRGNDATA *reg2, /* 2nd region in operation */ + PREGION newReg, /* Place to store result */ + PREGION reg1, /* First region in operation */ + PREGION reg2, /* 2nd region in operation */ overlapProcp overlapFunc, /* Function to call for over-lapping bands */ nonOverlapProcp nonOverlap1Func, /* Function to call for non-overlapping bands in region 1 */ nonOverlapProcp nonOverlap2Func) /* Function to call for non-overlapping bands in region 2 */ @@ -963,7 +979,6 @@ r1End = r1 + reg1->rdh.nCount; r2End = r2 + reg2->rdh.nCount; - /* newReg may be one of the src regions so we can't empty it. We keep a * note of its rects pointer (so that we can free them later), preserve its * extents and simply set numRects to zero. */ @@ -980,7 +995,7 @@ newReg->Buffer = ExAllocatePoolWithTag(PagedPool, newReg->rdh.nRgnSize, TAG_REGION); - if (!newReg->Buffer) + if (newReg->Buffer == NULL) { newReg->rdh.nRgnSize = 0; return; @@ -1010,7 +1025,6 @@ * the possible expansion, and resultant moving, of the new region's * array of rectangles. */ prevBand = 0; - do { curBand = newReg->rdh.nCount; @@ -1149,7 +1163,7 @@ if (newReg->rdh.nCount != curBand) { - (void) REGION_Coalesce(newReg, prevBand, curBand); + (VOID)REGION_Coalesce(newReg, prevBand, curBand); } /* A bit of cleanup. To keep regions from growing without bound, @@ -1158,7 +1172,8 @@ * * Only do this stuff if the number of rectangles allocated is more than * twice the number of rectangles in the region (a simple optimization...). */ - if ((2 * newReg->rdh.nCount * sizeof(RECT) < newReg->rdh.nRgnSize) && (newReg->rdh.nCount > 2)) + if ((newReg->rdh.nRgnSize > (2 * newReg->rdh.nCount * sizeof(RECT))) && + (newReg->rdh.nCount > 2)) { if (REGION_NOT_EMPTY(newReg)) { @@ -1167,8 +1182,10 @@ newReg->rdh.nCount * sizeof(RECT), TAG_REGION); - if (!newReg->Buffer) + if (newReg->Buffer == NULL) + { newReg->Buffer = prev_rects; + } else { newReg->rdh.nRgnSize = newReg->rdh.nCount*sizeof(RECT); @@ -1185,7 +1202,9 @@ if (newReg->Buffer != &newReg->rdh.rcBound) ExFreePoolWithTag(newReg->Buffer, TAG_REGION); - newReg->Buffer = ExAllocatePoolWithTag(PagedPool, sizeof(RECT), TAG_REGION); + newReg->Buffer = ExAllocatePoolWithTag(PagedPool, + sizeof(RECT), + TAG_REGION); ASSERT(newReg->Buffer); } } @@ -1213,16 +1232,16 @@ * */ static -void +VOID FASTCALL REGION_IntersectO( - PROSRGNDATA pReg, - PRECTL r1, - PRECTL r1End, - PRECTL r2, - PRECTL r2End, - INT top, - INT bottom) + PREGION pReg, + PRECTL r1, + PRECTL r1End, + PRECTL r2, + PRECTL r2End, + INT top, + INT bottom) { INT left, right; RECTL *pNextRect; @@ -1275,24 +1294,29 @@ * REGION_IntersectRegion */ static -void +VOID FASTCALL REGION_IntersectRegion( - ROSRGNDATA *newReg, - ROSRGNDATA *reg1, - ROSRGNDATA *reg2) + PREGION newReg, + PREGION reg1, + PREGION reg2) { /* Check for trivial reject */ - if ( (!(reg1->rdh.nCount)) || (!(reg2->rdh.nCount)) || - (!EXTENTCHECK(&reg1->rdh.rcBound, &reg2->rdh.rcBound)) ) + if ((reg1->rdh.nCount == 0) || + (reg2->rdh.nCount == 0) || + (EXTENTCHECK(&reg1->rdh.rcBound, &reg2->rdh.rcBound) == 0)) + { newReg->rdh.nCount = 0; + } else + { REGION_RegionOp(newReg, reg1, reg2, REGION_IntersectO, NULL, NULL); + } /* Can't alter newReg's extents before we call miRegionOp because * it might be one of the source regions and miRegionOp depends @@ -1320,14 +1344,14 @@ * */ static -void +VOID FASTCALL REGION_UnionNonO( - PROSRGNDATA pReg, - PRECTL r, - PRECTL rEnd, - INT top, - INT bottom) + PREGION pReg, + PRECTL r, + PRECTL rEnd, + INT top, + INT bottom) { RECTL *pNextRect; @@ -1361,16 +1385,16 @@ * */ static -void +VOID FASTCALL REGION_UnionO ( - PROSRGNDATA pReg, - PRECTL r1, - PRECTL r1End, - PRECTL r2, - PRECTL r2End, - INT top, - INT bottom) + PREGION pReg, + PRECTL r1, + PRECTL r1End, + PRECTL r2, + PRECTL r2End, + INT top, + INT bottom) { RECTL *pNextRect; @@ -1420,10 +1444,12 @@ while (r1 != r1End); } else + { while (r2 != r2End) { MERGERECT(r2); } + } return; } @@ -1431,17 +1457,19 @@ /*********************************************************************** * REGION_UnionRegion */ -static void FASTCALL +static +VOID +FASTCALL REGION_UnionRegion( - ROSRGNDATA *newReg, - ROSRGNDATA *reg1, - ROSRGNDATA *reg2) + PREGION newReg, + PREGION reg1, + PREGION reg2) { /* Checks all the simple cases * Region 1 and 2 are the same or region 1 is empty */ - if (reg1 == reg2 || 0 == reg1->rdh.nCount || - reg1->rdh.rcBound.right <= reg1->rdh.rcBound.left || - reg1->rdh.rcBound.bottom <= reg1->rdh.rcBound.top) + if ((reg1 == reg2) || (reg1->rdh.nCount == 0) || + (reg1->rdh.rcBound.right <= reg1->rdh.rcBound.left) || + (reg1->rdh.rcBound.bottom <= reg1->rdh.rcBound.top)) { if (newReg != reg2) { @@ -1452,23 +1480,24 @@ } /* If nothing to union (region 2 empty) */ - if (0 == reg2->rdh.nCount || - reg2->rdh.rcBound.right <= reg2->rdh.rcBound.left || - reg2->rdh.rcBound.bottom <= reg2->rdh.rcBound.top) + if ((reg2->rdh.nCount == 0) || + (reg2->rdh.rcBound.right <= reg2->rdh.rcBound.left) || + (reg2->rdh.rcBound.bottom <= reg2->rdh.rcBound.top)) { if (newReg != reg1) { REGION_CopyRegion(newReg, reg1); } + return; } /* Region 1 completely subsumes region 2 */ - if (1 == reg1->rdh.nCount && - reg1->rdh.rcBound.left <= reg2->rdh.rcBound.left && - reg1->rdh.rcBound.top <= reg2->rdh.rcBound.top && - reg2->rdh.rcBound.right <= reg1->rdh.rcBound.right && - reg2->rdh.rcBound.bottom <= reg1->rdh.rcBound.bottom) + if ((reg1->rdh.nCount == 1) && + (reg1->rdh.rcBound.left <= reg2->rdh.rcBound.left) && + (reg1->rdh.rcBound.top <= reg2->rdh.rcBound.top) && + (reg2->rdh.rcBound.right <= reg1->rdh.rcBound.right) && + (reg2->rdh.rcBound.bottom <= reg1->rdh.rcBound.bottom)) { if (newReg != reg1) { @@ -1479,11 +1508,11 @@ } /* Region 2 completely subsumes region 1 */ - if (1 == reg2->rdh.nCount && - reg2->rdh.rcBound.left <= reg1->rdh.rcBound.left && - reg2->rdh.rcBound.top <= reg1->rdh.rcBound.top && - reg1->rdh.rcBound.right <= reg2->rdh.rcBound.right && - reg1->rdh.rcBound.bottom <= reg2->rdh.rcBound.bottom) + if ((reg2->rdh.nCount == 1) && + (reg2->rdh.rcBound.left <= reg1->rdh.rcBound.left) && + (reg2->rdh.rcBound.top <= reg1->rdh.rcBound.top) && + (reg1->rdh.rcBound.right <= reg2->rdh.rcBound.right) && + (reg1->rdh.rcBound.bottom <= reg2->rdh.rcBound.bottom)) { if (newReg != reg2) { @@ -1493,12 +1522,12 @@ return; } - REGION_RegionOp (newReg, - reg1, - reg2, - REGION_UnionO, - REGION_UnionNonO, - REGION_UnionNonO); + REGION_RegionOp(newReg, + reg1, + reg2, + REGION_UnionO, + REGION_UnionNonO, + REGION_UnionNonO); newReg->rdh.rcBound.left = min(reg1->rdh.rcBound.left, reg2->rdh.rcBound.left); newReg->rdh.rcBound.top = min(reg1->rdh.rcBound.top, reg2->rdh.rcBound.top); @@ -1522,14 +1551,14 @@ * */ static -void +VOID FASTCALL REGION_SubtractNonO1( - PROSRGNDATA pReg, - PRECTL r, - PRECTL rEnd, - INT top, - INT bottom) + PREGION pReg, + PRECTL r, + PRECTL rEnd, + INT top, + INT bottom) { RECTL *pNextRect; @@ -1563,16 +1592,16 @@ * */ static -void +VOID FASTCALL REGION_SubtractO( - PROSRGNDATA pReg, - PRECTL r1, - PRECTL r1End, - PRECTL r2, - PRECTL r2End, - INT top, - INT bottom) + PREGION pReg, + PRECTL r1, + PRECTL r1End, + PRECTL r2, + PRECTL r2End, + INT top, + INT bottom) { RECTL *pNextRect; INT left; @@ -1644,6 +1673,7 @@ pReg->rdh.nCount += 1; pNextRect++; } + r1++; if (r1 != r1End) left = r1->left; @@ -1682,17 +1712,17 @@ * */ static -void +VOID FASTCALL REGION_SubtractRegion( - ROSRGNDATA *regD, - ROSRGNDATA *regM, - ROSRGNDATA *regS) + PREGION regD, + PREGION regM, + PREGION regS) { /* Check for trivial reject */ - if ((!(regM->rdh.nCount)) || - (!(regS->rdh.nCount)) || - (!EXTENTCHECK(&regM->rdh.rcBound, &regS->rdh.rcBound)) ) + if ((regM->rdh.nCount == 0) || + (regS->rdh.nCount == 0) || + (EXTENTCHECK(&regM->rdh.rcBound, &regS->rdh.rcBound) == 0)) { REGION_CopyRegion(regD, regM); return; @@ -1717,19 +1747,19 @@ * REGION_XorRegion */ static -void +VOID FASTCALL REGION_XorRegion( - ROSRGNDATA *dr, - ROSRGNDATA *sra, - ROSRGNDATA *srb) + PREGION dr, + PREGION sra, + PREGION srb) { HRGN htra, htrb; - ROSRGNDATA *tra, *trb; + PREGION tra, trb; // FIXME: Don't use a handle tra = REGION_AllocRgnWithHandle(sra->rdh.nCount + 1); - if (!tra ) + if (tra == NULL) { return; } @@ -1737,7 +1767,7 @@ // FIXME: Don't use a handle trb = REGION_AllocRgnWithHandle(srb->rdh.nCount + 1); - if (!trb) + if (trb == NULL) { RGNOBJAPI_Unlock(tra); GreDeleteObject(htra); @@ -1763,10 +1793,10 @@ VOID FASTCALL REGION_UnionRectWithRgn( - ROSRGNDATA *rgn, + PREGION rgn, const RECTL *rect) { - ROSRGNDATA region; + REGION region; region.Buffer = &region.rdh.rcBound; region.rdh.nCount = 1; @@ -1795,7 +1825,7 @@ BOOL FASTCALL REGION_CreateSimpleFrameRgn( - PROSRGNDATA rgn, + PREGION rgn, INT x, INT y) { @@ -1806,8 +1836,8 @@ { prc = rc; - if (rgn->rdh.rcBound.bottom - rgn->rdh.rcBound.top > y * 2 && - rgn->rdh.rcBound.right - rgn->rdh.rcBound.left > x * 2) + if ((rgn->rdh.rcBound.bottom - rgn->rdh.rcBound.top > y * 2) && + (rgn->rdh.rcBound.right - rgn->rdh.rcBound.left > x * 2)) { if (y != 0) { @@ -1854,8 +1884,10 @@ rgn->rdh.nCount = (DWORD)(prc - rc); ASSERT(rgn->rdh.nCount > 1); rgn->rdh.nRgnSize = rgn->rdh.nCount * sizeof(RECT); - rgn->Buffer = ExAllocatePoolWithTag(PagedPool, rgn->rdh.nRgnSize, TAG_REGION); - if (!rgn->Buffer) + rgn->Buffer = ExAllocatePoolWithTag(PagedPool, + rgn->rdh.nRgnSize, + TAG_REGION); + if (rgn->Buffer == NULL) { rgn->rdh.nRgnSize = 0; return FALSE; @@ -1869,18 +1901,20 @@ return TRUE; } -BOOL FASTCALL +BOOL +FASTCALL REGION_CreateFrameRgn( HRGN hDest, HRGN hSrc, INT x, INT y) { - PROSRGNDATA srcObj, destObj; + PREGION srcObj, destObj; PRECTL rc; ULONG i; - if (!(srcObj = RGNOBJAPI_Lock(hSrc, NULL))) + srcObj = RGNOBJAPI_Lock(hSrc, NULL); + if (srcObj == NULL) { return FALSE; } @@ -1891,7 +1925,8 @@ return FALSE; } - if (!(destObj = RGNOBJAPI_Lock(hDest, NULL))) + destObj = RGNOBJAPI_Lock(hDest, NULL); + if (destObj == NULL) { RGNOBJAPI_Unlock(srcObj); return FALSE; @@ -1936,6 +1971,7 @@ rc->right -= 2 * x; rc++; } + REGION_IntersectRegion(destObj, destObj, srcObj); /* Original region moved down */ @@ -1959,6 +1995,7 @@ rc->bottom -= 2 * y; rc++; } + REGION_IntersectRegion(destObj, destObj, srcObj); /* Restore the original region */ @@ -1969,6 +2006,7 @@ rc->bottom += y; rc++; } + REGION_SubtractRegion(destObj, srcObj, destObj); } @@ -1990,7 +2028,7 @@ RECTL tmpRect; PDC_ATTR pdcattr; - if (!dc) + if (dc == NULL) return FALSE; pdcattr = dc->pdcattr; @@ -2036,18 +2074,18 @@ return TRUE; } -PROSRGNDATA +PREGION FASTCALL REGION_AllocRgnWithHandle( INT nReg) { //HRGN hReg; - PROSRGNDATA pReg; - - pReg = (PROSRGNDATA)GDIOBJ_AllocateObject(GDIObjType_RGN_TYPE, - sizeof(REGION), - BASEFLAG_LOOKASIDE); - if (!pReg) + PREGION pReg; + + pReg = (PREGION)GDIOBJ_AllocateObject(GDIObjType_RGN_TYPE, + sizeof(REGION), + BASEFLAG_LOOKASIDE); + if (pReg == NULL) { DPRINT1("Could not allocate a palette.\n"); return NULL; @@ -2062,7 +2100,7 @@ //hReg = pReg->BaseObject.hHmgr; - if (nReg == 0 || nReg == 1) + if ((nReg == 0) || (nReg == 1)) { /* Testing shows that > 95% of all regions have only 1 rect. Including that here saves us from having to do another allocation */ @@ -2070,8 +2108,10 @@ } else { - pReg->Buffer = ExAllocatePoolWithTag(PagedPool, nReg * sizeof(RECT), TAG_REGION); - if (!pReg->Buffer) + pReg->Buffer = ExAllocatePoolWithTag(PagedPool, + nReg * sizeof(RECT), + TAG_REGION); + if (pReg->Buffer == NULL) { DPRINT1("Could not allocate region buffer\n"); GDIOBJ_vDeleteObject(&pReg->BaseObject); @@ -2100,7 +2140,7 @@ ASSERT(ppi); prgnattr = GdiPoolAllocate(ppi->pPoolRgnAttr); - if (!prgnattr) + if (prgnattr == NULL) { DPRINT1("Could not allocate RGN attr\n"); return FALSE; @@ -2117,7 +2157,7 @@ // // Allocate User Space Region Handle. // -PROSRGNDATA +PREGION FASTCALL REGION_AllocUserRgnWithHandle( INT nRgn) @@ -2125,7 +2165,7 @@ PREGION prgn; prgn = REGION_AllocRgnWithHandle(nRgn); - if (!prgn) + if (prgn == NULL) { return NULL; } @@ -2157,19 +2197,19 @@ { if ( pRgn_Attr->AttrFlags & (ATTR_RGN_VALID|ATTR_RGN_DIRTY) ) { - switch (pRgn_Attr->Flags) + switch (pRgn_Attr->iComplexity) { - case NULLREGION: - EMPTY_REGION( pRgn ); - break; - - case SIMPLEREGION: - REGION_SetRectRgn( pRgn, - pRgn_Attr->Rect.left, - pRgn_Attr->Rect.top, - pRgn_Attr->Rect.right, - pRgn_Attr->Rect.bottom ); - break; + case NULLREGION: + EMPTY_REGION( pRgn ); + break; + + case SIMPLEREGION: + REGION_SetRectRgn( pRgn, + pRgn_Attr->Rect.left, + pRgn_Attr->Rect.top, + pRgn_Attr->Rect.right, + pRgn_Attr->Rect.bottom ); + break; } pRgn_Attr->AttrFlags &= ~ATTR_RGN_DIRTY; } @@ -2177,7 +2217,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - (void)0; + (VOID)0; } _SEH2_END; } @@ -2185,15 +2225,17 @@ } -PROSRGNDATA +PREGION FASTCALL RGNOBJAPI_Lock( HRGN hRgn, PRGN_ATTR *ppRgn_Attr) { - PROSRGNDATA pRgn = NULL; + PREGION pRgn; pRgn = REGION_LockRgn(hRgn); + if (pRgn == NULL) + return NULL; REGION_vSyncRegion(pRgn); @@ -2206,7 +2248,7 @@ VOID FASTCALL RGNOBJAPI_Unlock( - PROSRGNDATA pRgn) + PREGION pRgn) { PRGN_ATTR pRgn_Attr; @@ -2220,7 +2262,7 @@ { if ( pRgn_Attr->AttrFlags & ATTR_RGN_VALID ) { - pRgn_Attr->Flags = REGION_Complexity( pRgn ); + pRgn_Attr->iComplexity = REGION_Complexity( pRgn ); pRgn_Attr->Rect.left = pRgn->rdh.rcBound.left; pRgn_Attr->Rect.top = pRgn->rdh.rcBound.top; pRgn_Attr->Rect.right = pRgn->rdh.rcBound.right; @@ -2229,7 +2271,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - (void)0; + (VOID)0; } _SEH2_END; } @@ -2245,7 +2287,7 @@ // // System Region Functions // -PROSRGNDATA +PREGION FASTCALL IntSysCreateRectpRgn( INT LeftRect, @@ -2257,7 +2299,7 @@ /* Allocate a region, witout a handle */ prgn = (PREGION)GDIOBJ_AllocateObject(GDIObjType_RGN_TYPE, sizeof(REGION), BASEFLAG_LOOKASIDE); - if (!prgn) + if (prgn == NULL) { return NULL; } @@ -2274,7 +2316,7 @@ NTAPI REGION_vCleanup(PVOID ObjectBody) { - PROSRGNDATA pRgn = (PROSRGNDATA)ObjectBody; + PREGION pRgn = (PREGION)ObjectBody; PPROCESSINFO ppi = PsGetCurrentProcessWin32Process(); ASSERT(ppi); @@ -2288,9 +2330,11 @@ VOID FASTCALL -REGION_Delete(PROSRGNDATA pRgn) -{ - if ( pRgn == prgnDefault) return; +REGION_Delete(PREGION pRgn) +{ + if (pRgn == prgnDefault) + return; + GDIOBJ_vDeleteObject(&pRgn->BaseObject); } @@ -2322,7 +2366,7 @@ VOID FASTCALL -IntUpdateVisRectRgn(PDC pDC, PROSRGNDATA pRgn) +IntUpdateVisRectRgn(PDC pDC, PREGION pRgn) { INT Index = GDI_HANDLE_GET_INDEX(pDC->BaseObject.hHmgr); PGDI_TABLE_ENTRY Entry = &GdiHandleTable->Entries[Index]; @@ -2333,9 +2377,9 @@ { pdcattr = pDC->pdcattr; - pdcattr->VisRectRegion.Flags = REGION_Complexity(pRgn); - - if (pRgn && pdcattr->VisRectRegion.Flags != NULLREGION) + pdcattr->VisRectRegion.iComplexity = REGION_Complexity(pRgn); + + if (pRgn && pdcattr->VisRectRegion.iComplexity != NULLREGION) { rcl.left = pRgn->rdh.rcBound.left; rcl.top = pRgn->rdh.rcBound.top; @@ -2348,7 +2392,9 @@ rcl.bottom -= pDC->erclWindow.top; } else + { RECTL_vSetEmptyRect(&rcl); + } pdcattr->VisRectRegion.Rect = rcl; @@ -2365,7 +2411,7 @@ PPROCESSINFO ppi; prgn = RGNOBJAPI_Lock(hRgn, &prgnattr); - if (!prgn) + if (prgn == NULL) { return FALSE; } @@ -2377,6 +2423,7 @@ ppi = PsGetCurrentProcessWin32Process(); GdiPoolFree(ppi->pPoolRgnAttr, prgnattr); } + RGNOBJAPI_Unlock(prgn); return GreSetObjectOwner(hRgn, OwnerMask); @@ -2385,19 +2432,19 @@ INT FASTCALL IntGdiCombineRgn( - PROSRGNDATA prgnDest, - PROSRGNDATA prgnSrc1, - PROSRGNDATA prgnSrc2, + PREGION prgnDest, + PREGION prgnSrc1, + PREGION prgnSrc2, INT iCombineMode) { - if (!prgnDest) + if (prgnDest == NULL) { DPRINT("IntGdiCombineRgn: hDest unavailable\n"); return ERROR; } - if (!prgnSrc1) + if (prgnSrc1 == NULL) { DPRINT("IntGdiCombineRgn: hSrc1 unavailable\n"); return ERROR; @@ -2407,10 +2454,11 @@ { if (!REGION_CopyRegion(prgnDest, prgnSrc1)) return ERROR; + return REGION_Complexity(prgnDest); } - if (!prgnSrc2) + if (prgnSrc2 == NULL) { DPRINT1("IntGdiCombineRgn requires hSrc2 != NULL for combine mode %d!\n", iCombineMode); ASSERT(FALSE); @@ -2439,12 +2487,12 @@ INT FASTCALL REGION_GetRgnBox( - PROSRGNDATA Rgn, + PREGION Rgn, PRECTL pRect) { DWORD ret; - if (Rgn) + if (Rgn != NULL) { *pRect = Rgn->rdh.rcBound; ret = REGION_Complexity(Rgn); @@ -2460,10 +2508,11 @@ HRGN hRgn, PRECTL pRect) { - PROSRGNDATA Rgn; + PREGION Rgn; DWORD ret; - if (!(Rgn = RGNOBJAPI_Lock(hRgn, NULL))) + Rgn = RGNOBJAPI_Lock(hRgn, NULL); + if (Rgn == NULL) { return ERROR; } @@ -2480,14 +2529,14 @@ PDC dc, PREGION Rgn) { - PROSRGNDATA VisRgn; + PREGION VisRgn; XCLIPOBJ ClipRegion; BOOL bRet = FALSE; POINTL BrushOrigin; SURFACE *psurf; PDC_ATTR pdcattr; - if (!dc || !Rgn) + if ((dc == NULL) || (Rgn == NULL)) return FALSE; pdcattr = dc->pdcattr; @@ -2495,7 +2544,7 @@ ASSERT(!(pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY))); VisRgn = IntSysCreateRectpRgn(0, 0, 0, 0); - if (!VisRgn) + if (VisRgn == NULL) { return FALSE; } @@ -2512,7 +2561,10 @@ IntGdiCombineRgn(VisRgn, VisRgn, dc->prgnRao, RGN_AND); IntEngInitClipObj(&ClipRegion); - IntEngUpdateClipRegion(&ClipRegion, VisRgn->rdh.nCount, VisRgn->Buffer, &VisRgn->rdh.rcBound ); + IntEngUpdateClipRegion(&ClipRegion, + VisRgn->rdh.nCount, + VisRgn->Buffer, + &VisRgn->rdh.rcBound ); BrushOrigin.x = pdcattr->ptlBrushOrigin.x; BrushOrigin.y = pdcattr->ptlBrushOrigin.y; @@ -2558,7 +2610,7 @@ BOOL FASTCALL REGION_RectInRegion( - PROSRGNDATA Rgn, + PREGION Rgn, const RECTL *rect) { PRECTL pCurRect, pRectEnd; @@ -2566,7 +2618,7 @@ /* Swap the coordinates to make right >= left and bottom >= top */ /* (region building rectangles are normalized the same way) */ - if( rect->top > rect->bottom) + if (rect->top > rect->bottom) { rc.top = rect->bottom; rc.bottom = rect->top; @@ -2577,7 +2629,7 @@ rc.bottom = rect->bottom; } - if( rect->right < rect->left) + if (rect->right < rect->left) { rc.right = rect->left; rc.left = rect->right; @@ -2611,13 +2663,14 @@ return TRUE; } } + return FALSE; } VOID FASTCALL REGION_SetRectRgn( - PROSRGNDATA rgn, + PREGION rgn, INT LeftRect, INT TopRect, INT RightRect, @@ -2659,7 +2712,7 @@ INT FASTCALL IntGdiOffsetRgn( - PROSRGNDATA rgn, + PREGION rgn, INT XOffset, INT YOffset) { @@ -2702,18 +2755,18 @@ * */ static -void +VOID FASTCALL REGION_InsertEdgeInET( - EdgeTable *ET, - EdgeTableEntry *ETE, + EDGE_TABLE *ET, + EDGE_TABLE_ENTRY *ETE, INT scanline, - ScanLineListBlock **SLLBlock, + SCANLINE_LISTBLOCK **SLLBlock, INT *iSLLBlock) { - EdgeTableEntry *start, *prev; - ScanLineList *pSLL, *pPrevSLL; - ScanLineListBlock *tmpSLLBlock; + EDGE_TABLE_ENTRY *start, *prev; + SCANLINE_LIST *pSLL, *pPrevSLL; + SCANLINE_LISTBLOCK *tmpSLLBlock; /* Find the right bucket to put the edge into */ pPrevSLL = &ET->scanlines; @@ -2724,13 +2777,15 @@ pSLL = pSLL->next; } - /* Reassign pSLL (pointer to ScanLineList) if necessary */ + /* Reassign pSLL (pointer to SCANLINE_LIST) if necessary */ if ((!pSLL) || (pSLL->scanline > scanline)) { if (*iSLLBlock > SLLSPERBLOCK-1) { - tmpSLLBlock = ExAllocatePoolWithTag(PagedPool, sizeof(ScanLineListBlock), TAG_REGION); - if (!tmpSLLBlock) + tmpSLLBlock = ExAllocatePoolWithTag(PagedPool, + sizeof(SCANLINE_LISTBLOCK), + TAG_REGION); + if (tmpSLLBlock == NULL) { DPRINT1("REGION_InsertEdgeInETL(): Can't alloc SLLB\n"); /* FIXME: Free resources? */ @@ -2738,7 +2793,7 @@ } (*SLLBlock)->next = tmpSLLBlock; - tmpSLLBlock->next = (ScanLineListBlock *)NULL; + tmpSLLBlock->next = (SCANLINE_LISTBLOCK *)NULL; *SLLBlock = tmpSLLBlock; *iSLLBlock = 0; } @@ -2746,14 +2801,14 @@ pSLL = &((*SLLBlock)->SLLs[(*iSLLBlock)++]); pSLL->next = pPrevSLL->next; - pSLL->edgelist = (EdgeTableEntry *)NULL; + pSLL->edgelist = (EDGE_TABLE_ENTRY *)NULL; pPrevSLL->next = pSLL; } pSLL->scanline = scanline; /* Now insert the edge in the right bucket */ - prev = (EdgeTableEntry *)NULL; + prev = (EDGE_TABLE_ENTRY *)NULL; start = pSLL->edgelist; while (start && (start->bres.minor_axis < ETE->bres.minor_axis)) { @@ -2772,20 +2827,20 @@ /*********************************************************************** * REGION_loadAET * - * This routine moves EdgeTableEntries from the - * EdgeTable into the Active Edge Table, + * This routine moves EDGE_TABLEEntries from the + * EDGE_TABLE into the Active Edge Table, * leaving them sorted by smaller x coordinate. * */ static -void +VOID FASTCALL REGION_loadAET( - EdgeTableEntry *AET, - EdgeTableEntry *ETEs) -{ - EdgeTableEntry *pPrevAET; - EdgeTableEntry *tmp; + EDGE_TABLE_ENTRY *AET, + EDGE_TABLE_ENTRY *ETEs) +{ + EDGE_TABLE_ENTRY *pPrevAET; + EDGE_TABLE_ENTRY *tmp; pPrevAET = AET; AET = AET->next; @@ -2814,7 +2869,7 @@ * REGION_computeWAET * * This routine links the AET by the - * nextWETE (winding EdgeTableEntry) link for + * nextWETE (winding EDGE_TABLE_ENTRY) link for * use by the winding number rule. The final * Active Edge Table (AET) might look something * like: @@ -2831,16 +2886,16 @@ * */ static -void +VOID FASTCALL REGION_computeWAET( - EdgeTableEntry *AET) -{ - register EdgeTableEntry *pWETE; - register int inside = 1; - register int isInside = 0; - - AET->nextWETE = (EdgeTableEntry *)NULL; + EDGE_TABLE_ENTRY *AET) +{ + register EDGE_TABLE_ENTRY *pWETE; + register INT inside = 1; + register INT isInside = 0; + + AET->nextWETE = (EDGE_TABLE_ENTRY *)NULL; pWETE = AET; AET = AET->next; while (AET) @@ -2860,7 +2915,7 @@ AET = AET->next; } - pWETE->nextWETE = (EdgeTableEntry *)NULL; + pWETE->nextWETE = (EDGE_TABLE_ENTRY *)NULL; } /*********************************************************************** @@ -2875,11 +2930,11 @@ BOOL FASTCALL REGION_InsertionSort( - EdgeTableEntry *AET) -{ - EdgeTableEntry *pETEchase; - EdgeTableEntry *pETEinsert; - EdgeTableEntry *pETEchaseBackTMP; + EDGE_TABLE_ENTRY *AET) +{ + EDGE_TABLE_ENTRY *pETEchase; + EDGE_TABLE_ENTRY *pETEinsert; + EDGE_TABLE_ENTRY *pETEchaseBackTMP; BOOL changed = FALSE; AET = AET->next; @@ -2915,12 +2970,12 @@ * Clean up our act. */ static -void +VOID FASTCALL REGION_FreeStorage( - ScanLineListBlock *pSLLBlock) -{ - ScanLineListBlock *tmpSLLBlock; + SCANLINE_LISTBLOCK *pSLLBlock) +{ + SCANLINE_LISTBLOCK *tmpSLLBlock; while (pSLLBlock) { @@ -2940,15 +2995,15 @@ INT FASTCALL REGION_PtsToRegion( - int numFullPtBlocks, - int iCurPtBlock, + INT numFullPtBlocks, + INT iCurPtBlock, POINTBLOCK *FirstPtBlock, - ROSRGNDATA *reg) + PREGION reg) { RECTL *rects; POINT *pts; POINTBLOCK *CurPtBlock; - int i; + INT i; RECTL *extents, *temp; INT numRects; @@ -2962,10 +3017,12 @@ numRects = 1; } - if (!(temp = ExAllocatePoolWithTag(PagedPool, numRects * sizeof(RECT), TAG_REGION))) + temp = ExAllocatePoolWithTag(PagedPool, numRects * sizeof(RECT), TAG_REGION); + if (temp == NULL) { return 0; } + if (reg->Buffer != NULL) { COPY_RECTS(temp, reg->Buffer, reg->rdh.nCount); @@ -2984,17 +3041,19 @@ { /* The loop uses 2 points per iteration */ i = NUMPTSTOBUFFER >> 1; - if (!numFullPtBlocks) + if (numFullPtBlocks == 0) i = iCurPtBlock >> 1; for (pts = CurPtBlock->pts; i--; pts += 2) { if (pts->x == pts[1].x) continue; - if (numRects && pts->x == rects->left && pts->y == rects->bottom && - pts[1].x == rects->right && - (numRects == 1 || rects[-1].top != rects->top) && - (i && pts[2].y > pts[1].y)) + + if ((numRects && pts->x == rects->left) && + (pts->y == rects->bottom) && + (pts[1].x == rects->right) && + ((numRects == 1) || (rects[-1].top != rects->top)) && + (i && pts[2].y > pts[1].y)) { rects->bottom = pts[1].y + 1; continue; @@ -3006,6 +3065,7 @@ rects->top = pts->y; rects->right = pts[1].x; rects->bottom = pts[1].y + 1; + if (rects->left < extents->left) extents->left = rects->left; if (rects->right > extents->right) @@ -3034,15 +3094,15 @@ } /*********************************************************************** - * REGION_CreateEdgeTable + * REGION_CreateEDGE_TABLE * * This routine creates the edge table for * scan converting polygons. * The Edge Table (ET) looks like: * - * EdgeTable + * EDGE_TABLE * -------- - * | ymax | ScanLineLists + * | ymax | SCANLINE_LISTs * |scanline|-->------------>-------------->... * -------- |scanline| |scanline| * |edgelist| |edgelist| @@ -3052,41 +3112,40 @@ * V V * list of ETEs list of ETEs * - * where ETE is an EdgeTableEntry data structure, - * and there is one ScanLineList per scanline at + * where ETE is an EDGE_TABLE_ENTRY data structure, + * and there is one SCANLINE_LIST per scanline at * which an edge is initially entered. * */ static -void +VOID FASTCALL REGION_CreateETandAET( const ULONG *Count, INT nbpolygons, const POINT *pts, - EdgeTable *ET, - EdgeTableEntry *AET, - EdgeTableEntry *pETEs, - ScanLineListBlock *pSLLBlock) + EDGE_TABLE *ET, + EDGE_TABLE_ENTRY *AET, + EDGE_TABLE_ENTRY *pETEs, + SCANLINE_LISTBLOCK *pSLLBlock) { const POINT *top, *bottom; const POINT *PrevPt, *CurrPt, *EndPt; INT poly, count; - int iSLLBlock = 0; - int dy; - + INT iSLLBlock = 0; + INT dy; /* Initialize the Active Edge Table */ - AET->next = (EdgeTableEntry *)NULL; - AET->back = (EdgeTableEntry *)NULL; - AET->nextWETE = (EdgeTableEntry *)NULL; + AET->next = (EDGE_TABLE_ENTRY *)NULL; + AET->back = (EDGE_TABLE_ENTRY *)NULL; + AET->nextWETE = (EDGE_TABLE_ENTRY *)NULL; AET->bres.minor_axis = SMALL_COORDINATE; /* Initialize the Edge Table. */ - ET->scanlines.next = (ScanLineList *)NULL; + ET->scanlines.next = (SCANLINE_LIST *)NULL; ET->ymax = SMALL_COORDINATE; ET->ymin = LARGE_COORDINATE; - pSLLBlock->next = (ScanLineListBlock *)NULL; + pSLLBlock->next = (SCANLINE_LISTBLOCK *)NULL; EndPt = pts - 1; for (poly = 0; poly < nbpolygons; poly++) @@ -3154,21 +3213,21 @@ INT mode, PREGION Rgn) { - EdgeTableEntry *pAET; /* Active Edge Table */ - INT y; /* Current scanline */ - int iPts = 0; /* Number of pts in buffer */ - EdgeTableEntry *pWETE; /* Winding Edge Table Entry */ - ScanLineList *pSLL; /* Current scanLineList */ - POINT *pts; /* Output buffer */ - EdgeTableEntry *pPrevAET; /* Pointer to previous AET */ - EdgeTable ET; /* Header node for ET */ - EdgeTableEntry AET; /* Header node for AET */ - EdgeTableEntry *pETEs; /* EdgeTableEntries pool */ - ScanLineListBlock SLLBlock; /* Header for scanlinelist */ - int fixWAET = FALSE; - POINTBLOCK FirstPtBlock, *curPtBlock; /* PtBlock buffers */ + EDGE_TABLE_ENTRY *pAET; /* Active Edge Table */ + INT y; /* Current scanline */ + INT iPts = 0; /* Number of pts in buffer */ + EDGE_TABLE_ENTRY *pWETE; /* Winding Edge Table Entry */ + SCANLINE_LIST *pSLL; /* Current SCANLINE_LIST */ + POINT *pts; /* Output buffer */ + EDGE_TABLE_ENTRY *pPrevAET; /* Pointer to previous AET */ + EDGE_TABLE ET; /* Header node for ET */ + EDGE_TABLE_ENTRY AET; /* Header node for AET */ + EDGE_TABLE_ENTRY *pETEs; /* EDGE_TABLEEntries pool */ + SCANLINE_LISTBLOCK SLLBlock; /* Header for SCANLINE_LIST */ + INT fixWAET = FALSE; + POINTBLOCK FirstPtBlock, *curPtBlock; /* PtBlock buffers */ POINTBLOCK *tmpPtBlock; - int numFullPtBlocks = 0; + INT numFullPtBlocks = 0; INT poly, total; if (mode == 0 || mode > 2) return 0; @@ -3196,7 +3255,10 @@ for (poly = total = 0; poly < nbpolygons; poly++) total += Count[poly]; - if (!(pETEs = ExAllocatePoolWithTag(PagedPool, sizeof(EdgeTableEntry) * total, TAG_REGION)) ) + pETEs = ExAllocatePoolWithTag(PagedPool, + sizeof(EDGE_TABLE_ENTRY) * total, + TAG_REGION); + if (pETEs == NULL) { return FALSE; } @@ -3230,8 +3292,10 @@ /* Send out the buffer */ if (iPts == NUMPTSTOBUFFER) { - tmpPtBlock = ExAllocatePoolWithTag(PagedPool, sizeof(POINTBLOCK), TAG_REGION); - if (!tmpPtBlock) + tmpPtBlock = ExAllocatePoolWithTag(PagedPool, + sizeof(POINTBLOCK), + TAG_REGION); + if (tmpPtBlock == NULL) { DPRINT1("Can't alloc tPB\n"); ExFreePoolWithTag(pETEs, TAG_REGION); @@ -3264,6 +3328,7 @@ REGION_computeWAET(&AET); pSLL = pSLL->next; } + pPrevAET = &AET; pAET = AET.next; pWETE = pAET; @@ -3282,8 +3347,9 @@ if (iPts == NUMPTSTOBUFFER) { tmpPtBlock = ExAllocatePoolWithTag(PagedPool, - sizeof(POINTBLOCK), TAG_REGION); - if (!tmpPtBlock) + sizeof(POINTBLOCK), + TAG_REGION); + if (tmpPtBlock == NULL) { DPRINT1("Can't alloc tPB\n"); ExFreePoolWithTag(pETEs, TAG_REGION); @@ -3332,10 +3398,11 @@ HRGN hRgn, LPRECTL rc) { - PROSRGNDATA Rgn; + PREGION Rgn; BOOL Ret; - if (!(Rgn = RGNOBJAPI_Lock(hRgn, NULL))) + Rgn = RGNOBJAPI_Lock(hRgn, NULL); + if (Rgn == NULL) { return ERROR; } @@ -3361,12 +3428,16 @@ PREGION aprgn[3]; INT iResult; - if (iMode < RGN_AND || iMode > RGN_COPY) + /* Validate the combine mode */ + if ((iMode < RGN_AND) || (iMode > RGN_COPY)) { return ERROR; } - if (!hrgnDst || !hrgnSrc1 || (iMode != RGN_COPY && !hrgnSrc2)) + /* Validate that we have the required regions */ + if ((hrgnDst == NULL) || + (hrgnSrc1 == NULL) || + ((iMode != RGN_COPY) && (hrgnSrc2 == NULL))) { DPRINT1("NtGdiCombineRgn: %p, %p, %p, %d\n", hrgnDst, hrgnSrc1, hrgnSrc2, iMode); @@ -3392,10 +3463,14 @@ /* Call the internal function */ iResult = IntGdiCombineRgn(aprgn[0], aprgn[1], aprgn[2], iMode); + /// FIXME: need to sync user attr back + /* Cleanup and return */ REGION_UnlockRgn(aprgn[0]); REGION_UnlockRgn(aprgn[1]); - if (aprgn[2]) REGION_UnlockRgn(aprgn[2]); + if (aprgn[2]) + REGION_UnlockRgn(aprgn[2]); + return iResult; } @@ -3422,15 +3497,17 @@ INT RightRect, INT BottomRect) { - PROSRGNDATA pRgn; + PREGION pRgn; HRGN hRgn; /* Allocate region data structure with space for 1 RECTL */ - if (!(pRgn = REGION_AllocUserRgnWithHandle(1))) + pRgn = REGION_AllocUserRgnWithHandle(1); + if (pRgn == NULL) { EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); return NULL; } + hRgn = pRgn->BaseObject.hHmgr; REGION_SetRectRgn(pRgn, LeftRect, TopRect, RightRect, BottomRect); @@ -3451,9 +3528,9 @@ INT ellipse_width, INT ellipse_height) { - PROSRGNDATA obj; + PREGION obj; HRGN hrgn; - int asq, bsq, d, xd, yd; + INT asq, bsq, d, xd, yd; RECTL rect; /* Make the dimensions sensible */ @@ -3486,8 +3563,10 @@ /* Create region */ d = (ellipse_height < 128) ? ((3 * ellipse_height) >> 2) : 64; - if (!(obj = REGION_AllocUserRgnWithHandle(d))) + obj = REGION_AllocUserRgnWithHandle(d); + if (obj == NULL) return 0; + hrgn = obj->BaseObject.hHmgr; /* Ellipse algorithm, based on an article by K. Porter @@ -3569,15 +3648,17 @@ HRGN hSrcRgn1, HRGN hSrcRgn2) { - PROSRGNDATA rgn1, rgn2; + PREGION rgn1, rgn2; PRECTL tRect1, tRect2; ULONG i; BOOL bRet = FALSE; - if (!(rgn1 = RGNOBJAPI_Lock(hSrcRgn1, NULL))) + rgn1 = RGNOBJAPI_Lock(hSrcRgn1, NULL); + if (rgn1 == NULL) return ERROR; - if (!(rgn2 = RGNOBJAPI_Lock(hSrcRgn2, NULL))) + rgn2 = RGNOBJAPI_Lock(hSrcRgn2, NULL); + if (rgn2 == NULL) { RGNOBJAPI_Unlock(rgn1); return ERROR; @@ -3592,24 +3673,24 @@ goto exit; } - if (rgn1->rdh.rcBound.left != rgn2->rdh.rcBound.left || - rgn1->rdh.rcBound.right != rgn2->rdh.rcBound.right || - rgn1->rdh.rcBound.top != rgn2->rdh.rcBound.top || - rgn1->rdh.rcBound.bottom != rgn2->rdh.rcBound.bottom ) + if ((rgn1->rdh.rcBound.left != rgn2->rdh.rcBound.left) || + (rgn1->rdh.rcBound.right != rgn2->rdh.rcBound.right) || + (rgn1->rdh.rcBound.top != rgn2->rdh.rcBound.top) || + (rgn1->rdh.rcBound.bottom != rgn2->rdh.rcBound.bottom)) goto exit; tRect1 = rgn1->Buffer; tRect2 = rgn2->Buffer; - if (!tRect1 || !tRect2) + if ((tRect1 == NULL) || (tRect2 == NULL)) goto exit; for (i=0; i < rgn1->rdh.nCount; i++) { - if (tRect1[i].left != tRect2[i].left || - tRect1[i].right != tRect2[i].right || - tRect1[i].top != tRect2[i].top || - tRect1[i].bottom != tRect2[i].bottom ) + if ((tRect1[i].left != tRect2[i].left) || + (tRect1[i].right != tRect2[i].right) || + (tRect1[i].top != tRect2[i].top) || + (tRect1[i].bottom != tRect2[i].bottom)) goto exit; } @@ -3629,7 +3710,7 @@ LPRGNDATA RgnData) { HRGN hRgn; - PROSRGNDATA Region; + PREGION Region; DWORD nCount = 0; DWORD iType = 0; DWORD dwSize = 0; @@ -3661,9 +3742,9 @@ } /* Check parameters, but don't set last error here */ - if (Count < sizeof(RGNDATAHEADER) + nCount * sizeof(RECT) || - iType != RDH_RECTANGLES || - dwSize != sizeof(RGNDATAHEADER)) + if ((Count < sizeof(RGNDATAHEADER) + nCount * sizeof(RECT)) || + (iType != RDH_RECTANGLES) || + (dwSize != sizeof(RGNDATAHEADER))) { return NULL; } @@ -3684,7 +3765,8 @@ { REGION_UnionRectWithRgn(Region, &rects[i]); } - if (Xform) + + if (Xform != NULL) { ULONG ret; @@ -3734,15 +3816,17 @@ HBRUSH hBrush) { HBRUSH oldhBrush; - PROSRGNDATA rgn; + PREGION rgn; PRECTL r; - if (NULL == (rgn = RGNOBJAPI_Lock(hRgn, NULL))) + rgn = RGNOBJAPI_Lock(hRgn, NULL); + if (rgn == NULL) { return FALSE; } - if (NULL == (oldhBrush = NtGdiSelectBrush(hDC, hBrush))) + oldhBrush = NtGdiSelectBrush(hDC, hBrush); + if (oldhBrush == NULL) { RGNOBJAPI_Unlock(rgn); return FALSE; @@ -3771,7 +3855,8 @@ HRGN FrameRgn; BOOL Ret; - if (!(FrameRgn = NtGdiCreateRectRgn(0, 0, 0, 0))) + FrameRgn = NtGdiCreateRectRgn(0, 0, 0, 0); + if (FrameRgn == NULL) { return FALSE; } @@ -3795,19 +3880,20 @@ HRGN hRgn, PRECTL pRect) { - PROSRGNDATA Rgn; + PREGION Rgn; RECTL SafeRect; DWORD ret; NTSTATUS Status = STATUS_SUCCESS; - if (!(Rgn = RGNOBJAPI_Lock(hRgn, NULL))) + Rgn = RGNOBJAPI_Lock(hRgn, NULL); + if (Rgn == NULL) { return ERROR; } ret = REGION_GetRgnBox(Rgn, &SafeRect); RGNOBJAPI_Unlock(Rgn); - if (ERROR == ret) + if (ret == ERROR) { return ret; } @@ -3836,11 +3922,12 @@ HDC hDC, HRGN hRgn) { - PROSRGNDATA RgnData; + PREGION RgnData; ULONG i; PRECTL rc; - if (!(RgnData = RGNOBJAPI_Lock(hRgn, NULL))) + RgnData = RGNOBJAPI_Lock(hRgn, NULL); + if (RgnData == NULL) { EngSetLastError(ERROR_INVALID_HANDLE); return FALSE; @@ -3869,12 +3956,13 @@ INT XOffset, INT YOffset) { - PROSRGNDATA rgn = RGNOBJAPI_Lock(hRgn, NULL); + PREGION rgn; INT ret; DPRINT("NtGdiOffsetRgn: hRgn %p Xoffs %d Yoffs %d rgn %p\n", hRgn, XOffset, YOffset, rgn ); - if (!rgn) + rgn = RGNOBJAPI_Lock(hRgn, NULL); + if (rgn == NULL) { DPRINT("NtGdiOffsetRgn: hRgn error\n"); return ERROR; @@ -3896,7 +3984,8 @@ PREGION prgn; BOOL ret; - if (!(prgn = RGNOBJAPI_Lock(hRgn, NULL))) + prgn = RGNOBJAPI_Lock(hRgn, NULL); + if (prgn == NULL) return FALSE; ret = REGION_PtInRegion(prgn, X, Y); @@ -3944,9 +4033,10 @@ INT RightRect, INT BottomRect) { - PROSRGNDATA rgn; - - if (!(rgn = RGNOBJAPI_Lock(hRgn, NULL))) + PREGION rgn; + + rgn = RGNOBJAPI_Lock(hRgn, NULL); + if (rgn == NULL) { return 0; // Per documentation } @@ -3964,10 +4054,11 @@ const RECTL *UnsafeRect) { RECTL SafeRect = { 0 }; - PROSRGNDATA Rgn; + PREGION Rgn; NTSTATUS Status = STATUS_SUCCESS; - if (!(Rgn = RGNOBJAPI_Lock(hDest, NULL))) + Rgn = RGNOBJAPI_Lock(hDest, NULL); + if (Rgn == NULL) { EngSetLastError(ERROR_INVALID_HANDLE); return NULL; @@ -3984,7 +4075,7 @@ } _SEH2_END; - if (! NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) { RGNOBJAPI_Unlock(Rgn); SetLastNtError(Status); @@ -4019,7 +4110,7 @@ /* Lock the region */ prgn = RGNOBJAPI_Lock(hrgn, NULL); - if (!prgn) + if (prgn == NULL) { EngSetLastError(ERROR_INVALID_HANDLE); return 0; Modified: trunk/reactos/win32ss/gdi/ntgdi/region.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/region.h… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/region.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/region.h [iso-8859-1] Thu Dec 18 08:11:19 2014 @@ -4,7 +4,7 @@ /* Internal region data. Can't use RGNDATA structure because buffer is allocated statically */ -typedef struct _ROSRGNDATA +typedef struct _REGION { /* Header for all gdi objects in the handle table. Do not (re)move this. */ @@ -14,7 +14,7 @@ RGNDATAHEADER rdh; RECTL *Buffer; -} ROSRGNDATA, *PROSRGNDATA, *LPROSRGNDATA, REGION, *PREGION; +} REGION, *PREGION; /* Functions ******************************************************************/ @@ -22,41 +22,41 @@ #define REGION_FreeRgn(pRgn) GDIOBJ_FreeObj((POBJ)pRgn, GDIObjType_RGN_TYPE) #define REGION_FreeRgnByHandle(hRgn) GDIOBJ_FreeObjByHandle((HGDIOBJ)hRgn, GDI_OBJECT_TYPE_REGION) -PROSRGNDATA FASTCALL REGION_AllocRgnWithHandle(INT n); -PROSRGNDATA FASTCALL REGION_AllocUserRgnWithHandle(INT n); -VOID FASTCALL REGION_UnionRectWithRgn(ROSRGNDATA *rgn, const RECTL *rect); +PREGION FASTCALL REGION_AllocRgnWithHandle(INT n); +PREGION FASTCALL REGION_AllocUserRgnWithHandle(INT n); +VOID FASTCALL REGION_UnionRectWithRgn(PREGION rgn, const RECTL *rect); INT FASTCALL REGION_SubtractRectFromRgn(PREGION prgnDest, PREGION prgnSrc, const RECTL *prcl); -INT FASTCALL REGION_GetRgnBox(PROSRGNDATA Rgn, RECTL *pRect); -BOOL FASTCALL REGION_RectInRegion(PROSRGNDATA Rgn, const RECTL *rc); +INT FASTCALL REGION_GetRgnBox(PREGION Rgn, RECTL *pRect); +BOOL FASTCALL REGION_RectInRegion(PREGION Rgn, const RECTL *rc); BOOL FASTCALL REGION_PtInRegion(PREGION, INT, INT); -INT FASTCALL REGION_CropAndOffsetRegion(PROSRGNDATA rgnDst, PROSRGNDATA rgnSrc, const RECTL *rect, const POINT *off); -VOID FASTCALL REGION_SetRectRgn(PROSRGNDATA pRgn, INT LeftRect, INT TopRect, INT RightRect, INT BottomRect); +INT FASTCALL REGION_CropAndOffsetRegion(PREGION rgnDst, PREGION rgnSrc, const RECTL *rect, const POINT *off); +VOID FASTCALL REGION_SetRectRgn(PREGION pRgn, INT LeftRect, INT TopRect, INT RightRect, INT BottomRect); VOID NTAPI REGION_vCleanup(PVOID ObjectBody); -extern PROSRGNDATA prgnDefault; +extern PREGION prgnDefault; extern HRGN hrgnDefault; -VOID FASTCALL REGION_Delete(PROSRGNDATA); +VOID FASTCALL REGION_Delete(PREGION); VOID FASTCALL IntGdiReleaseRaoRgn(PDC); VOID FASTCALL IntGdiReleaseVisRgn(PDC); INT APIENTRY IntGdiGetRgnBox(HRGN, RECTL*); BOOL FASTCALL IntGdiPaintRgn(PDC, PREGION ); BOOL FASTCALL IntSetPolyPolygonRgn(PPOINT, PULONG, INT, INT, PREGION); -INT FASTCALL IntGdiOffsetRgn(PROSRGNDATA,INT,INT); +INT FASTCALL IntGdiOffsetRgn(PREGION,INT,INT); BOOL FASTCALL IntRectInRegion(HRGN,LPRECTL); -INT FASTCALL IntGdiCombineRgn(PROSRGNDATA, PROSRGNDATA, PROSRGNDATA, INT); -INT FASTCALL REGION_Complexity(PROSRGNDATA); -PROSRGNDATA FASTCALL RGNOBJAPI_Lock(HRGN,PRGN_ATTR *); -VOID FASTCALL RGNOBJAPI_Unlock(PROSRGNDATA); -PROSRGNDATA FASTCALL IntSysCreateRectpRgn(INT,INT,INT,INT); +INT FASTCALL IntGdiCombineRgn(PREGION, PREGION, PREGION, INT); +INT FASTCALL REGION_Complexity(PREGION); +PREGION FASTCALL RGNOBJAPI_Lock(HRGN,PRGN_ATTR *); +VOID FASTCALL RGNOBJAPI_Unlock(PREGION); +PREGION FASTCALL IntSysCreateRectpRgn(INT,INT,INT,INT); BOOL FASTCALL IntGdiSetRegionOwner(HRGN,DWORD); #define IntSysCreateRectpRgnIndirect(prc) \ IntSysCreateRectpRgn((prc)->left, (prc)->top, (prc)->right, (prc)->bottom) -PROSRGNDATA +PREGION FASTCALL IntSysCreateRectpRgn(INT LeftRect, INT TopRect, INT RightRect, INT BottomRect); Modified: trunk/reactos/win32ss/include/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntgdihdl.h… ============================================================================== --- trunk/reactos/win32ss/include/ntgdihdl.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntgdihdl.h [iso-8859-1] Thu Dec 18 08:11:19 2014 @@ -273,7 +273,7 @@ typedef struct _RGN_ATTR { ULONG AttrFlags; - ULONG Flags; /* Clipping region's complexity. NULL, SIMPLE & COMPLEXREGION */ + ULONG iComplexity; /* Clipping region's complexity. NULL, SIMPLE & COMPLEXREGION */ RECTL Rect; } RGN_ATTR,*PRGN_ATTR; Modified: trunk/reactos/win32ss/user/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/painti… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] Thu Dec 18 08:11:19 2014 @@ -1309,7 +1309,7 @@ PWND Window; RECTL Rect; INT RegionType; - PROSRGNDATA RgnData; + PREGION RgnData; NTSTATUS Status; DECLARE_RETURN(BOOL);

10 years

[tkreuzer] 65719: [WIN32K/FORMATTING] - Tabs -> spaces - Fix indentation - Improve comment formating - No code change

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Dec 18 08:11:13 2014 New Revision: 65719 URL: http://svn.reactos.org/svn/reactos?rev=65719&view=rev Log: [WIN32K/FORMATTING] - Tabs -> spaces - Fix indentation - Improve comment formating - No code change Modified: trunk/reactos/win32ss/gdi/ntgdi/region.c Modified: trunk/reactos/win32ss/gdi/ntgdi/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/region.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/region.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/region.c [iso-8859-1] Thu Dec 18 08:11:13 2014 @@ -23,7 +23,7 @@ * * Copyright 1993, 1994, 1995 Alexandre Julliard * Modifications and additions: Copyright 1998 Huw Davies - * 1999 Alex Korobka + * 1999 Alex Korobka * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -68,7 +68,7 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts. - All Rights Reserved + All Rights Reserved Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted, @@ -157,10 +157,10 @@ * 0 if two RECTs do not overlap. */ #define EXTENTCHECK(r1, r2) \ - ((r1)->right > (r2)->left && \ - (r1)->left < (r2)->right && \ - (r1)->bottom > (r2)->top && \ - (r1)->top < (r2)->bottom) + ((r1)->right > (r2)->left && \ + (r1)->left < (r2)->right && \ + (r1)->bottom > (r2)->top && \ + (r1)->top < (r2)->bottom) /* * In scan converting polygons, we want to choose those pixels @@ -238,15 +238,15 @@ */ typedef struct { - INT minor_axis; /* Minor axis */ - INT d; /* Decision variable */ - INT m, m1; /* Slope and slope+1 */ - INT incr1, incr2; /* Error increments */ + INT minor_axis; /* Minor axis */ + INT d; /* Decision variable */ + INT m, m1; /* Slope and slope+1 */ + INT incr1, incr2; /* Error increments */ } BRESINFO; #define BRESINITPGONSTRUCT(dmaj, min1, min2, bres) \ - BRESINITPGON(dmaj, min1, min2, bres.minor_axis, bres.d, \ + BRESINITPGON(dmaj, min1, min2, bres.minor_axis, bres.d, \ bres.m, bres.m1, bres.incr1, bres.incr2) #define BRESINCRPGONSTRUCT(bres) \ @@ -308,28 +308,28 @@ typedef struct _EdgeTableEntry { - INT ymax; /* ycoord at which we exit this edge. */ - BRESINFO bres; /* Bresenham info to run the edge */ - struct _EdgeTableEntry *next; /* Next in the list */ - struct _EdgeTableEntry *back; /* For insertion sort */ - struct _EdgeTableEntry *nextWETE; /* For winding num rule */ - int ClockWise; /* Flag for winding number rule */ + INT ymax; /* ycoord at which we exit this edge. */ + BRESINFO bres; /* Bresenham info to run the edge */ + struct _EdgeTableEntry *next; /* Next in the list */ + struct _EdgeTableEntry *back; /* For insertion sort */ + struct _EdgeTableEntry *nextWETE; /* For winding num rule */ + int ClockWise; /* Flag for winding number rule */ } EdgeTableEntry; typedef struct _ScanLineList { - INT scanline; /* The scanline represented */ - EdgeTableEntry *edgelist; /* Header node */ - struct _ScanLineList *next; /* Next in the list */ + INT scanline; /* The scanline represented */ + EdgeTableEntry *edgelist; /* Header node */ + struct _ScanLineList *next; /* Next in the list */ } ScanLineList; typedef struct { - INT ymax; /* ymax for the polygon */ - INT ymin; /* ymin for the polygon */ - ScanLineList scanlines; /* Header node */ + INT ymax; /* ymax for the polygon */ + INT ymin; /* ymin for the polygon */ + ScanLineList scanlines; /* Header node */ } EdgeTable; @@ -342,8 +342,8 @@ typedef struct _ScanLineListBlock { - ScanLineList SLLs[SLLSPERBLOCK]; - struct _ScanLineListBlock *next; + ScanLineList SLLs[SLLSPERBLOCK]; + struct _ScanLineListBlock *next; } ScanLineListBlock; @@ -447,22 +447,21 @@ // Number of points to buffer before sending them off to scanlines() : Must be an even number #define NUMPTSTOBUFFER 200 -#define RGN_DEFAULT_RECTS 2 +#define RGN_DEFAULT_RECTS 2 // Used to allocate buffers for points and link the buffers together - typedef struct _POINTBLOCK { - POINT pts[NUMPTSTOBUFFER]; - struct _POINTBLOCK *next; + POINT pts[NUMPTSTOBUFFER]; + struct _POINTBLOCK *next; } POINTBLOCK; #ifndef NDEBUG /* * This function is left there for debugging purposes. */ - -VOID FASTCALL +VOID +FASTCALL IntDumpRegion(HRGN hRgn) { ROSRGNDATA *Data; @@ -491,13 +490,18 @@ FASTCALL REGION_Complexity(PREGION prgn) { - if (!prgn) return NULLREGION; - switch(prgn->rdh.nCount) - { - DPRINT("Region Complexity -> %lu", prgn->rdh.nCount); - case 0: return NULLREGION; - case 1: return SIMPLEREGION; - default: return COMPLEXREGION; + if (!prgn) + return NULLREGION; + + switch (prgn->rdh.nCount) + { + DPRINT("Region Complexity -> %lu", prgn->rdh.nCount); + case 0: + return NULLREGION; + case 1: + return SIMPLEREGION; + default: + return COMPLEXREGION; } } @@ -506,8 +510,7 @@ FASTCALL REGION_CopyRegion( PROSRGNDATA dst, - PROSRGNDATA src -) + PROSRGNDATA src) { if (dst != src) // Don't want to copy to itself { @@ -524,6 +527,7 @@ dst->Buffer = temp; dst->rdh.nRgnSize = src->rdh.nCount * sizeof(RECT); // Size of region buffer } + dst->rdh.nCount = src->rdh.nCount; // Number of rectangles present in Buffer dst->rdh.rcBound.left = src->rdh.rcBound.left; dst->rdh.rcBound.top = src->rdh.rcBound.top; @@ -532,11 +536,15 @@ dst->rdh.iType = src->rdh.iType; COPY_RECTS(dst->Buffer, src->Buffer, src->rdh.nCount); } + return TRUE; } -static void FASTCALL -REGION_SetExtents(ROSRGNDATA *pReg) +static +void +FASTCALL +REGION_SetExtents( + ROSRGNDATA *pReg) { RECTL *pRect, *pRectEnd, *pExtents; @@ -554,13 +562,11 @@ pRect = pReg->Buffer; pRectEnd = pReg->Buffer + pReg->rdh.nCount - 1; - /* - * Since pRect is the first rectangle in the region, it must have the + /* Since pRect is the first rectangle in the region, it must have the * smallest top and since pRectEnd is the last rectangle in the region, * it must have the largest bottom, because of banding. Initialize left and * right from pRect and pRectEnd, resp., as good things to initialize them - * to... - */ + * to... */ pExtents->left = pRect->left; pExtents->top = pRect->top; pExtents->right = pRectEnd->right; @@ -574,6 +580,7 @@ pExtents->right = pRect->right; pRect++; } + pReg->rdh.iType = RDH_RECTANGLES; } @@ -594,7 +601,8 @@ if (!off) off = &pt; - if (!rect) // Just copy and offset + /* Just copy and offset */ + if (!rect) { PRECTL xrect; if (rgnDst == rgnSrc) @@ -606,11 +614,15 @@ } else { - xrect = ExAllocatePoolWithTag(PagedPool, rgnSrc->rdh.nCount * sizeof(RECT), TAG_REGION); - if(!xrect) - return ERROR; - if (rgnDst->Buffer && rgnDst->Buffer != &rgnDst->rdh.rcBound) - ExFreePoolWithTag(rgnDst->Buffer, TAG_REGION); // Free the old buffer. Will be assigned to xrect below. + xrect = ExAllocatePoolWithTag(PagedPool, + rgnSrc->rdh.nCount * sizeof(RECT), + TAG_REGION); + if(!xrect) + return ERROR; + + /* Free the old buffer. Will be assigned to xrect below. */ + if (rgnDst->Buffer && (rgnDst->Buffer != &rgnDst->rdh.rcBound)) + ExFreePoolWithTag(rgnDst->Buffer, TAG_REGION); } if (rgnDst != rgnSrc) @@ -620,7 +632,7 @@ if (off->x || off->y) { - ULONG i; + ULONG i; for (i = 0; i < rgnDst->rdh.nCount; i++) { xrect[i].left = (rgnSrc->Buffer + i)->left + off->x; @@ -628,6 +640,7 @@ xrect[i].top = (rgnSrc->Buffer + i)->top + off->y; xrect[i].bottom = (rgnSrc->Buffer + i)->bottom + off->y; } + rgnDst->rdh.rcBound.left += off->x; rgnDst->rdh.rcBound.right += off->x; rgnDst->rdh.rcBound.top += off->y; @@ -778,12 +791,13 @@ * - pReg->numRects will be decreased. * */ -static INT FASTCALL +static +INT +FASTCALL REGION_Coalesce( PROSRGNDATA pReg, /* Region to coalesce */ INT prevStart, /* Index of start of previous band */ - INT curStart /* Index of start of current band */ -) + INT curStart) /* Index of start of current band */ { RECTL *pPrevRect; /* Current rect in previous band */ RECTL *pCurRect; /* Current rect in current band */ @@ -796,28 +810,24 @@ pPrevRect = pReg->Buffer + prevStart; prevNumRects = curStart - prevStart; - /* - * Figure out how many rectangles are in the current band. Have to do + /* Figure out how many rectangles are in the current band. Have to do * this because multiple bands could have been added in REGION_RegionOp - * at the end when one region has been exhausted. - */ + * at the end when one region has been exhausted. */ pCurRect = pReg->Buffer + curStart; bandtop = pCurRect->top; for (curNumRects = 0; - (pCurRect != pRegEnd) && (pCurRect->top == bandtop); - curNumRects++) + (pCurRect != pRegEnd) && (pCurRect->top == bandtop); + curNumRects++) { pCurRect++; } if (pCurRect != pRegEnd) { - /* - * If more than one band was added, we have to find the start + /* If more than one band was added, we have to find the start * of the last band added so the next coalescing job can start * at the right place... (given when multiple bands are added, - * this may be pointless -- see above). - */ + * this may be pointless -- see above). */ pRegEnd--; while ((pRegEnd-1)->top == pRegEnd->top) { @@ -830,28 +840,23 @@ if ((curNumRects == prevNumRects) && (curNumRects != 0)) { pCurRect -= curNumRects; - /* - * The bands may only be coalesced if the bottom of the previous - * matches the top scanline of the current. - */ + /* The bands may only be coalesced if the bottom of the previous + * matches the top scanline of the current. */ if (pPrevRect->bottom == pCurRect->top) { - /* - * Make sure the bands have rects in the same places. This + /* Make sure the bands have rects in the same places. This * assumes that rects have been added in such a way that they * cover the most area possible. I.e. two rects in a band must - * have some horizontal space between them. - */ + * have some horizontal space between them. */ do { if ((pPrevRect->left != pCurRect->left) || - (pPrevRect->right != pCurRect->right)) + (pPrevRect->right != pCurRect->right)) { - /* - * The bands don't line up so they can't be coalesced. - */ + /* The bands don't line up so they can't be coalesced. */ return (curStart); } + pPrevRect++; pCurRect++; prevNumRects -= 1; @@ -862,11 +867,9 @@ pCurRect -= curNumRects; pPrevRect -= curNumRects; - /* - * The bands may be merged, so set the bottom of each rect + /* The bands may be merged, so set the bottom of each rect * in the previous band to that of the corresponding rect in - * the current band. - */ + * the current band. */ do { pPrevRect->bottom = pCurRect->bottom; @@ -876,16 +879,14 @@ } while (curNumRects != 0); - /* - * If only one band was added to the region, we have to backup + /* If only one band was added to the region, we have to backup * curStart to the start of the previous band. * * If more than one band was added to the region, copy the * other bands down. The assumption here is that the other bands * came from the same region as the current one and no further * coalescing can be done on them since it's all been done - * already... curStart is already in the right place. - */ + * already... curStart is already in the right place. */ if (pCurRect == pRegEnd) { curStart = prevStart; @@ -900,6 +901,7 @@ } } } + return (curStart); } @@ -925,71 +927,66 @@ * to reduce the number of rectangles in the region. * */ -static void FASTCALL +static +void +FASTCALL REGION_RegionOp( ROSRGNDATA *newReg, /* Place to store result */ ROSRGNDATA *reg1, /* First region in operation */ ROSRGNDATA *reg2, /* 2nd region in operation */ overlapProcp overlapFunc, /* Function to call for over-lapping bands */ nonOverlapProcp nonOverlap1Func, /* Function to call for non-overlapping bands in region 1 */ - nonOverlapProcp nonOverlap2Func /* Function to call for non-overlapping bands in region 2 */ -) + nonOverlapProcp nonOverlap2Func) /* Function to call for non-overlapping bands in region 2 */ { RECTL *r1; /* Pointer into first region */ RECTL *r2; /* Pointer into 2d region */ RECTL *r1End; /* End of 1st region */ RECTL *r2End; /* End of 2d region */ - INT ybot; /* Bottom of intersection */ - INT ytop; /* Top of intersection */ + INT ybot; /* Bottom of intersection */ + INT ytop; /* Top of intersection */ RECTL *oldRects; /* Old rects for newReg */ - ULONG prevBand; /* Index of start of - * Previous band in newReg */ - ULONG curBand; /* Index of start of current band in newReg */ + ULONG prevBand; /* Index of start of + * Previous band in newReg */ + ULONG curBand; /* Index of start of current band in newReg */ RECTL *r1BandEnd; /* End of current band in r1 */ RECTL *r2BandEnd; /* End of current band in r2 */ - ULONG top; /* Top of non-overlapping band */ - ULONG bot; /* Bottom of non-overlapping band */ - - /* - * Initialization: + ULONG top; /* Top of non-overlapping band */ + ULONG bot; /* Bottom of non-overlapping band */ + + /* Initialization: * set r1, r2, r1End and r2End appropriately, preserve the important * parts of the destination region until the end in case it's one of * the two source regions, then mark the "new" region empty, allocating - * another array of rectangles for it to use. - */ + * another array of rectangles for it to use. */ r1 = reg1->Buffer; r2 = reg2->Buffer; r1End = r1 + reg1->rdh.nCount; r2End = r2 + reg2->rdh.nCount; - /* - * newReg may be one of the src regions so we can't empty it. We keep a + /* newReg may be one of the src regions so we can't empty it. We keep a * note of its rects pointer (so that we can free them later), preserve its - * extents and simply set numRects to zero. - */ - + * extents and simply set numRects to zero. */ oldRects = newReg->Buffer; newReg->rdh.nCount = 0; - /* - * Allocate a reasonable number of rectangles for the new region. The idea + /* Allocate a reasonable number of rectangles for the new region. The idea * is to allocate enough so the individual functions don't need to * reallocate and copy the array, which is time consuming, yet we don't * have to worry about using too much memory. I hope to be able to - * nuke the Xrealloc() at the end of this function eventually. - */ - newReg->rdh.nRgnSize = max(reg1->rdh.nCount + 1,reg2->rdh.nCount) * 2 * sizeof(RECT); - - newReg->Buffer = ExAllocatePoolWithTag(PagedPool, newReg->rdh.nRgnSize, TAG_REGION); + * nuke the Xrealloc() at the end of this function eventually. */ + newReg->rdh.nRgnSize = max(reg1->rdh.nCount + 1, reg2->rdh.nCount) * 2 * sizeof(RECT); + + newReg->Buffer = ExAllocatePoolWithTag(PagedPool, + newReg->rdh.nRgnSize, + TAG_REGION); if (!newReg->Buffer) { newReg->rdh.nRgnSize = 0; return; } - /* - * Initialize ybot and ytop. + /* Initialize ybot and ytop. * In the upcoming loop, ybot and ytop serve different functions depending * on whether the band being handled is an overlapping or non-overlapping * band. @@ -999,35 +996,30 @@ * ytop is the top of the next intersection between the two regions and * serves to clip the bottom of the rectangles in the current band. * For an overlapping band (where the two regions intersect), ytop clips - * the top of the rectangles of both regions and ybot clips the bottoms. - */ + * the top of the rectangles of both regions and ybot clips the bottoms. */ if (reg1->rdh.rcBound.top < reg2->rdh.rcBound.top) ybot = reg1->rdh.rcBound.top; else ybot = reg2->rdh.rcBound.top; - /* - * prevBand serves to mark the start of the previous band so rectangles + /* prevBand serves to mark the start of the previous band so rectangles * can be coalesced into larger rectangles. qv. miCoalesce, above. * In the beginning, there is no previous band, so prevBand == curBand * (curBand is set later on, of course, but the first band will always * start at index 0). prevBand and curBand must be indices because of * the possible expansion, and resultant moving, of the new region's - * array of rectangles. - */ + * array of rectangles. */ prevBand = 0; do { curBand = newReg->rdh.nCount; - /* - * This algorithm proceeds one source-band (as opposed to a + /* This algorithm proceeds one source-band (as opposed to a * destination band, which is determined by where the two regions * intersect) at a time. r1BandEnd and r2BandEnd serve to mark the * rectangle after the last one in the current band for their - * respective regions. - */ + * respective regions. */ r1BandEnd = r1; while ((r1BandEnd != r1End) && (r1BandEnd->top == r1->top)) { @@ -1040,14 +1032,12 @@ r2BandEnd++; } - /* - * First handle the band that doesn't intersect, if any. + /* First handle the band that doesn't intersect, if any. * * Note that attention is restricted to one band in the * non-intersecting region at once, so if a region has n * bands between the current position and the next place it overlaps - * the other, this entire loop will be passed through n times. - */ + * the other, this entire loop will be passed through n times. */ if (r1->top < r2->top) { top = max(r1->top,ybot); @@ -1055,7 +1045,7 @@ if ((top != bot) && (nonOverlap1Func != NULL)) { - (* nonOverlap1Func) (newReg, r1, r1BandEnd, top, bot); + (*nonOverlap1Func)(newReg, r1, r1BandEnd, top, bot); } ytop = r2->top; @@ -1067,7 +1057,7 @@ if ((top != bot) && (nonOverlap2Func != NULL)) { - (* nonOverlap2Func) (newReg, r2, r2BandEnd, top, bot); + (*nonOverlap2Func)(newReg, r2, r2BandEnd, top, bot); } ytop = r1->top; @@ -1077,37 +1067,31 @@ ytop = r1->top; } - /* - * If any rectangles got added to the region, try and coalesce them + /* If any rectangles got added to the region, try and coalesce them * with rectangles from the previous band. Note we could just do * this test in miCoalesce, but some machines incur a not - * inconsiderable cost for function calls, so... - */ + * inconsiderable cost for function calls, so... */ if (newReg->rdh.nCount != curBand) { - prevBand = REGION_Coalesce (newReg, prevBand, curBand); - } - - /* - * Now see if we've hit an intersecting band. The two bands only - * intersect if ybot > ytop - */ + prevBand = REGION_Coalesce(newReg, prevBand, curBand); + } + + /* Now see if we've hit an intersecting band. The two bands only + * intersect if ybot > ytop */ ybot = min(r1->bottom, r2->bottom); curBand = newReg->rdh.nCount; if (ybot > ytop) { - (* overlapFunc) (newReg, r1, r1BandEnd, r2, r2BandEnd, ytop, ybot); + (*overlapFunc)(newReg, r1, r1BandEnd, r2, r2BandEnd, ytop, ybot); } if (newReg->rdh.nCount != curBand) { - prevBand = REGION_Coalesce (newReg, prevBand, curBand); - } - - /* - * If we've finished with a band (bottom == ybot) we skip forward - * in the region to the next band. - */ + prevBand = REGION_Coalesce(newReg, prevBand, curBand); + } + + /* If we've finished with a band (bottom == ybot) we skip forward + * in the region to the next band. */ if (r1->bottom == ybot) { r1 = r1BandEnd; @@ -1119,9 +1103,7 @@ } while ((r1 != r1End) && (r2 != r2End)); - /* - * Deal with whichever region still has rectangles left. - */ + /* Deal with whichever region still has rectangles left. */ curBand = newReg->rdh.nCount; if (r1 != r1End) { @@ -1134,8 +1116,12 @@ { r1BandEnd++; } - (* nonOverlap1Func) (newReg, r1, r1BandEnd, - max(r1->top,ybot), r1->bottom); + + (*nonOverlap1Func)(newReg, + r1, + r1BandEnd, + max(r1->top,ybot), + r1->bottom); r1 = r1BandEnd; } while (r1 != r1End); @@ -1150,8 +1136,12 @@ { r2BandEnd++; } - (* nonOverlap2Func) (newReg, r2, r2BandEnd, - max(r2->top,ybot), r2->bottom); + + (*nonOverlap2Func)(newReg, + r2, + r2BandEnd, + max(r2->top,ybot), + r2->bottom); r2 = r2BandEnd; } while (r2 != r2End); @@ -1159,25 +1149,25 @@ if (newReg->rdh.nCount != curBand) { - (void) REGION_Coalesce (newReg, prevBand, curBand); - } - - /* - * A bit of cleanup. To keep regions from growing without bound, + (void) REGION_Coalesce(newReg, prevBand, curBand); + } + + /* A bit of cleanup. To keep regions from growing without bound, * we shrink the array of rectangles to match the new number of * rectangles in the region. This never goes to 0, however... * * Only do this stuff if the number of rectangles allocated is more than - * twice the number of rectangles in the region (a simple optimization...). - */ - if ((2 * newReg->rdh.nCount*sizeof(RECT) < newReg->rdh.nRgnSize && (newReg->rdh.nCount > 2))) + * twice the number of rectangles in the region (a simple optimization...). */ + if ((2 * newReg->rdh.nCount * sizeof(RECT) < newReg->rdh.nRgnSize) && (newReg->rdh.nCount > 2)) { if (REGION_NOT_EMPTY(newReg)) { RECTL *prev_rects = newReg->Buffer; - newReg->Buffer = ExAllocatePoolWithTag(PagedPool, newReg->rdh.nCount*sizeof(RECT), TAG_REGION); - - if (! newReg->Buffer) + newReg->Buffer = ExAllocatePoolWithTag(PagedPool, + newReg->rdh.nCount * sizeof(RECT), + TAG_REGION); + + if (!newReg->Buffer) newReg->Buffer = prev_rects; else { @@ -1189,17 +1179,17 @@ } else { - /* - * No point in doing the extra work involved in an Xrealloc if - * the region is empty - */ + /* No point in doing the extra work involved in an Xrealloc if + * the region is empty */ newReg->rdh.nRgnSize = sizeof(RECT); if (newReg->Buffer != &newReg->rdh.rcBound) ExFreePoolWithTag(newReg->Buffer, TAG_REGION); + newReg->Buffer = ExAllocatePoolWithTag(PagedPool, sizeof(RECT), TAG_REGION); ASSERT(newReg->Buffer); } } + newReg->rdh.iType = RDH_RECTANGLES; if (oldRects != &newReg->rdh.rcBound) @@ -1222,7 +1212,9 @@ * Rectangles may be added to the region. * */ -static void FASTCALL +static +void +FASTCALL REGION_IntersectO( PROSRGNDATA pReg, PRECTL r1, @@ -1230,8 +1222,7 @@ PRECTL r2, PRECTL r2End, INT top, - INT bottom -) + INT bottom) { INT left, right; RECTL *pNextRect; @@ -1241,15 +1232,13 @@ while ((r1 != r1End) && (r2 != r2End)) { left = max(r1->left, r2->left); - right = min(r1->right, r2->right); - - /* - * If there's any overlap between the two rectangles, add that + right = min(r1->right, r2->right); + + /* If there's any overlap between the two rectangles, add that * overlap to the new region. * There's no need to check for subsumption because the only way * such a need could arise is if some region has two rectangles - * right next to each other. Since that should never happen... - */ + * right next to each other. Since that should never happen... */ if (left < right) { MEMCHECK(pReg, pNextRect, pReg->Buffer); @@ -1261,11 +1250,9 @@ pNextRect++; } - /* - * Need to advance the pointers. Shift the one that extends + /* Need to advance the pointers. Shift the one that extends * to the right the least, since the other still has a chance to - * overlap with that region's next rectangle, if you see what I mean. - */ + * overlap with that region's next rectangle, if you see what I mean. */ if (r1->right < r2->right) { r1++; @@ -1280,40 +1267,43 @@ r2++; } } + return; } /*********************************************************************** - * REGION_IntersectRegion + * REGION_IntersectRegion */ -static void FASTCALL +static +void +FASTCALL REGION_IntersectRegion( ROSRGNDATA *newReg, ROSRGNDATA *reg1, - ROSRGNDATA *reg2 -) + ROSRGNDATA *reg2) { /* Check for trivial reject */ if ( (!(reg1->rdh.nCount)) || (!(reg2->rdh.nCount)) || - (!EXTENTCHECK(&reg1->rdh.rcBound, &reg2->rdh.rcBound)) ) + (!EXTENTCHECK(&reg1->rdh.rcBound, &reg2->rdh.rcBound)) ) newReg->rdh.nCount = 0; else - REGION_RegionOp (newReg, reg1, reg2, - REGION_IntersectO, NULL, NULL); - - /* - * Can't alter newReg's extents before we call miRegionOp because + REGION_RegionOp(newReg, + reg1, + reg2, + REGION_IntersectO, + NULL, + NULL); + + /* Can't alter newReg's extents before we call miRegionOp because * it might be one of the source regions and miRegionOp depends * on the extents of those regions being the same. Besides, this * way there's no checking against rectangles that will be nuked - * due to coalescing, so we have to examine fewer rectangles. - */ - + * due to coalescing, so we have to examine fewer rectangles. */ REGION_SetExtents(newReg); } /*********************************************************************** - * Region Union + * Region Union ***********************************************************************/ /*! @@ -1329,14 +1319,15 @@ * with the rectangles we're passed. * */ -static void FASTCALL -REGION_UnionNonO ( +static +void +FASTCALL +REGION_UnionNonO( PROSRGNDATA pReg, PRECTL r, PRECTL rEnd, INT top, - INT bottom -) + INT bottom) { RECTL *pNextRect; @@ -1353,6 +1344,7 @@ pNextRect++; r++; } + return; } @@ -1368,7 +1360,9 @@ * be changed. * */ -static void FASTCALL +static +void +FASTCALL REGION_UnionO ( PROSRGNDATA pReg, PRECTL r1, @@ -1376,8 +1370,7 @@ PRECTL r2, PRECTL r2End, INT top, - INT bottom -) + INT bottom) { RECTL *pNextRect; @@ -1385,24 +1378,24 @@ #define MERGERECT(r) \ if ((pReg->rdh.nCount != 0) && \ - ((pNextRect-1)->top == top) && \ - ((pNextRect-1)->bottom == bottom) && \ - ((pNextRect-1)->right >= r->left)) \ + ((pNextRect-1)->top == top) && \ + ((pNextRect-1)->bottom == bottom) && \ + ((pNextRect-1)->right >= r->left)) \ { \ - if ((pNextRect-1)->right < r->right) \ - { \ - (pNextRect-1)->right = r->right; \ - } \ + if ((pNextRect-1)->right < r->right) \ + { \ + (pNextRect-1)->right = r->right; \ + } \ } \ else \ { \ - MEMCHECK(pReg, pNextRect, pReg->Buffer); \ - pNextRect->top = top; \ - pNextRect->bottom = bottom; \ - pNextRect->left = r->left; \ - pNextRect->right = r->right; \ - pReg->rdh.nCount += 1; \ - pNextRect += 1; \ + MEMCHECK(pReg, pNextRect, pReg->Buffer); \ + pNextRect->top = top; \ + pNextRect->bottom = bottom; \ + pNextRect->left = r->left; \ + pNextRect->right = r->right; \ + pReg->rdh.nCount += 1; \ + pNextRect += 1; \ } \ r++; @@ -1426,45 +1419,42 @@ } while (r1 != r1End); } - else while (r2 != r2End) + else + while (r2 != r2End) { MERGERECT(r2); } + return; } /*********************************************************************** - * REGION_UnionRegion + * REGION_UnionRegion */ static void FASTCALL REGION_UnionRegion( ROSRGNDATA *newReg, ROSRGNDATA *reg1, - ROSRGNDATA *reg2 -) -{ - /* Checks all the simple cases */ - - /* - * Region 1 and 2 are the same or region 1 is empty - */ + ROSRGNDATA *reg2) +{ + /* Checks all the simple cases + * Region 1 and 2 are the same or region 1 is empty */ if (reg1 == reg2 || 0 == reg1->rdh.nCount || - reg1->rdh.rcBound.right <= reg1->rdh.rcBound.left || - reg1->rdh.rcBound.bottom <= reg1->rdh.rcBound.top) + reg1->rdh.rcBound.right <= reg1->rdh.rcBound.left || + reg1->rdh.rcBound.bottom <= reg1->rdh.rcBound.top) { if (newReg != reg2) { REGION_CopyRegion(newReg, reg2); } + return; } - /* - * If nothing to union (region 2 empty) - */ + /* If nothing to union (region 2 empty) */ if (0 == reg2->rdh.nCount || - reg2->rdh.rcBound.right <= reg2->rdh.rcBound.left || - reg2->rdh.rcBound.bottom <= reg2->rdh.rcBound.top) + reg2->rdh.rcBound.right <= reg2->rdh.rcBound.left || + reg2->rdh.rcBound.bottom <= reg2->rdh.rcBound.top) { if (newReg != reg1) { @@ -1473,40 +1463,43 @@ return; } - /* - * Region 1 completely subsumes region 2 - */ + /* Region 1 completely subsumes region 2 */ if (1 == reg1->rdh.nCount && - reg1->rdh.rcBound.left <= reg2->rdh.rcBound.left && - reg1->rdh.rcBound.top <= reg2->rdh.rcBound.top && - reg2->rdh.rcBound.right <= reg1->rdh.rcBound.right && - reg2->rdh.rcBound.bottom <= reg1->rdh.rcBound.bottom) + reg1->rdh.rcBound.left <= reg2->rdh.rcBound.left && + reg1->rdh.rcBound.top <= reg2->rdh.rcBound.top && + reg2->rdh.rcBound.right <= reg1->rdh.rcBound.right && + reg2->rdh.rcBound.bottom <= reg1->rdh.rcBound.bottom) { if (newReg != reg1) { REGION_CopyRegion(newReg, reg1); } + return; } - /* - * Region 2 completely subsumes region 1 - */ + /* Region 2 completely subsumes region 1 */ if (1 == reg2->rdh.nCount && - reg2->rdh.rcBound.left <= reg1->rdh.rcBound.left && - reg2->rdh.rcBound.top <= reg1->rdh.rcBound.top && - reg1->rdh.rcBound.right <= reg2->rdh.rcBound.right && - reg1->rdh.rcBound.bottom <= reg2->rdh.rcBound.bottom) + reg2->rdh.rcBound.left <= reg1->rdh.rcBound.left && + reg2->rdh.rcBound.top <= reg1->rdh.rcBound.top && + reg1->rdh.rcBound.right <= reg2->rdh.rcBound.right && + reg1->rdh.rcBound.bottom <= reg2->rdh.rcBound.bottom) { if (newReg != reg2) { REGION_CopyRegion(newReg, reg2); } + return; } - REGION_RegionOp (newReg, reg1, reg2, REGION_UnionO, - REGION_UnionNonO, REGION_UnionNonO); + REGION_RegionOp (newReg, + reg1, + reg2, + REGION_UnionO, + REGION_UnionNonO, + REGION_UnionNonO); + newReg->rdh.rcBound.left = min(reg1->rdh.rcBound.left, reg2->rdh.rcBound.left); newReg->rdh.rcBound.top = min(reg1->rdh.rcBound.top, reg2->rdh.rcBound.top); newReg->rdh.rcBound.right = max(reg1->rdh.rcBound.right, reg2->rdh.rcBound.right); @@ -1514,7 +1507,7 @@ } /*********************************************************************** - * Region Subtraction + * Region Subtraction ***********************************************************************/ /*! @@ -1528,14 +1521,15 @@ * pReg may be affected. * */ -static void FASTCALL +static +void +FASTCALL REGION_SubtractNonO1( PROSRGNDATA pReg, PRECTL r, PRECTL rEnd, INT top, - INT bottom -) + INT bottom) { RECTL *pNextRect; @@ -1552,6 +1546,7 @@ pNextRect++; r++; } + return; } @@ -1567,7 +1562,9 @@ * pReg may have rectangles added to it. * */ -static void FASTCALL +static +void +FASTCALL REGION_SubtractO( PROSRGNDATA pReg, PRECTL r1, @@ -1575,8 +1572,7 @@ PRECTL r2, PRECTL r2End, INT top, - INT bottom -) + INT bottom) { RECTL *pNextRect; INT left; @@ -1588,42 +1584,32 @@ { if (r2->right <= left) { - /* - * Subtrahend missed the boat: go to next subtrahend. - */ + /* Subtrahend missed the boat: go to next subtrahend. */ r2++; } else if (r2->left <= left) { - /* - * Subtrahend preceeds minuend: nuke left edge of minuend. - */ + /* Subtrahend preceeds minuend: nuke left edge of minuend. */ left = r2->right; if (left >= r1->right) { - /* - * Minuend completely covered: advance to next minuend and - * reset left fence to edge of new minuend. - */ + /* Minuend completely covered: advance to next minuend and + * reset left fence to edge of new minuend. */ r1++; if (r1 != r1End) left = r1->left; } else { - /* - * Subtrahend now used up since it doesn't extend beyond - * minuend - */ + /* Subtrahend now used up since it doesn't extend beyond + * minuend */ r2++; } } else if (r2->left < r1->right) { - /* - * Left part of subtrahend covers part of minuend: add uncovered - * part of minuend to region and skip to next subtrahend. - */ + /* Left part of subtrahend covers part of minuend: add uncovered + * part of minuend to region and skip to next subtrahend. */ MEMCHECK(pReg, pNextRect, pReg->Buffer); pNextRect->left = left; pNextRect->top = top; @@ -1634,26 +1620,20 @@ left = r2->right; if (left >= r1->right) { - /* - * Minuend used up: advance to new... - */ + /* Minuend used up: advance to new... */ r1++; if (r1 != r1End) left = r1->left; } else { - /* - * Subtrahend used up - */ + /* Subtrahend used up */ r2++; } } else { - /* - * Minuend used up: add any remaining piece before advancing. - */ + /* Minuend used up: add any remaining piece before advancing. */ if (r1->right > left) { MEMCHECK(pReg, pNextRect, pReg->Buffer); @@ -1670,9 +1650,7 @@ } } - /* - * Add remaining minuend rectangles to region. - */ + /* Add remaining minuend rectangles to region. */ while (r1 != r1End) { MEMCHECK(pReg, pNextRect, pReg->Buffer); @@ -1688,6 +1666,7 @@ left = r1->left; } } + return; } @@ -1702,43 +1681,48 @@ * regD is overwritten. * */ -static void FASTCALL +static +void +FASTCALL REGION_SubtractRegion( ROSRGNDATA *regD, ROSRGNDATA *regM, - ROSRGNDATA *regS -) + ROSRGNDATA *regS) { /* Check for trivial reject */ - if ( (!(regM->rdh.nCount)) || (!(regS->rdh.nCount)) || - (!EXTENTCHECK(&regM->rdh.rcBound, &regS->rdh.rcBound)) ) + if ((!(regM->rdh.nCount)) || + (!(regS->rdh.nCount)) || + (!EXTENTCHECK(&regM->rdh.rcBound, &regS->rdh.rcBound)) ) { REGION_CopyRegion(regD, regM); return; } - REGION_RegionOp (regD, regM, regS, REGION_SubtractO, - REGION_SubtractNonO1, NULL); - - /* - * Can't alter newReg's extents before we call miRegionOp because + REGION_RegionOp(regD, + regM, + regS, + REGION_SubtractO, + REGION_SubtractNonO1, + NULL); + + /* Can't alter newReg's extents before we call miRegionOp because * it might be one of the source regions and miRegionOp depends * on the extents of those regions being the unaltered. Besides, this * way there's no checking against rectangles that will be nuked - * due to coalescing, so we have to examine fewer rectangles. - */ - REGION_SetExtents (regD); + * due to coalescing, so we have to examine fewer rectangles. */ + REGION_SetExtents(regD); } /*********************************************************************** - * REGION_XorRegion + * REGION_XorRegion */ -static void FASTCALL +static +void +FASTCALL REGION_XorRegion( ROSRGNDATA *dr, ROSRGNDATA *sra, - ROSRGNDATA *srb -) + ROSRGNDATA *srb) { HRGN htra, htrb; ROSRGNDATA *tra, *trb; @@ -1776,11 +1760,11 @@ /*! * Adds a rectangle to a REGION */ -VOID FASTCALL +VOID +FASTCALL REGION_UnionRectWithRgn( ROSRGNDATA *rgn, - const RECTL *rect -) + const RECTL *rect) { ROSRGNDATA region; @@ -1808,12 +1792,12 @@ return REGION_Complexity(prgnDest); } -BOOL FASTCALL +BOOL +FASTCALL REGION_CreateSimpleFrameRgn( PROSRGNDATA rgn, INT x, - INT y -) + INT y) { RECTL rc[4]; PRECTL prc; @@ -1823,7 +1807,7 @@ prc = rc; if (rgn->rdh.rcBound.bottom - rgn->rdh.rcBound.top > y * 2 && - rgn->rdh.rcBound.right - rgn->rdh.rcBound.left > x * 2) + rgn->rdh.rcBound.right - rgn->rdh.rcBound.left > x * 2) { if (y != 0) { @@ -1890,8 +1874,7 @@ HRGN hDest, HRGN hSrc, INT x, - INT y -) + INT y) { PROSRGNDATA srcObj, destObj; PRECTL rc; @@ -1901,11 +1884,13 @@ { return FALSE; } + if (!REGION_NOT_EMPTY(srcObj)) { RGNOBJAPI_Unlock(srcObj); return FALSE; } + if (!(destObj = RGNOBJAPI_Lock(hDest, NULL))) { RGNOBJAPI_Unlock(srcObj); @@ -1940,6 +1925,7 @@ rc->right += x; rc++; } + REGION_IntersectRegion(destObj, destObj, srcObj); /* Original region moved to left */ @@ -1962,6 +1948,7 @@ rc->bottom += y; rc++; } + REGION_IntersectRegion(destObj, destObj, srcObj); /* Original region moved up */ @@ -1992,7 +1979,8 @@ static -BOOL FASTCALL +BOOL +FASTCALL REGION_LPTODP( _In_ PDC dc, _Inout_ PREGION RgnDest, @@ -2011,8 +1999,9 @@ if (IntGdiCombineRgn(RgnDest, RgnSrc, 0, RGN_COPY) == ERROR) return FALSE; - IntGdiOffsetRgn(RgnDest, pdcattr->ptlViewportOrg.x - pdcattr->ptlWindowOrg.x, - pdcattr->ptlViewportOrg.y - pdcattr->ptlWindowOrg.y); + IntGdiOffsetRgn(RgnDest, + pdcattr->ptlViewportOrg.x - pdcattr->ptlWindowOrg.x, + pdcattr->ptlViewportOrg.y - pdcattr->ptlWindowOrg.y); return TRUE; } @@ -2033,6 +2022,7 @@ tmpRect.left = tmpRect.right; tmpRect.right = tmp; } + if (tmpRect.top > tmpRect.bottom) { INT tmp = tmpRect.top; @@ -2048,7 +2038,8 @@ PROSRGNDATA FASTCALL -REGION_AllocRgnWithHandle(INT nReg) +REGION_AllocRgnWithHandle( + INT nReg) { //HRGN hReg; PROSRGNDATA pReg; @@ -2099,7 +2090,8 @@ BOOL NTAPI -REGION_bAllocRgnAttr(PREGION prgn) +REGION_bAllocRgnAttr( + PREGION prgn) { PPROCESSINFO ppi; PRGN_ATTR prgnattr; @@ -2127,7 +2119,8 @@ // PROSRGNDATA FASTCALL -REGION_AllocUserRgnWithHandle(INT nRgn) +REGION_AllocUserRgnWithHandle( + INT nRgn) { PREGION prgn; @@ -2147,97 +2140,101 @@ VOID NTAPI -REGION_vSyncRegion(PREGION pRgn) -{ - PRGN_ATTR pRgn_Attr = NULL; - - if (pRgn && pRgn->prgnattr != &pRgn->rgnattr) - { - pRgn_Attr = GDIOBJ_pvGetObjectAttr(&pRgn->BaseObject); - - if ( pRgn_Attr ) - { - _SEH2_TRY - { - if ( !(pRgn_Attr->AttrFlags & ATTR_CACHED) ) - { - if ( pRgn_Attr->AttrFlags & (ATTR_RGN_VALID|ATTR_RGN_DIRTY) ) - { - switch (pRgn_Attr->Flags) - { - case NULLREGION: - EMPTY_REGION( pRgn ); - break; - - case SIMPLEREGION: - REGION_SetRectRgn( pRgn, - pRgn_Attr->Rect.left, - pRgn_Attr->Rect.top, - pRgn_Attr->Rect.right, - pRgn_Attr->Rect.bottom ); - break; - } - pRgn_Attr->AttrFlags &= ~ATTR_RGN_DIRTY; - } - } - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - (void)0; - } - _SEH2_END; - } - } +REGION_vSyncRegion( + PREGION pRgn) +{ + PRGN_ATTR pRgn_Attr = NULL; + + if (pRgn && pRgn->prgnattr != &pRgn->rgnattr) + { + pRgn_Attr = GDIOBJ_pvGetObjectAttr(&pRgn->BaseObject); + + if ( pRgn_Attr ) + { + _SEH2_TRY + { + if ( !(pRgn_Attr->AttrFlags & ATTR_CACHED) ) + { + if ( pRgn_Attr->AttrFlags & (ATTR_RGN_VALID|ATTR_RGN_DIRTY) ) + { + switch (pRgn_Attr->Flags) + { + case NULLREGION: + EMPTY_REGION( pRgn ); + break; + + case SIMPLEREGION: + REGION_SetRectRgn( pRgn, + pRgn_Attr->Rect.left, + pRgn_Attr->Rect.top, + pRgn_Attr->Rect.right, + pRgn_Attr->Rect.bottom ); + break; + } + pRgn_Attr->AttrFlags &= ~ATTR_RGN_DIRTY; + } + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + (void)0; + } + _SEH2_END; + } + } } PROSRGNDATA FASTCALL -RGNOBJAPI_Lock(HRGN hRgn, PRGN_ATTR *ppRgn_Attr) -{ - PROSRGNDATA pRgn = NULL; - - pRgn = REGION_LockRgn(hRgn); - - REGION_vSyncRegion(pRgn); - - if (ppRgn_Attr) - *ppRgn_Attr = pRgn->prgnattr; - - return pRgn; +RGNOBJAPI_Lock( + HRGN hRgn, + PRGN_ATTR *ppRgn_Attr) +{ + PROSRGNDATA pRgn = NULL; + + pRgn = REGION_LockRgn(hRgn); + + REGION_vSyncRegion(pRgn); + + if (ppRgn_Attr) + *ppRgn_Attr = pRgn->prgnattr; + + return pRgn; } VOID FASTCALL -RGNOBJAPI_Unlock(PROSRGNDATA pRgn) -{ - PRGN_ATTR pRgn_Attr; - - if (pRgn && GreGetObjectOwner(pRgn->BaseObject.hHmgr) == GDI_OBJ_HMGR_POWNED) - { - pRgn_Attr = GDIOBJ_pvGetObjectAttr(&pRgn->BaseObject); - - if ( pRgn_Attr ) - { - _SEH2_TRY - { - if ( pRgn_Attr->AttrFlags & ATTR_RGN_VALID ) - { - pRgn_Attr->Flags = REGION_Complexity( pRgn ); - pRgn_Attr->Rect.left = pRgn->rdh.rcBound.left; - pRgn_Attr->Rect.top = pRgn->rdh.rcBound.top; - pRgn_Attr->Rect.right = pRgn->rdh.rcBound.right; - pRgn_Attr->Rect.bottom = pRgn->rdh.rcBound.bottom; - } - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - (void)0; - } - _SEH2_END; - } - } - REGION_UnlockRgn(pRgn); +RGNOBJAPI_Unlock( + PROSRGNDATA pRgn) +{ + PRGN_ATTR pRgn_Attr; + + if (pRgn && GreGetObjectOwner(pRgn->BaseObject.hHmgr) == GDI_OBJ_HMGR_POWNED) + { + pRgn_Attr = GDIOBJ_pvGetObjectAttr(&pRgn->BaseObject); + + if ( pRgn_Attr ) + { + _SEH2_TRY + { + if ( pRgn_Attr->AttrFlags & ATTR_RGN_VALID ) + { + pRgn_Attr->Flags = REGION_Complexity( pRgn ); + pRgn_Attr->Rect.left = pRgn->rdh.rcBound.left; + pRgn_Attr->Rect.top = pRgn->rdh.rcBound.top; + pRgn_Attr->Rect.right = pRgn->rdh.rcBound.right; + pRgn_Attr->Rect.bottom = pRgn->rdh.rcBound.bottom; + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + (void)0; + } + _SEH2_END; + } + } + REGION_UnlockRgn(pRgn); } /* @@ -2250,7 +2247,11 @@ // PROSRGNDATA FASTCALL -IntSysCreateRectpRgn(INT LeftRect, INT TopRect, INT RightRect, INT BottomRect) +IntSysCreateRectpRgn( + INT LeftRect, + INT TopRect, + INT RightRect, + INT BottomRect) { PREGION prgn; @@ -2269,7 +2270,8 @@ return prgn; } -VOID NTAPI +VOID +NTAPI REGION_vCleanup(PVOID ObjectBody) { PROSRGNDATA pRgn = (PROSRGNDATA)ObjectBody; @@ -2284,14 +2286,16 @@ ExFreePoolWithTag(pRgn->Buffer, TAG_REGION); } -VOID FASTCALL +VOID +FASTCALL REGION_Delete(PROSRGNDATA pRgn) { - if ( pRgn == prgnDefault) return; - GDIOBJ_vDeleteObject(&pRgn->BaseObject); -} - -VOID FASTCALL + if ( pRgn == prgnDefault) return; + GDIOBJ_vDeleteObject(&pRgn->BaseObject); +} + +VOID +FASTCALL IntGdiReleaseRaoRgn(PDC pDC) { INT Index = GDI_HANDLE_GET_INDEX(pDC->BaseObject.hHmgr); @@ -2303,51 +2307,53 @@ pDC->prgnRao = NULL; } -VOID FASTCALL +VOID +FASTCALL IntGdiReleaseVisRgn(PDC pDC) { - INT Index = GDI_HANDLE_GET_INDEX(pDC->BaseObject.hHmgr); - PGDI_TABLE_ENTRY Entry = &GdiHandleTable->Entries[Index]; - pDC->fs |= DC_FLAG_DIRTY_RAO; - Entry->Flags |= GDI_ENTRY_VALIDATE_VIS; - RECTL_vSetEmptyRect(&pDC->erclClip); - REGION_Delete(pDC->prgnVis); - pDC->prgnVis = prgnDefault; -} - -VOID FASTCALL + INT Index = GDI_HANDLE_GET_INDEX(pDC->BaseObject.hHmgr); + PGDI_TABLE_ENTRY Entry = &GdiHandleTable->Entries[Index]; + pDC->fs |= DC_FLAG_DIRTY_RAO; + Entry->Flags |= GDI_ENTRY_VALIDATE_VIS; + RECTL_vSetEmptyRect(&pDC->erclClip); + REGION_Delete(pDC->prgnVis); + pDC->prgnVis = prgnDefault; +} + +VOID +FASTCALL IntUpdateVisRectRgn(PDC pDC, PROSRGNDATA pRgn) { - INT Index = GDI_HANDLE_GET_INDEX(pDC->BaseObject.hHmgr); - PGDI_TABLE_ENTRY Entry = &GdiHandleTable->Entries[Index]; - PDC_ATTR pdcattr; - RECTL rcl; - - if (Entry->Flags & GDI_ENTRY_VALIDATE_VIS) - { - pdcattr = pDC->pdcattr; - - pdcattr->VisRectRegion.Flags = REGION_Complexity(pRgn); - - if (pRgn && pdcattr->VisRectRegion.Flags != NULLREGION) - { - rcl.left = pRgn->rdh.rcBound.left; - rcl.top = pRgn->rdh.rcBound.top; - rcl.right = pRgn->rdh.rcBound.right; - rcl.bottom = pRgn->rdh.rcBound.bottom; - - rcl.left -= pDC->erclWindow.left; - rcl.top -= pDC->erclWindow.top; - rcl.right -= pDC->erclWindow.left; - rcl.bottom -= pDC->erclWindow.top; - } - else - RECTL_vSetEmptyRect(&rcl); - - pdcattr->VisRectRegion.Rect = rcl; - - Entry->Flags &= ~GDI_ENTRY_VALIDATE_VIS; - } + INT Index = GDI_HANDLE_GET_INDEX(pDC->BaseObject.hHmgr); + PGDI_TABLE_ENTRY Entry = &GdiHandleTable->Entries[Index]; + PDC_ATTR pdcattr; + RECTL rcl; + + if (Entry->Flags & GDI_ENTRY_VALIDATE_VIS) + { + pdcattr = pDC->pdcattr; + + pdcattr->VisRectRegion.Flags = REGION_Complexity(pRgn); + + if (pRgn && pdcattr->VisRectRegion.Flags != NULLREGION) + { + rcl.left = pRgn->rdh.rcBound.left; + rcl.top = pRgn->rdh.rcBound.top; + rcl.right = pRgn->rdh.rcBound.right; + rcl.bottom = pRgn->rdh.rcBound.bottom; + + rcl.left -= pDC->erclWindow.left; + rcl.top -= pDC->erclWindow.top; + rcl.right -= pDC->erclWindow.left; + rcl.bottom -= pDC->erclWindow.top; + } + else + RECTL_vSetEmptyRect(&rcl); + + pdcattr->VisRectRegion.Rect = rcl; + + Entry->Flags &= ~GDI_ENTRY_VALIDATE_VIS; + } } BOOL @@ -2430,11 +2436,11 @@ return REGION_Complexity(prgnDest); } -INT FASTCALL +INT +FASTCALL REGION_GetRgnBox( PROSRGNDATA Rgn, - PRECTL pRect -) + PRECTL pRect) { DWORD ret; @@ -2448,11 +2454,11 @@ return 0; // If invalid region return zero } -INT APIENTRY +INT +APIENTRY IntGdiGetRgnBox( HRGN hRgn, - PRECTL pRect -) + PRECTL pRect) { PROSRGNDATA Rgn; DWORD ret; @@ -2472,8 +2478,7 @@ FASTCALL IntGdiPaintRgn( PDC dc, - PREGION Rgn -) + PREGION Rgn) { PROSRGNDATA VisRgn; XCLIPOBJ ClipRegion; @@ -2497,7 +2502,7 @@ // Transform region into device co-ords if (!REGION_LPTODP(dc, VisRgn, Rgn) || - IntGdiOffsetRgn(VisRgn, dc->ptlDCOrig.x, dc->ptlDCOrig.y) == ERROR) + IntGdiOffsetRgn(VisRgn, dc->ptlDCOrig.x, dc->ptlDCOrig.y) == ERROR) { REGION_Delete(VisRgn); return FALSE; @@ -2554,25 +2559,31 @@ FASTCALL REGION_RectInRegion( PROSRGNDATA Rgn, - const RECTL *rect -) + const RECTL *rect) { PRECTL pCurRect, pRectEnd; RECT rc; /* Swap the coordinates to make right >= left and bottom >= top */ /* (region building rectangles are normalized the same way) */ - if( rect->top > rect->bottom) { + if( rect->top > rect->bottom) + { rc.top = rect->bottom; rc.bottom = rect->top; - } else { + } + else + { rc.top = rect->top; rc.bottom = rect->bottom; } - if( rect->right < rect->left) { + + if( rect->right < rect->left) + { rc.right = rect->left; rc.left = rect->right; - } else { + } + else + { rc.right = rect->right; rc.left = rect->left; } @@ -2581,10 +2592,10 @@ if ((Rgn->rdh.nCount > 0) && EXTENTCHECK(&Rgn->rdh.rcBound, &rc)) { for (pCurRect = Rgn->Buffer, pRectEnd = pCurRect + - Rgn->rdh.nCount; pCurRect < pRectEnd; pCurRect++) + Rgn->rdh.nCount; pCurRect < pRectEnd; pCurRect++) { if (pCurRect->bottom <= rc.top) - continue; /* Not far enough down yet */ + continue; /* Not far enough down yet */ if (pCurRect->top >= rc.bottom) break; /* Too far down */ @@ -2592,7 +2603,8 @@ if (pCurRect->right <= rc.left) continue; /* Not far enough over yet */ - if (pCurRect->left >= rc.right) { + if (pCurRect->left >= rc.right) + { continue; } @@ -2609,8 +2621,7 @@ INT LeftRect, INT TopRect, INT RightRect, - INT BottomRect -) + INT BottomRect) { PRECTL firstRect; @@ -2620,6 +2631,7 @@ LeftRect = RightRect; RightRect = tmp; } + if (TopRect > BottomRect) { INT tmp = TopRect; @@ -2649,7 +2661,7 @@ IntGdiOffsetRgn( PROSRGNDATA rgn, INT XOffset, - INT YOffset ) + INT YOffset) { if (XOffset || YOffset) { @@ -2666,6 +2678,7 @@ pbox->bottom += YOffset; pbox++; } + if (rgn->Buffer != &rgn->rdh.rcBound) { rgn->rdh.rcBound.left += XOffset; @@ -2675,6 +2688,7 @@ } } } + return REGION_Complexity(rgn); } @@ -2687,22 +2701,21 @@ * bucket. Finally, we can insert it. * */ -static void FASTCALL +static +void +FASTCALL REGION_InsertEdgeInET( EdgeTable *ET, EdgeTableEntry *ETE, INT scanline, ScanLineListBlock **SLLBlock, - INT *iSLLBlock -) + INT *iSLLBlock) { EdgeTableEntry *start, *prev; ScanLineList *pSLL, *pPrevSLL; ScanLineListBlock *tmpSLLBlock; - /* - * Find the right bucket to put the edge into - */ + /* Find the right bucket to put the edge into */ pPrevSLL = &ET->scanlines; pSLL = pPrevSLL->next; while (pSLL && (pSLL->scanline < scanline)) @@ -2711,9 +2724,7 @@ pSLL = pSLL->next; } - /* - * Reassign pSLL (pointer to ScanLineList) if necessary - */ + /* Reassign pSLL (pointer to ScanLineList) if necessary */ if ((!pSLL) || (pSLL->scanline > scanline)) { if (*iSLLBlock > SLLSPERBLOCK-1) @@ -2725,22 +2736,23 @@ /* FIXME: Free resources? */ return; } + (*SLLBlock)->next = tmpSLLBlock; tmpSLLBlock->next = (ScanLineListBlock *)NULL; *SLLBlock = tmpSLLBlock; *iSLLBlock = 0; } + pSLL = &((*SLLBlock)->SLLs[(*iSLLBlock)++]); pSLL->next = pPrevSLL->next; pSLL->edgelist = (EdgeTableEntry *)NULL; pPrevSLL->next = pSLL; } + pSLL->scanline = scanline; - /* - * Now insert the edge in the right bucket - */ + /* Now insert the edge in the right bucket */ prev = (EdgeTableEntry *)NULL; start = pSLL->edgelist; while (start && (start->bres.minor_axis < ETE->bres.minor_axis)) @@ -2748,6 +2760,7 @@ prev = start; start = start->next; } + ETE->next = start; if (prev) @@ -2764,11 +2777,12 @@ * leaving them sorted by smaller x coordinate. * */ -static void FASTCALL +static +void +FASTCALL REGION_loadAET( EdgeTableEntry *AET, - EdgeTableEntry *ETEs -) + EdgeTableEntry *ETEs) { EdgeTableEntry *pPrevAET; EdgeTableEntry *tmp; @@ -2782,10 +2796,12 @@ pPrevAET = AET; AET = AET->next; } + tmp = ETEs->next; ETEs->next = AET; if (AET) AET->back = ETEs; + ETEs->back = pPrevAET; pPrevAET->next = ETEs; pPrevAET = ETEs; @@ -2814,8 +2830,11 @@ * V-------------------> V---> ... * */ -static void FASTCALL -REGION_computeWAET(EdgeTableEntry *AET) +static +void +FASTCALL +REGION_computeWAET( + EdgeTableEntry *AET) { register EdgeTableEntry *pWETE; register int inside = 1; @@ -2831,8 +2850,8 @@ else isInside--; - if ( (!inside && !isInside) || - ( inside && isInside) ) + if ((!inside && !isInside) || + ( inside && isInside)) { pWETE->nextWETE = AET; pWETE = AET; @@ -2840,6 +2859,7 @@ } AET = AET->next; } + pWETE->nextWETE = (EdgeTableEntry *)NULL; } @@ -2851,8 +2871,11 @@ * Edge Table. * */ -static BOOL FASTCALL -REGION_InsertionSort(EdgeTableEntry *AET) +static +BOOL +FASTCALL +REGION_InsertionSort( + EdgeTableEntry *AET) { EdgeTableEntry *pETEchase; EdgeTableEntry *pETEinsert; @@ -2874,6 +2897,7 @@ pETEinsert->back->next = AET; if (AET) AET->back = pETEinsert->back; + pETEinsert->next = pETEchase; pETEchase->back->next = pETEinsert; pETEchase->back = pETEinsert; @@ -2881,6 +2905,7 @@ changed = TRUE; } } + return changed; } @@ -2889,8 +2914,11 @@ * * Clean up our act. */ -static void FASTCALL -REGION_FreeStorage(ScanLineListBlock *pSLLBlock) +static +void +FASTCALL +REGION_FreeStorage( + ScanLineListBlock *pSLLBlock) { ScanLineListBlock *tmpSLLBlock; @@ -2908,7 +2936,9 @@ * * Create an array of rectangles from a list of points. */ -static int FASTCALL +static +INT +FASTCALL REGION_PtsToRegion( int numFullPtBlocks, int iCurPtBlock, @@ -2956,6 +2986,7 @@ i = NUMPTSTOBUFFER >> 1; if (!numFullPtBlocks) i = iCurPtBlock >> 1; + for (pts = CurPtBlock->pts; i--; pts += 2) { if (pts->x == pts[1].x) @@ -2968,6 +2999,7 @@ rects->bottom = pts[1].y + 1; continue; } + numRects++; rects++; rects->left = pts->x; @@ -2979,6 +3011,7 @@ if (rects->right > extents->right) extents->right = rects->right; } + CurPtBlock = CurPtBlock->next; } @@ -2994,6 +3027,7 @@ extents->right = 0; extents->bottom = 0; } + reg->rdh.nCount = numRects; return(TRUE); @@ -3023,7 +3057,9 @@ * which an edge is initially entered. * */ -static void FASTCALL +static +void +FASTCALL REGION_CreateETandAET( const ULONG *Count, INT nbpolygons, @@ -3031,8 +3067,7 @@ EdgeTable *ET, EdgeTableEntry *AET, EdgeTableEntry *pETEs, - ScanLineListBlock *pSLLBlock -) + ScanLineListBlock *pSLLBlock) { const POINT *top, *bottom; const POINT *PrevPt, *CurrPt, *EndPt; @@ -3041,17 +3076,13 @@ int dy; - /* - * Initialize the Active Edge Table - */ + /* Initialize the Active Edge Table */ AET->next = (EdgeTableEntry *)NULL; AET->back = (EdgeTableEntry *)NULL; AET->nextWETE = (EdgeTableEntry *)NULL; AET->bres.minor_axis = SMALL_COORDINATE; - /* - * Initialize the Edge Table. - */ + /* Initialize the Edge Table. */ ET->scanlines.next = (ScanLineList *)NULL; ET->ymax = SMALL_COORDINATE; ET->ymin = LARGE_COORDINATE; @@ -3067,18 +3098,14 @@ PrevPt = EndPt; - /* - * For each vertex in the array of points. + /* For each vertex in the array of points. * In this loop we are dealing with two vertices at - * a time -- these make up one edge of the polygon. - */ + * a time -- these make up one edge of the polygon. */ while (count--) { CurrPt = pts++; - /* - * Find out which point is above and which is below. - */ + /* Find out which point is above and which is below. */ if (PrevPt->y > CurrPt->y) { bottom = PrevPt, top = CurrPt; @@ -3090,21 +3117,20 @@ pETEs->ClockWise = 1; } - /* - * Don't add horizontal edges to the Edge table. - */ + /* Don't add horizontal edges to the Edge table. */ if (bottom->y != top->y) { - pETEs->ymax = bottom->y-1; /* -1 so we don't get last scanline */ - - /* - * Initialize integer edge algorithm - */ + pETEs->ymax = bottom->y - 1; + + /* Initialize integer edge algorithm */ dy = bottom->y - top->y; BRESINITPGONSTRUCT(dy, top->x, bottom->x, pETEs->bres); - REGION_InsertEdgeInET(ET, pETEs, top->y, &pSLLBlock, + REGION_InsertEdgeInET(ET, + pETEs, + top->y, + &pSLLBlock, &iSLLBlock); if (PrevPt->y > ET->ymax) @@ -3119,14 +3145,14 @@ } } -BOOL FASTCALL +BOOL +FASTCALL IntSetPolyPolygonRgn( POINT *Pts, PULONG Count, INT nbpolygons, INT mode, - PREGION Rgn -) + PREGION Rgn) { EdgeTableEntry *pAET; /* Active Edge Table */ INT y; /* Current scanline */ @@ -3148,32 +3174,33 @@ if (mode == 0 || mode > 2) return 0; /* Special case a rectangle */ - if (((nbpolygons == 1) && ((*Count == 4) || - ((*Count == 5) && (Pts[4].x == Pts[0].x) && (Pts[4].y == Pts[0].y)))) && - (((Pts[0].y == Pts[1].y) && - (Pts[1].x == Pts[2].x) && - (Pts[2].y == Pts[3].y) && - (Pts[3].x == Pts[0].x)) || - ((Pts[0].x == Pts[1].x) && - (Pts[1].y == Pts[2].y) && - (Pts[2].x == Pts[3].x) && - (Pts[3].y == Pts[0].y)))) + ((*Count == 5) && (Pts[4].x == Pts[0].x) && (Pts[4].y == Pts[0].y)))) && + (((Pts[0].y == Pts[1].y) && + (Pts[1].x == Pts[2].x) && + (Pts[2].y == Pts[3].y) && + (Pts[3].x == Pts[0].x)) || + ((Pts[0].x == Pts[1].x) && + (Pts[1].y == Pts[2].y) && + (Pts[2].x == Pts[3].x) && + (Pts[3].y == Pts[0].y)))) { REGION_SetRectRgn(Rgn, - min(Pts[0].x, Pts[2].x), - min(Pts[0].y, Pts[2].y), - max(Pts[0].x, Pts[2].x), - max(Pts[0].y, Pts[2].y)); + min(Pts[0].x, Pts[2].x), + min(Pts[0].y, Pts[2].y), + max(Pts[0].x, Pts[2].x), + max(Pts[0].y, Pts[2].y)); return TRUE; } for (poly = total = 0; poly < nbpolygons; poly++) total += Count[poly]; - if (! (pETEs = ExAllocatePoolWithTag(PagedPool, sizeof(EdgeTableEntry) * total, TAG_REGION)) ) + + if (!(pETEs = ExAllocatePoolWithTag(PagedPool, sizeof(EdgeTableEntry) * total, TAG_REGION)) ) { return FALSE; } + pts = FirstPtBlock.pts; REGION_CreateETandAET(Count, nbpolygons, Pts, &ET, &AET, pETEs, &SLLBlock); pSLL = ET.scanlines.next; @@ -3181,15 +3208,11 @@ if (mode != WINDING) { - /* - * For each scanline - */ + /* For each scanline */ for (y = ET.ymin; y < ET.ymax; y++) { - /* - * Add a new edge to the active edge table when we - * get to the next edge. - */ + /* Add a new edge to the active edge table when we + * get to the next edge. */ if (pSLL != NULL && y == pSLL->scanline) { REGION_loadAET(&AET, pSLL->edgelist); @@ -3198,17 +3221,13 @@ pPrevAET = &AET; pAET = AET.next; - /* - * For each active edge - */ + /* For each active edge */ while (pAET) { pts->x = pAET->bres.minor_axis, pts->y = y; pts++, iPts++; - /* - * Send out the buffer - */ + /* Send out the buffer */ if (iPts == NUMPTSTOBUFFER) { tmpPtBlock = ExAllocatePoolWithTag(PagedPool, sizeof(POINTBLOCK), TAG_REGION); @@ -3218,28 +3237,27 @@ ExFreePoolWithTag(pETEs, TAG_REGION); return FALSE; } + curPtBlock->next = tmpPtBlock; curPtBlock = tmpPtBlock; pts = curPtBlock->pts; numFullPtBlocks++; iPts = 0; } + EVALUATEEDGEEVENODD(pAET, pPrevAET, y); } + REGION_InsertionSort(&AET); } } else { - /* - * For each scanline - */ + /* For each scanline */ for (y = ET.ymin; y < ET.ymax; y++) { - /* - * Add a new edge to the active edge table when we - * get to the next edge. - */ + /* Add a new edge to the active edge table when we + * get to the next edge. */ if (pSLL != NULL && y == pSLL->scanline) { REGION_loadAET(&AET, pSLL->edgelist); @@ -3250,23 +3268,17 @@ pAET = AET.next; pWETE = pAET; - /* - * For each active edge - */ + /* For each active edge */ while (pAET) { - /* - * Add to the buffer only those edges that - * are in the Winding active edge table. - */ + /* Add to the buffer only those edges that + * are in the Winding active edge table. */ if (pWETE == pAET) { pts->x = pAET->bres.minor_axis, pts->y = y; pts++, iPts++; - /* - * Send out the buffer - */ + /* Send out the buffer */ if (iPts == NUMPTSTOBUFFER) { tmpPtBlock = ExAllocatePoolWithTag(PagedPool, @@ -3283,15 +3295,15 @@ numFullPtBlocks++; iPts = 0; } + pWETE = pWETE->nextWETE; } + EVALUATEEDGEWINDING(pAET, pPrevAET, y, fixWAET); } - /* - * Recompute the winding active edge table if - * we just resorted or have exited an edge. - */ + /* Recompute the winding active edge table if + * we just resorted or have exited an edge. */ if (REGION_InsertionSort(&AET) || fixWAET) { REGION_computeWAET(&AET); @@ -3299,6 +3311,7 @@ } } } + REGION_FreeStorage(SLLBlock.next); REGION_PtsToRegion(numFullPtBlocks, iPts, &FirstPtBlock, Rgn); @@ -3308,6 +3321,7 @@ ExFreePoolWithTag(curPtBlock, TAG_REGION); curPtBlock = tmpPtBlock; } + ExFreePoolWithTag(pETEs, TAG_REGION); return TRUE; } @@ -3316,8 +3330,7 @@ FASTCALL IntRectInRegion( HRGN hRgn, - LPRECTL rc -) + LPRECTL rc) { PROSRGNDATA Rgn; BOOL Ret; @@ -3392,15 +3405,22 @@ INT Left, INT Top, INT Right, - INT Bottom -) -{ - return NtGdiCreateRoundRectRgn(Left, Top, Right, Bottom, - Right - Left, Bottom - Top); -} - -HRGN APIENTRY -NtGdiCreateRectRgn(INT LeftRect, INT TopRect, INT RightRect, INT BottomRect) + INT Bottom) +{ + return NtGdiCreateRoundRectRgn(Left, + Top, + Right, Bottom, + Right - Left, + Bottom - Top); +} + +HRGN +APIENTRY +NtGdiCreateRectRgn( + INT LeftRect, + INT TopRect, + INT RightRect, + INT BottomRect) { PROSRGNDATA pRgn; HRGN hRgn; @@ -3429,8 +3449,7 @@ INT right, INT bottom, INT ellipse_width, - INT ellipse_height -) + INT ellipse_height) { PROSRGNDATA obj; HRGN hrgn; @@ -3438,13 +3457,13 @@ RECTL rect; /* Make the dimensions sensible */ - if (left > right) { INT tmp = left; left = right; right = tmp; } + if (top > bottom) { INT tmp = top; @@ -3456,24 +3475,23 @@ ellipse_height = abs(ellipse_height); /* Check parameters */ - - if (ellipse_width > right-left) ellipse_width = right-left; - if (ellipse_height > bottom-top) ellipse_height = bottom-top; + if (ellipse_width > right-left) + ellipse_width = right-left; + if (ellipse_height > bottom-top) + ellipse_height = bottom-top; /* Check if we can do a normal rectangle instead */ - if ((ellipse_width < 2) || (ellipse_height < 2)) return NtGdiCreateRectRgn(left, top, right, bottom); /* Create region */ - d = (ellipse_height < 128) ? ((3 * ellipse_height) >> 2) : 64; - if (!(obj = REGION_AllocUserRgnWithHandle(d))) return 0; + if (!(obj = REGION_AllocUserRgnWithHandle(d))) + return 0; hrgn = obj->BaseObject.hHmgr; - /* Ellipse algorithm, based on an article by K. Porter */ - /* in DDJ Graphics Programming Column, 8/89 */ - + /* Ellipse algorithm, based on an article by K. Porter + in DDJ Graphics Programming Column, 8/89 */ asq = ellipse_width * ellipse_width / 4; /* a^2 */ bsq = ellipse_height * ellipse_height / 4; /* b^2 */ d = bsq - asq * ellipse_height / 2 + asq / 4; /* b^2 - a^2b + a^2/4 */ @@ -3484,10 +3502,10 @@ rect.right = right - ellipse_width / 2; /* Loop to draw first half of quadrant */ - while (xd < yd) { - if (d > 0) /* If nearest pixel is toward the center */ + /* If nearest pixel is toward the center */ + if (d > 0) { /* Move toward center */ rect.top = top++; @@ -3499,13 +3517,15 @@ yd -= 2*asq; d -= yd; } - rect.left--; /* Next horiz point */ + + /* Next horiz point */ + rect.left--; rect.right++; xd += 2*bsq; d += bsq + xd; } + /* Loop to draw second half of quadrant */ - d += (3 * (asq-bsq) / 2 - (xd+yd)) / 2; while (yd >= 0) { @@ -3516,18 +3536,22 @@ rect.top = --bottom; rect.bottom = rect.top + 1; REGION_UnionRectWithRgn(obj, &rect); - if (d < 0) /* If nearest pixel is outside ellipse */ - { - rect.left--; /* Move away from center */ + + /* If nearest pixel is outside ellipse */ + if (d < 0) + { + /* Move away from center */ + rect.left--; rect.right++; xd += 2*bsq; d += xd; } + yd -= 2*asq; d += asq - yd; } + /* Add the inside rectangle */ - if (top <= bottom) { rect.top = top; @@ -3543,51 +3567,52 @@ APIENTRY NtGdiEqualRgn( HRGN hSrcRgn1, - HRGN hSrcRgn2 -) + HRGN hSrcRgn2) { PROSRGNDATA rgn1, rgn2; PRECTL tRect1, tRect2; ULONG i; BOOL bRet = FALSE; - if ( !(rgn1 = RGNOBJAPI_Lock(hSrcRgn1, NULL)) ) + if (!(rgn1 = RGNOBJAPI_Lock(hSrcRgn1, NULL))) return ERROR; - if ( !(rgn2 = RGNOBJAPI_Lock(hSrcRgn2, NULL)) ) + if (!(rgn2 = RGNOBJAPI_Lock(hSrcRgn2, NULL))) { RGNOBJAPI_Unlock(rgn1); return ERROR; } - if ( rgn1->rdh.nCount != rgn2->rdh.nCount ) goto exit; - - if ( rgn1->rdh.nCount == 0 ) - { - bRet = TRUE; - goto exit; - } - - if ( rgn1->rdh.rcBound.left != rgn2->rdh.rcBound.left || - rgn1->rdh.rcBound.right != rgn2->rdh.rcBound.right || - rgn1->rdh.rcBound.top != rgn2->rdh.rcBound.top || - rgn1->rdh.rcBound.bottom != rgn2->rdh.rcBound.bottom ) - goto exit; + if (rgn1->rdh.nCount != rgn2->rdh.nCount) + goto exit; + + if (rgn1->rdh.nCount == 0) + { + bRet = TRUE; + goto exit; + } + + if (rgn1->rdh.rcBound.left != rgn2->rdh.rcBound.left || + rgn1->rdh.rcBound.right != rgn2->rdh.rcBound.right || + rgn1->rdh.rcBound.top != rgn2->rdh.rcBound.top || + rgn1->rdh.rcBound.bottom != rgn2->rdh.rcBound.bottom ) + goto exit; tRect1 = rgn1->Buffer; tRect2 = rgn2->Buffer; if (!tRect1 || !tRect2) - goto exit; + goto exit; for (i=0; i < rgn1->rdh.nCount; i++) { - if ( tRect1[i].left != tRect2[i].left || - tRect1[i].right != tRect2[i].right || - tRect1[i].top != tRect2[i].top || - tRect1[i].bottom != tRect2[i].bottom ) - goto exit; - } + if (tRect1[i].left != tRect2[i].left || + tRect1[i].right != tRect2[i].right || + tRect1[i].top != tRect2[i].top || + tRect1[i].bottom != tRect2[i].bottom ) + goto exit; + } + bRet = TRUE; exit: @@ -3601,16 +3626,15 @@ NtGdiExtCreateRegion( OPTIONAL LPXFORM Xform, DWORD Count, - LPRGNDATA RgnData -) + LPRGNDATA RgnData) { HRGN hRgn; PROSRGNDATA Region; DWORD nCount = 0; DWORD iType = 0; DWORD dwSize = 0; - UINT i; - RECT* rects; + UINT i; + RECT* rects; NTSTATUS Status = STATUS_SUCCESS; MATRIX matrix; XFORMOBJ xo; @@ -3622,13 +3646,14 @@ nCount = RgnData->rdh.nCount; iType = RgnData->rdh.iType; dwSize = RgnData->rdh.dwSize; - rects = (RECT*)RgnData->Buffer; + rects = (RECT*)RgnData->Buffer; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { Status = _SEH2_GetExceptionCode(); } _SEH2_END; + if (!NT_SUCCESS(Status)) { SetLastNtError(Status); @@ -3654,11 +3679,11 @@ _SEH2_TRY { - /* Insert the rectangles one by one */ - for(i=0; i<nCount; i++) - { - REGION_UnionRectWithRgn(Region, &rects[i]); - } + /* Insert the rectangles one by one */ + for(i=0; i<nCount; i++) + { + REGION_UnionRectWithRgn(Region, &rects[i]); + } if (Xform) { ULONG ret; @@ -3706,8 +3731,7 @@ NtGdiFillRgn( HDC hDC, HRGN hRgn, - HBRUSH hBrush -) + HBRUSH hBrush) { HBRUSH oldhBrush; PROSRGNDATA rgn; @@ -3742,8 +3766,7 @@ HRGN hRgn, HBRUSH hBrush, INT Width, - INT Height -) + INT Height) { HRGN FrameRgn; BOOL Ret; @@ -3752,6 +3775,7 @@ { return FALSE; } + if (!REGION_CreateFrameRgn(FrameRgn, hRgn, Width, Height)) { GreDeleteObject(FrameRgn); @@ -3765,11 +3789,11 @@ } -INT APIENTRY +INT +APIENTRY NtGdiGetRgnBox( HRGN hRgn, - PRECTL pRect -) + PRECTL pRect) { PROSRGNDATA Rgn; RECTL SafeRect; @@ -3810,8 +3834,7 @@ APIENTRY NtGdiInvertRgn( HDC hDC, - HRGN hRgn -) + HRGN hRgn) { PROSRGNDATA RgnData; ULONG i; @@ -3844,8 +3867,7 @@ NtGdiOffsetRgn( HRGN hRgn, INT XOffset, - INT YOffset -) + INT YOffset) { PROSRGNDATA rgn = RGNOBJAPI_Lock(hRgn, NULL); INT ret; @@ -3869,13 +3891,12 @@ NtGdiPtInRegion( HRGN hRgn, INT X, - INT Y -) + INT Y) { PREGION prgn; BOOL ret; - if (!(prgn = RGNOBJAPI_Lock(hRgn, NULL) ) ) + if (!(prgn = RGNOBJAPI_Lock(hRgn, NULL))) return FALSE; ret = REGION_PtInRegion(prgn, X, Y); @@ -3888,8 +3909,7 @@ APIENTRY NtGdiRectInRegion( HRGN hRgn, - LPRECTL unsaferc -) + LPRECTL unsaferc) { RECTL rc = { 0 }; NTSTATUS Status = STATUS_SUCCESS; @@ -3922,12 +3942,11 @@ INT LeftRect, INT TopRect, INT RightRect, - INT BottomRect -) + INT BottomRect) { PROSRGNDATA rgn; - if ( !(rgn = RGNOBJAPI_Lock(hRgn, NULL)) ) + if (!(rgn = RGNOBJAPI_Lock(hRgn, NULL))) { return 0; // Per documentation } @@ -3938,11 +3957,11 @@ return TRUE; } -HRGN APIENTRY +HRGN +APIENTRY NtGdiUnionRectWithRgn( HRGN hDest, - const RECTL *UnsafeRect -) + const RECTL *UnsafeRect) { RECTL SafeRect = { 0 }; PROSRGNDATA Rgn;

10 years

[tkreuzer] 65718: [GDI32] Avoid casting RECT and POINT to RECTL and POINTL by adding a define

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Dec 18 08:11:09 2014 New Revision: 65718 URL: http://svn.reactos.org/svn/reactos?rev=65718&view=rev Log: [GDI32] Avoid casting RECT and POINT to RECTL and POINTL by adding a define Modified: trunk/reactos/win32ss/gdi/gdi32/include/precomp.h Modified: trunk/reactos/win32ss/gdi/gdi32/include/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/include/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/include/precomp.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/include/precomp.h [iso-8859-1] Thu Dec 18 08:11:09 2014 @@ -21,6 +21,16 @@ /* SDK/DDK/NDK Headers. */ #include <windef.h> + +/* Avoid type casting, by defining RECT to RECTL */ +#define RECT RECTL +#define PRECT PRECTL +#define LPRECT LPRECTL +#define LPCRECT LPCRECTL +#define POINT POINTL +#define LPPOINT PPOINTL +#define PPOINT PPOINTL + #include <winbase.h> #include <winnls.h> #include <objbase.h>

10 years

[tkreuzer] 65717: [GDI32] Implement GdiGetRgnAttr

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Dec 18 08:11:04 2014 New Revision: 65717 URL: http://svn.reactos.org/svn/reactos?rev=65717&view=rev Log: [GDI32] Implement GdiGetRgnAttr Modified: trunk/reactos/win32ss/gdi/gdi32/include/gdi32p.h Modified: trunk/reactos/win32ss/gdi/gdi32/include/gdi32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/include/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/include/gdi32p.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/include/gdi32p.h [iso-8859-1] Thu Dec 18 08:11:04 2014 @@ -398,6 +398,21 @@ return pdcattr; } +FORCEINLINE +PRGN_ATTR +GdiGetRgnAttr(HRGN hrgn) +{ + PRGN_ATTR prgnattr; + + /* Get the region attribute */ + if (!GdiGetHandleUserData(hrgn, GDILoObjType_LO_REGION_TYPE, (PVOID*)&prgnattr)) + { + return NULL; + } + + return prgnattr; +} + #ifdef _M_IX86 FLOATL FASTCALL EFtoF(EFLOAT_S * efp); #define FOtoF(pfo) EFtoF((EFLOAT_S*)pfo)

10 years

[hbelusca] 65716: [USER32][USERSRV] Temporarily disable UserClientConnect (in server side) and CSR client to server call (in client side), always set gfServerProcess to FALSE (that is normally almo...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Dec 18 01:53:08 2014 New Revision: 65716 URL: http://svn.reactos.org/svn/reactos?rev=65716&view=rev Log: [USER32][USERSRV] Temporarily disable UserClientConnect (in server side) and CSR client to server call (in client side), always set gfServerProcess to FALSE (that is normally almost true but when CSR itself does USER32 operations...), and comment again GetConnect() call in ClientThreadSetup, in an attempt to "fix" 3rd stage for bots (so that we don't assert in DesktopPtrToUser because some pdi is NULL...) Modified: trunk/reactos/win32ss/user/user32/misc/dllmain.c trunk/reactos/win32ss/user/winsrv/usersrv/init.c Modified: trunk/reactos/win32ss/user/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] Thu Dec 18 01:53:08 2014 @@ -240,7 +240,7 @@ // continue as normal. // - GetConnected(); + // GetConnected(); UNIMPLEMENTED; return TRUE; @@ -319,6 +319,8 @@ { case DLL_PROCESS_ATTACH: { + +#if 0 #define WIN_OBJ_DIR L"\\Windows" #define SESSION_DIR L"\\Sessions" @@ -366,6 +368,10 @@ return FALSE; } +#else + gfServerProcess = FALSE; +#endif + User32Instance = hInstanceDll; if (!RegisterClientPFN()) Modified: trunk/reactos/win32ss/user/winsrv/usersrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/usersrv/init.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/usersrv/init.c [iso-8859-1] Thu Dec 18 01:53:08 2014 @@ -210,7 +210,11 @@ LoadedServerDll->NameTable = UserServerApiNameTable; #endif LoadedServerDll->SizeOfProcessData = 0; +#if 0 LoadedServerDll->ConnectCallback = UserClientConnect; +#else + LoadedServerDll->ConnectCallback = NULL; +#endif LoadedServerDll->DisconnectCallback = NULL; LoadedServerDll->HardErrorCallback = UserServerHardError; LoadedServerDll->ShutdownProcessCallback = UserClientShutdown;

10 years

[hbelusca] 65715: [CONSRV]: Explicitely use UNICODE SetWindowText API.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Dec 18 01:35:55 2014 New Revision: 65715 URL: http://svn.reactos.org/svn/reactos?rev=65715&view=rev Log: [CONSRV]: Explicitely use UNICODE SetWindowText API. Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c [iso-8859-1] Thu Dec 18 01:35:55 2014 @@ -1007,7 +1007,7 @@ wcscat(WindowTitle, L" - "); wcscat(WindowTitle, Console->Title.Buffer); - SetWindowText(GuiData->hWindow, WindowTitle); + SetWindowTextW(GuiData->hWindow, WindowTitle); ConsoleFreeHeap(WindowTitle); } @@ -1027,7 +1027,7 @@ ConioUnpause(Console, PAUSED_FROM_SELECTION); /* Restore the console title */ - SetWindowText(GuiData->hWindow, Console->Title.Buffer); + SetWindowTextW(GuiData->hWindow, Console->Title.Buffer); } DeleteObject(oldRgn); @@ -2468,7 +2468,7 @@ break; // case PM_CONSOLE_SET_TITLE: - // SetWindowText(GuiData->hWindow, GuiData->Console->Title.Buffer); + // SetWindowTextW(GuiData->hWindow, GuiData->Console->Title.Buffer); // break; default: Default: Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] Thu Dec 18 01:35:55 2014 @@ -791,7 +791,7 @@ { PGUI_CONSOLE_DATA GuiData = This->Context; // PostMessageW(GuiData->hWindow, PM_CONSOLE_SET_TITLE, 0, 0); - SetWindowText(GuiData->hWindow, GuiData->Console->Title.Buffer); + SetWindowTextW(GuiData->hWindow, GuiData->Console->Title.Buffer); } static BOOL NTAPI

10 years

[hbelusca] 65714: [WIN32K] - Code formatting for NtUserProcessConnect. [USER32] - Hack a call to GetConnected in ClientThreadSetup in an attempt to temporarily "fix" a bug that makes the bots fail....

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Dec 18 00:30:27 2014 New Revision: 65714 URL: http://svn.reactos.org/svn/reactos?rev=65714&view=rev Log: [WIN32K] - Code formatting for NtUserProcessConnect. [USER32] - Hack a call to GetConnected in ClientThreadSetup in an attempt to temporarily "fix" a bug that makes the bots fail. Now we really need to fix user32 init! Modified: trunk/reactos/include/reactos/subsys/win/base.h trunk/reactos/win32ss/include/ntuser.h trunk/reactos/win32ss/user/ntuser/ntstubs.c trunk/reactos/win32ss/user/user32/misc/dllmain.c Modified: trunk/reactos/include/reactos/subsys/win/base.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/win… ============================================================================== --- trunk/reactos/include/reactos/subsys/win/base.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/win/base.h [iso-8859-1] Thu Dec 18 00:30:27 2014 @@ -13,7 +13,7 @@ typedef BOOL -(CALLBACK *BASE_PROCESS_CREATE_NOTIFY_ROUTINE)( +(NTAPI *BASE_PROCESS_CREATE_NOTIFY_ROUTINE)( HANDLE NewProcessId, HANDLE ParentThreadId, ULONG dwUnknown, Modified: trunk/reactos/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?r… ============================================================================== --- trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] Thu Dec 18 00:30:27 2014 @@ -2521,9 +2521,9 @@ NTAPI NtUserNotifyProcessCreate( HANDLE NewProcessId, - HANDLE SourceThreadId, - DWORD dwUnknown, - ULONG CreateFlags); + HANDLE ParentThreadId, + ULONG dwUnknown, + ULONG CreateFlags); VOID NTAPI Modified: trunk/reactos/win32ss/user/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntstub… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] Thu Dec 18 00:30:27 2014 @@ -724,34 +724,43 @@ PUSERCONNECT pUserConnect, DWORD Size) { - NTSTATUS Status = STATUS_SUCCESS; - TRACE("NtUserProcessConnect\n"); - if (pUserConnect && ( Size == sizeof(USERCONNECT) )) - { - PPROCESSINFO W32Process; - UserEnterShared(); - GetW32ThreadInfo(); - W32Process = PsGetCurrentProcessWin32Process(); - _SEH2_TRY - { + NTSTATUS Status = STATUS_SUCCESS; + PPROCESSINFO W32Process; + + TRACE("NtUserProcessConnect\n"); + + if ( pUserConnect == NULL || + Size != sizeof(*pUserConnect) ) + { + return STATUS_UNSUCCESSFUL; + } + + UserEnterShared(); + + W32Process = PsGetCurrentProcessWin32Process(); + _SEH2_TRY + { + // FIXME: Check that pUserConnect->ulVersion == USER_VERSION; + pUserConnect->siClient.psi = gpsi; pUserConnect->siClient.aheList = gHandleTable; - pUserConnect->siClient.ulSharedDelta = (ULONG_PTR)W32Process->HeapMappings.KernelMapping - - (ULONG_PTR)W32Process->HeapMappings.UserMapping; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { + pUserConnect->siClient.ulSharedDelta = + (ULONG_PTR)W32Process->HeapMappings.KernelMapping - + (ULONG_PTR)W32Process->HeapMappings.UserMapping; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { Status = _SEH2_GetExceptionCode(); - } - _SEH2_END - if (!NT_SUCCESS(Status)) - { + } + _SEH2_END; + + if (!NT_SUCCESS(Status)) + { SetLastNtError(Status); - } - UserLeave(); - return Status; - } - return STATUS_UNSUCCESSFUL; + } + + UserLeave(); + return Status; } NTSTATUS Modified: trunk/reactos/win32ss/user/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] Thu Dec 18 00:30:27 2014 @@ -240,6 +240,8 @@ // continue as normal. // + GetConnected(); + UNIMPLEMENTED; return TRUE; } @@ -247,44 +249,53 @@ BOOL Init(VOID) { - USERCONNECT UserCon; - - /* Set PEB data */ - NtCurrentPeb()->KernelCallbackTable = apfnDispatch; - NtCurrentPeb()->PostProcessInitRoutine = NULL; - - NtUserProcessConnect( NtCurrentProcess(), - &UserCon, - sizeof(USERCONNECT)); - - g_ppi = GetWin32ClientInfo()->ppi; // Snapshot PI, used as pointer only! - g_ulSharedDelta = UserCon.siClient.ulSharedDelta; - gpsi = SharedPtrToUser(UserCon.siClient.psi); - gHandleTable = SharedPtrToUser(UserCon.siClient.aheList); - gHandleEntries = SharedPtrToUser(gHandleTable->handles); - - RtlInitializeCriticalSection(&gcsUserApiHook); - - //ERR("1 SI 0x%x : HT 0x%x : D 0x%x\n", UserCon.siClient.psi, UserCon.siClient.aheList, g_ulSharedDelta); - - /* Allocate an index for user32 thread local data. */ - User32TlsIndex = TlsAlloc(); - if (User32TlsIndex != TLS_OUT_OF_INDEXES) - { - if (MessageInit()) - { - if (MenuInit()) - { + NTSTATUS Status; + USERCONNECT UserCon; + + TRACE("user32::Init()\n"); + + /* Set PEB data */ + NtCurrentPeb()->KernelCallbackTable = apfnDispatch; + NtCurrentPeb()->PostProcessInitRoutine = NULL; + + /* Minimal setup of the connect info structure */ + UserCon.ulVersion = USER_VERSION; + + /* Connect to win32k */ + Status = NtUserProcessConnect(NtCurrentProcess(), + &UserCon, + sizeof(UserCon)); + if (!NT_SUCCESS(Status)) return FALSE; + + /* Retrieve data */ + g_ppi = GetWin32ClientInfo()->ppi; // Snapshot PI, used as pointer only! + g_ulSharedDelta = UserCon.siClient.ulSharedDelta; + gpsi = SharedPtrToUser(UserCon.siClient.psi); + gHandleTable = SharedPtrToUser(UserCon.siClient.aheList); + gHandleEntries = SharedPtrToUser(gHandleTable->handles); + + RtlInitializeCriticalSection(&gcsUserApiHook); + + //ERR("1 SI 0x%x : HT 0x%x : D 0x%x\n", UserCon.siClient.psi, UserCon.siClient.aheList, g_ulSharedDelta); + + /* Allocate an index for user32 thread local data */ + User32TlsIndex = TlsAlloc(); + if (User32TlsIndex == TLS_OUT_OF_INDEXES) + return FALSE; + + if (MessageInit()) + { + if (MenuInit()) + { InitializeCriticalSection(&U32AccelCacheLock); LoadAppInitDlls(); return TRUE; - } - MessageCleanup(); - } - TlsFree(User32TlsIndex); - } - - return FALSE; + } + MessageCleanup(); + } + + TlsFree(User32TlsIndex); + return FALSE; } VOID @@ -323,6 +334,9 @@ /* Don't bother us for each thread */ DisableThreadLibraryCalls(hInstanceDll); + + /* Minimal setup of the connect info structure */ + ConnectInfo.ulVersion = USER_VERSION; /* Setup the Object Directory path */ if (!SessionId) @@ -373,32 +387,40 @@ } } - /* Finally init GDI */ + /* Finally, initialize GDI */ return GdiDllInitialize(hInstanceDll, dwReason, reserved); } -// FIXME: This function seems to be unused... +// FIXME: This function IS A BIIG HACK!! VOID FASTCALL GetConnected(VOID) { - USERCONNECT UserCon; - - if ((PTHREADINFO)NtCurrentTeb()->Win32ThreadInfo == NULL) - NtUserGetThreadState(THREADSTATE_GETTHREADINFO); - - if (gpsi && g_ppi) return; - - NtUserProcessConnect( NtCurrentProcess(), - &UserCon, - sizeof(USERCONNECT)); - - g_ppi = GetWin32ClientInfo()->ppi; - g_ulSharedDelta = UserCon.siClient.ulSharedDelta; - gpsi = SharedPtrToUser(UserCon.siClient.psi); - gHandleTable = SharedPtrToUser(UserCon.siClient.aheList); - gHandleEntries = SharedPtrToUser(gHandleTable->handles); - + NTSTATUS Status; + USERCONNECT UserCon; + + TRACE("user32::GetConnected()\n"); + + if ((PTHREADINFO)NtCurrentTeb()->Win32ThreadInfo == NULL) + NtUserGetThreadState(THREADSTATE_GETTHREADINFO); + + if (gpsi && g_ppi) return; + + /* Minimal setup of the connect info structure */ + UserCon.ulVersion = USER_VERSION; + + /* Connect to win32k */ + Status = NtUserProcessConnect(NtCurrentProcess(), + &UserCon, + sizeof(UserCon)); + if (!NT_SUCCESS(Status)) return; + + /* Retrieve data */ + g_ppi = GetWin32ClientInfo()->ppi; // Snapshot PI, used as pointer only! + g_ulSharedDelta = UserCon.siClient.ulSharedDelta; + gpsi = SharedPtrToUser(UserCon.siClient.psi); + gHandleTable = SharedPtrToUser(UserCon.siClient.aheList); + gHandleEntries = SharedPtrToUser(gHandleTable->handles); } NTSTATUS

10 years

← Newer
1
...
18
19
20
21
22
23
24
...
39
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2014