Ros-diffs September 2014

ros-diffs@reactos.org

16 participants
413 discussions

[jgardou] 64180: [WIN32K] - Silence a forgotten and very noisy DPRINT.

by jgardou＠svn.reactos.org

Author: jgardou Date: Wed Sep 17 12:12:28 2014 New Revision: 64180 URL: http://svn.reactos.org/svn/reactos?rev=64180&view=rev Log: [WIN32K] - Silence a forgotten and very noisy DPRINT. 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] Wed Sep 17 12:12:28 2014 @@ -3381,7 +3381,7 @@ REGION_SetRectRgn(pRgn, LeftRect, TopRect, RightRect, BottomRect); RGNOBJAPI_Unlock(pRgn); - DPRINT1("Returning %p.\n", hRgn); + DPRINT("Returning %p.\n", hRgn); return hRgn; }

10 years

[jgardou] 64179: [WIN32K] - Return empty region in DceGetVisRgn if there is nothing to return.

by jgardou＠svn.reactos.org

Author: jgardou Date: Wed Sep 17 12:01:34 2014 New Revision: 64179 URL: http://svn.reactos.org/svn/reactos?rev=64179&view=rev Log: [WIN32K] - Return empty region in DceGetVisRgn if there is nothing to return. Modified: trunk/reactos/win32ss/user/ntuser/windc.c Modified: trunk/reactos/win32ss/user/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/windc.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/windc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/windc.c [iso-8859-1] Wed Sep 17 12:01:34 2014 @@ -69,10 +69,15 @@ PREGION FASTCALL DceGetVisRgn(PWND Window, ULONG Flags, HWND hWndChild, ULONG CFlags) { - return VIS_ComputeVisibleRegion( Window, - 0 == (Flags & DCX_WINDOW), - 0 != (Flags & DCX_CLIPCHILDREN), - 0 != (Flags & DCX_CLIPSIBLINGS)); + PREGION Rgn; + Rgn = VIS_ComputeVisibleRegion( Window, + 0 == (Flags & DCX_WINDOW), + 0 != (Flags & DCX_CLIPCHILDREN), + 0 != (Flags & DCX_CLIPSIBLINGS)); + /* Caller expects a non-null region */ + if (!Rgn) + Rgn = IntSysCreateRectpRgn(0, 0, 0, 0); + return Rgn; } PDCE FASTCALL

10 years

[jgardou] 64178: [WIN32K] - Fix user-mode region attribute handling in IntGdiSetRegionOwner.

by jgardou＠svn.reactos.org

Author: jgardou Date: Wed Sep 17 11:40:21 2014 New Revision: 64178 URL: http://svn.reactos.org/svn/reactos?rev=64178&view=rev Log: [WIN32K] - Fix user-mode region attribute handling in IntGdiSetRegionOwner. 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] Wed Sep 17 11:40:21 2014 @@ -2323,23 +2323,22 @@ PRGN_ATTR prgnattr; PPROCESSINFO ppi; - prgn = REGION_LockRgn(hRgn); + prgn = RGNOBJAPI_Lock(hRgn, &prgnattr); if (!prgn) { return FALSE; } - prgnattr = GDIOBJ_pvGetObjectAttr(&prgn->BaseObject); - if (prgnattr) + if (prgnattr != &prgn->rgnattr) { GDIOBJ_vSetObjectAttr(&prgn->BaseObject, NULL); - prgn->prgnattr = NULL; + prgn->prgnattr = &prgn->rgnattr; ppi = PsGetCurrentProcessWin32Process(); GdiPoolFree(ppi->pPoolRgnAttr, prgnattr); } RGNOBJAPI_Unlock(prgn); - return GreSetObjectOwner(hRgn, OwnerMask); + return GreSetObjectOwner(hRgn, OwnerMask); } INT

10 years

[jgardou] 64177: [WIN32K] - Slap *a bit* of sense in the way we use region objects and handles, avoiding a massive orgy of handle allocations, locks, leaks and so on. The motto here being "if you d...

by jgardou＠svn.reactos.org

Author: jgardou Date: Wed Sep 17 09:54:27 2014 New Revision: 64177 URL: http://svn.reactos.org/svn/reactos?rev=64177&view=rev Log: [WIN32K] - Slap *a bit* of sense in the way we use region objects and handles, avoiding a massive orgy of handle allocations, locks, leaks and so on. The motto here being "if you don't need a valid user-mode handle, then chances are that you don't need one at all." CORE-8506 #resolve #comment Stale region handles should not be passed anymore to user-mode apps now. Modified: trunk/reactos/win32ss/gdi/eng/engwindow.c trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c trunk/reactos/win32ss/gdi/ntgdi/fillshap.c trunk/reactos/win32ss/gdi/ntgdi/path.c trunk/reactos/win32ss/gdi/ntgdi/path.h trunk/reactos/win32ss/gdi/ntgdi/region.c trunk/reactos/win32ss/gdi/ntgdi/region.h trunk/reactos/win32ss/user/ntuser/defwnd.c trunk/reactos/win32ss/user/ntuser/desktop.c trunk/reactos/win32ss/user/ntuser/message.c trunk/reactos/win32ss/user/ntuser/monitor.c trunk/reactos/win32ss/user/ntuser/painting.c trunk/reactos/win32ss/user/ntuser/painting.h trunk/reactos/win32ss/user/ntuser/simplecall.c trunk/reactos/win32ss/user/ntuser/vis.c trunk/reactos/win32ss/user/ntuser/vis.h trunk/reactos/win32ss/user/ntuser/windc.c trunk/reactos/win32ss/user/ntuser/winpos.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] Wed Sep 17 09:54:27 2014 @@ -52,41 +52,31 @@ XCLIPOBJ* Clip, PWND Window) { - HRGN hVisRgn; PROSRGNDATA visRgn; TRACE("IntEngWndUpdateClipObj\n"); - hVisRgn = VIS_ComputeVisibleRegion(Window, TRUE, TRUE, TRUE); - if (hVisRgn != NULL) - { - visRgn = RGNOBJAPI_Lock(hVisRgn, NULL); - if (visRgn != NULL) + visRgn = VIS_ComputeVisibleRegion(Window, TRUE, TRUE, TRUE); + if (visRgn != NULL) + { + if (visRgn->rdh.nCount > 0) { - if (visRgn->rdh.nCount > 0) + IntEngUpdateClipRegion(Clip, visRgn->rdh.nCount, visRgn->Buffer, &visRgn->rdh.rcBound); + TRACE("Created visible region with %lu rects\n", visRgn->rdh.nCount); + TRACE(" BoundingRect: %d, %d %d, %d\n", + visRgn->rdh.rcBound.left, visRgn->rdh.rcBound.top, + visRgn->rdh.rcBound.right, visRgn->rdh.rcBound.bottom); { - IntEngUpdateClipRegion(Clip, visRgn->rdh.nCount, visRgn->Buffer, &visRgn->rdh.rcBound); - TRACE("Created visible region with %lu rects\n", visRgn->rdh.nCount); - TRACE(" BoundingRect: %d, %d %d, %d\n", - visRgn->rdh.rcBound.left, visRgn->rdh.rcBound.top, - visRgn->rdh.rcBound.right, visRgn->rdh.rcBound.bottom); + ULONG i; + for (i = 0; i < visRgn->rdh.nCount; i++) { - ULONG i; - for (i = 0; i < visRgn->rdh.nCount; i++) - { - TRACE(" Rect #%lu: %ld,%ld %ld,%ld\n", i+1, - visRgn->Buffer[i].left, visRgn->Buffer[i].top, - visRgn->Buffer[i].right, visRgn->Buffer[i].bottom); - } + TRACE(" Rect #%lu: %ld,%ld %ld,%ld\n", i+1, + visRgn->Buffer[i].left, visRgn->Buffer[i].top, + visRgn->Buffer[i].right, visRgn->Buffer[i].bottom); } } - RGNOBJAPI_Unlock(visRgn); } - else - { - WARN("Couldn't lock visible region of window DC\n"); - } - GreDeleteObject(hVisRgn); + REGION_Delete(visRgn); } else { Modified: trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c [iso-8859-1] Wed Sep 17 09:54:27 2014 @@ -477,7 +477,7 @@ HDC hDC, int Mode) { - HRGN hrgnPath; + PREGION RgnPath; PPATH pPath; BOOL success = FALSE; PDC_ATTR pdcattr; @@ -507,20 +507,30 @@ } /* Construct a region from the path */ - else if (PATH_PathToRegion(pPath, pdcattr->jFillMode, &hrgnPath)) - { - PREGION prgnPath = REGION_LockRgn(hrgnPath); - ASSERT(prgnPath); - success = IntGdiExtSelectClipRgn(pdc, prgnPath, Mode) != ERROR; - REGION_UnlockRgn(prgnPath); - GreDeleteObject( hrgnPath ); - - /* Empty the path */ - if (success) - PATH_EmptyPath(pPath); - - /* FIXME: Should this function delete the path even if it failed? */ - } + RgnPath = IntSysCreateRectpRgn(0, 0, 0, 0); + if (!RgnPath) + { + EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); + DC_UnlockDc(pdc); + return FALSE; + } + + if (!PATH_PathToRegion(pPath, pdcattr->jFillMode, RgnPath)) + { + EngSetLastError(ERROR_CAN_NOT_COMPLETE); + REGION_Delete(RgnPath); + DC_UnlockDc(pdc); + return FALSE; + } + + success = IntGdiExtSelectClipRgn(pdc, RgnPath, Mode) != ERROR; + REGION_Delete(RgnPath); + + /* Empty the path */ + if (success) + PATH_EmptyPath(pPath); + + /* FIXME: Should this function delete the path even if it failed? */ PATH_UnlockPath(pPath); DC_UnlockDc(pdc); Modified: trunk/reactos/win32ss/gdi/ntgdi/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/fillshap… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/fillshap.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/fillshap.c [iso-8859-1] Wed Sep 17 09:54:27 2014 @@ -458,8 +458,24 @@ /* Special handling for GdiPolyPolyRgn */ if (iFunc == GdiPolyPolyRgn) { + PREGION Rgn; HRGN hRgn; - hRgn = IntCreatePolyPolygonRgn(SafePoints, SafeCounts, Count, (INT_PTR)hDC); + + Rgn = REGION_AllocUserRgnWithHandle(0); + if (!Rgn) + { + EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); + ExFreePoolWithTag(pTemp, TAG_SHAPE); + return 0; + } + hRgn = Rgn->BaseObject.hHmgr; + if (!IntSetPolyPolygonRgn(SafePoints, SafeCounts, Count, hDC ? 1 : 2, Rgn)) + { + /* EngSetLastError ? */ + GreDeleteObject(hRgn); + hRgn = NULL; + } + RGNOBJAPI_Unlock(Rgn); ExFreePoolWithTag(pTemp, TAG_SHAPE); return (ULONG_PTR)hRgn; } Modified: trunk/reactos/win32ss/gdi/ntgdi/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/path.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/path.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/path.c [iso-8859-1] Wed Sep 17 09:54:27 2014 @@ -98,7 +98,7 @@ //SIZE ptViewportExt, ptWindowExt; //POINTL ptViewportOrg, ptWindowOrg; XFORM xform; - HRGN hrgn; + PREGION Rgn; PDC_ATTR pdcattr = dc->pdcattr; if (pPath->state != PATH_Closed) @@ -107,61 +107,72 @@ return FALSE; } - if (PATH_PathToRegion(pPath, pdcattr->jFillMode, &hrgn)) - { - /* Since PaintRgn interprets the region as being in logical coordinates - * but the points we store for the path are already in device - * coordinates, we have to set the mapping mode to MM_TEXT temporarily. - * Using SaveDC to save information about the mapping mode / world - * transform would be easier but would require more overhead, especially - * now that SaveDC saves the current path. - */ - - /* Save the information about the old mapping mode */ - //mapMode = pdcattr->iMapMode; - //ptViewportExt = pdcattr->szlViewportExt; - //ptViewportOrg = pdcattr->ptlViewportOrg; - //ptWindowExt = pdcattr->szlWindowExt; - //ptWindowOrg = pdcattr->ptlWindowOrg; - - /* Save world transform - * NB: The Windows documentation on world transforms would lead one to - * believe that this has to be done only in GM_ADVANCED; however, my - * tests show that resetting the graphics mode to GM_COMPATIBLE does - * not reset the world transform. - */ - MatrixS2XForm(&xform, &dc->pdcattr->mxWorldToPage); - - /* Set MM_TEXT */ + /* Allocate a temporary region */ + Rgn = IntSysCreateRectpRgn(0, 0, 0, 0); + if (!Rgn) + { + EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + if (!PATH_PathToRegion(pPath, pdcattr->jFillMode, Rgn)) + { + /* EngSetLastError ? */ + REGION_Delete(Rgn); + return FALSE; + } + + /* Since PaintRgn interprets the region as being in logical coordinates + * but the points we store for the path are already in device + * coordinates, we have to set the mapping mode to MM_TEXT temporarily. + * Using SaveDC to save information about the mapping mode / world + * transform would be easier but would require more overhead, especially + * now that SaveDC saves the current path. + */ + + /* Save the information about the old mapping mode */ + //mapMode = pdcattr->iMapMode; + //ptViewportExt = pdcattr->szlViewportExt; + //ptViewportOrg = pdcattr->ptlViewportOrg; + //ptWindowExt = pdcattr->szlWindowExt; + //ptWindowOrg = pdcattr->ptlWindowOrg; + + /* Save world transform + * NB: The Windows documentation on world transforms would lead one to + * believe that this has to be done only in GM_ADVANCED; however, my + * tests show that resetting the graphics mode to GM_COMPATIBLE does + * not reset the world transform. + */ + MatrixS2XForm(&xform, &dc->pdcattr->mxWorldToPage); + + /* Set MM_TEXT */ // IntGdiSetMapMode(dc, MM_TEXT); // pdcattr->ptlViewportOrg.x = 0; // pdcattr->ptlViewportOrg.y = 0; // pdcattr->ptlWindowOrg.x = 0; // pdcattr->ptlWindowOrg.y = 0; - // graphicsMode = pdcattr->iGraphicsMode; + // graphicsMode = pdcattr->iGraphicsMode; // pdcattr->iGraphicsMode = GM_ADVANCED; // IntGdiModifyWorldTransform(dc, &xform, MWT_IDENTITY); // pdcattr->iGraphicsMode = graphicsMode; - /* Paint the region */ - IntGdiPaintRgn(dc, hrgn); - GreDeleteObject(hrgn); - /* Restore the old mapping mode */ + /* Paint the region */ + IntGdiPaintRgn(dc, Rgn); + REGION_Delete(Rgn); + /* Restore the old mapping mode */ // IntGdiSetMapMode(dc, mapMode); // pdcattr->szlViewportExt = ptViewportExt; // pdcattr->ptlViewportOrg = ptViewportOrg; // pdcattr->szlWindowExt = ptWindowExt; // pdcattr->ptlWindowOrg = ptWindowOrg; - /* Go to GM_ADVANCED temporarily to restore the world transform */ - //graphicsMode = pdcattr->iGraphicsMode; + /* Go to GM_ADVANCED temporarily to restore the world transform */ + //graphicsMode = pdcattr->iGraphicsMode; // pdcattr->iGraphicsMode = GM_ADVANCED; // IntGdiModifyWorldTransform(dc, &xform, MWT_MAX+1); // pdcattr->iGraphicsMode = graphicsMode; - return TRUE; - } - return FALSE; + return TRUE; } /* PATH_InitGdiPath @@ -1221,14 +1232,14 @@ PATH_PathToRegion( PPATH pPath, INT nPolyFillMode, - HRGN *pHrgn) + PREGION Rgn) { int numStrokes, iStroke, i; PULONG pNumPointsInStroke; - HRGN hrgn = 0; + BOOL Ret; ASSERT(pPath != NULL); - ASSERT(pHrgn != NULL); + ASSERT(Rgn != NULL); PATH_FlattenPath(pPath); @@ -1268,23 +1279,18 @@ pNumPointsInStroke[iStroke]++; } - /* Create a region from the strokes */ - hrgn = IntCreatePolyPolygonRgn(pPath->pPoints, - pNumPointsInStroke, - numStrokes, - nPolyFillMode); - if (hrgn == (HRGN)0) - { - EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } + /* Fill the region with the strokes */ + Ret = IntSetPolyPolygonRgn(pPath->pPoints, + pNumPointsInStroke, + numStrokes, + nPolyFillMode, + Rgn); /* Free memory for number-of-points-in-stroke array */ ExFreePoolWithTag(pNumPointsInStroke, TAG_PATH); /* Success! */ - *pHrgn = hrgn; - return TRUE; + return Ret; } /* PATH_EmptyPath @@ -2675,6 +2681,7 @@ { PPATH pPath; HRGN hrgnRval = 0; + PREGION Rgn; DC *pDc; PDC_ATTR pdcattr; @@ -2703,9 +2710,25 @@ } else { + /* Create the region and fill it with the path strokes */ + Rgn = REGION_AllocUserRgnWithHandle(1); + if (!Rgn) + { + PATH_UnlockPath(pPath); + DC_UnlockDc(pDc); + } + hrgnRval = Rgn->BaseObject.hHmgr; /* FIXME: Should we empty the path even if conversion failed? */ - if (PATH_PathToRegion(pPath, pdcattr->jFillMode, &hrgnRval)) + if (PATH_PathToRegion(pPath, pdcattr->jFillMode, Rgn)) + { PATH_EmptyPath(pPath); + } + else + { + GreDeleteObject(hrgnRval); + hrgnRval = NULL; + } + RGNOBJAPI_Unlock(Rgn); } PATH_UnlockPath(pPath); Modified: trunk/reactos/win32ss/gdi/ntgdi/path.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/path.h?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/path.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/path.h [iso-8859-1] Wed Sep 17 09:54:27 2014 @@ -67,7 +67,7 @@ BOOL FASTCALL PATH_PolyPolyline( PDC dc, const POINT* pts, const DWORD* counts, DWORD polylines); BOOL FASTCALL PATH_Rectangle (PDC dc, INT x1, INT y1, INT x2, INT y2); BOOL FASTCALL PATH_RoundRect(DC *dc, INT x1, INT y1, INT x2, INT y2, INT ell_width, INT ell_height); -BOOL FASTCALL PATH_PathToRegion (PPATH pPath, INT nPolyFillMode, HRGN *pHrgn); +BOOL FASTCALL PATH_PathToRegion (PPATH pPath, INT nPolyFillMode, PREGION Rgn); BOOL FASTCALL PATH_ExtTextOut(PDC dc,INT x,INT y,UINT flags,const RECTL *lprc,LPCWSTR str,UINT count,const INT *dx); BOOL FASTCALL PATH_AddEntry (PPATH pPath, const POINT *pPoint, BYTE flags); 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] Wed Sep 17 09:54:27 2014 @@ -1956,46 +1956,35 @@ } +static BOOL FASTCALL REGION_LPTODP( - PDC dc, - HRGN hDest, - HRGN hSrc) + _In_ PDC dc, + _Inout_ PREGION RgnDest, + _In_ PREGION RgnSrc) { RECTL *pCurRect, *pEndRect; - PROSRGNDATA srcObj = NULL; - PROSRGNDATA destObj = NULL; - RECTL tmpRect; - BOOL ret = FALSE; PDC_ATTR pdcattr; if (!dc) - return ret; + return FALSE; pdcattr = dc->pdcattr; if (pdcattr->iMapMode == MM_TEXT) // Requires only a translation { - if (NtGdiCombineRgn(hDest, hSrc, 0, RGN_COPY) == ERROR) - goto done; - - NtGdiOffsetRgn(hDest, pdcattr->ptlViewportOrg.x - pdcattr->ptlWindowOrg.x, + if (IntGdiCombineRgn(RgnDest, RgnSrc, 0, RGN_COPY) == ERROR) + return FALSE; + + IntGdiOffsetRgn(RgnDest, pdcattr->ptlViewportOrg.x - pdcattr->ptlWindowOrg.x, pdcattr->ptlViewportOrg.y - pdcattr->ptlWindowOrg.y); - ret = TRUE; - goto done; - } - - if ( !(srcObj = RGNOBJAPI_Lock(hSrc, NULL)) ) - goto done; - if ( !(destObj = RGNOBJAPI_Lock(hDest, NULL)) ) - { - RGNOBJAPI_Unlock(srcObj); - goto done; - } - EMPTY_REGION(destObj); - - pEndRect = srcObj->Buffer + srcObj->rdh.nCount; - for (pCurRect = srcObj->Buffer; pCurRect < pEndRect; pCurRect++) + return TRUE; + } + + EMPTY_REGION(RgnDest); + + pEndRect = RgnSrc->Buffer + RgnSrc->rdh.nCount; + for (pCurRect = RgnSrc->Buffer; pCurRect < pEndRect; pCurRect++) { tmpRect = *pCurRect; tmpRect.left = XLPTODP(pdcattr, tmpRect.left); @@ -2016,15 +2005,10 @@ tmpRect.bottom = tmp; } - REGION_UnionRectWithRgn(destObj, &tmpRect); - } - ret = TRUE; - - RGNOBJAPI_Unlock(srcObj); - RGNOBJAPI_Unlock(destObj); - -done: - return ret; + REGION_UnionRectWithRgn(RgnDest, &tmpRect); + } + + return TRUE; } PROSRGNDATA @@ -2236,7 +2220,7 @@ PREGION prgn; /* Allocate a region, witout a handle */ - prgn = (PREGION)GDIOBJ_AllocateObject(GDIObjType_RGN_TYPE, sizeof(REGION), 0); + prgn = (PREGION)GDIOBJ_AllocateObject(GDIObjType_RGN_TYPE, sizeof(REGION), BASEFLAG_LOOKASIDE); if (!prgn) { return NULL; @@ -2248,31 +2232,6 @@ REGION_SetRectRgn(prgn, LeftRect, TopRect, RightRect, BottomRect); return prgn; -} - -HRGN -FASTCALL -IntSysCreateRectRgn(INT LeftRect, INT TopRect, INT RightRect, INT BottomRect) -{ - PREGION prgn; - HRGN hrgn; - - /* Allocate a region, witout a handle */ - prgn = (PREGION)GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_REGION, sizeof(REGION)); - if (!prgn) - { - return NULL; - } - - /* Initialize it */ - prgn->Buffer = &prgn->rdh.rcBound; - REGION_SetRectRgn(prgn, LeftRect, TopRect, RightRect, BottomRect); - hrgn = prgn->BaseObject.hHmgr; - prgn->prgnattr = &prgn->rgnattr; - - REGION_UnlockRgn(prgn); - - return hrgn; } VOID NTAPI @@ -2479,44 +2438,42 @@ FASTCALL IntGdiPaintRgn( PDC dc, - HRGN hRgn + PREGION Rgn ) { - HRGN tmpVisRgn; - PROSRGNDATA visrgn; + PROSRGNDATA VisRgn; XCLIPOBJ ClipRegion; BOOL bRet = FALSE; POINTL BrushOrigin; SURFACE *psurf; PDC_ATTR pdcattr; - if (!dc) return FALSE; + if (!dc || !Rgn) + return FALSE; + pdcattr = dc->pdcattr; ASSERT(!(pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY))); - if (!(tmpVisRgn = IntSysCreateRectRgn(0, 0, 0, 0))) return FALSE; + VisRgn = IntSysCreateRectpRgn(0, 0, 0, 0); + if (!VisRgn) + { + return FALSE; + } // Transform region into device co-ords - if (!REGION_LPTODP(dc, tmpVisRgn, hRgn) || - NtGdiOffsetRgn(tmpVisRgn, dc->ptlDCOrig.x, dc->ptlDCOrig.y) == ERROR) - { - GreDeleteObject(tmpVisRgn); + if (!REGION_LPTODP(dc, VisRgn, Rgn) || + IntGdiOffsetRgn(VisRgn, dc->ptlDCOrig.x, dc->ptlDCOrig.y) == ERROR) + { + REGION_Delete(VisRgn); return FALSE; } - visrgn = RGNOBJAPI_Lock(tmpVisRgn, NULL); - if (visrgn == NULL) - { - GreDeleteObject(tmpVisRgn); - return FALSE; - } - if (dc->prgnRao) - IntGdiCombineRgn(visrgn, visrgn, dc->prgnRao, RGN_AND); + 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; @@ -2529,8 +2486,7 @@ &BrushOrigin, 0xFFFF); // FIXME: Don't know what to put here - RGNOBJAPI_Unlock(visrgn); - GreDeleteObject(tmpVisRgn); + REGION_Delete(VisRgn); IntEngFreeClipResources(&ClipRegion); // Fill the region @@ -3129,16 +3085,15 @@ } } -HRGN FASTCALL -IntCreatePolyPolygonRgn( +BOOL FASTCALL +IntSetPolyPolygonRgn( POINT *Pts, PULONG Count, INT nbpolygons, - INT mode + INT mode, + PREGION Rgn ) { - HRGN hrgn; - ROSRGNDATA *region; EdgeTableEntry *pAET; /* Active Edge Table */ INT y; /* Current scanline */ int iPts = 0; /* Number of pts in buffer */ @@ -3158,10 +3113,6 @@ if (mode == 0 || mode > 2) return 0; - if (!(region = REGION_AllocUserRgnWithHandle(nbpolygons))) - return 0; - hrgn = region->BaseObject.hHmgr; - /* Special case a rectangle */ if (((nbpolygons == 1) && ((*Count == 4) || @@ -3175,18 +3126,19 @@ (Pts[2].x == Pts[3].x) && (Pts[3].y == Pts[0].y)))) { - RGNOBJAPI_Unlock(region); - NtGdiSetRectRgn(hrgn, 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 hrgn; + 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)); + return TRUE; } for (poly = total = 0; poly < nbpolygons; poly++) total += Count[poly]; if (! (pETEs = ExAllocatePoolWithTag(PagedPool, sizeof(EdgeTableEntry) * total, TAG_REGION)) ) { - GreDeleteObject(hrgn); - return 0; + return FALSE; } pts = FirstPtBlock.pts; REGION_CreateETandAET(Count, nbpolygons, Pts, &ET, &AET, pETEs, &SLLBlock); @@ -3230,7 +3182,7 @@ { DPRINT1("Can't alloc tPB\n"); ExFreePoolWithTag(pETEs, TAG_REGION); - return 0; + return FALSE; } curPtBlock->next = tmpPtBlock; curPtBlock = tmpPtBlock; @@ -3289,8 +3241,7 @@ { DPRINT1("Can't alloc tPB\n"); ExFreePoolWithTag(pETEs, TAG_REGION); - GreDeleteObject(hrgn); - return 0; + return FALSE; } curPtBlock->next = tmpPtBlock; curPtBlock = tmpPtBlock; @@ -3315,7 +3266,7 @@ } } REGION_FreeStorage(SLLBlock.next); - REGION_PtsToRegion(numFullPtBlocks, iPts, &FirstPtBlock, region); + REGION_PtsToRegion(numFullPtBlocks, iPts, &FirstPtBlock, Rgn); for (curPtBlock = FirstPtBlock.next; --numFullPtBlocks >= 0;) { @@ -3324,8 +3275,7 @@ curPtBlock = tmpPtBlock; } ExFreePoolWithTag(pETEs, TAG_REGION); - RGNOBJAPI_Unlock(region); - return hrgn; + return TRUE; } BOOL @@ -3431,6 +3381,8 @@ REGION_SetRectRgn(pRgn, LeftRect, TopRect, RightRect, BottomRect); RGNOBJAPI_Unlock(pRgn); + + DPRINT1("Returning %p.\n", hRgn); return hRgn; } @@ -3762,7 +3714,7 @@ HRGN FrameRgn; BOOL Ret; - if (!(FrameRgn = IntSysCreateRectRgn(0, 0, 0, 0))) + if (!(FrameRgn = NtGdiCreateRectRgn(0, 0, 0, 0))) { return FALSE; } 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] Wed Sep 17 09:54:27 2014 @@ -40,8 +40,8 @@ VOID FASTCALL IntGdiReleaseVisRgn(PDC); INT APIENTRY IntGdiGetRgnBox(HRGN, RECTL*); -BOOL FASTCALL IntGdiPaintRgn(PDC, HRGN ); -HRGN FASTCALL IntCreatePolyPolygonRgn(PPOINT, PULONG, INT, INT); +BOOL FASTCALL IntGdiPaintRgn(PDC, PREGION ); +BOOL FASTCALL IntSetPolyPolygonRgn(PPOINT, PULONG, INT, INT, PREGION); INT FASTCALL IntGdiOffsetRgn(PROSRGNDATA,INT,INT); BOOL FASTCALL IntRectInRegion(HRGN,LPRECTL); @@ -49,12 +49,8 @@ INT FASTCALL REGION_Complexity(PROSRGNDATA); PROSRGNDATA FASTCALL RGNOBJAPI_Lock(HRGN,PRGN_ATTR *); VOID FASTCALL RGNOBJAPI_Unlock(PROSRGNDATA); -HRGN FASTCALL IntSysCreateRectRgn(INT,INT,INT,INT); PROSRGNDATA FASTCALL IntSysCreateRectpRgn(INT,INT,INT,INT); BOOL FASTCALL IntGdiSetRegionOwner(HRGN,DWORD); - -#define IntSysCreateRectRgnIndirect(prc) \ - IntSysCreateRectRgn((prc)->left, (prc)->top, (prc)->right, (prc)->bottom) #define IntSysCreateRectpRgnIndirect(prc) \ IntSysCreateRectpRgn((prc)->left, (prc)->top, (prc)->right, (prc)->bottom) 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] Wed Sep 17 09:54:27 2014 @@ -1010,16 +1010,20 @@ case WM_SYNCPAINT: { - HRGN hRgn; + PREGION Rgn; Wnd->state &= ~WNDS_SYNCPAINTPENDING; ERR("WM_SYNCPAINT\n"); - hRgn = IntSysCreateRectRgn(0, 0, 0, 0); - if (co_UserGetUpdateRgn(Wnd, hRgn, FALSE) != NULLREGION) + Rgn = IntSysCreateRectpRgn(0, 0, 0, 0); + if (Rgn) { - if (!wParam) wParam = (RDW_ERASENOW | RDW_ERASE | RDW_FRAME | RDW_ALLCHILDREN); - co_UserRedrawWindow(Wnd, NULL, hRgn, wParam); + if (co_UserGetUpdateRgn(Wnd, Rgn, FALSE) != NULLREGION) + { + if (!wParam) + wParam = (RDW_ERASENOW | RDW_ERASE | RDW_FRAME | RDW_ALLCHILDREN); + co_UserRedrawWindow(Wnd, NULL, Rgn, wParam); + } + REGION_Delete(Rgn); } - GreDeleteObject(hRgn); return 0; } Modified: trunk/reactos/win32ss/user/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/deskto… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] Wed Sep 17 09:54:27 2014 @@ -752,19 +752,19 @@ UserRedrawDesktop() { PWND Window = NULL; - HRGN hRgn; + PREGION Rgn; Window = UserGetDesktopWindow(); - hRgn = IntSysCreateRectRgnIndirect(&Window->rcWindow); + Rgn = IntSysCreateRectpRgnIndirect(&Window->rcWindow); IntInvalidateWindows( Window, - hRgn, + Rgn, RDW_FRAME | RDW_ERASE | RDW_INVALIDATE | RDW_ALLCHILDREN); - GreDeleteObject(hRgn); + REGION_Delete(Rgn); } Modified: trunk/reactos/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/messag… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] Wed Sep 17 09:54:27 2014 @@ -652,7 +652,6 @@ LRESULT retval = 0; PTHREADINFO pti; PWND Window = NULL; - HRGN hrgn; BOOL DoCallBack = TRUE; if (pMsg->hwnd) @@ -743,11 +742,12 @@ if (pMsg->message == WM_PAINT) { + PREGION Rgn; Window->state2 &= ~WNDS2_WMPAINTSENT; /* send a WM_NCPAINT and WM_ERASEBKGND if the non-client area is still invalid */ - hrgn = IntSysCreateRectRgn( 0, 0, 0, 0 ); - co_UserGetUpdateRgn( Window, hrgn, TRUE ); - GreDeleteObject(hrgn); + Rgn = IntSysCreateRectpRgn( 0, 0, 0, 0 ); + co_UserGetUpdateRgn( Window, Rgn, TRUE ); + REGION_Delete(Rgn); } return retval; Modified: trunk/reactos/win32ss/user/ntuser/monitor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/monito… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/monitor.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/monitor.c [iso-8859-1] Wed Sep 17 09:54:27 2014 @@ -258,7 +258,11 @@ } /* ...and create new one */ - pMonitor->hrgnMonitor = IntSysCreateRectRgnIndirect(&pMonitor->rcMonitor); + pMonitor->hrgnMonitor = NtGdiCreateRectRgn( + pMonitor->rcMonitor.left, + pMonitor->rcMonitor.top, + pMonitor->rcMonitor.right, + pMonitor->rcMonitor.bottom); if (pMonitor->hrgnMonitor) IntGdiSetRegionOwner(pMonitor->hrgnMonitor, GDI_OBJ_HMGR_PUBLIC); 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] Wed Sep 17 09:54:27 2014 @@ -56,7 +56,7 @@ } BOOL FASTCALL -IntValidateParent(PWND Child, HRGN hValidateRgn, BOOL Recurse) +IntValidateParent(PWND Child, PREGION ValidateRgn, BOOL Recurse) { PWND ParentWnd = Child; @@ -81,7 +81,7 @@ return FALSE; IntInvalidateWindows( ParentWnd, - hValidateRgn, + ValidateRgn, RDW_VALIDATE | RDW_NOCHILDREN); } @@ -177,9 +177,21 @@ HRGN hRgnWindow; if (Client) - hRgnWindow = IntSysCreateRectRgnIndirect(&Wnd->rcClient); + { + hRgnWindow = NtGdiCreateRectRgn( + Wnd->rcClient.left, + Wnd->rcClient.top, + Wnd->rcClient.right, + Wnd->rcClient.bottom); + } else - hRgnWindow = IntSysCreateRectRgnIndirect(&Wnd->rcWindow); + { + hRgnWindow = NtGdiCreateRectRgn( + Wnd->rcWindow.left, + Wnd->rcWindow.top, + Wnd->rcWindow.right, + Wnd->rcWindow.bottom); + } if (Wnd->hrgnClip != NULL && !(Wnd->style & WS_MINIMIZE)) { @@ -302,8 +314,16 @@ { if (Wnd->hrgnUpdate) { - if (!IntValidateParent(Wnd, Wnd->hrgnUpdate, Recurse)) - return; + PREGION RgnUpdate = RGNOBJAPI_Lock(Wnd->hrgnUpdate, NULL); + if (RgnUpdate) + { + if (!IntValidateParent(Wnd, RgnUpdate, Recurse)) + { + RGNOBJAPI_Unlock(RgnUpdate); + return; + } + RGNOBJAPI_Unlock(RgnUpdate); + } } if (Flags & RDW_UPDATENOW) @@ -397,7 +417,7 @@ * co_WinPosSetWindowPos, IntValidateParent, co_UserRedrawWindow. */ VOID FASTCALL -IntInvalidateWindows(PWND Wnd, HRGN hRgn, ULONG Flags) +IntInvalidateWindows(PWND Wnd, PREGION Rgn, ULONG Flags) { INT RgnType; BOOL HadPaintMessage; @@ -412,11 +432,14 @@ */ if (0 != (Flags & RDW_INVALIDATE) && 0 == (Flags & RDW_FRAME)) { - HRGN hRgnClient; - - hRgnClient = IntSysCreateRectRgnIndirect(&Wnd->rcClient); - RgnType = NtGdiCombineRgn(hRgn, hRgn, hRgnClient, RGN_AND); - GreDeleteObject(hRgnClient); + PREGION RgnClient; + + RgnClient = IntSysCreateRectpRgnIndirect(&Wnd->rcClient); + if (RgnClient) + { + RgnType = IntGdiCombineRgn(Rgn, Rgn, RgnClient, RGN_AND); + REGION_Delete(RgnClient); + } } /* @@ -425,21 +448,27 @@ if (!Wnd->hrgnClip || (Wnd->style & WS_MINIMIZE)) { - HRGN hRgnWindow; - - hRgnWindow = IntSysCreateRectRgnIndirect(&Wnd->rcWindow); - RgnType = NtGdiCombineRgn(hRgn, hRgn, hRgnWindow, RGN_AND); - GreDeleteObject(hRgnWindow); + PREGION RgnWindow = IntSysCreateRectpRgnIndirect(&Wnd->rcWindow); + if (RgnWindow) + { + RgnType = IntGdiCombineRgn(Rgn, Rgn, RgnWindow, RGN_AND); + REGION_Delete(RgnWindow); + } } else { - NtGdiOffsetRgn( hRgn, - -Wnd->rcWindow.left, - -Wnd->rcWindow.top); - RgnType = NtGdiCombineRgn(hRgn, hRgn, Wnd->hrgnClip, RGN_AND); - NtGdiOffsetRgn( hRgn, - Wnd->rcWindow.left, - Wnd->rcWindow.top); + PREGION RgnClip = RGNOBJAPI_Lock(Wnd->hrgnClip, NULL); + if (RgnClip) + { + IntGdiOffsetRgn( Rgn, + -Wnd->rcWindow.left, + -Wnd->rcWindow.top); + RgnType = IntGdiCombineRgn(Rgn, Rgn, RgnClip, RGN_AND); + IntGdiOffsetRgn( Rgn, + Wnd->rcWindow.left, + Wnd->rcWindow.top); + RGNOBJAPI_Unlock(RgnClip); + } } /* @@ -462,6 +491,8 @@ if (Flags & RDW_INVALIDATE && RgnType != NULLREGION) { + PREGION RgnUpdate; + Wnd->state &= ~WNDS_NONCPAINT; /* If not the same thread set it dirty. */ @@ -479,16 +510,21 @@ if (Wnd->hrgnUpdate == NULL) { - Wnd->hrgnUpdate = IntSysCreateRectRgn(0, 0, 0, 0); + Wnd->hrgnUpdate = NtGdiCreateRectRgn(0, 0, 0, 0); IntGdiSetRegionOwner(Wnd->hrgnUpdate, GDI_OBJ_HMGR_PUBLIC); } - if (NtGdiCombineRgn(Wnd->hrgnUpdate, Wnd->hrgnUpdate, - hRgn, RGN_OR) == NULLREGION) + RgnUpdate = RGNOBJAPI_Lock(Wnd->hrgnUpdate, NULL); + if (RgnUpdate) { - IntGdiSetRegionOwner(Wnd->hrgnUpdate, GDI_OBJ_HMGR_POWNED); - GreDeleteObject(Wnd->hrgnUpdate); - Wnd->hrgnUpdate = NULL; + RgnType = IntGdiCombineRgn(RgnUpdate, RgnUpdate, Rgn, RGN_OR); + RGNOBJAPI_Unlock(RgnUpdate); + if (RgnType == NULLREGION) + { + IntGdiSetRegionOwner(Wnd->hrgnUpdate, GDI_OBJ_HMGR_POWNED); + GreDeleteObject(Wnd->hrgnUpdate); + Wnd->hrgnUpdate = NULL; + } } Flags |= RDW_FRAME; // For children. } @@ -511,13 +547,20 @@ if (Wnd->hrgnUpdate != NULL) { - if (NtGdiCombineRgn(Wnd->hrgnUpdate, Wnd->hrgnUpdate, - hRgn, RGN_DIFF) == NULLREGION) - { - IntGdiSetRegionOwner(Wnd->hrgnUpdate, GDI_OBJ_HMGR_POWNED); - GreDeleteObject(Wnd->hrgnUpdate); - Wnd->hrgnUpdate = NULL; - } + PREGION RgnUpdate = RGNOBJAPI_Lock(Wnd->hrgnUpdate, NULL); + + if (RgnUpdate) + { + RgnType = IntGdiCombineRgn(RgnUpdate, RgnUpdate, Rgn, RGN_DIFF); + RGNOBJAPI_Unlock(RgnUpdate); + + if(RgnType == NULLREGION) + { + IntGdiSetRegionOwner(Wnd->hrgnUpdate, GDI_OBJ_HMGR_POWNED); + GreDeleteObject(Wnd->hrgnUpdate); + Wnd->hrgnUpdate = NULL; + } + } } if (Wnd->hrgnUpdate == NULL) @@ -541,10 +584,13 @@ /* * Recursive call to update children hrgnUpdate */ - HRGN hRgnTemp = IntSysCreateRectRgn(0, 0, 0, 0); - NtGdiCombineRgn(hRgnTemp, hRgn, 0, RGN_COPY); - IntInvalidateWindows(Child, hRgnTemp, Flags); - GreDeleteObject(hRgnTemp); + PREGION RgnTemp = IntSysCreateRectpRgn(0, 0, 0, 0); + if (RgnTemp) + { + IntGdiCombineRgn(RgnTemp, Rgn, 0, RGN_COPY); + IntInvalidateWindows(Child, RgnTemp, Flags); + REGION_Delete(RgnTemp); + } } } } @@ -602,10 +648,10 @@ co_UserRedrawWindow( PWND Window, const RECTL* UpdateRect, - HRGN UpdateRgn, + PREGION UpdateRgn, ULONG Flags) { - HRGN hRgn = NULL; + PREGION TmpRgn = NULL; TRACE("co_UserRedrawWindow start\n"); /* @@ -626,35 +672,37 @@ if (Flags & (RDW_INVALIDATE | RDW_VALIDATE)) // Both are OKAY! { - if (UpdateRgn != NULL) - { - hRgn = IntSysCreateRectRgn(0, 0, 0, 0); - if (NtGdiCombineRgn(hRgn, UpdateRgn, NULL, RGN_COPY) == NULLREGION) - { - GreDeleteObject(hRgn); - hRgn = NULL; - } - else - NtGdiOffsetRgn(hRgn, Window->rcClient.left, Window->rcClient.top); + if (UpdateRgn) + { + TmpRgn = IntSysCreateRectpRgn(0, 0, 0, 0); + if (IntGdiCombineRgn(TmpRgn, UpdateRgn, NULL, RGN_COPY) == NULLREGION) + { + REGION_Delete(TmpRgn); + TmpRgn = NULL; + } + else + { + IntGdiOffsetRgn(TmpRgn, Window->rcClient.left, Window->rcClient.top); + } } else if (UpdateRect != NULL) { if (!RECTL_bIsEmptyRect(UpdateRect)) { - hRgn = IntSysCreateRectRgnIndirect((RECTL *)UpdateRect); - NtGdiOffsetRgn(hRgn, Window->rcClient.left, Window->rcClient.top); + TmpRgn = IntSysCreateRectpRgnIndirect(UpdateRect); + IntGdiOffsetRgn(TmpRgn, Window->rcClient.left, Window->rcClient.top); } } else if ((Flags & (RDW_INVALIDATE | RDW_FRAME)) == (RDW_INVALIDATE | RDW_FRAME) || (Flags & (RDW_VALIDATE | RDW_NOFRAME)) == (RDW_VALIDATE | RDW_NOFRAME)) { if (!RECTL_bIsEmptyRect(&Window->rcWindow)) - hRgn = IntSysCreateRectRgnIndirect(&Window->rcWindow); + TmpRgn = IntSysCreateRectpRgnIndirect(&Window->rcWindow); } else { if (!RECTL_bIsEmptyRect(&Window->rcClient)) - hRgn = IntSysCreateRectRgnIndirect(&Window->rcClient); + TmpRgn = IntSysCreateRectpRgnIndirect(&Window->rcClient); } } @@ -664,9 +712,9 @@ */ if (Flags & (RDW_INVALIDATE | RDW_VALIDATE | RDW_INTERNALPAINT | RDW_NOINTERNALPAINT) && - hRgn != NULL) - { - IntInvalidateWindows(Window, hRgn, Flags); + TmpRgn != NULL) + { + IntInvalidateWindows(Window, TmpRgn, Flags); } /* @@ -685,9 +733,9 @@ * Cleanup ;-) */ - if (hRgn != NULL) - { - GreDeleteObject(hRgn); + if (TmpRgn != NULL) + { + REGION_Delete(TmpRgn); } TRACE("co_UserRedrawWindow exit\n"); @@ -991,7 +1039,7 @@ for (Child = Window->spwndChild; Child; Child = Child->spwndNext) { if (Child->hrgnUpdate == NULL && Child->state & WNDS_SENDNCPAINT) // Helped fixing test_redrawnow. - IntInvalidateWindows(Child, Window->hrgnUpdate, RDW_FRAME | RDW_ERASE | RDW_INVALIDATE | RDW_ALLCHILDREN); + IntInvalidateWindows(Child, NULL, RDW_FRAME | RDW_ERASE | RDW_INVALIDATE | RDW_ALLCHILDREN); } } } @@ -1157,32 +1205,38 @@ } INT FASTCALL -co_UserGetUpdateRgn(PWND Window, HRGN hRgn, BOOL bErase) -{ - int RegionType; - RECTL Rect; - - ASSERT_REFS_CO(Window); - - Window->state &= ~WNDS_UPDATEDIRTY; - - if (Window->hrgnUpdate == NULL) - { - RegionType = (NtGdiSetRectRgn(hRgn, 0, 0, 0, 0) ? NULLREGION : ERROR); - } - else - { - Rect = Window->rcClient; - IntIntersectWithParents(Window, &Rect); - NtGdiSetRectRgn(hRgn, Rect.left, Rect.top, Rect.right, Rect.bottom); - RegionType = NtGdiCombineRgn(hRgn, hRgn, Window->hrgnUpdate, RGN_AND); - NtGdiOffsetRgn(hRgn, -Window->rcClient.left, -Window->rcClient.top); - } +co_UserGetUpdateRgn(PWND Window, PREGION Rgn, BOOL bErase) +{ + int RegionType; + RECTL Rect; + PREGION UpdateRgn; + + ASSERT_REFS_CO(Window); + + Window->state &= ~WNDS_UPDATEDIRTY; + + if (Window->hrgnUpdate == NULL) + { + REGION_SetRectRgn(Rgn, 0, 0, 0, 0); + return NULLREGION; + } + + UpdateRgn = RGNOBJAPI_Lock(Window->hrgnUpdate, NULL); + if (!UpdateRgn) + return ERROR; + + Rect = Window->rcClient; + IntIntersectWithParents(Window, &Rect); + REGION_SetRectRgn(Rgn, Rect.left, Rect.top, Rect.right, Rect.bottom); + RegionType = IntGdiCombineRgn(Rgn, Rgn, UpdateRgn, RGN_AND); + IntGdiOffsetRgn(Rgn, -Window->rcClient.left, -Window->rcClient.top); if (bErase && RegionType != NULLREGION && RegionType != ERROR) { co_UserRedrawWindow(Window, NULL, NULL, RDW_ERASENOW | RDW_NOCHILDREN); } + + RGNOBJAPI_Unlock(UpdateRgn); return RegionType; } @@ -1201,6 +1255,7 @@ PWND Window; INT ret; USER_REFERENCE_ENTRY Ref; + PREGION Rgn = NULL; TRACE("Enter NtUserGetUpdateRgn\n"); UserEnterExclusive(); @@ -1210,13 +1265,19 @@ RETURN(ERROR); } + Rgn = RGNOBJAPI_Lock(hRgn, NULL); + if (!Rgn) + RETURN(ERROR); + UserRefObjectCo(Window, &Ref); - ret = co_UserGetUpdateRgn(Window, hRgn, bErase); + ret = co_UserGetUpdateRgn(Window, Rgn, bErase); UserDerefObjectCo(Window); RETURN(ret); CLEANUP: + if (Rgn) + RGNOBJAPI_Unlock(Rgn); TRACE("Leave NtUserGetUpdateRgn, ret=%i\n",_ret_); UserLeave(); END_CLEANUP; @@ -1327,6 +1388,7 @@ BOOL Ret; USER_REFERENCE_ENTRY Ref; NTSTATUS Status = STATUS_SUCCESS; + PREGION RgnUpdate = NULL; DECLARE_RETURN(BOOL); TRACE("Enter NtUserRedrawWindow\n"); @@ -1365,11 +1427,21 @@ RETURN( FALSE); } + if (hrgnUpdate) + { + RgnUpdate = RGNOBJAPI_Lock(hrgnUpdate, NULL); + if (!RgnUpdate) + { + EngSetLastError(ERROR_INVALID_HANDLE); + RETURN(FALSE); + } + } + UserRefObjectCo(Wnd, &Ref); Ret = co_UserRedrawWindow( Wnd, lprcUpdate ? &SafeUpdateRect : NULL, - hrgnUpdate, + RgnUpdate, flags); UserDerefObjectCo(Wnd); @@ -1377,6 +1449,8 @@ RETURN( Ret); CLEANUP: + if (RgnUpdate) + RGNOBJAPI_Unlock(RgnUpdate); TRACE("Leave NtUserRedrawWindow, ret=%i\n",_ret_); UserLeave(); END_CLEANUP; @@ -1390,7 +1464,7 @@ INT dy, const RECTL *prcScroll, const RECTL *prcClip, - HRGN hrgnUpdate, + PREGION RgnUpdate, RECTL *prcUpdate) { PDC pDC; @@ -1435,10 +1509,9 @@ /* Calculate the region that was invalidated by moving or could not be copied, because it was not visible */ - if (hrgnUpdate || prcUpdate) - { - HRGN hrgnOwn, hrgnTmp; - PREGION prgnTmp; + if (RgnUpdate || prcUpdate) + { + PREGION RgnOwn, RgnTmp; pDC = DC_LockDc(hDC); if (!pDC) @@ -1450,44 +1523,38 @@ rcDst = rcScroll; RECTL_vOffsetRect(&rcDst, dx, dy); RECTL_bIntersectRect(&rcDst, &rcDst, &rcClip); - if (hrgnUpdate) - { - hrgnOwn = hrgnUpdate; - if (!NtGdiSetRectRgn(hrgnOwn, rcDst.left, rcDst.top, rcDst.right, rcDst.bottom)) - { - DC_UnlockDc(pDC); - return ERROR; - } + if (RgnUpdate) + { + RgnOwn = RgnUpdate; + REGION_SetRectRgn(RgnOwn, rcDst.left, rcDst.top, rcDst.right, rcDst.bottom); } else { - hrgnOwn = IntSysCreateRectRgnIndirect(&rcDst); + RgnOwn = IntSysCreateRectpRgnIndirect(&rcDst); } /* Add the source rect */ - hrgnTmp = IntSysCreateRectRgnIndirect(&rcSrc); - NtGdiCombineRgn(hrgnOwn, hrgnOwn, hrgnTmp, RGN_OR); + RgnTmp = IntSysCreateRectpRgnIndirect(&rcSrc); + IntGdiCombineRgn(RgnOwn, RgnOwn, RgnTmp, RGN_OR); /* Substract the part of the dest that was visible in source */ - prgnTmp = RGNOBJAPI_Lock(hrgnTmp, NULL); - IntGdiCombineRgn(prgnTmp, prgnTmp, pDC->prgnVis, RGN_AND); - RGNOBJAPI_Unlock(prgnTmp); - NtGdiOffsetRgn(hrgnTmp, dx, dy); - Result = NtGdiCombineRgn(hrgnOwn, hrgnOwn, hrgnTmp, RGN_DIFF); + IntGdiCombineRgn(RgnTmp, RgnTmp, pDC->prgnVis, RGN_AND); + IntGdiOffsetRgn(RgnTmp, dx, dy); + Result = IntGdiCombineRgn(RgnOwn, RgnOwn, RgnTmp, RGN_DIFF); /* DO NOT Unlock DC while messing with prgnVis! */ DC_UnlockDc(pDC); - GreDeleteObject(hrgnTmp); + REGION_Delete(RgnTmp); if (prcUpdate) { - IntGdiGetRgnBox(hrgnOwn, prcUpdate); - } - - if (!hrgnUpdate) - { - GreDeleteObject(hrgnOwn); + REGION_GetRgnBox(RgnOwn, prcUpdate); + } + + if (!RgnUpdate) + { + REGION_Delete(RgnOwn); } } else @@ -1516,6 +1583,7 @@ RECTL rcScroll, rcClip, rcUpdate; NTSTATUS Status = STATUS_SUCCESS; DWORD Result; + PREGION RgnUpdate = NULL; TRACE("Enter NtUserScrollDC\n"); UserEnterExclusive(); @@ -1546,6 +1614,13 @@ { SetLastNtError(Status); RETURN(FALSE); + } + + if (hrgnUpdate) + { + RgnUpdate = RGNOBJAPI_Lock(hrgnUpdate, NULL); + if (!RgnUpdate) + RETURN(FALSE); } Result = UserScrollDC( hDC, @@ -1553,7 +1628,7 @@ dy, prcUnsafeScroll? &rcScroll : 0, prcUnsafeClip? &rcClip : 0, - hrgnUpdate, + RgnUpdate, prcUnsafeUpdate? &rcUpdate : NULL); if(Result == ERROR) { @@ -1583,6 +1658,8 @@ RETURN(TRUE); CLEANUP: + if (RgnUpdate) + RGNOBJAPI_Unlock(RgnUpdate); TRACE("Leave NtUserScrollDC, ret=%lu\n",_ret_); UserLeave(); END_CLEANUP; @@ -1610,7 +1687,7 @@ INT Result; PWND Window = NULL, CaretWnd; HDC hDC; - HRGN hrgnOwn = NULL, hrgnTemp, hrgnWinupd = NULL; + PREGION RgnOwn = NULL, RgnTemp, RgnWinupd = NULL; HWND hwndCaret; DWORD dcxflags = 0; int rdw_flags; @@ -1668,11 +1745,15 @@ if (hrgnUpdate) { - hrgnOwn = hrgnUpdate; + RgnOwn = RGNOBJAPI_Lock(hrgnUpdate, NULL); + if (!RgnOwn) + { + RETURN(ERROR); + } bOwnRgn = FALSE; } else - hrgnOwn = IntSysCreateRectRgn(0, 0, 0, 0); + RgnOwn = IntSysCreateRectpRgn(0, 0, 0, 0); /* ScrollWindow uses the window DC, ScrollWindowEx doesn't */ if (flags & SW_SCROLLWNDDCE) @@ -1709,7 +1790,7 @@ dy, &rcScroll, &rcClip, - hrgnOwn, + RgnOwn, prcUnsafeUpdate? &rcUpdate : NULL); UserReleaseDC(Window, hDC, FALSE); @@ -1719,22 +1800,29 @@ * the scroll. Keep a copy in hrgnWinupd to be added to hrngUpdate at the end. */ - hrgnTemp = IntSysCreateRectRgn(0, 0, 0, 0); - if (co_UserGetUpdateRgn(Window, hrgnTemp, FALSE) != NULLREGION) - { - HRGN hrgnClip = IntSysCreateRectRgnIndirect(&rcClip); - if (!bOwnRgn) - { - hrgnWinupd = IntSysCreateRectRgn( 0, 0, 0, 0); - NtGdiCombineRgn( hrgnWinupd, hrgnTemp, 0, RGN_COPY); - } - NtGdiOffsetRgn(hrgnTemp, dx, dy); - NtGdiCombineRgn(hrgnTemp, hrgnTemp, hrgnClip, RGN_AND); - if (!bOwnRgn) NtGdiCombineRgn( hrgnWinupd, hrgnWinupd, hrgnTemp, RGN_OR ); - co_UserRedrawWindow(Window, NULL, hrgnTemp, rdw_flags ); - GreDeleteObject(hrgnClip); - } - GreDeleteObject(hrgnTemp); + RgnTemp = IntSysCreateRectpRgn(0, 0, 0, 0); + if (RgnTemp) + { + if (co_UserGetUpdateRgn(Window, RgnTemp, FALSE) != NULLREGION) + { + PREGION RgnClip = IntSysCreateRectpRgnIndirect(&rcClip); + if (RgnClip) + { + if (!bOwnRgn) + { + RgnWinupd = IntSysCreateRectpRgn( 0, 0, 0, 0); + IntGdiCombineRgn( RgnWinupd, RgnTemp, 0, RGN_COPY); + } + IntGdiOffsetRgn(RgnTemp, dx, dy); + IntGdiCombineRgn(RgnTemp, RgnTemp, RgnClip, RGN_AND); + if (!bOwnRgn) + IntGdiCombineRgn( RgnWinupd, RgnWinupd, RgnTemp, RGN_OR ); + co_UserRedrawWindow(Window, NULL, RgnTemp, rdw_flags ); + REGION_Delete(RgnClip); + } + } + REGION_Delete(RgnTemp); + } if (flags & SW_SCROLLCHILDREN) { @@ -1766,7 +1854,7 @@ if (flags & (SW_INVALIDATE | SW_ERASE)) { - co_UserRedrawWindow(Window, NULL, hrgnOwn, rdw_flags | + co_UserRedrawWindow(Window, NULL, RgnOwn, rdw_flags | ((flags & SW_ERASE) ? RDW_ERASENOW : 0) | ((flags & SW_SCROLLCHILDREN) ? RDW_ALLCHILDREN : 0)); } @@ -1805,15 +1893,19 @@ RETURN(Result); CLEANUP: - if (hrgnWinupd && !bOwnRgn) - { - NtGdiCombineRgn( hrgnOwn, hrgnOwn, hrgnWinupd, RGN_OR); - GreDeleteObject(hrgnWinupd); - } - - if (hrgnOwn && !hrgnUpdate) - { - GreDeleteObject(hrgnOwn); + if (RgnWinupd && !bOwnRgn) + { + IntGdiCombineRgn( RgnOwn, RgnOwn, RgnWinupd, RGN_OR); + REGION_Delete(RgnWinupd); + } + + if (RgnOwn && !hrgnUpdate) + { + REGION_Delete(RgnOwn); + } + else if (RgnOwn) + { + RGNOBJAPI_Unlock(RgnOwn); } if (Window) Modified: trunk/reactos/win32ss/user/ntuser/painting.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/painti… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/painting.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/painting.h [iso-8859-1] Wed Sep 17 09:54:27 2014 @@ -1,12 +1,12 @@ #pragma once -BOOL FASTCALL co_UserRedrawWindow(PWND Wnd, const RECTL* UpdateRect, HRGN UpdateRgn, ULONG Flags); -VOID FASTCALL IntInvalidateWindows(PWND Window, HRGN hRgn, ULONG Flags); +BOOL FASTCALL co_UserRedrawWindow(PWND Wnd, const RECTL* UpdateRect, PREGION UpdateRgn, ULONG Flags); +VOID FASTCALL IntInvalidateWindows(PWND Window, PREGION Rgn, ULONG Flags); BOOL FASTCALL IntGetPaintMessage(PWND Window, UINT MsgFilterMin, UINT MsgFilterMax, PTHREADINFO Thread, MSG *Message, BOOL Remove); INT FASTCALL UserRealizePalette(HDC); -INT FASTCALL co_UserGetUpdateRgn(PWND, HRGN, BOOL); +INT FASTCALL co_UserGetUpdateRgn(PWND, PREGION, BOOL); VOID FASTCALL co_IntPaintWindows(PWND Window, ULONG Flags, BOOL Recurse); -BOOL FASTCALL IntValidateParent(PWND Child, HRGN hValidateRgn, BOOL Recurse); +BOOL FASTCALL IntValidateParent(PWND Child, PREGION ValidateRgn, BOOL Recurse); BOOL FASTCALL IntIsWindowDirty(PWND); BOOL FASTCALL IntEndPaint(PWND,PPAINTSTRUCT); HDC FASTCALL IntBeginPaint(PWND,PPAINTSTRUCT); Modified: trunk/reactos/win32ss/user/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/simple… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] Wed Sep 17 09:54:27 2014 @@ -793,8 +793,15 @@ switch (Routine) { case TWOPARAM_ROUTINE_VALIDATERGN: - Ret = (DWORD)co_UserRedrawWindow( Window, NULL, (HRGN)Param, RDW_VALIDATE); - break; + { + PREGION Rgn = RGNOBJAPI_Lock((HRGN)Param, NULL); + if (Rgn) + { + Ret = (DWORD)co_UserRedrawWindow( Window, NULL, Rgn, RDW_VALIDATE); + RGNOBJAPI_Unlock(Rgn); + } + break; + } } UserDerefObjectCo(Window); Modified: trunk/reactos/win32ss/user/ntuser/vis.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/vis.c?… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/vis.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/vis.c [iso-8859-1] Wed Sep 17 09:54:27 2014 @@ -9,14 +9,14 @@ #include <win32k.h> DBG_DEFAULT_CHANNEL(UserWinpos); -HRGN FASTCALL +PREGION FASTCALL VIS_ComputeVisibleRegion( PWND Wnd, BOOLEAN ClientArea, BOOLEAN ClipChildren, BOOLEAN ClipSiblings) { - HRGN VisRgn, ClipRgn; + PREGION VisRgn, ClipRgn; PWND PreviousWindow, CurrentWindow, CurrentSibling; if (!Wnd || !(Wnd->style & WS_VISIBLE)) @@ -28,11 +28,11 @@ if (ClientArea) { - VisRgn = IntSysCreateRectRgnIndirect(&Wnd->rcClient); + VisRgn = IntSysCreateRectpRgnIndirect(&Wnd->rcClient); } else { - VisRgn = IntSysCreateRectRgnIndirect(&Wnd->rcWindow); + VisRgn = IntSysCreateRectpRgnIndirect(&Wnd->rcWindow); } /* @@ -48,19 +48,21 @@ if (!VerifyWnd(CurrentWindow)) { ERR("ATM the Current Window or Parent is dead! %p\n",CurrentWindow); - if (VisRgn) GreDeleteObject(VisRgn); + if (VisRgn) + REGION_Delete(VisRgn); return NULL; } if (!(CurrentWindow->style & WS_VISIBLE)) { - if (VisRgn) GreDeleteObject(VisRgn); + if (VisRgn) + REGION_Delete(VisRgn); return NULL; } - ClipRgn = IntSysCreateRectRgnIndirect(&CurrentWindow->rcClient); - NtGdiCombineRgn(VisRgn, VisRgn, ClipRgn, RGN_AND); - GreDeleteObject(ClipRgn); + ClipRgn = IntSysCreateRectpRgnIndirect(&CurrentWindow->rcClient); + IntGdiCombineRgn(VisRgn, VisRgn, ClipRgn, RGN_AND); + REGION_Delete(ClipRgn); if ((PreviousWindow->style & WS_CLIPSIBLINGS) || (PreviousWindow == Wnd && ClipSiblings)) @@ -72,16 +74,21 @@ if ((CurrentSibling->style & WS_VISIBLE) && !(CurrentSibling->ExStyle & WS_EX_TRANSPARENT)) { - ClipRgn = IntSysCreateRectRgnIndirect(&CurrentSibling->rcWindow); + ClipRgn = IntSysCreateRectpRgnIndirect(&CurrentSibling->rcWindow); /* Combine it with the window region if available */ if (CurrentSibling->hrgnClip && !(CurrentSibling->style & WS_MINIMIZE)) { - NtGdiOffsetRgn(ClipRgn, -CurrentSibling->rcWindow.left, -CurrentSibling->rcWindow.top); - NtGdiCombineRgn(ClipRgn, ClipRgn, CurrentSibling->hrgnClip, RGN_AND); - NtGdiOffsetRgn(ClipRgn, CurrentSibling->rcWindow.left, CurrentSibling->rcWindow.top); + PREGION SiblingClipRgn = RGNOBJAPI_Lock(CurrentSibling->hrgnClip, NULL); + if (SiblingClipRgn) + { + IntGdiOffsetRgn(ClipRgn, -CurrentSibling->rcWindow.left, -CurrentSibling->rcWindow.top); + IntGdiCombineRgn(ClipRgn, ClipRgn, SiblingClipRgn, RGN_AND); + IntGdiOffsetRgn(ClipRgn, CurrentSibling->rcWindow.left, CurrentSibling->rcWindow.top); + RGNOBJAPI_Unlock(SiblingClipRgn); + } } - NtGdiCombineRgn(VisRgn, VisRgn, ClipRgn, RGN_DIFF); - GreDeleteObject(ClipRgn); + IntGdiCombineRgn(VisRgn, VisRgn, ClipRgn, RGN_DIFF); + REGION_Delete(ClipRgn); } CurrentSibling = CurrentSibling->spwndNext; } @@ -99,16 +106,20 @@ if ((CurrentWindow->style & WS_VISIBLE) && !(CurrentWindow->ExStyle & WS_EX_TRANSPARENT)) { - ClipRgn = IntSysCreateRectRgnIndirect(&CurrentWindow->rcWindow); + ClipRgn = IntSysCreateRectpRgnIndirect(&CurrentWindow->rcWindow); /* Combine it with the window region if available */ if (CurrentWindow->hrgnClip && !(CurrentWindow->style & WS_MINIMIZE)) { - NtGdiOffsetRgn(ClipRgn, -CurrentWindow->rcWindow.left, -CurrentWindow->rcWindow.top); - NtGdiCombineRgn(ClipRgn, ClipRgn, CurrentWindow->hrgnClip, RGN_AND); - NtGdiOffsetRgn(ClipRgn, CurrentWindow->rcWindow.left, CurrentWindow->rcWindow.top); + PREGION CurrentRgnClip = RGNOBJAPI_Lock(CurrentWindow->hrgnClip, NULL); + if (CurrentRgnClip) + { + IntGdiOffsetRgn(ClipRgn, -CurrentWindow->rcWindow.left, -CurrentWindow->rcWindow.top); + IntGdiCombineRgn(ClipRgn, ClipRgn, CurrentRgnClip, RGN_AND); + IntGdiOffsetRgn(ClipRgn, CurrentWindow->rcWindow.left, CurrentWindow->rcWindow.top); + } } - NtGdiCombineRgn(VisRgn, VisRgn, ClipRgn, RGN_DIFF); - GreDeleteObject(ClipRgn); + IntGdiCombineRgn(VisRgn, VisRgn, ClipRgn, RGN_DIFF); + REGION_Delete(ClipRgn); } CurrentWindow = CurrentWindow->spwndNext; } @@ -116,9 +127,14 @@ if (Wnd->hrgnClip && !(Wnd->style & WS_MINIMIZE)) { - NtGdiOffsetRgn(VisRgn, -Wnd->rcWindow.left, -Wnd->rcWindow.top); - NtGdiCombineRgn(VisRgn, VisRgn, Wnd->hrgnClip, RGN_AND); - NtGdiOffsetRgn(VisRgn, Wnd->rcWindow.left, Wnd->rcWindow.top); + PREGION WndRgnClip = RGNOBJAPI_Lock(Wnd->hrgnClip, NULL); + if (WndRgnClip) + { + IntGdiOffsetRgn(VisRgn, -Wnd->rcWindow.left, -Wnd->rcWindow.top); + IntGdiCombineRgn(VisRgn, VisRgn, WndRgnClip, RGN_AND); + IntGdiOffsetRgn(VisRgn, Wnd->rcWindow.left, Wnd->rcWindow.top); + RGNOBJAPI_Unlock(WndRgnClip); + } } return VisRgn; @@ -127,9 +143,8 @@ VOID FASTCALL co_VIS_WindowLayoutChanged( PWND Wnd, - HRGN NewlyExposed) + PREGION NewlyExposed) { - HRGN Temp; PWND Parent; USER_REFERENCE_ENTRY Ref; @@ -138,20 +153,23 @@ Parent = Wnd->spwndParent; if(Parent) { - Temp = IntSysCreateRectRgn(0, 0, 0, 0); + PREGION TempRgn = IntSysCreateRectpRgn(0, 0, 0, 0); - NtGdiCombineRgn(Temp, NewlyExposed, NULL, RGN_COPY); - NtGdiOffsetRgn(Temp, - Wnd->rcWindow.left - Parent->rcClient.left, - Wnd->rcWindow.top - Parent->rcClient.top); + if (!TempRgn) + return; - UserRefObjectCo(Parent, &Ref); - co_UserRedrawWindow(Parent, NULL, Temp, - RDW_FRAME | RDW_ERASE | RDW_INVALIDATE | - RDW_ALLCHILDREN); - UserDerefObjectCo(Parent); + IntGdiCombineRgn(TempRgn, NewlyExposed, NULL, RGN_COPY); + IntGdiOffsetRgn(TempRgn, + Wnd->rcWindow.left - Parent->rcClient.left, + Wnd->rcWindow.top - Parent->rcClient.top); - GreDeleteObject(Temp); + UserRefObjectCo(Parent, &Ref); + co_UserRedrawWindow(Parent, NULL, TempRgn, + RDW_FRAME | RDW_ERASE | RDW_INVALIDATE | + RDW_ALLCHILDREN); + UserDerefObjectCo(Parent); + + REGION_Delete(TempRgn); } } Modified: trunk/reactos/win32ss/user/ntuser/vis.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/vis.h?… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/vis.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/vis.h [iso-8859-1] Wed Sep 17 09:54:27 2014 @@ -9,7 +9,7 @@ #pragma once -HRGN FASTCALL VIS_ComputeVisibleRegion(PWND Window, BOOLEAN ClientArea, BOOLEAN ClipChildren, BOOLEAN ClipSiblings); -VOID FASTCALL co_VIS_WindowLayoutChanged(PWND Window, HRGN UncoveredRgn); +PREGION FASTCALL VIS_ComputeVisibleRegion(PWND Window, BOOLEAN ClientArea, BOOLEAN ClipChildren, BOOLEAN ClipSiblings); +VOID FASTCALL co_VIS_WindowLayoutChanged(PWND Window, PREGION UncoveredRgn); /* EOF */ Modified: trunk/reactos/win32ss/user/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/windc.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/windc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/windc.c [iso-8859-1] Wed Sep 17 09:54:27 2014 @@ -69,24 +69,10 @@ PREGION FASTCALL DceGetVisRgn(PWND Window, ULONG Flags, HWND hWndChild, ULONG CFlags) { - PREGION RetRgn; - HRGN hVisRgn; - hVisRgn = VIS_ComputeVisibleRegion( Window, - 0 == (Flags & DCX_WINDOW), - 0 != (Flags & DCX_CLIPCHILDREN), - 0 != (Flags & DCX_CLIPSIBLINGS)); - - RetRgn = IntSysCreateRectpRgn(0, 0, 0, 0); - - if (hVisRgn != NULL) - { - PREGION VisRgn = REGION_LockRgn(hVisRgn); - IntGdiCombineRgn(RetRgn, VisRgn, NULL, RGN_COPY); - REGION_UnlockRgn(VisRgn); - GreDeleteObject(hVisRgn); - } - - return RetRgn; + return VIS_ComputeVisibleRegion( Window, + 0 == (Flags & DCX_WINDOW), + 0 != (Flags & DCX_CLIPCHILDREN), + 0 != (Flags & DCX_CLIPSIBLINGS)); } PDCE FASTCALL @@ -582,11 +568,19 @@ { if (!(Flags & DCX_WINDOW)) { - Dce->hrgnClip = IntSysCreateRectRgnIndirect(&Wnd->rcClient); + Dce->hrgnClip = NtGdiCreateRectRgn( + Wnd->rcClient.left, + Wnd->rcClient.top, + Wnd->rcClient.right, + Wnd->rcClient.bottom); } else { - Dce->hrgnClip = IntSysCreateRectRgnIndirect(&Wnd->rcWindow); + Dce->hrgnClip = NtGdiCreateRectRgn( + Wnd->rcWindow.left, + Wnd->rcWindow.top, + Wnd->rcWindow.right, + Wnd->rcWindow.bottom); } Dce->DCXFlags &= ~DCX_KEEPCLIPRGN; bUpdateVisRgn = TRUE; Modified: trunk/reactos/win32ss/user/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winpos… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] Wed Sep 17 09:54:27 2014 @@ -1652,13 +1652,10 @@ RECTL NewWindowRect; RECTL NewClientRect; RECTL valid_rects[2]; - PROSRGNDATA VisRgn; - HRGN VisBefore = NULL; - HRGN VisBeforeJustClient = NULL; - HRGN VisAfter = NULL; - HRGN DirtyRgn = NULL; - HRGN ExposedRgn = NULL; - HRGN CopyRgn = NULL; + PREGION VisBefore = NULL; + PREGION VisBeforeJustClient = NULL; + PREGION VisAfter = NULL; + PREGION CopyRgn = NULL; ULONG WvrFlags = 0; RECTL OldWindowRect, OldClientRect; int RgnType; @@ -1736,20 +1733,16 @@ { VisBefore = VIS_ComputeVisibleRegion(Window, FALSE, FALSE, (Window->style & WS_CLIPSIBLINGS) ? TRUE : FALSE); - VisRgn = NULL; if ( VisBefore != NULL && - (VisRgn = (PROSRGNDATA)RGNOBJAPI_Lock(VisBefore, NULL)) && - REGION_Complexity(VisRgn) == NULLREGION ) + REGION_Complexity(VisBefore) == NULLREGION ) { - RGNOBJAPI_Unlock(VisRgn); - GreDeleteObject(VisBefore); + REGION_Delete(VisBefore); VisBefore = NULL; } - else if(VisRgn) + else if(VisBefore) { - RGNOBJAPI_Unlock(VisRgn); - NtGdiOffsetRgn(VisBefore, -Window->rcWindow.left, -Window->rcWindow.top); + IntGdiOffsetRgn(VisBefore, -Window->rcWindow.left, -Window->rcWindow.top); } /* Calculate the non client area for resizes, as this is used in the copy region */ @@ -1757,20 +1750,16 @@ { VisBeforeJustClient = VIS_ComputeVisibleRegion(Window, TRUE, FALSE, (Window->style & WS_CLIPSIBLINGS) ? TRUE : FALSE); - VisRgn = NULL; if ( VisBeforeJustClient != NULL && - (VisRgn = (PROSRGNDATA)RGNOBJAPI_Lock(VisBeforeJustClient, NULL)) && - REGION_Complexity(VisRgn) == NULLREGION ) + REGION_Complexity(VisBeforeJustClient) == NULLREGION ) { - RGNOBJAPI_Unlock(VisRgn); - GreDeleteObject(VisBeforeJustClient); + REGION_Delete(VisBeforeJustClient); VisBeforeJustClient = NULL; } - else if(VisRgn) + else if(VisBeforeJustClient) { - RGNOBJAPI_Unlock(VisRgn); - NtGdiOffsetRgn(VisBeforeJustClient, -Window->rcWindow.left, -Window->rcWindow.top); + IntGdiOffsetRgn(VisBeforeJustClient, -Window->rcWindow.left, -Window->rcWindow.top); } } } @@ -1843,20 +1832,16 @@ /* Determine the new visible region */ VisAfter = VIS_ComputeVisibleRegion(Window, FALSE, FALSE, (Window->style & WS_CLIPSIBLINGS) ? TRUE : FALSE); - VisRgn = NULL; if ( VisAfter != NULL && - (VisRgn = (PROSRGNDATA)RGNOBJAPI_Lock(VisAfter, NULL)) && - REGION_Complexity(VisRgn) == NULLREGION ) - { - RGNOBJAPI_Unlock(VisRgn); - GreDeleteObject(VisAfter); + REGION_Complexity(VisAfter) == NULLREGION ) + { + REGION_Delete(VisAfter); VisAfter = NULL; } - else if(VisRgn) - { - RGNOBJAPI_Unlock(VisRgn); - NtGdiOffsetRgn(VisAfter, -Window->rcWindow.left, -Window->rcWindow.top); + else if(VisAfter) + { + IntGdiOffsetRgn(VisAfter, -Window->rcWindow.left, -Window->rcWindow.top); } /* @@ -1882,21 +1867,26 @@ * region...) */ - CopyRgn = IntSysCreateRectRgn(0, 0, 0, 0); + CopyRgn = IntSysCreateRectpRgn(0, 0, 0, 0); if (WinPos.flags & SWP_NOSIZE) - RgnType = NtGdiCombineRgn(CopyRgn, VisAfter, VisBefore, RGN_AND); + RgnType = IntGdiCombineRgn(CopyRgn, VisAfter, VisBefore, RGN_AND); else if (VisBeforeJustClient != NULL) { - RgnType = NtGdiCombineRgn(CopyRgn, VisAfter, VisBeforeJustClient, RGN_AND); - GreDeleteObject(VisBeforeJustClient); + RgnType = IntGdiCombineRgn(CopyRgn, VisAfter, VisBeforeJustClient, RGN_AND); + REGION_Delete(VisBeforeJustClient); } /* No use in copying bits which are in the update region. */ if (Window->hrgnUpdate != NULL) { - NtGdiOffsetRgn(CopyRgn, NewWindowRect.left, NewWindowRect.top); - NtGdiCombineRgn(CopyRgn, CopyRgn, Window->hrgnUpdate, RGN_DIFF); - NtGdiOffsetRgn(CopyRgn, -NewWindowRect.left, -NewWindowRect.top); + PREGION RgnUpdate = RGNOBJAPI_Lock(Window->hrgnUpdate, NULL); + if (RgnUpdate) + { + IntGdiOffsetRgn(CopyRgn, NewWindowRect.left, NewWindowRect.top); + IntGdiCombineRgn(CopyRgn, CopyRgn, RgnUpdate, RGN_DIFF); + IntGdiOffsetRgn(CopyRgn, -NewWindowRect.left, -NewWindowRect.top); + RGNOBJAPI_Unlock(RgnUpdate); + } } /* @@ -1904,21 +1894,17 @@ * there's nothing to copy. Also, it's no use copying bits onto * themselves. */ - if ( (VisRgn = (PROSRGNDATA)RGNOBJAPI_Lock(CopyRgn, NULL)) && - REGION_GetRgnBox(VisRgn, &CopyRect) == NULLREGION) + if (REGION_GetRgnBox(CopyRgn, &CopyRect) == NULLREGION) { /* Nothing to copy, clean up */ - RGNOBJAPI_Unlock(VisRgn); - GreDeleteObject(CopyRgn); + REGION_Delete(CopyRgn); CopyRgn = NULL; } else if (OldWindowRect.left != NewWindowRect.left || OldWindowRect.top != NewWindowRect.top) { - if(VisRgn) - { - RGNOBJAPI_Unlock(VisRgn); - } + HRGN DcRgn = NtGdiCreateRectRgn(0, 0, 0, 0); + PREGION DcRgnObj = RGNOBJAPI_Lock(DcRgn, NULL); /* * Small trick here: there is no function to bitblt a region. So @@ -1929,9 +1915,11 @@ * Since NtUserGetDCEx takes ownership of the clip region, we need * to create a copy of CopyRgn and pass that. We need CopyRgn later */ - NtGdiOffsetRgn(CopyRgn, NewWindowRect.left, NewWindowRect.top); + IntGdiCombineRgn(DcRgnObj, CopyRgn, NULL, RGN_COPY); + IntGdiOffsetRgn(DcRgnObj, NewWindowRect.left, NewWindowRect.top); + RGNOBJAPI_Unlock(DcRgnObj); Dc = UserGetDCEx( Window, - CopyRgn, + DcRgn, DCX_WINDOW|DCX_CACHE|DCX_INTERSECTRGN|DCX_CLIPSIBLINGS|DCX_KEEPCLIPRGN); NtGdiBitBlt( Dc, CopyRect.left, CopyRect.top, @@ -1946,11 +1934,7 @@ UserReleaseDC(Window, Dc, FALSE); IntValidateParent(Window, CopyRgn, FALSE); - NtGdiOffsetRgn(CopyRgn, -NewWindowRect.left, -NewWindowRect.top); - } - else if(VisRgn) - { - RGNOBJAPI_Unlock(VisRgn); + GreDeleteObject(DcRgn); } } else @@ -1961,78 +1945,84 @@ /* We need to redraw what wasn't visible before */ if (VisAfter != NULL) { - DirtyRgn = IntSysCreateRectRgn(0, 0, 0, 0); - if (CopyRgn != NULL) + PREGION DirtyRgn = IntSysCreateRectpRgn(0, 0, 0, 0); + if (DirtyRgn) { - RgnType = NtGdiCombineRgn(DirtyRgn, VisAfter, CopyRgn, RGN_DIFF); - } - else - { - RgnType = NtGdiCombineRgn(DirtyRgn, VisAfter, 0, RGN_COPY); - } - if (RgnType != ERROR && RgnType != NULLREGION) - { - /* old code - NtGdiOffsetRgn(DirtyRgn, Window->rcWindow.left, Window->rcWindow.top); - IntInvalidateWindows( Window, - DirtyRgn, - RDW_ERASE | RDW_FRAME | RDW_INVALIDATE | RDW_ALLCHILDREN); - } - GreDeleteObject(DirtyRgn); - */ - - PWND Parent = Window->spwndParent; - - NtGdiOffsetRgn( DirtyRgn, - Window->rcWindow.left, - Window->rcWindow.top); - if ( (Window->style & WS_CHILD) && - (Parent) && - !(Parent->style & WS_CLIPCHILDREN)) - { - IntInvalidateWindows( Parent, - DirtyRgn, - RDW_ERASE | RDW_INVALIDATE); - co_IntPaintWindows(Parent, RDW_ERASENOW, FALSE); - } - else - { + if (CopyRgn != NULL) + { + RgnType = IntGdiCombineRgn(DirtyRgn, VisAfter, CopyRgn, RGN_DIFF); + } + else + { + RgnType = IntGdiCombineRgn(DirtyRgn, VisAfter, 0, RGN_COPY); + } + if (RgnType != ERROR && RgnType != NULLREGION) + { + /* old code + NtGdiOffsetRgn(DirtyRgn, Window->rcWindow.left, Window->rcWindow.top); IntInvalidateWindows( Window, DirtyRgn, - RDW_ERASE | RDW_FRAME | RDW_INVALIDATE | RDW_ALLCHILDREN); - } + RDW_ERASE | RDW_FRAME | RDW_INVALIDATE | RDW_ALLCHILDREN); + } + GreDeleteObject(DirtyRgn); + */ + + PWND Parent = Window->spwndParent; + + IntGdiOffsetRgn( DirtyRgn, + Window->rcWindow.left, + Window->rcWindow.top); + if ( (Window->style & WS_CHILD) && + (Parent) && + !(Parent->style & WS_CLIPCHILDREN)) + { + IntInvalidateWindows( Parent, + DirtyRgn, + RDW_ERASE | RDW_INVALIDATE); + co_IntPaintWindows(Parent, RDW_ERASENOW, FALSE); + } + else + { + IntInvalidateWindows( Window, + DirtyRgn, + RDW_ERASE | RDW_FRAME | RDW_INVALIDATE | RDW_ALLCHILDREN); + } + } + REGION_Delete(DirtyRgn); } - GreDeleteObject(DirtyRgn); } if (CopyRgn != NULL) { - GreDeleteObject(CopyRgn); + REGION_Delete(CopyRgn); } /* Expose what was covered before but not covered anymore */ if (VisBefore != NULL) { - ExposedRgn = IntSysCreateRectRgn(0, 0, 0, 0); - RgnType = NtGdiCombineRgn(ExposedRgn, VisBefore, NULL, RGN_COPY); - NtGdiOffsetRgn( ExposedRgn, - OldWindowRect.left - NewWindowRect.left, - OldWindowRect.top - NewWindowRect.top); - - if (VisAfter != NULL) - RgnType = NtGdiCombineRgn(ExposedRgn, ExposedRgn, VisAfter, RGN_DIFF); - - if (RgnType != ERROR && RgnType != NULLREGION) + PREGION ExposedRgn = IntSysCreateRectpRgn(0, 0, 0, 0); + if (ExposedRgn) { - co_VIS_WindowLayoutChanged(Window, ExposedRgn); + RgnType = IntGdiCombineRgn(ExposedRgn, VisBefore, NULL, RGN_COPY); + IntGdiOffsetRgn( ExposedRgn, + OldWindowRect.left - NewWindowRect.left, + OldWindowRect.top - NewWindowRect.top); + + if (VisAfter != NULL) + RgnType = IntGdiCombineRgn(ExposedRgn, ExposedRgn, VisAfter, RGN_DIFF); + + if (RgnType != ERROR && RgnType != NULLREGION) + { + co_VIS_WindowLayoutChanged(Window, ExposedRgn); + } + REGION_Delete(ExposedRgn); } - GreDeleteObject(ExposedRgn); - GreDeleteObject(VisBefore); + REGION_Delete(VisBefore); } if (VisAfter != NULL) { - GreDeleteObject(VisAfter); + REGION_Delete(VisAfter); } } @@ -3112,7 +3102,7 @@ HRGN hRgn, BOOL bRedraw) { - HRGN hrgnCopy; + HRGN hrgnCopy = NULL; PWND Window; INT flags = (SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE); BOOLEAN Ret = FALSE; @@ -3132,17 +3122,13 @@ { if (GreIsHandleValid(hRgn)) { - hrgnCopy = IntSysCreateRectRgn(0, 0, 0, 0); + hrgnCopy = NtGdiCreateRectRgn(0, 0, 0, 0); /* The coordinates of a window's window region are relative to the upper-left corner of the window, not the client area of the window. */ NtGdiCombineRgn( hrgnCopy, hRgn, 0, RGN_COPY); } else RETURN( 0); - } - else - { - hrgnCopy = NULL; } if (Window->hrgnClip)

10 years

[jgardou] 64176: [GDI32] - Fix up values got from win32k in GetOutlineTextMetrics and do not fail if the provided buffersize is only sizeof(OUTLINETEXTMETRICW). CORE-8507 #resolve

by jgardou＠svn.reactos.org

Author: jgardou Date: Wed Sep 17 09:54:14 2014 New Revision: 64176 URL: http://svn.reactos.org/svn/reactos?rev=64176&view=rev Log: [GDI32] - Fix up values got from win32k in GetOutlineTextMetrics and do not fail if the provided buffersize is only sizeof(OUTLINETEXTMETRICW). CORE-8507 #resolve Modified: trunk/reactos/win32ss/gdi/gdi32/objects/font.c Modified: trunk/reactos/win32ss/gdi/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/font.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/font.c [iso-8859-1] Wed Sep 17 09:54:14 2014 @@ -9,8 +9,19 @@ #include <precomp.h> +#include <math.h> + #define NDEBUG #include <debug.h> + +/* Rounds a floating point number to integer. The world-to-viewport + * transformation process is done in floating point internally. This function + * is then used to round these coordinates to integer values. + */ +static __inline INT GDI_ROUND(FLOAT val) +{ + return (int)floor(val + 0.5); +} /* * For TranslateCharsetInfo @@ -1204,6 +1215,29 @@ return ret; } +/* Performs a device to world transformation on the specified size (which + * is in integer format). + */ +static inline INT INTERNAL_YDSTOWS(XFORM *xForm, INT height) +{ + double floatHeight; + + /* Perform operation with floating point */ + floatHeight = (double)height * xForm->eM22; + /* Round to integers */ + return GDI_ROUND(floatHeight); +} + +/* scale width and height but don't mirror them */ +static inline INT width_to_LP( XFORM *xForm, INT width ) +{ + return GDI_ROUND( (double)width * fabs( xForm->eM11)); +} + +static inline INT height_to_LP( XFORM *xForm, INT height ) +{ + return GDI_ROUND( (double)height * fabs( xForm->eM22 )); +} /* * @implemented @@ -1217,8 +1251,146 @@ ) { TMDIFF Tmd; // Should not be zero. - - return NtGdiGetOutlineTextMetricsInternalW(hdc, cbData, lpOTM, &Tmd); + UINT Size, AvailableSize = 0, StringSize; + XFORM DevToWorld; + OUTLINETEXTMETRICW* LocalOTM; + WCHAR* Str; + BYTE* Ptr; + + /* Get the structure */ + Size = NtGdiGetOutlineTextMetricsInternalW(hdc, 0, NULL, &Tmd); + if (!Size) + return 0; + if (!lpOTM || (cbData < sizeof(*lpOTM))) + return Size; + + LocalOTM = HeapAlloc(GetProcessHeap(), 0, Size); + LocalOTM->otmSize = Size; + Size = NtGdiGetOutlineTextMetricsInternalW(hdc, Size, LocalOTM, &Tmd); + if (!Size) + { + HeapFree(GetProcessHeap(), 0, LocalOTM); + return 0; + } + + if (!NtGdiGetTransform(hdc, GdiDeviceSpaceToWorldSpace, &DevToWorld)) + { + DPRINT1("NtGdiGetTransform failed!\n"); + HeapFree(GetProcessHeap(), 0, LocalOTM); + SetLastError(ERROR_INVALID_HANDLE); + return 0; + } + + /* Fill in DC specific data */ + LocalOTM->otmTextMetrics.tmDigitizedAspectX = GetDeviceCaps(hdc, LOGPIXELSX); + LocalOTM->otmTextMetrics.tmDigitizedAspectY = GetDeviceCaps(hdc, LOGPIXELSY); + LocalOTM->otmTextMetrics.tmHeight = height_to_LP( &DevToWorld, LocalOTM->otmTextMetrics.tmHeight ); + LocalOTM->otmTextMetrics.tmAscent = height_to_LP( &DevToWorld, LocalOTM->otmTextMetrics.tmAscent ); + LocalOTM->otmTextMetrics.tmDescent = height_to_LP( &DevToWorld, LocalOTM->otmTextMetrics.tmDescent ); + LocalOTM->otmTextMetrics.tmInternalLeading = height_to_LP( &DevToWorld, LocalOTM->otmTextMetrics.tmInternalLeading ); + LocalOTM->otmTextMetrics.tmExternalLeading = height_to_LP( &DevToWorld, LocalOTM->otmTextMetrics.tmExternalLeading ); + LocalOTM->otmTextMetrics.tmAveCharWidth = width_to_LP( &DevToWorld, LocalOTM->otmTextMetrics.tmAveCharWidth ); + LocalOTM->otmTextMetrics.tmMaxCharWidth = width_to_LP( &DevToWorld, LocalOTM->otmTextMetrics.tmMaxCharWidth ); + LocalOTM->otmTextMetrics.tmOverhang = width_to_LP( &DevToWorld, LocalOTM->otmTextMetrics.tmOverhang ); + LocalOTM->otmAscent = height_to_LP( &DevToWorld, LocalOTM->otmAscent); + LocalOTM->otmDescent = height_to_LP( &DevToWorld, LocalOTM->otmDescent); + LocalOTM->otmLineGap = abs(INTERNAL_YDSTOWS(&DevToWorld,LocalOTM->otmLineGap)); + LocalOTM->otmsCapEmHeight = abs(INTERNAL_YDSTOWS(&DevToWorld,LocalOTM->otmsCapEmHeight)); + LocalOTM->otmsXHeight = abs(INTERNAL_YDSTOWS(&DevToWorld,LocalOTM->otmsXHeight)); + LocalOTM->otmrcFontBox.top = height_to_LP( &DevToWorld, LocalOTM->otmrcFontBox.top); + LocalOTM->otmrcFontBox.bottom = height_to_LP( &DevToWorld, LocalOTM->otmrcFontBox.bottom); + LocalOTM->otmrcFontBox.left = width_to_LP( &DevToWorld, LocalOTM->otmrcFontBox.left); + LocalOTM->otmrcFontBox.right = width_to_LP( &DevToWorld, LocalOTM->otmrcFontBox.right); + LocalOTM->otmMacAscent = height_to_LP( &DevToWorld, LocalOTM->otmMacAscent); + LocalOTM->otmMacDescent = height_to_LP( &DevToWorld, LocalOTM->otmMacDescent); + LocalOTM->otmMacLineGap = abs(INTERNAL_YDSTOWS(&DevToWorld,LocalOTM->otmMacLineGap)); + LocalOTM->otmptSubscriptSize.x = width_to_LP( &DevToWorld, LocalOTM->otmptSubscriptSize.x); + LocalOTM->otmptSubscriptSize.y = height_to_LP( &DevToWorld, LocalOTM->otmptSubscriptSize.y); + LocalOTM->otmptSubscriptOffset.x = width_to_LP( &DevToWorld, LocalOTM->otmptSubscriptOffset.x); + LocalOTM->otmptSubscriptOffset.y = height_to_LP( &DevToWorld, LocalOTM->otmptSubscriptOffset.y); + LocalOTM->otmptSuperscriptSize.x = width_to_LP( &DevToWorld, LocalOTM->otmptSuperscriptSize.x); + LocalOTM->otmptSuperscriptSize.y = height_to_LP( &DevToWorld, LocalOTM->otmptSuperscriptSize.y); + LocalOTM->otmptSuperscriptOffset.x = width_to_LP( &DevToWorld, LocalOTM->otmptSuperscriptOffset.x); + LocalOTM->otmptSuperscriptOffset.y = height_to_LP( &DevToWorld, LocalOTM->otmptSuperscriptOffset.y); + LocalOTM->otmsStrikeoutSize = abs(INTERNAL_YDSTOWS(&DevToWorld,LocalOTM->otmsStrikeoutSize)); + LocalOTM->otmsStrikeoutPosition = height_to_LP( &DevToWorld, LocalOTM->otmsStrikeoutPosition); + LocalOTM->otmsUnderscoreSize = height_to_LP( &DevToWorld, LocalOTM->otmsUnderscoreSize); + LocalOTM->otmsUnderscorePosition = height_to_LP( &DevToWorld, LocalOTM->otmsUnderscorePosition); + + /* Copy what we can */ + CopyMemory(lpOTM, LocalOTM, min(Size, cbData)); + + lpOTM->otmpFamilyName = NULL; + lpOTM->otmpFaceName = NULL; + lpOTM->otmpStyleName = NULL; + lpOTM->otmpFullName = NULL; + + Size = sizeof(*lpOTM); + AvailableSize = cbData - Size; + Ptr = (BYTE*)lpOTM + sizeof(*lpOTM); + + /* Fix string values up */ + if (LocalOTM->otmpFamilyName) + { + Str = (WCHAR*)((char*)LocalOTM + (ptrdiff_t)LocalOTM->otmpFamilyName); + StringSize = (wcslen(Str) + 1) * sizeof(WCHAR); + if (AvailableSize >= StringSize) + { + CopyMemory(Ptr, Str, StringSize); + lpOTM->otmpFamilyName = (PSTR)(Ptr - (BYTE*)lpOTM); + Ptr += StringSize; + AvailableSize -= StringSize; + Size += StringSize; + } + } + + if (LocalOTM->otmpFaceName) + { + Str = (WCHAR*)((char*)LocalOTM + (ptrdiff_t)LocalOTM->otmpFaceName); + StringSize = (wcslen(Str) + 1) * sizeof(WCHAR); + if (AvailableSize >= StringSize) + { + CopyMemory(Ptr, Str, StringSize); + lpOTM->otmpFaceName = (PSTR)(Ptr - (BYTE*)lpOTM); + Ptr += StringSize; + AvailableSize -= StringSize; + Size += StringSize; + } + } + + if (LocalOTM->otmpStyleName) + { + Str = (WCHAR*)((char*)LocalOTM + (ptrdiff_t)LocalOTM->otmpStyleName); + StringSize = (wcslen(Str) + 1) * sizeof(WCHAR); + if (AvailableSize >= StringSize) + { + CopyMemory(Ptr, Str, StringSize); + lpOTM->otmpStyleName = (PSTR)(Ptr - (BYTE*)lpOTM); + Ptr += StringSize; + AvailableSize -= StringSize; + Size += StringSize; + } + } + + if (LocalOTM->otmpFullName) + { + Str = (WCHAR*)((char*)LocalOTM + (ptrdiff_t)LocalOTM->otmpFullName); + StringSize = (wcslen(Str) + 1) * sizeof(WCHAR); + if (AvailableSize >= StringSize) + { + CopyMemory(Ptr, Str, StringSize); + lpOTM->otmpFullName = (PSTR)(Ptr - (BYTE*)lpOTM); + Ptr += StringSize; + AvailableSize -= StringSize; + Size += StringSize; + } + } + + lpOTM->otmSize = Size; + + HeapFree(GetProcessHeap(), 0, LocalOTM); + + return Size; } /*

10 years

[tkreuzer] 64175: [TCPIP] - Implement InfoTdiQueryGetATInfo, which implements some special case for InfoTdiQueryInformationEx. It's based on wild guesses, but it helps to make Windows 2003 lsass no...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Sep 16 22:02:53 2014 New Revision: 64175 URL: http://svn.reactos.org/svn/reactos?rev=64175&view=rev Log: [TCPIP] - Implement InfoTdiQueryGetATInfo, which implements some special case for InfoTdiQueryInformationEx. It's based on wild guesses, but it helps to make Windows 2003 lsass not fail. - Silence VC warnings Modified: branches/kernel-fun/reactos/drivers/network/tcpip/include/tcpip.h branches/kernel-fun/reactos/drivers/network/tcpip/tcpip/info.c branches/kernel-fun/reactos/drivers/network/tcpip/tcpip/main.c branches/kernel-fun/reactos/drivers/network/tcpip/tcpip/proto.c branches/kernel-fun/reactos/drivers/network/tcpip/tests/tests/tigetprotocolnumber.c Modified: branches/kernel-fun/reactos/drivers/network/tcpip/include/tcpip.h URL: http://svn.reactos.org/svn/reactos/branches/kernel-fun/reactos/drivers/netw… ============================================================================== --- branches/kernel-fun/reactos/drivers/network/tcpip/include/tcpip.h [iso-8859-1] (original) +++ branches/kernel-fun/reactos/drivers/network/tcpip/include/tcpip.h [iso-8859-1] Tue Sep 16 22:02:53 2014 @@ -170,6 +170,6 @@ extern ULONG EntityMax; extern NTSTATUS TiGetProtocolNumber( PUNICODE_STRING FileName, - PULONG Protocol ); + PUSHORT Protocol ); /* EOF */ Modified: branches/kernel-fun/reactos/drivers/network/tcpip/tcpip/info.c URL: http://svn.reactos.org/svn/reactos/branches/kernel-fun/reactos/drivers/netw… ============================================================================== --- branches/kernel-fun/reactos/drivers/network/tcpip/tcpip/info.c [iso-8859-1] (original) +++ branches/kernel-fun/reactos/drivers/network/tcpip/tcpip/info.c [iso-8859-1] Tue Sep 16 22:02:53 2014 @@ -179,6 +179,38 @@ return TDI_SUCCESS; } + +TDI_STATUS +InfoTdiQueryGetATInfo( + TDIEntityID ID, + PIP_INTERFACE Interface, + PNDIS_BUFFER Buffer, + PUINT BufferSize) +{ + ULONG ATInfo[2]; + TDI_STATUS Status; + + TI_DbgPrint(DEBUG_INFO, ("Called.\n")); + + if (!Interface) + return TDI_INVALID_PARAMETER; + + if (*BufferSize < 2 * sizeof(ULONG)) + return STATUS_BUFFER_TOO_SMALL; + + // Fixme: I have no idea what the first field should contain... + ATInfo[0] = 0; + ATInfo[1] = Interface->Index; + + Status = InfoCopyOut( (PCHAR)ATInfo, sizeof(ATInfo), + Buffer, BufferSize ); + + TI_DbgPrint(DEBUG_INFO, ("Returning %08x\n", Status)); + + *BufferSize = 8; + return Status; +} + TDI_STATUS InfoTdiQueryInformationEx( PTDI_REQUEST Request, @@ -246,21 +278,32 @@ return TDI_INVALID_PARAMETER; if (ID->toi_entity.tei_entity == IF_ENTITY) + { if ((EntityListContext = GetContext(ID->toi_entity))) return InfoTdiQueryGetInterfaceMIB(ID->toi_entity, EntityListContext, Buffer, BufferSize); else return TDI_INVALID_PARAMETER; + } else if (ID->toi_entity.tei_entity == CL_NL_ENTITY || ID->toi_entity.tei_entity == CO_NL_ENTITY) + { if ((EntityListContext = GetContext(ID->toi_entity))) return InfoTdiQueryGetIPSnmpInfo(ID->toi_entity, EntityListContext, Buffer, BufferSize); else return TDI_INVALID_PARAMETER; + } + else if (ID->toi_entity.tei_entity == AT_ENTITY) + { + if ((EntityListContext = GetContext(ID->toi_entity))) + return InfoTdiQueryGetATInfo(ID->toi_entity, EntityListContext, Buffer, BufferSize); + else + return TDI_INVALID_PARAMETER; + } else return TDI_INVALID_PARAMETER; case IP_MIB_ADDRTABLE_ENTRY_ID: - if (ID->toi_entity.tei_entity != CL_NL_ENTITY && + if (ID->toi_entity.tei_entity != CL_NL_ENTITY && ID->toi_entity.tei_entity != CO_NL_ENTITY) return TDI_INVALID_PARAMETER; Modified: branches/kernel-fun/reactos/drivers/network/tcpip/tcpip/main.c URL: http://svn.reactos.org/svn/reactos/branches/kernel-fun/reactos/drivers/netw… ============================================================================== --- branches/kernel-fun/reactos/drivers/network/tcpip/tcpip/main.c [iso-8859-1] (original) +++ branches/kernel-fun/reactos/drivers/network/tcpip/tcpip/main.c [iso-8859-1] Tue Sep 16 22:02:53 2014 @@ -116,7 +116,7 @@ TDI_REQUEST Request; PVOID ClientContext; NTSTATUS Status; - ULONG Protocol; + USHORT Protocol; BOOLEAN Shared; TI_DbgPrint(DEBUG_IRP, ("Called. DeviceObject is at (0x%X), IRP is at (0x%X).\n", DeviceObject, Irp)); Modified: branches/kernel-fun/reactos/drivers/network/tcpip/tcpip/proto.c URL: http://svn.reactos.org/svn/reactos/branches/kernel-fun/reactos/drivers/netw… ============================================================================== --- branches/kernel-fun/reactos/drivers/network/tcpip/tcpip/proto.c [iso-8859-1] (original) +++ branches/kernel-fun/reactos/drivers/network/tcpip/tcpip/proto.c [iso-8859-1] Tue Sep 16 22:02:53 2014 @@ -2,7 +2,7 @@ NTSTATUS TiGetProtocolNumber( PUNICODE_STRING FileName, - PULONG Protocol) + PUSHORT Protocol) /* * FUNCTION: Returns the protocol number from a file name * ARGUMENTS: @@ -33,7 +33,7 @@ if (!NT_SUCCESS(Status) || ((Value > 255))) return STATUS_UNSUCCESSFUL; - *Protocol = Value; + *Protocol = (USHORT)Value; return STATUS_SUCCESS; } Modified: branches/kernel-fun/reactos/drivers/network/tcpip/tests/tests/tigetprotocolnumber.c URL: http://svn.reactos.org/svn/reactos/branches/kernel-fun/reactos/drivers/netw… ============================================================================== --- branches/kernel-fun/reactos/drivers/network/tcpip/tests/tests/tigetprotocolnumber.c [iso-8859-1] (original) +++ branches/kernel-fun/reactos/drivers/network/tcpip/tests/tests/tigetprotocolnumber.c [iso-8859-1] Tue Sep 16 22:02:53 2014 @@ -3,9 +3,9 @@ static void RunTest() { UNICODE_STRING Str; - int Proto; + USHORT Proto; RtlInitUnicodeString( &Str, L"1" ); - TiGetProtocolNumber( &Str, (PULONG)&Proto ); + TiGetProtocolNumber( &Str, &Proto ); _AssertEqualValue(1, Proto); }

10 years

[tkreuzer] 64174: [NTOSKRNL] - Remove an undocumented flag from the lpc request type in NtRequestWaitReplyPort. This is required for some windows modules that use this flag, otherwise the function ...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Sep 16 21:57:31 2014 New Revision: 64174 URL: http://svn.reactos.org/svn/reactos?rev=64174&view=rev Log: [NTOSKRNL] - Remove an undocumented flag from the lpc request type in NtRequestWaitReplyPort. This is required for some windows modules that use this flag, otherwise the function fails. Modified: branches/kernel-fun/reactos/ntoskrnl/lpc/send.c Modified: branches/kernel-fun/reactos/ntoskrnl/lpc/send.c URL: http://svn.reactos.org/svn/reactos/branches/kernel-fun/reactos/ntoskrnl/lpc… ============================================================================== --- branches/kernel-fun/reactos/ntoskrnl/lpc/send.c [iso-8859-1] (original) +++ branches/kernel-fun/reactos/ntoskrnl/lpc/send.c [iso-8859-1] Tue Sep 16 21:57:31 2014 @@ -744,6 +744,9 @@ } } + /* This flag is undocumented. Remove it before continuing */ + LocalLpcRequest.u2.s2.Type &= ~0x4000; + /* Check if this is an LPC Request */ if (LpcpGetMessageType(&LocalLpcRequest) == LPC_REQUEST) {

10 years

[tkreuzer] 64173: [NTOSKRNL] - Add some DPRINTs on errors - Silence a DPRINT - Only DPRINT on unimplemented affinity support on SMP builds

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Sep 16 21:46:56 2014 New Revision: 64173 URL: http://svn.reactos.org/svn/reactos?rev=64173&view=rev Log: [NTOSKRNL] - Add some DPRINTs on errors - Silence a DPRINT - Only DPRINT on unimplemented affinity support on SMP builds Modified: branches/kernel-fun/reactos/ntoskrnl/io/iomgr/file.c branches/kernel-fun/reactos/ntoskrnl/ke/thrdschd.c branches/kernel-fun/reactos/ntoskrnl/lpc/connect.c branches/kernel-fun/reactos/ntoskrnl/mm/ARM3/expool.c Modified: branches/kernel-fun/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/branches/kernel-fun/reactos/ntoskrnl/io/… ============================================================================== --- branches/kernel-fun/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] (original) +++ branches/kernel-fun/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] Tue Sep 16 21:46:56 2014 @@ -1600,6 +1600,8 @@ if (OpenPacket.ParseCheck != TRUE) { /* Parse failed */ + DPRINT1("IopQueryAttributesFile failed for '%wZ' with 0x%lx\n", + ObjectAttributes->ObjectName, Status); return Status; } else @@ -1822,6 +1824,7 @@ /* Make sure we have extra parameters */ if (!ExtraCreateParameters) { + DPRINT1("Invalid parameter: ExtraCreateParameters == 0!\n"); return STATUS_INVALID_PARAMETER; } @@ -1835,6 +1838,7 @@ (CreateOptions & ~FILE_VALID_PIPE_OPTION_FLAGS)) { /* Invalid named pipe create */ + DPRINT1("Invalid named pipe create\n"); return STATUS_INVALID_PARAMETER; } } @@ -1843,6 +1847,7 @@ /* Make sure we have extra parameters */ if (!ExtraCreateParameters) { + DPRINT1("Invalid parameter: ExtraCreateParameters == 0!\n"); return STATUS_INVALID_PARAMETER; } @@ -1853,6 +1858,7 @@ (CreateOptions & ~FILE_VALID_MAILSLOT_OPTION_FLAGS)) { /* Invalid mailslot create */ + DPRINT1("Invalid mailslot create\n"); return STATUS_INVALID_PARAMETER; } } @@ -1956,6 +1962,7 @@ if (!OpenPacket->EaBuffer) { ExFreePool(OpenPacket); + DPRINT1("Failed to allocate open packet EA buffer\n"); return STATUS_INSUFFICIENT_RESOURCES; } Modified: branches/kernel-fun/reactos/ntoskrnl/ke/thrdschd.c URL: http://svn.reactos.org/svn/reactos/branches/kernel-fun/reactos/ntoskrnl/ke/… ============================================================================== --- branches/kernel-fun/reactos/ntoskrnl/ke/thrdschd.c [iso-8859-1] (original) +++ branches/kernel-fun/reactos/ntoskrnl/ke/thrdschd.c [iso-8859-1] Tue Sep 16 21:46:56 2014 @@ -696,8 +696,10 @@ /* Check if system affinity is disabled */ if (!Thread->SystemAffinityActive) { +#ifdef CONFIG_SMP /* FIXME: TODO */ DPRINT1("Affinity support disabled!\n"); +#endif } /* Return the old affinity */ Modified: branches/kernel-fun/reactos/ntoskrnl/lpc/connect.c URL: http://svn.reactos.org/svn/reactos/branches/kernel-fun/reactos/ntoskrnl/lpc… ============================================================================== --- branches/kernel-fun/reactos/ntoskrnl/lpc/connect.c [iso-8859-1] (original) +++ branches/kernel-fun/reactos/ntoskrnl/lpc/connect.c [iso-8859-1] Tue Sep 16 21:46:56 2014 @@ -139,7 +139,11 @@ PreviousMode, NULL, (PVOID *)&Port); - if (!NT_SUCCESS(Status)) return Status; + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to reference port '%wZ': 0x%lx\n", PortName, Status); + return Status; + } /* This has to be a connection port */ if ((Port->Flags & LPCP_PORT_TYPE_MASK) != LPCP_CONNECTION_PORT) @@ -352,7 +356,7 @@ ConnectMessage->SectionToMap = SectionToMap; /* Set the data for the connection request message */ - Message->Request.u1.s1.DataLength = (CSHORT)ConnectionInfoLength + + Message->Request.u1.s1.DataLength = (CSHORT)ConnectionInfoLength + sizeof(LPCP_CONNECTION_MESSAGE); Message->Request.u1.s1.TotalLength = sizeof(LPCP_MESSAGE) + Message->Request.u1.s1.DataLength; Modified: branches/kernel-fun/reactos/ntoskrnl/mm/ARM3/expool.c URL: http://svn.reactos.org/svn/reactos/branches/kernel-fun/reactos/ntoskrnl/mm/… ============================================================================== --- branches/kernel-fun/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] (original) +++ branches/kernel-fun/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] Tue Sep 16 21:46:56 2014 @@ -1336,7 +1336,7 @@ InterlockedIncrementUL(&ExpPoolBigEntriesInUse); if ((i >= 16) && (ExpPoolBigEntriesInUse > (TableSize / 4))) { - DPRINT1("Should attempt expansion since we now have %lu entries\n", + DPRINT("Should attempt expansion since we now have %lu entries\n", ExpPoolBigEntriesInUse); }

10 years

[tkreuzer] 64172: [NTDLL] - Add Etw trace api stubs (moved from avdapi32) - Add exports for Etw* functions [ADVAPI32] - Add forwarders of trace api functions to ntdll Etw* functions

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Sep 16 20:40:33 2014 New Revision: 64172 URL: http://svn.reactos.org/svn/reactos?rev=64172&view=rev Log: [NTDLL] - Add Etw trace api stubs (moved from avdapi32) - Add exports for Etw* functions [ADVAPI32] - Add forwarders of trace api functions to ntdll Etw* functions Added: trunk/reactos/dll/ntdll/etw/ (with props) trunk/reactos/dll/ntdll/etw/trace.c - copied, changed from r64162, trunk/reactos/dll/win32/advapi32/misc/trace.c Removed: trunk/reactos/dll/win32/advapi32/misc/trace.c Modified: trunk/reactos/dll/ntdll/CMakeLists.txt trunk/reactos/dll/ntdll/def/ntdll.spec trunk/reactos/dll/win32/advapi32/CMakeLists.txt trunk/reactos/dll/win32/advapi32/advapi32.spec Modified: trunk/reactos/dll/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/CMakeLists.txt [iso-8859-1] Tue Sep 16 20:40:33 2014 @@ -22,6 +22,7 @@ ldr/ldrutils.c rtl/libsupp.c rtl/version.c + etw/trace.c include/ntdll.h) if(ARCH STREQUAL "i386") Modified: trunk/reactos/dll/ntdll/def/ntdll.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.spec?r… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] Tue Sep 16 20:40:33 2014 @@ -43,37 +43,37 @@ @ stdcall DbgUiStopDebugging(ptr) @ stdcall DbgUiWaitStateChange(ptr ptr) @ stdcall DbgUserBreakPoint() -# EtwControlTraceA -# EtwControlTraceW -# EtwCreateTraceInstanceId -# EtwEnableTrace -# EtwEnumerateTraceGuids -# EtwFlushTraceA -# EtwFlushTraceW -# EtwGetTraceEnableFlags -# EtwGetTraceEnableLevel -# EtwGetTraceLoggerHandle -# EtwNotificationRegistrationA -# EtwNotificationRegistrationW -# EtwQueryAllTracesA -# EtwQueryAllTracesW -# EtwQueryTraceA -# EtwQueryTraceW -# EtwReceiveNotificationsA -# EtwReceiveNotificationsW -# EtwRegisterTraceGuidsA -# EtwRegisterTraceGuidsW -# EtwStartTraceA -# EtwStartTraceW -# EtwStopTraceA -# EtwStopTraceW -# EtwTraceEvent -# EtwTraceEventInstance -# EtwTraceMessage -# EtwTraceMessageVa -# EtwUnregisterTraceGuids -# EtwUpdateTraceA -# EtwUpdateTraceW +@ stdcall EtwControlTraceA(double str ptr long) +@ stdcall EtwControlTraceW(double wstr ptr long) +@ stdcall -stub EtwCreateTraceInstanceId(ptr ptr) +@ stdcall EtwEnableTrace(long long long ptr double) +@ stdcall -stub EtwEnumerateTraceGuids(ptr long ptr) +@ stdcall -stub EtwFlushTraceA(double str ptr) +@ stdcall -stub EtwFlushTraceW(double wstr ptr) +@ stdcall EtwGetTraceEnableFlags(double) +@ stdcall EtwGetTraceEnableLevel(double) +@ stdcall EtwGetTraceLoggerHandle(ptr) +@ stdcall -stub EtwNotificationRegistrationA(ptr long ptr long long) +@ stdcall -stub EtwNotificationRegistrationW(ptr long ptr long long) +@ stdcall EtwQueryAllTracesA(ptr long ptr) +@ stdcall EtwQueryAllTracesW(ptr long ptr) +@ stdcall -stub EtwQueryTraceA(double str ptr) +@ stdcall -stub EtwQueryTraceW(double wstr ptr) +@ stdcall -stub EtwReceiveNotificationsA() # FIXME prototype +@ stdcall -stub EtwReceiveNotificationsW() # FIXME prototype +@ stdcall EtwRegisterTraceGuidsA(ptr ptr ptr long ptr str str ptr) +@ stdcall EtwRegisterTraceGuidsW(ptr ptr ptr long ptr wstr wstr ptr) +@ stdcall EtwStartTraceA(ptr str ptr) +@ stdcall EtwStartTraceW(ptr wstr ptr) +@ stdcall -stub EtwStopTraceA(double str ptr) +@ stdcall -stub EtwStopTraceW(double wstr ptr) +@ stdcall EtwTraceEvent(double ptr) +@ stdcall -stub EtwTraceEventInstance(double ptr ptr ptr) +@ varargs EtwTraceMessage(ptr long ptr long) +@ stdcall -stub EtwTraceMessageVa(double long ptr long ptr) +@ stdcall EtwUnregisterTraceGuids(double) +@ stdcall -stub EtwUpdateTraceA(double str ptr) +@ stdcall -stub EtwUpdateTraceW(double wstr ptr) # EtwpGetTraceBuffer # EtwpSetHWConfigFunction @ stdcall -arch=i386 KiFastSystemCall() Propchange: trunk/reactos/dll/ntdll/etw/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Tue Sep 16 20:40:33 2014 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/ntdll/etw/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/ntdll/etw/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/ntdll/etw/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Copied: trunk/reactos/dll/ntdll/etw/trace.c (from r64162, trunk/reactos/dll/win32/advapi32/misc/trace.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/etw/trace.c?p2=t… ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/trace.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/etw/trace.c [iso-8859-1] Tue Sep 16 20:40:33 2014 @@ -1,18 +1,22 @@ /* - * Advapi32.dll Event Tracing Functions - */ - -#include <advapi32.h> + * ntdll.dll Event Tracing Functions + */ + +#include <ntdll.h> #include <wmistr.h> #include <evntrace.h> -WINE_DEFAULT_DEBUG_CHANNEL(advapi); +#define NDEBUG +#include <debug.h> + +#define FIXME DPRINT1 + /* * @unimplemented */ ULONG CDECL -TraceMessage( +EtwTraceMessage( TRACEHANDLE SessionHandle, ULONG MessageFlags, LPCGUID MessageGuid, @@ -24,24 +28,24 @@ } TRACEHANDLE -WMIAPI -GetTraceLoggerHandle( +NTAPI +EtwGetTraceLoggerHandle( PVOID Buffer ) { - FIXME("GetTraceLoggerHandle stub()\n"); + FIXME("EtwGetTraceLoggerHandle stub()\n"); return (TRACEHANDLE)-1; } ULONG -WMIAPI -TraceEvent( +NTAPI +EtwTraceEvent( TRACEHANDLE SessionHandle, PEVENT_TRACE_HEADER EventTrace ) { - FIXME("TraceEvent stub()\n"); + FIXME("EtwTraceEvent stub()\n"); if (!SessionHandle || !EventTrace) { @@ -59,38 +63,38 @@ } ULONG -WMIAPI -GetTraceEnableFlags( +NTAPI +EtwGetTraceEnableFlags( TRACEHANDLE TraceHandle ) { - FIXME("GetTraceEnableFlags stub()\n"); + FIXME("EtwGetTraceEnableFlags stub()\n"); return 0xFF; } UCHAR -WMIAPI -GetTraceEnableLevel( +NTAPI +EtwGetTraceEnableLevel( TRACEHANDLE TraceHandle ) { - FIXME("GetTraceEnableLevel stub()\n"); + FIXME("EtwGetTraceEnableLevel stub()\n"); return 0xFF; } ULONG -WMIAPI -UnregisterTraceGuids( +NTAPI +EtwUnregisterTraceGuids( TRACEHANDLE RegistrationHandle ) { - FIXME("UnregisterTraceGuids stub()\n"); - return ERROR_SUCCESS; -} - -ULONG -WMIAPI -RegisterTraceGuidsA( + FIXME("EtwUnregisterTraceGuids stub()\n"); + return ERROR_SUCCESS; +} + +ULONG +NTAPI +EtwRegisterTraceGuidsA( WMIDPREQUEST RequestAddress, PVOID RequestContext, LPCGUID ControlGuid, @@ -101,13 +105,13 @@ PTRACEHANDLE RegistrationHandle ) { - FIXME("RegisterTraceGuidsA stub()\n"); - return ERROR_SUCCESS; -} - -ULONG -WMIAPI -RegisterTraceGuidsW( + FIXME("EtwRegisterTraceGuidsA stub()\n"); + return ERROR_SUCCESS; +} + +ULONG +NTAPI +EtwRegisterTraceGuidsW( WMIDPREQUEST RequestAddress, PVOID RequestContext, LPCGUID ControlGuid, @@ -118,66 +122,66 @@ PTRACEHANDLE RegistrationHandle ) { - FIXME("RegisterTraceGuidsW stub()\n"); - return ERROR_SUCCESS; -} - -ULONG WINAPI StartTraceW( PTRACEHANDLE pSessionHandle, LPCWSTR SessionName, PEVENT_TRACE_PROPERTIES Properties ) -{ - FIXME("(%p, %s, %p) stub\n", pSessionHandle, debugstr_w(SessionName), Properties); + FIXME("EtwRegisterTraceGuidsW stub()\n"); + return ERROR_SUCCESS; +} + +ULONG WINAPI EtwStartTraceW( PTRACEHANDLE pSessionHandle, LPCWSTR SessionName, PEVENT_TRACE_PROPERTIES Properties ) +{ + FIXME("(%p, %s, %p) stub\n", pSessionHandle, SessionName, Properties); if (pSessionHandle) *pSessionHandle = 0xcafe4242; return ERROR_SUCCESS; } -ULONG WINAPI StartTraceA( PTRACEHANDLE pSessionHandle, LPCSTR SessionName, PEVENT_TRACE_PROPERTIES Properties ) -{ - FIXME("(%p, %s, %p) stub\n", pSessionHandle, debugstr_a(SessionName), Properties); +ULONG WINAPI EtwStartTraceA( PTRACEHANDLE pSessionHandle, LPCSTR SessionName, PEVENT_TRACE_PROPERTIES Properties ) +{ + FIXME("(%p, %s, %p) stub\n", pSessionHandle, SessionName, Properties); if (pSessionHandle) *pSessionHandle = 0xcafe4242; return ERROR_SUCCESS; } /****************************************************************************** - * ControlTraceW [ADVAPI32.@] + * EtwControlTraceW [NTDLL.@] * * Control a givel event trace session * */ -ULONG WINAPI ControlTraceW( TRACEHANDLE hSession, LPCWSTR SessionName, PEVENT_TRACE_PROPERTIES Properties, ULONG control ) -{ - FIXME("(%s, %s, %p, %d) stub\n", wine_dbgstr_longlong(hSession), debugstr_w(SessionName), Properties, control); - return ERROR_SUCCESS; -} - -/****************************************************************************** - * ControlTraceA [ADVAPI32.@] +ULONG WINAPI EtwControlTraceW( TRACEHANDLE hSession, LPCWSTR SessionName, PEVENT_TRACE_PROPERTIES Properties, ULONG control ) +{ + FIXME("(%I64x, %s, %p, %d) stub\n", hSession, SessionName, Properties, control); + return ERROR_SUCCESS; +} + +/****************************************************************************** + * EtwControlTraceA [NTDLL.@] * * See ControlTraceW. * */ -ULONG WINAPI ControlTraceA( TRACEHANDLE hSession, LPCSTR SessionName, PEVENT_TRACE_PROPERTIES Properties, ULONG control ) -{ - FIXME("(%s, %s, %p, %d) stub\n", wine_dbgstr_longlong(hSession), debugstr_a(SessionName), Properties, control); - return ERROR_SUCCESS; -} - -/****************************************************************************** - * EnableTrace [ADVAPI32.@] - */ -ULONG WINAPI EnableTrace( ULONG enable, ULONG flag, ULONG level, LPCGUID guid, TRACEHANDLE hSession ) -{ - FIXME("(%d, 0x%x, %d, %s, %s): stub\n", enable, flag, level, - debugstr_guid(guid), wine_dbgstr_longlong(hSession)); - - return ERROR_SUCCESS; -} - -/****************************************************************************** - * QueryAllTracesW [ADVAPI32.@] +ULONG WINAPI EtwControlTraceA( TRACEHANDLE hSession, LPCSTR SessionName, PEVENT_TRACE_PROPERTIES Properties, ULONG control ) +{ + FIXME("(%I64x, %s, %p, %d) stub\n", hSession, SessionName, Properties, control); + return ERROR_SUCCESS; +} + +/****************************************************************************** + * EtwEnableTrace [NTDLL.@] + */ +ULONG WINAPI EtwEnableTrace( ULONG enable, ULONG flag, ULONG level, LPCGUID guid, TRACEHANDLE hSession ) +{ + FIXME("(%d, 0x%x, %d, %p, %I64x): stub\n", enable, flag, level, + guid, hSession); + + return ERROR_SUCCESS; +} + +/****************************************************************************** + * EtwQueryAllTracesW [NTDLL.@] * * Query information for started event trace sessions * */ -ULONG WINAPI QueryAllTracesW( PEVENT_TRACE_PROPERTIES * parray, ULONG arraycount, PULONG psessioncount ) +ULONG WINAPI EtwQueryAllTracesW( PEVENT_TRACE_PROPERTIES * parray, ULONG arraycount, PULONG psessioncount ) { FIXME("(%p, %d, %p) stub\n", parray, arraycount, psessioncount); @@ -186,11 +190,11 @@ } /****************************************************************************** - * QueryAllTracesA [ADVAPI32.@] - * - * See QueryAllTracesW. - */ -ULONG WINAPI QueryAllTracesA( PEVENT_TRACE_PROPERTIES * parray, ULONG arraycount, PULONG psessioncount ) + * QueryAllTracesA [NTDLL.@] + * + * See EtwQueryAllTracesA. + */ +ULONG WINAPI EtwQueryAllTracesA( PEVENT_TRACE_PROPERTIES * parray, ULONG arraycount, PULONG psessioncount ) { FIXME("(%p, %d, %p) stub\n", parray, arraycount, psessioncount); Modified: trunk/reactos/dll/win32/advapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/advapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/CMakeLists.txt [iso-8859-1] Tue Sep 16 20:40:33 2014 @@ -28,7 +28,6 @@ misc/msi.c misc/shutdown.c misc/sysfunc.c - misc/trace.c reg/reg.c sec/ac.c sec/audit.c Modified: trunk/reactos/dll/win32/advapi32/advapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] Tue Sep 16 20:40:33 2014 @@ -66,8 +66,8 @@ @ stdcall CommandLineFromMsiDescriptor(wstr ptr ptr) @ stub ComputeAccessTokenFromCodeAuthzLevel @ stdcall ControlService(long long ptr) -@ stdcall ControlTraceA(double str ptr long) -@ stdcall ControlTraceW(double wstr ptr long) +@ stdcall ControlTraceA(double str ptr long) ntdll.EtwControlTraceA +@ stdcall ControlTraceW(double wstr ptr long) ntdll.EtwControlTraceW @ stub ConvertAccessToSecurityDescriptorA @ stub ConvertAccessToSecurityDescriptorW @ stub ConvertSDToStringSDRootDomainA @@ -101,7 +101,7 @@ @ stdcall CreateRestrictedToken(long long long ptr long ptr long ptr ptr) @ stdcall CreateServiceA(long str str long long long long str str ptr str str str) @ stdcall CreateServiceW(long wstr wstr long long long long wstr wstr ptr wstr wstr wstr) -@ stub CreateTraceInstanceId +@ stdcall CreateTraceInstanceId(ptr ptr) ntdll.EtwCreateTraceInstanceId @ stdcall CreateWellKnownSid(long ptr ptr ptr) @ stdcall CredDeleteA(str long long) @ stdcall CredDeleteW(wstr long long) @@ -199,9 +199,9 @@ @ stub ElfRegisterEventSourceA @ stub ElfRegisterEventSourceW @ stub ElfReportEventA -# ElfReportEventAndSourceW +@ stub ElfReportEventAndSourceW @ stub ElfReportEventW -@ stdcall EnableTrace(long long long ptr double) +@ stdcall EnableTrace(long long long ptr double) ntdll.EtwEnableTrace @ stdcall EncryptFileA(str) @ stdcall EncryptFileW(wstr) @ stub EncryptedFileKeyInfo @@ -213,15 +213,15 @@ @ stdcall EnumServicesStatusExA(long long long long ptr long ptr ptr ptr str) @ stdcall EnumServicesStatusExW(long long long long ptr long ptr ptr ptr wstr) @ stdcall EnumServicesStatusW(long long long ptr long ptr ptr ptr) -@ stub EnumerateTraceGuids +@ stdcall EnumerateTraceGuids(ptr long ptr) ntdll.EtwEnumerateTraceGuids @ stdcall EqualDomainSid(ptr ptr ptr) @ stdcall EqualPrefixSid(ptr ptr) @ stdcall EqualSid(ptr ptr) @ stdcall FileEncryptionStatusA(str ptr) @ stdcall FileEncryptionStatusW(wstr ptr) @ stdcall FindFirstFreeAce(ptr ptr) -@ stub FlushTraceA -@ stub FlushTraceW +@ stdcall FlushTraceA(double str ptr) ntdll.EtwFlushTraceA +@ stdcall FlushTraceW(double wstr ptr) ntdll.EtwFlushTraceW @ stub FreeEncryptedFileKeyInfo @ stdcall FreeEncryptionCertificateHashList(ptr) @ stdcall FreeInheritedFromArray(ptr long ptr) @@ -282,9 +282,9 @@ @ stdcall GetSidSubAuthority(ptr long) @ stdcall GetSidSubAuthorityCount(ptr) @ stdcall GetTokenInformation(long long ptr long ptr) -@ stdcall GetTraceEnableFlags(double) -@ stdcall GetTraceEnableLevel(double) -@ stdcall GetTraceLoggerHandle(ptr) +@ stdcall GetTraceEnableFlags(double) ntdll.EtwGetTraceEnableFlags +@ stdcall GetTraceEnableLevel(double) ntdll.EtwGetTraceEnableLevel +@ stdcall GetTraceLoggerHandle(ptr) ntdll.EtwGetTraceLoggerHandle @ stdcall GetTrusteeFormA(ptr) @ stdcall GetTrusteeFormW(ptr) @ stdcall GetTrusteeNameA(ptr) @@ -294,7 +294,7 @@ @ stdcall GetUserNameA(ptr ptr) @ stdcall GetUserNameW(ptr ptr) @ stdcall GetWindowsAccountDomainSid(ptr ptr ptr) -# I_QueryTagInformation +@ stub I_QueryTagInformation @ stub I_ScIsSecurityProcess @ stub I_ScPnPGetServiceName @ stub I_ScSendTSMessage @@ -439,8 +439,8 @@ @ stdcall PrivilegedServiceAuditAlarmW(wstr wstr long ptr long) @ stub ProcessIdleTasks @ stub ProcessTrace -@ stdcall QueryAllTracesA(ptr long ptr) -@ stdcall QueryAllTracesW(ptr long ptr) +@ stdcall QueryAllTracesA(ptr long ptr) ntdll.EtwQueryAllTracesA +@ stdcall QueryAllTracesW(ptr long ptr) ntdll.EtwQueryAllTracesW @ stdcall QueryRecoveryAgentsOnEncryptedFile(wstr ptr) @ stdcall QueryServiceConfig2A(long long ptr long ptr) @ stdcall QueryServiceConfig2W(long long ptr long ptr) @@ -451,16 +451,16 @@ @ stdcall QueryServiceObjectSecurity(long long ptr long ptr) @ stdcall QueryServiceStatus(long ptr) @ stdcall QueryServiceStatusEx(long long ptr long ptr) -@ stub QueryTraceA -@ stub QueryTraceW +@ stdcall QueryTraceA(double str ptr) ntdll.EtwQueryTraceA +@ stdcall QueryTraceW(double str ptr) ntdll.EtwQueryTraceA @ stdcall QueryUsersOnEncryptedFile(wstr ptr) @ stub ReadEncryptedFileRaw @ stdcall ReadEventLogA(long long long ptr long ptr ptr) @ stdcall ReadEventLogW(long long long ptr long ptr ptr) @ stdcall RegCloseKey(long) @ stdcall RegConnectRegistryA(str long ptr) -# RegConnectRegistryExA -# RegConnectRegistryExW +@ stub RegConnectRegistryExA +@ stub RegConnectRegistryExW @ stdcall RegConnectRegistryW(wstr long ptr) @ stdcall RegCreateKeyA(long str ptr) @ stdcall RegCreateKeyExA(long str long ptr long long ptr ptr ptr) @@ -526,8 +526,8 @@ @ stdcall RegisterServiceCtrlHandlerExA(str ptr ptr) @ stdcall RegisterServiceCtrlHandlerExW(wstr ptr ptr) @ stdcall RegisterServiceCtrlHandlerW(wstr ptr) -@ stdcall RegisterTraceGuidsA(ptr ptr ptr long ptr str str ptr) -@ stdcall RegisterTraceGuidsW(ptr ptr ptr long ptr wstr wstr ptr) +@ stdcall RegisterTraceGuidsA(ptr ptr ptr long ptr str str ptr) ntdll.EtwRegisterTraceGuidsA +@ stdcall RegisterTraceGuidsW(ptr ptr ptr long ptr wstr wstr ptr) ntdll.EtwRegisterTraceGuidsW @ stub RemoveTraceCallback @ stdcall RemoveUsersFromEncryptedFile(wstr ptr) @ stdcall ReportEventA(long long long long ptr long long str ptr) @@ -587,10 +587,10 @@ @ stdcall StartServiceCtrlDispatcherA(ptr) @ stdcall StartServiceCtrlDispatcherW(ptr) @ stdcall StartServiceW(long long ptr) -@ stdcall StartTraceA(ptr str ptr) -@ stdcall StartTraceW(ptr wstr ptr) -@ stub StopTraceA -@ stub StopTraceW +@ stdcall StartTraceA(ptr str ptr) ntdll.EtwStartTraceA +@ stdcall StartTraceW(ptr wstr ptr) ntdll.EtwStartTraceW +@ stdcall StopTraceA(double str ptr) ntdll.EtwStopTraceA +@ stdcall StopTraceW(double wstr ptr) ntdll.EtwStopTraceA @ stdcall SystemFunction001(ptr ptr ptr) @ stdcall SystemFunction002(ptr ptr ptr) @ stdcall SystemFunction003(ptr ptr) @@ -629,10 +629,10 @@ @ stdcall SystemFunction036(ptr long) # RtlGenRandom @ stdcall SystemFunction040(ptr long long) # RtlEncryptMemory @ stdcall SystemFunction041(ptr long long) # RtlDecryptMemory -@ stdcall TraceEvent(double ptr) -@ stub TraceEventInstance -@ varargs TraceMessage(ptr long ptr long) -@ stub TraceMessageVa +@ stdcall TraceEvent(double ptr) ntdll.EtwTraceEvent +@ stdcall TraceEventInstance(double ptr ptr ptr) ntdll.EtwTraceEventInstance +@ varargs TraceMessage(ptr long ptr long) ntdll.EtwTraceMessage +@ stdcall TraceMessageVa(double long ptr long ptr) ntdll.EtwTraceMessageVa @ stdcall TreeResetNamedSecurityInfoA(str ptr ptr ptr ptr ptr ptr long ptr ptr ptr) @ stdcall TreeResetNamedSecurityInfoW(wstr long long ptr ptr ptr ptr long ptr long ptr) @ stub TrusteeAccessToObjectA @@ -640,9 +640,9 @@ @ stub UninstallApplication @ stdcall UnlockServiceDatabase(ptr) @ stub UnregisterIdleTask -@ stdcall UnregisterTraceGuids(double) -@ stub UpdateTraceA -@ stub UpdateTraceW +@ stdcall UnregisterTraceGuids(double) ntdll.EtwUnregisterTraceGuids +@ stdcall UpdateTraceA(double str ptr) ntdll.EtwUpdateTraceA +@ stdcall UpdateTraceW(double wstr ptr) ntdll.EtwUpdateTraceW @ stub WdmWmiServiceMain @ stub WmiCloseBlock @ stub WmiCloseTraceWithCursor @@ -660,8 +660,8 @@ @ stub WmiGetTraceHeader @ stub WmiMofEnumerateResourcesA @ stub WmiMofEnumerateResourcesW -@ stub WmiNotificationRegistrationA -@ stub WmiNotificationRegistrationW +@ stdcall WmiNotificationRegistrationA(ptr long ptr long long) ntdll.EtwNotificationRegistrationA +@ stdcall WmiNotificationRegistrationW(ptr long ptr long long) ntdll.EtwNotificationRegistrationW @ stub WmiOpenBlock @ stub WmiOpenTraceWithCursor @ stub WmiParseTraceEvent @@ -674,8 +674,8 @@ @ stub WmiQuerySingleInstanceMultipleA @ stub WmiQuerySingleInstanceMultipleW @ stub WmiQuerySingleInstanceW -@ stub WmiReceiveNotificationsA -@ stub WmiReceiveNotificationsW +@ stdcall WmiReceiveNotificationsA() ntdll.EtwReceiveNotificationsA # FIXME prototype +@ stdcall WmiReceiveNotificationsW() ntdll.EtwReceiveNotificationsW # FIXME prototype @ stub WmiSetSingleInstanceA @ stub WmiSetSingleInstanceW @ stub WmiSetSingleItemA Removed: trunk/reactos/dll/win32/advapi32/misc/trace.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/tr… ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/trace.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/misc/trace.c (removed) @@ -1,201 +0,0 @@ -/* - * Advapi32.dll Event Tracing Functions - */ - -#include <advapi32.h> - -#include <wmistr.h> -#include <evntrace.h> - -WINE_DEFAULT_DEBUG_CHANNEL(advapi); -/* - * @unimplemented - */ -ULONG CDECL -TraceMessage( - TRACEHANDLE SessionHandle, - ULONG MessageFlags, - LPCGUID MessageGuid, - USHORT MessageNumber, - ...) -{ - FIXME("TraceMessage()\n"); - return ERROR_SUCCESS; -} - -TRACEHANDLE -WMIAPI -GetTraceLoggerHandle( - PVOID Buffer -) -{ - FIXME("GetTraceLoggerHandle stub()\n"); - return (TRACEHANDLE)-1; -} - - -ULONG -WMIAPI -TraceEvent( - TRACEHANDLE SessionHandle, - PEVENT_TRACE_HEADER EventTrace -) -{ - FIXME("TraceEvent stub()\n"); - - if (!SessionHandle || !EventTrace) - { - /* invalid parameters */ - return ERROR_INVALID_PARAMETER; - } - - if (EventTrace->Size != sizeof(EVENT_TRACE_HEADER)) - { - /* invalid parameter */ - return ERROR_INVALID_PARAMETER; - } - - return ERROR_SUCCESS; -} - -ULONG -WMIAPI -GetTraceEnableFlags( - TRACEHANDLE TraceHandle -) -{ - FIXME("GetTraceEnableFlags stub()\n"); - return 0xFF; -} - -UCHAR -WMIAPI -GetTraceEnableLevel( - TRACEHANDLE TraceHandle -) -{ - FIXME("GetTraceEnableLevel stub()\n"); - return 0xFF; -} - -ULONG -WMIAPI -UnregisterTraceGuids( - TRACEHANDLE RegistrationHandle -) -{ - FIXME("UnregisterTraceGuids stub()\n"); - return ERROR_SUCCESS; -} - -ULONG -WMIAPI -RegisterTraceGuidsA( - WMIDPREQUEST RequestAddress, - PVOID RequestContext, - LPCGUID ControlGuid, - ULONG GuidCount, - PTRACE_GUID_REGISTRATION TraceGuidReg, - LPCSTR MofImagePath, - LPCSTR MofResourceName, - PTRACEHANDLE RegistrationHandle -) -{ - FIXME("RegisterTraceGuidsA stub()\n"); - return ERROR_SUCCESS; -} - -ULONG -WMIAPI -RegisterTraceGuidsW( - WMIDPREQUEST RequestAddress, - PVOID RequestContext, - LPCGUID ControlGuid, - ULONG GuidCount, - PTRACE_GUID_REGISTRATION TraceGuidReg, - LPCWSTR MofImagePath, - LPCWSTR MofResourceName, - PTRACEHANDLE RegistrationHandle -) -{ - FIXME("RegisterTraceGuidsW stub()\n"); - return ERROR_SUCCESS; -} - -ULONG WINAPI StartTraceW( PTRACEHANDLE pSessionHandle, LPCWSTR SessionName, PEVENT_TRACE_PROPERTIES Properties ) -{ - FIXME("(%p, %s, %p) stub\n", pSessionHandle, debugstr_w(SessionName), Properties); - if (pSessionHandle) *pSessionHandle = 0xcafe4242; - return ERROR_SUCCESS; -} - -ULONG WINAPI StartTraceA( PTRACEHANDLE pSessionHandle, LPCSTR SessionName, PEVENT_TRACE_PROPERTIES Properties ) -{ - FIXME("(%p, %s, %p) stub\n", pSessionHandle, debugstr_a(SessionName), Properties); - if (pSessionHandle) *pSessionHandle = 0xcafe4242; - return ERROR_SUCCESS; -} - -/****************************************************************************** - * ControlTraceW [ADVAPI32.@] - * - * Control a givel event trace session - * - */ -ULONG WINAPI ControlTraceW( TRACEHANDLE hSession, LPCWSTR SessionName, PEVENT_TRACE_PROPERTIES Properties, ULONG control ) -{ - FIXME("(%s, %s, %p, %d) stub\n", wine_dbgstr_longlong(hSession), debugstr_w(SessionName), Properties, control); - return ERROR_SUCCESS; -} - -/****************************************************************************** - * ControlTraceA [ADVAPI32.@] - * - * See ControlTraceW. - * - */ -ULONG WINAPI ControlTraceA( TRACEHANDLE hSession, LPCSTR SessionName, PEVENT_TRACE_PROPERTIES Properties, ULONG control ) -{ - FIXME("(%s, %s, %p, %d) stub\n", wine_dbgstr_longlong(hSession), debugstr_a(SessionName), Properties, control); - return ERROR_SUCCESS; -} - -/****************************************************************************** - * EnableTrace [ADVAPI32.@] - */ -ULONG WINAPI EnableTrace( ULONG enable, ULONG flag, ULONG level, LPCGUID guid, TRACEHANDLE hSession ) -{ - FIXME("(%d, 0x%x, %d, %s, %s): stub\n", enable, flag, level, - debugstr_guid(guid), wine_dbgstr_longlong(hSession)); - - return ERROR_SUCCESS; -} - -/****************************************************************************** - * QueryAllTracesW [ADVAPI32.@] - * - * Query information for started event trace sessions - * - */ -ULONG WINAPI QueryAllTracesW( PEVENT_TRACE_PROPERTIES * parray, ULONG arraycount, PULONG psessioncount ) -{ - FIXME("(%p, %d, %p) stub\n", parray, arraycount, psessioncount); - - if (psessioncount) *psessioncount = 0; - return ERROR_SUCCESS; -} - -/****************************************************************************** - * QueryAllTracesA [ADVAPI32.@] - * - * See QueryAllTracesW. - */ -ULONG WINAPI QueryAllTracesA( PEVENT_TRACE_PROPERTIES * parray, ULONG arraycount, PULONG psessioncount ) -{ - FIXME("(%p, %d, %p) stub\n", parray, arraycount, psessioncount); - - if (psessioncount) *psessioncount = 0; - return ERROR_SUCCESS; -} - -/* EOF */

10 years

[hbelusca] 64171: [NTVDM]: We can specify device "command" procedures for each PS/2 port so that when one writes to port 0x60, one can write to the correct device "plugged" into it (keyboard, mouse...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Sep 16 18:54:50 2014 New Revision: 64171 URL: http://svn.reactos.org/svn/reactos?rev=64171&view=rev Log: [NTVDM]: We can specify device "command" procedures for each PS/2 port so that when one writes to port 0x60, one can write to the correct device "plugged" into it (keyboard, mouse). modularity++; Modified: trunk/reactos/subsystems/ntvdm/hardware/keyboard.c trunk/reactos/subsystems/ntvdm/hardware/keyboard.h trunk/reactos/subsystems/ntvdm/hardware/mouse.c trunk/reactos/subsystems/ntvdm/hardware/mouse.h trunk/reactos/subsystems/ntvdm/hardware/ps2.c trunk/reactos/subsystems/ntvdm/hardware/ps2.h Modified: trunk/reactos/subsystems/ntvdm/hardware/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/keyboard.c [iso-8859-1] Tue Sep 16 18:54:50 2014 @@ -13,7 +13,16 @@ #include "keyboard.h" #include "ps2.h" +/* PRIVATE VARIABLES **********************************************************/ + static BYTE PS2Port = 0; + +/* PRIVATE FUNCTIONS **********************************************************/ + +static VOID WINAPI KeyboardCommand(LPVOID Param, BYTE Command) +{ + UNIMPLEMENTED; +} /* PUBLIC FUNCTIONS ***********************************************************/ @@ -34,13 +43,11 @@ // PicInterruptRequest(1); } -VOID KeyboardCommand(BYTE Command) -{ - UNIMPLEMENTED; -} - BOOLEAN KeyboardInit(BYTE PS2Connector) { + /* Finish to plug the mouse to the specified PS/2 port */ PS2Port = PS2Connector; + PS2SetDeviceCmdProc(PS2Port, NULL, KeyboardCommand); + return TRUE; } Modified: trunk/reactos/subsystems/ntvdm/hardware/keyboard.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/keyboard.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/keyboard.h [iso-8859-1] Tue Sep 16 18:54:50 2014 @@ -22,7 +22,6 @@ /* FUNCTIONS ******************************************************************/ VOID KeyboardEventHandler(PKEY_EVENT_RECORD KeyEvent); -VOID KeyboardCommand(BYTE Command); BOOLEAN KeyboardInit(BYTE PS2Connector); #endif // _KEYBOARD_H_ Modified: trunk/reactos/subsystems/ntvdm/hardware/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/mouse.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/mouse.c [iso-8859-1] Tue Sep 16 18:54:50 2014 @@ -136,31 +136,17 @@ ButtonState = NewButtonState; } -/* PUBLIC FUNCTIONS ***********************************************************/ - -VOID MouseEventHandler(PMOUSE_EVENT_RECORD MouseEvent) -{ - // FIXME: Sync our private data - - // HACK: Bypass PS/2 and instead, notify the MOUSE.COM driver directly - MouseBiosUpdatePosition(&MouseEvent->dwMousePosition); - MouseBiosUpdateButtons(LOWORD(MouseEvent->dwButtonState)); - - // PS2QueuePush(PS2Port, Data); - // PicInterruptRequest(12); -} - -VOID MouseScroll(LONG Direction) +/*static*/ VOID MouseScroll(LONG Direction) { ScrollCounter += Direction; } -COORD MouseGetPosition(VOID) +/*static*/ COORD MouseGetPosition(VOID) { return Position; } -VOID MouseCommand(BYTE Command) +static VOID WINAPI MouseCommand(LPVOID Param, BYTE Command) { switch (Command) { @@ -319,6 +305,20 @@ } } +/* PUBLIC FUNCTIONS ***********************************************************/ + +VOID MouseEventHandler(PMOUSE_EVENT_RECORD MouseEvent) +{ + // FIXME: Sync our private data + + // HACK: Bypass PS/2 and instead, notify the MOUSE.COM driver directly + MouseBiosUpdatePosition(&MouseEvent->dwMousePosition); + MouseBiosUpdateButtons(LOWORD(MouseEvent->dwButtonState)); + + // PS2QueuePush(PS2Port, Data); + // PicInterruptRequest(12); +} + BOOLEAN MouseInit(BYTE PS2Connector) { HWND hWnd; @@ -341,7 +341,9 @@ /* Release the device context */ ReleaseDC(hWnd, hDC); + /* Finish to plug the mouse to the specified PS/2 port */ PS2Port = PS2Connector; + PS2SetDeviceCmdProc(PS2Port, NULL, MouseCommand); MouseReset(); return TRUE; Modified: trunk/reactos/subsystems/ntvdm/hardware/mouse.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/mouse.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/mouse.h [iso-8859-1] Tue Sep 16 18:54:50 2014 @@ -69,11 +69,6 @@ /* FUNCTIONS ******************************************************************/ VOID MouseEventHandler(PMOUSE_EVENT_RECORD MouseEvent); - -VOID MouseScroll(LONG Direction); -COORD MouseGetPosition(VOID); - -VOID MouseCommand(BYTE Command); BOOLEAN MouseInit(BYTE PS2Connector); #endif // _MOUSE_H_ Modified: trunk/reactos/subsystems/ntvdm/hardware/ps2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/ps2.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/ps2.c [iso-8859-1] Tue Sep 16 18:54:50 2014 @@ -16,9 +16,6 @@ #include "ps2.h" #include "pic.h" -#include "keyboard.h" -#include "mouse.h" - /* PRIVATE VARIABLES **********************************************************/ #define BUFFER_SIZE 32 @@ -32,6 +29,9 @@ UINT QueueStart; UINT QueueEnd; HANDLE QueueMutex; + + LPVOID Param; + PS2_DEVICE_CMDPROC DeviceCommand; } PS2_PORT, *PPS2_PORT; /* @@ -50,6 +50,14 @@ static BYTE OutputBuffer = 0x00; // PS/2 Output Buffer /* PRIVATE FUNCTIONS **********************************************************/ + +static VOID PS2SendCommand(PPS2_PORT Port, BYTE Command) +{ + if (!Port->IsEnabled) return; + + /* Call the device command */ + if (Port->DeviceCommand) Port->DeviceCommand(Port->Param, Command); +} static BYTE WINAPI PS2ReadPort(ULONG Port) { @@ -238,10 +246,7 @@ */ case 0xD4: { - if (Ports[1].IsEnabled) - // Ports[1].Function - MouseCommand(Data); - + PS2SendCommand(&Ports[1], Data); break; } } @@ -249,10 +254,8 @@ return; } - // TODO: Implement PS/2 device commands - if (Ports[0].IsEnabled) - // Ports[0].Function - KeyboardCommand(Data); + /* By default, send a command to the first PS/2 port */ + PS2SendCommand(&Ports[0], Data); } } @@ -300,6 +303,14 @@ } /* PUBLIC FUNCTIONS ***********************************************************/ + +VOID PS2SetDeviceCmdProc(BYTE PS2Port, LPVOID Param, PS2_DEVICE_CMDPROC DeviceCommand) +{ + if (PS2Port >= PS2_PORTS) return; + + Ports[PS2Port].Param = Param; + Ports[PS2Port].DeviceCommand = DeviceCommand; +} // PS2SendToPort BOOLEAN PS2QueuePush(BYTE PS2Port, BYTE Data) Modified: trunk/reactos/subsystems/ntvdm/hardware/ps2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/ps2.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/ps2.h [iso-8859-1] Tue Sep 16 18:54:50 2014 @@ -19,7 +19,11 @@ #define PS2_DATA_PORT 0x60 #define PS2_CONTROL_PORT 0x64 +typedef VOID (WINAPI *PS2_DEVICE_CMDPROC)(LPVOID Param, BYTE Command); + /* FUNCTIONS ******************************************************************/ + +VOID PS2SetDeviceCmdProc(BYTE PS2Port, LPVOID Param, PS2_DEVICE_CMDPROC DeviceCommand); BOOLEAN PS2QueuePush(BYTE PS2Port, BYTE Data);

10 years

← Newer
1
...
23
24
25
26
27
28
29
...
42
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 September 2014