Ros-diffs July 2014

ros-diffs@reactos.org

9 participants
111 discussions

[jgardou] 63741: [WIN32K] - Explicitly initialize PropListItems

by jgardou＠svn.reactos.org

Author: jgardou Date: Sat Jul 26 15:41:25 2014 New Revision: 63741 URL: http://svn.reactos.org/svn/reactos?rev=63741&view=rev Log: [WIN32K] - Explicitly initialize PropListItems Modified: trunk/reactos/win32ss/user/ntuser/window.c Modified: trunk/reactos/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] Sat Jul 26 15:41:25 2014 @@ -1802,6 +1802,7 @@ } InitializeListHead(&pWnd->PropListHead); + pWnd->PropListItems = 0; if ( WindowName->Buffer != NULL && WindowName->Length > 0 ) {

10 years, 5 months

[jgardou] 63740: [WIN32K] - Some more DPRINT -> DEBUGCHANNEL

by jgardou＠svn.reactos.org

Author: jgardou Date: Sat Jul 26 15:41:21 2014 New Revision: 63740 URL: http://svn.reactos.org/svn/reactos?rev=63740&view=rev Log: [WIN32K] - Some more DPRINT -> DEBUGCHANNEL Modified: trunk/reactos/win32ss/gdi/eng/clip.c Modified: trunk/reactos/win32ss/gdi/eng/clip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/clip.c?rev… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/clip.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/clip.c [iso-8859-1] Sat Jul 26 15:41:21 2014 @@ -7,9 +7,8 @@ */ #include <win32k.h> - -#define NDEBUG -#include <debug.h> +DBG_DEFAULT_CHANNEL(EngClip); + static __inline int CompareRightDown( @@ -256,13 +255,15 @@ APIENTRY EngCreateClip(VOID) { - CLIPGDI *Clip = EngAllocMem(FL_ZERO_MEMORY, sizeof(CLIPGDI), GDITAG_CLIPOBJ); + XCLIPOBJ *Clip = EngAllocMem(FL_ZERO_MEMORY, sizeof(XCLIPOBJ), GDITAG_CLIPOBJ); if(Clip != NULL) { - Clip->Rects = &Clip->ClipObj.rclBounds; + IntEngInitClipObj(Clip); + TRACE("Created Clip Obj %p.\n", Clip); return &Clip->ClipObj; } + ERR("Clip object allocation failed!\n"); return NULL; } @@ -275,8 +276,8 @@ _In_ _Post_ptr_invalid_ CLIPOBJ *pco) { XCLIPOBJ* Clip = CONTAINING_RECORD(pco, XCLIPOBJ, ClipObj); - if (Clip->Rects != &Clip->ClipObj.rclBounds) - EngFreeMem(Clip->Rects); + TRACE("Deleting %p.\n"); + IntEngFreeClipResources(Clip); EngFreeMem(Clip); } @@ -319,7 +320,7 @@ break; default: - DPRINT1("Invalid iDirection %lu\n", iDirection); + ERR("Invalid iDirection %lu\n", iDirection); iDirection = Clip->EnumOrder; CompareFunc = NULL; break;

10 years, 5 months

[jgardou] 63739: [WIN32K] - Improve the WNDOBJ/CLIPOBJ hack by using the same internal structure for both object. This way a driver can enumerate WNDOBJ::coClient safely. Also take this as an oppor...

by jgardou＠svn.reactos.org

Author: jgardou Date: Sat Jul 26 15:41:08 2014 New Revision: 63739 URL: http://svn.reactos.org/svn/reactos?rev=63739&view=rev Log: [WIN32K] - Improve the WNDOBJ/CLIPOBJ hack by using the same internal structure for both object. This way a driver can enumerate WNDOBJ::coClient safely. Also take this as an opportunity to get rid of DC::ros_dc. Modified: trunk/reactos/win32ss/gdi/eng/bitblt.c trunk/reactos/win32ss/gdi/eng/clip.c trunk/reactos/win32ss/gdi/eng/engobjects.h trunk/reactos/win32ss/gdi/eng/engwindow.c trunk/reactos/win32ss/gdi/eng/inteng.h trunk/reactos/win32ss/gdi/eng/lineto.c trunk/reactos/win32ss/gdi/ntgdi/arc.c trunk/reactos/win32ss/gdi/ntgdi/bitblt.c trunk/reactos/win32ss/gdi/ntgdi/cliprgn.c trunk/reactos/win32ss/gdi/ntgdi/dc.h trunk/reactos/win32ss/gdi/ntgdi/dclife.c trunk/reactos/win32ss/gdi/ntgdi/dibobj.c trunk/reactos/win32ss/gdi/ntgdi/drawing.c trunk/reactos/win32ss/gdi/ntgdi/fillshap.c trunk/reactos/win32ss/gdi/ntgdi/freetype.c trunk/reactos/win32ss/gdi/ntgdi/line.c trunk/reactos/win32ss/gdi/ntgdi/polyfill.c trunk/reactos/win32ss/gdi/ntgdi/region.c trunk/reactos/win32ss/gdi/ntgdi/wingl.c trunk/reactos/win32ss/user/ntuser/cursoricon.c trunk/reactos/win32ss/user/ntuser/windc.c Modified: trunk/reactos/win32ss/gdi/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/bitblt.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/bitblt.c [iso-8859-1] Sat Jul 26 15:41:08 2014 @@ -14,7 +14,17 @@ XCLIPOBJ gxcoTrivial = { - {0, {LONG_MIN, LONG_MIN, LONG_MAX, LONG_MAX}, DC_TRIVIAL, FC_RECT, TC_RECTANGLES, 0}, + /* CLIPOBJ */ + { + { + 0, /* iUniq */ + {LONG_MIN, LONG_MIN, LONG_MAX, LONG_MAX}, /* rclBounds */ + DC_TRIVIAL, /* idCOmplexity */ + FC_RECT, /* iFComplexity */ + TC_RECTANGLES, /* iMode */ + 0 /* fjOptions */ + }, + }, 0, 0, 0 }; Modified: trunk/reactos/win32ss/gdi/eng/clip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/clip.c?rev… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/clip.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/clip.c [iso-8859-1] Sat Jul 26 15:41:08 2014 @@ -190,63 +190,63 @@ VOID FASTCALL -IntEngDeleteClipRegion(CLIPOBJ *ClipObj) -{ - EngFreeMem(ObjToGDI(ClipObj, CLIP)); -} - -CLIPOBJ* +IntEngInitClipObj(XCLIPOBJ *Clip) +{ + Clip->Rects = &Clip->ClipObj.rclBounds; +} + +VOID FASTCALL +IntEngFreeClipResources(XCLIPOBJ *Clip) +{ + if (Clip->Rects != &Clip->ClipObj.rclBounds) + EngFreeMem(Clip->Rects); +} + + +VOID FASTCALL -IntEngCreateClipRegion(ULONG count, PRECTL pRect, PRECTL rcBounds) -{ - CLIPGDI *Clip; - +IntEngUpdateClipRegion( + XCLIPOBJ* Clip, + ULONG count, + const RECTL* pRect, + const RECTL* rcBounds) +{ if(count > 1) { - RECTL *dest; - - Clip = EngAllocMem(0, sizeof(CLIPGDI) + ((count - 1) * sizeof(RECTL)), GDITAG_CLIPOBJ); - - if(Clip != NULL) - { - Clip->EnumRects.c = count; + RECTL* NewRects = EngAllocMem(0, FIELD_OFFSET(ENUMRECTS, arcl[count]), GDITAG_CLIPOBJ); + + if(NewRects != NULL) + { + Clip->RectCount = count; Clip->EnumOrder = CD_ANY; - for(dest = Clip->EnumRects.arcl;count > 0; count--, dest++, pRect++) - { - *dest = *pRect; - } + RtlCopyMemory(NewRects, pRect, count * sizeof(RECTL)); Clip->ClipObj.iDComplexity = DC_COMPLEX; - Clip->ClipObj.iFComplexity = ((Clip->EnumRects.c <= 4) ? FC_RECT4 : FC_COMPLEX); + Clip->ClipObj.iFComplexity = ((Clip->RectCount <= 4) ? FC_RECT4 : FC_COMPLEX); Clip->ClipObj.iMode = TC_RECTANGLES; Clip->ClipObj.rclBounds = *rcBounds; - return GDIToObj(Clip, CLIP); - } - } - else - { - Clip = EngAllocMem(0, sizeof(CLIPGDI), GDITAG_CLIPOBJ); - - if(Clip != NULL) - { - Clip->EnumRects.c = 1; - Clip->EnumOrder = CD_ANY; - Clip->EnumRects.arcl[0] = *rcBounds; - - Clip->ClipObj.iDComplexity = (((rcBounds->top == rcBounds->bottom) && - (rcBounds->left == rcBounds->right)) - ? DC_TRIVIAL : DC_RECT); - - Clip->ClipObj.iFComplexity = FC_RECT; - Clip->ClipObj.iMode = TC_RECTANGLES; - Clip->ClipObj.rclBounds = *rcBounds; - - return GDIToObj(Clip, CLIP); - } - } - - return NULL; + if (Clip->Rects != &Clip->ClipObj.rclBounds) + EngFreeMem(Clip->Rects); + Clip->Rects = NewRects; + } + } + else + { + Clip->EnumOrder = CD_ANY; + + Clip->ClipObj.iDComplexity = (((rcBounds->top == rcBounds->bottom) && + (rcBounds->left == rcBounds->right)) + ? DC_TRIVIAL : DC_RECT); + + Clip->ClipObj.iFComplexity = FC_RECT; + Clip->ClipObj.iMode = TC_RECTANGLES; + Clip->ClipObj.rclBounds = *rcBounds; + Clip->RectCount = 1; + if (Clip->Rects != &Clip->ClipObj.rclBounds) + EngFreeMem(Clip->Rects); + Clip->Rects = &Clip->ClipObj.rclBounds; + } } /* @@ -259,7 +259,8 @@ CLIPGDI *Clip = EngAllocMem(FL_ZERO_MEMORY, sizeof(CLIPGDI), GDITAG_CLIPOBJ); if(Clip != NULL) { - return GDIToObj(Clip, CLIP); + Clip->Rects = &Clip->ClipObj.rclBounds; + return &Clip->ClipObj; } return NULL; @@ -273,7 +274,10 @@ EngDeleteClip( _In_ _Post_ptr_invalid_ CLIPOBJ *pco) { - EngFreeMem(ObjToGDI(pco, CLIP)); + XCLIPOBJ* Clip = CONTAINING_RECORD(pco, XCLIPOBJ, ClipObj); + if (Clip->Rects != &Clip->ClipObj.rclBounds) + EngFreeMem(Clip->Rects); + EngFreeMem(Clip); } /* @@ -288,13 +292,13 @@ _In_ ULONG iDirection, _In_ ULONG cMaxRects) { - CLIPGDI *ClipGDI = ObjToGDI(pco, CLIP); + XCLIPOBJ* Clip = CONTAINING_RECORD(pco, XCLIPOBJ, ClipObj); SORTCOMP CompareFunc; - ClipGDI->EnumPos = 0; - ClipGDI->EnumMax = (cMaxRects > 0) ? cMaxRects : ClipGDI->EnumRects.c; - - if (CD_ANY != iDirection && ClipGDI->EnumOrder != iDirection) + Clip->EnumPos = 0; + Clip->EnumMax = (cMaxRects > 0) ? cMaxRects : Clip->RectCount; + + if (CD_ANY != iDirection && Clip->EnumOrder != iDirection) { switch (iDirection) { @@ -316,26 +320,26 @@ default: DPRINT1("Invalid iDirection %lu\n", iDirection); - iDirection = ClipGDI->EnumOrder; + iDirection = Clip->EnumOrder; CompareFunc = NULL; break; } if (NULL != CompareFunc) { - EngSort((PBYTE) ClipGDI->EnumRects.arcl, sizeof(RECTL), ClipGDI->EnumRects.c, CompareFunc); - } - - ClipGDI->EnumOrder = iDirection; + EngSort((PBYTE) Clip->Rects, sizeof(RECTL), Clip->RectCount, CompareFunc); + } + + Clip->EnumOrder = iDirection; } /* Return the number of rectangles enumerated */ - if ((cMaxRects > 0) && (ClipGDI->EnumRects.c > cMaxRects)) + if ((cMaxRects > 0) && (Clip->RectCount > cMaxRects)) { return 0xFFFFFFFF; } - return ClipGDI->EnumRects.c; + return Clip->RectCount; } /* @@ -348,14 +352,14 @@ _In_ ULONG cj, _Out_bytecap_(cj) ULONG *pulEnumRects) { - RECTL *dest, *src; - CLIPGDI *ClipGDI = ObjToGDI(pco, CLIP); - ULONG nCopy, i; + const RECTL* src; + XCLIPOBJ* Clip = CONTAINING_RECORD(pco, XCLIPOBJ, ClipObj); + ULONG nCopy; ENUMRECTS* pERects = (ENUMRECTS*)pulEnumRects; // Calculate how many rectangles we should copy - nCopy = min( ClipGDI->EnumMax - ClipGDI->EnumPos, - min( ClipGDI->EnumRects.c - ClipGDI->EnumPos, + nCopy = min( Clip->EnumMax - Clip->EnumPos, + min( Clip->RectCount - Clip->EnumPos, (cj - sizeof(ULONG)) / sizeof(RECTL))); if(nCopy == 0) @@ -364,17 +368,14 @@ } /* Copy rectangles */ - src = ClipGDI->EnumRects.arcl + ClipGDI->EnumPos; - for(i = 0, dest = pERects->arcl; i < nCopy; i++, dest++, src++) - { - *dest = *src; - } + src = &Clip->Rects[Clip->EnumPos]; + RtlCopyMemory(pERects->arcl, src, nCopy * sizeof(RECTL)); pERects->c = nCopy; - ClipGDI->EnumPos+=nCopy; - - return ClipGDI->EnumPos < ClipGDI->EnumRects.c; + Clip->EnumPos+=nCopy; + + return Clip->EnumPos < Clip->RectCount; } /* EOF */ Modified: trunk/reactos/win32ss/gdi/eng/engobjects.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/engobjects… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/engobjects.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/engobjects.h [iso-8859-1] Sat Jul 26 15:41:08 2014 @@ -68,11 +68,22 @@ } */ typedef struct _CLIPGDI { - CLIPOBJ ClipObj; - ULONG EnumPos; - ULONG EnumOrder; - ULONG EnumMax; - ENUMRECTS EnumRects; + union + { + CLIPOBJ ClipObj; + WNDOBJ WndObj; + }; + /* WNDOBJ part */ + HWND Hwnd; + WNDOBJCHANGEPROC ChangeProc; + FLONG Flags; + int PixelFormat; + /* CLIPOBJ part */ + ULONG EnumPos; + ULONG EnumOrder; + ULONG EnumMax; + ULONG RectCount; + RECTL* Rects; } CLIPGDI, *PCLIPGDI; // HACK, until we use the original structure @@ -112,15 +123,6 @@ PATHOBJ PathObj; } PATHGDI; -typedef struct _WNDGDI { - WNDOBJ WndObj; - HWND Hwnd; - CLIPOBJ *ClientClipObj; - WNDOBJCHANGEPROC ChangeProc; - FLONG Flags; - int PixelFormat; -} WNDGDI, *PWNDGDI; - typedef struct _XFORMGDI { ULONG Dummy; /* XFORMOBJ has no public members */ 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] Sat Jul 26 15:41:08 2014 @@ -21,15 +21,15 @@ IN WNDOBJ *pwo, IN FLONG flChanged) { - WNDGDI *WndObjInt = ObjToGDI(pwo, WND); - - if (WndObjInt->ChangeProc == NULL) + XCLIPOBJ* Clip = CONTAINING_RECORD(pwo, XCLIPOBJ, WndObj); + + if (Clip->ChangeProc == NULL) { return; } /* check flags of the WNDOBJ */ - flChanged &= WndObjInt->Flags; + flChanged &= Clip->Flags; if (flChanged == 0) { return; @@ -42,8 +42,8 @@ } TRACE("Calling WNDOBJCHANGEPROC (0x%p), Changed = 0x%x\n", - WndObjInt->ChangeProc, flChanged); - WndObjInt->ChangeProc(pwo, flChanged); + Clip->ChangeProc, flChanged); + Clip->ChangeProc(pwo, flChanged); } /* @@ -52,13 +52,11 @@ BOOLEAN FASTCALL IntEngWndUpdateClipObj( - WNDGDI *WndObjInt, + XCLIPOBJ* Clip, PWND Window) { HRGN hVisRgn; PROSRGNDATA visRgn; - CLIPOBJ *ClipObj = NULL; - CLIPOBJ *OldClipObj; TRACE("IntEngWndUpdateClipObj\n"); @@ -70,8 +68,7 @@ { if (visRgn->rdh.nCount > 0) { - ClipObj = IntEngCreateClipRegion(visRgn->rdh.nCount, visRgn->Buffer, - &visRgn->rdh.rcBound); + 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, @@ -96,27 +93,12 @@ } else { - WARN("VIS_ComputeVisibleRegion failed!\n"); - } - - if (ClipObj == NULL) - { /* Fall back to client rect */ - ClipObj = IntEngCreateClipRegion(1, &Window->rcClient, - &Window->rcClient); - } - - if (ClipObj == NULL) - { - ERR("IntEngCreateClipRegion() failed!\n"); - return FALSE; - } - - RtlCopyMemory(&WndObjInt->WndObj.coClient, ClipObj, sizeof (CLIPOBJ)); - RtlCopyMemory(&WndObjInt->WndObj.rclClient, &Window->rcClient, sizeof (RECT)); - OldClipObj = InterlockedExchangePointer((PVOID*)&WndObjInt->ClientClipObj, ClipObj); - if (OldClipObj != NULL) - IntEngDeleteClipRegion(OldClipObj); + IntEngUpdateClipRegion(Clip, 1, &Window->rcClient, &Window->rcClient); + } + + /* Update the WNDOBJ */ + Clip->WndObj.rclClient = Window->rcClient; return TRUE; } @@ -131,7 +113,7 @@ _In_ FLONG flChanged) { PPROPERTY pprop; - WNDGDI *Current; + XCLIPOBJ *Current; HWND hWnd; ASSERT_IRQL_LESS_OR_EQUAL(PASSIVE_LEVEL); @@ -142,7 +124,7 @@ { return; } - Current = (WNDGDI *)pprop->Data; + Current = (XCLIPOBJ *)pprop->Data; if ( gcountPWO && Current && Current->Hwnd == hWnd && @@ -184,7 +166,7 @@ FLONG fl, int iPixelFormat) { - WNDGDI *WndObjInt = NULL; + XCLIPOBJ *Clip = NULL; WNDOBJ *WndObjUser = NULL; PWND Window; BOOL calledFromUser; @@ -206,34 +188,34 @@ } /* Create WNDOBJ */ - WndObjInt = EngAllocMem(0, sizeof (WNDGDI), GDITAG_WNDOBJ); - if (WndObjInt == NULL) + Clip = EngAllocMem(FL_ZERO_MEMORY, sizeof (XCLIPOBJ), GDITAG_WNDOBJ); + if (Clip == NULL) { ERR("Failed to allocate memory for a WND structure!\n"); RETURN( NULL); } + IntEngInitClipObj(Clip); /* Fill the clipobj */ - WndObjInt->ClientClipObj = NULL; - if (!IntEngWndUpdateClipObj(WndObjInt, Window)) - { - EngFreeMem(WndObjInt); + if (!IntEngWndUpdateClipObj(Clip, Window)) + { + EngFreeMem(Clip); RETURN( NULL); } /* Fill user object */ - WndObjUser = GDIToObj(WndObjInt, WND); + WndObjUser = &Clip->WndObj; WndObjUser->psoOwner = pso; WndObjUser->pvConsumer = NULL; /* Fill internal object */ - WndObjInt->Hwnd = hWnd; - WndObjInt->ChangeProc = pfn; - WndObjInt->Flags = fl; - WndObjInt->PixelFormat = iPixelFormat; + Clip->Hwnd = hWnd; + Clip->ChangeProc = pfn; + Clip->Flags = fl; + Clip->PixelFormat = iPixelFormat; /* associate object with window */ - IntSetProp(Window, AtomWndObj, WndObjInt); + IntSetProp(Window, AtomWndObj, Clip); ++gcountPWO; TRACE("EngCreateWnd: SUCCESS!\n"); @@ -258,7 +240,7 @@ EngDeleteWnd( IN WNDOBJ *pwo) { - WNDGDI *WndObjInt = ObjToGDI(pwo, WND); + XCLIPOBJ* Clip = CONTAINING_RECORD(pwo, XCLIPOBJ, WndObj); PWND Window; BOOL calledFromUser; @@ -270,7 +252,7 @@ } /* Get window object */ - Window = UserGetWindowObject(WndObjInt->Hwnd); + Window = UserGetWindowObject(Clip->Hwnd); if (Window == NULL) { ERR("Couldnt get window object for WndObjInt->Hwnd!!!\n"); @@ -287,8 +269,8 @@ } /* Free resources */ - IntEngDeleteClipRegion(WndObjInt->ClientClipObj); - EngFreeMem(WndObjInt); + IntEngFreeClipResources(Clip); + EngFreeMem(Clip); } @@ -302,14 +284,8 @@ IN ULONG cj, OUT ULONG *pul) { - WNDGDI *WndObjInt = ObjToGDI(pwo, WND); - BOOL Ret; - - TRACE("WNDOBJ_bEnum: pwo = 0x%p, cj = %lu, pul = 0x%p\n", pwo, cj, pul); - Ret = CLIPOBJ_bEnum(WndObjInt->ClientClipObj, cj, pul); - - TRACE("WNDOBJ_bEnum: Returning %s\n", Ret ? "True" : "False"); - return Ret; + /* Relay */ + return CLIPOBJ_bEnum(&pwo->coClient, cj, pul); } @@ -324,17 +300,9 @@ IN ULONG iDirection, IN ULONG cLimit) { - WNDGDI *WndObjInt = ObjToGDI(pwo, WND); - ULONG Ret; - - TRACE("WNDOBJ_cEnumStart: pwo = 0x%p, iType = %lu, iDirection = %lu, cLimit = %lu\n", - pwo, iType, iDirection, cLimit); - - /* FIXME: Should we enumerate all rectangles or not? */ - Ret = CLIPOBJ_cEnumStart(WndObjInt->ClientClipObj, FALSE, iType, iDirection, cLimit); - - TRACE("WNDOBJ_cEnumStart: Returning 0x%lx\n", Ret); - return Ret; + /* Relay */ + // FIXME: Should we enumerate all rectangles or not? + return CLIPOBJ_cEnumStart(&pwo->coClient, FALSE, iType, iDirection, cLimit); } Modified: trunk/reactos/win32ss/gdi/eng/inteng.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/inteng.h?r… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/inteng.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/inteng.h [iso-8859-1] Sat Jul 26 15:41:08 2014 @@ -114,13 +114,17 @@ LONG dCount, MIX mix); -CLIPOBJ* FASTCALL -IntEngCreateClipRegion(ULONG count, - PRECTL pRect, - PRECTL rcBounds); +VOID FASTCALL +IntEngUpdateClipRegion(XCLIPOBJ* Clip, + ULONG count, + const RECTL* pRect, + const RECTL* rcBounds); VOID FASTCALL -IntEngDeleteClipRegion(CLIPOBJ *ClipObj); +IntEngInitClipObj(XCLIPOBJ *Clip); + +VOID FASTCALL +IntEngFreeClipResources(XCLIPOBJ *Clip); BOOL FASTCALL Modified: trunk/reactos/win32ss/gdi/eng/lineto.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/lineto.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/lineto.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/lineto.c [iso-8859-1] Sat Jul 26 15:41:08 2014 @@ -366,11 +366,12 @@ if (!Clip) { - Clip = pcoPriv = IntEngCreateClipRegion(0, 0, RectBounds); + Clip = pcoPriv = EngCreateClip(); if (!Clip) { return FALSE; } + IntEngUpdateClipRegion((XCLIPOBJ*)Clip, 0, 0, RectBounds); } x1 += Translate.x; @@ -487,7 +488,7 @@ if (pcoPriv) { - IntEngDeleteClipRegion(pcoPriv); + EngDeleteClip(pcoPriv); } return IntEngLeave(&EnterLeave); Modified: trunk/reactos/win32ss/gdi/ntgdi/arc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/arc.c?re… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/arc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/arc.c [iso-8859-1] Sat Jul 26 15:41:08 2014 @@ -8,7 +8,7 @@ */ #define PUTPIXEL(x,y,BrushInst) \ ret = ret && IntEngLineTo(&psurf->SurfObj, \ - dc->rosdc.CombinedClip, \ + &dc->co.ClipObj, \ &BrushInst.BrushObject, \ x, y, (x)+1, y, \ &RectBounds, \ @@ -16,7 +16,7 @@ #define PUTLINE(x1,y1,x2,y2,BrushInst) \ ret = ret && IntEngLineTo(&psurf->SurfObj, \ - dc->rosdc.CombinedClip, \ + &dc->co.ClipObj, \ &BrushInst.BrushObject, \ x1, y1, x2, y2, \ &RectBounds, \ Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/bitblt.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] Sat Jul 26 15:41:08 2014 @@ -131,7 +131,7 @@ TRACE("Performing the alpha blend\n"); bResult = IntEngAlphaBlend(&BitmapDest->SurfObj, &BitmapSrc->SurfObj, - DCDest->rosdc.CombinedClip, + &DCDest->co.ClipObj, &exlo.xlo, &DestRect, &SourceRect, @@ -290,7 +290,7 @@ EXLATEOBJ_vInitXlateFromDCs(&exlo, DCSrc, DCDest); Ret = IntEngTransparentBlt(&BitmapDest->SurfObj, &BitmapSrc->SurfObj, - DCDest->rosdc.CombinedClip, &exlo.xlo, &rcDest, &rcSrc, + &DCDest->co.ClipObj, &exlo.xlo, &rcDest, &rcSrc, TransparentColor, 0); EXLATEOBJ_vCleanup(&exlo); @@ -487,7 +487,7 @@ Status = IntEngBitBlt(&BitmapDest->SurfObj, BitmapSrc ? &BitmapSrc->SurfObj : NULL, psurfMask ? &psurfMask->SurfObj : NULL, - DCDest->rosdc.CombinedClip, + &DCDest->co.ClipObj, XlateObj, &DestRect, &SourcePoint, @@ -697,7 +697,7 @@ Status = IntEngStretchBlt(&BitmapDest->SurfObj, BitmapSrc ? &BitmapSrc->SurfObj : NULL, BitmapMask ? &BitmapMask->SurfObj : NULL, - DCDest->rosdc.CombinedClip, + &DCDest->co.ClipObj, XlateObj, &DCDest->dclevel.ca, &DestRect, @@ -834,7 +834,7 @@ &psurf->SurfObj, NULL, NULL, - pdc->rosdc.CombinedClip, + &pdc->co.ClipObj, NULL, &DestRect, NULL, Modified: trunk/reactos/win32ss/gdi/ntgdi/cliprgn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/cliprgn.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/cliprgn.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/cliprgn.c [iso-8859-1] Sat Jul 26 15:41:08 2014 @@ -467,8 +467,6 @@ FASTCALL CLIPPING_UpdateGCRegion(PDC pDC) { - CLIPOBJ * co; - /* Must have VisRgn set to a valid state! */ ASSERT (pDC->prgnVis); @@ -540,16 +538,10 @@ // With pDC->co.pClipRgn->Buffer, // pDC->co.pClipRgn = pDC->prgnRao ? pDC->prgnRao : pDC->prgnVis; - co = IntEngCreateClipRegion(pDC->prgnRao->rdh.nCount, - pDC->prgnRao->Buffer, - &pDC->erclClip); - if (co) - { - if (pDC->rosdc.CombinedClip != NULL) - IntEngDeleteClipRegion(pDC->rosdc.CombinedClip); - - pDC->rosdc.CombinedClip = co; - } + IntEngUpdateClipRegion(&pDC->co, + pDC->prgnRao->rdh.nCount, + pDC->prgnRao->Buffer, + &pDC->erclClip); IntGdiOffsetRgn(pDC->prgnRao, -pDC->ptlDCOrig.x, -pDC->ptlDCOrig.y); } Modified: trunk/reactos/win32ss/gdi/ntgdi/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dc.h?rev… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dc.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dc.h [iso-8859-1] Sat Jul 26 15:41:08 2014 @@ -45,11 +45,6 @@ /* Type definitions ***********************************************************/ - -typedef struct _ROS_DC_INFO -{ - CLIPOBJ *CombinedClip; -} ROS_DC_INFO; typedef struct _DCLEVEL { @@ -136,9 +131,6 @@ ULONG ulCopyCount; PVOID pSurfInfo; POINTL ptlDoBanding; - - /* Reactos specific members */ - ROS_DC_INFO rosdc; } DC; extern PDC defaultDCstate; Modified: trunk/reactos/win32ss/gdi/ntgdi/dclife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dclife.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dclife.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dclife.c [iso-8859-1] Sat Jul 26 15:41:08 2014 @@ -232,6 +232,9 @@ pdc->prgnVis = IntSysCreateRectpRgn(0, 0, pdc->dclevel.sizl.cx, pdc->dclevel.sizl.cy); ASSERT(pdc->prgnVis); + /* Initialize Clip object */ + IntEngInitClipObj(&pdc->co); + /* Setup palette */ pdc->dclevel.hpal = StockObjects[DEFAULT_PALETTE]; pdc->dclevel.ppal = PALETTE_ShareLockPalette(pdc->dclevel.hpal); @@ -373,8 +376,9 @@ REGION_Delete(pdc->prgnRao); if (pdc->prgnAPI) REGION_Delete(pdc->prgnAPI); - if (pdc->rosdc.CombinedClip) - IntEngDeleteClipRegion(pdc->rosdc.CombinedClip); + + /* Free CLIPOBJ resources */ + IntEngFreeClipResources(&pdc->co); PATH_Delete(pdc->dclevel.hPath); Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dibobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] Sat Jul 26 15:41:08 2014 @@ -530,7 +530,7 @@ Status = IntEngBitBlt(pDestSurf, pSourceSurf, NULL, - pDC->rosdc.CombinedClip, + &pDC->co.ClipObj, &exlo.xlo, &rcDest, &ptSource, @@ -1200,7 +1200,7 @@ bResult = IntEngStretchBlt(&psurfDst->SurfObj, &psurfTmp->SurfObj, NULL, - pdc->rosdc.CombinedClip, + &pdc->co.ClipObj, &exlo.xlo, &pdc->dclevel.ca, &rcDst, Modified: trunk/reactos/win32ss/gdi/ntgdi/drawing.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/drawing.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/drawing.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/drawing.c [iso-8859-1] Sat Jul 26 15:41:08 2014 @@ -1295,7 +1295,7 @@ &psurf->SurfObj, NULL, NULL, - dc->rosdc.CombinedClip, + &dc->co.ClipObj, NULL, &DestRect, NULL, 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] Sat Jul 26 15:41:08 2014 @@ -112,7 +112,7 @@ // Points[1].x, Points[1].y ); ret = IntEngLineTo(&psurf->SurfObj, - dc->rosdc.CombinedClip, + &dc->co.ClipObj, &dc->eboLine.BrushObject, Points[i].x, /* From */ Points[i].y, @@ -126,7 +126,7 @@ if (ret) { ret = IntEngLineTo(&psurf->SurfObj, - dc->rosdc.CombinedClip, + &dc->co.ClipObj, &dc->eboLine.BrushObject, Points[Count-1].x, /* From */ Points[Count-1].y, @@ -599,7 +599,7 @@ ret = IntEngBitBlt(&psurf->SurfObj, NULL, NULL, - dc->rosdc.CombinedClip, + &dc->co.ClipObj, NULL, &DestRect, NULL, @@ -618,28 +618,28 @@ { Mix = ROP2_TO_MIX(pdcattr->jROP2); ret = ret && IntEngLineTo(&psurf->SurfObj, - dc->rosdc.CombinedClip, + &dc->co.ClipObj, &dc->eboLine.BrushObject, DestRect.left, DestRect.top, DestRect.right, DestRect.top, &DestRect, // Bounding rectangle Mix); ret = ret && IntEngLineTo(&psurf->SurfObj, - dc->rosdc.CombinedClip, + &dc->co.ClipObj, &dc->eboLine.BrushObject, DestRect.right, DestRect.top, DestRect.right, DestRect.bottom, &DestRect, // Bounding rectangle Mix); ret = ret && IntEngLineTo(&psurf->SurfObj, - dc->rosdc.CombinedClip, + &dc->co.ClipObj, &dc->eboLine.BrushObject, DestRect.right, DestRect.bottom, DestRect.left, DestRect.bottom, &DestRect, // Bounding rectangle Mix); ret = ret && IntEngLineTo(&psurf->SurfObj, - dc->rosdc.CombinedClip, + &dc->co.ClipObj, &dc->eboLine.BrushObject, DestRect.left, DestRect.bottom, DestRect.left, DestRect.top, &DestRect, // Bounding rectangle @@ -963,10 +963,8 @@ DC_vPrepareDCsForBlit(pdc, &rclExtent, NULL, NULL); - ASSERT(pdc->rosdc.CombinedClip); - bRet = IntEngGradientFill(&psurf->SurfObj, - pdc->rosdc.CombinedClip, + &pdc->co.ClipObj, &exlo.xlo, pVertex, nVertex, Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Sat Jul 26 15:41:08 2014 @@ -3317,7 +3317,7 @@ &dc->dclevel.pSurface->SurfObj, NULL, NULL, - dc->rosdc.CombinedClip, + &dc->co.ClipObj, NULL, &DestRect, &SourcePoint, @@ -3577,7 +3577,7 @@ &psurf->SurfObj, NULL, NULL, - dc->rosdc.CombinedClip, + &dc->co.ClipObj, NULL, &DestRect, &SourcePoint, @@ -3650,7 +3650,7 @@ IntEngMaskBlt( SurfObj, SourceGlyphSurf, - dc->rosdc.CombinedClip, + &dc->co.ClipObj, &exloRGB2Dst.xlo, &exloDst2RGB.xlo, &DestRect, Modified: trunk/reactos/win32ss/gdi/ntgdi/line.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/line.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/line.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/line.c [iso-8859-1] Sat Jul 26 15:41:08 2014 @@ -149,7 +149,7 @@ if (!(pbrLine->flAttrs & BR_IS_NULL)) { Ret = IntEngLineTo(&psurf->SurfObj, - dc->rosdc.CombinedClip, + &dc->co.ClipObj, &dc->eboLine.BrushObject, Points[0].x, Points[0].y, Points[1].x, Points[1].y, @@ -285,7 +285,7 @@ } Ret = IntEngPolyline(&psurf->SurfObj, - dc->rosdc.CombinedClip, + &dc->co.ClipObj, &dc->eboLine.BrushObject, Points, Count, Modified: trunk/reactos/win32ss/gdi/ntgdi/polyfill.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/polyfill… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/polyfill.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/polyfill.c [iso-8859-1] Sat Jul 26 15:41:08 2014 @@ -408,7 +408,7 @@ //DPRINT("Fill Line (%d, %d) to (%d, %d)\n",x1, ScanLine, x2, ScanLine); IntEngLineTo(&psurf->SurfObj, - dc->rosdc.CombinedClip, + &dc->co.ClipObj, BrushObj, x1, ScanLine, @@ -481,7 +481,7 @@ //DPRINT("Fill Line (%d, %d) to (%d, %d)\n",x1, ScanLine, x2, ScanLine); IntEngLineTo(&psurf->SurfObj, - dc->rosdc.CombinedClip, + &dc->co.ClipObj, BrushObj, x1, ScanLine, @@ -504,7 +504,7 @@ //DPRINT("Fill Line (%d, %d) to (%d, %d)\n",x1, ScanLine, x2, ScanLine); IntEngLineTo(&psurf->SurfObj, - dc->rosdc.CombinedClip, + &dc->co.ClipObj, BrushObj, x1, ScanLine, @@ -627,7 +627,7 @@ IntEngBitBlt(&psurf->SurfObj, NULL, NULL, - dc->rosdc.CombinedClip, + &dc->co.ClipObj, NULL, &LineRect, NULL, 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] Sat Jul 26 15:41:08 2014 @@ -2484,7 +2484,7 @@ { HRGN tmpVisRgn; PROSRGNDATA visrgn; - CLIPOBJ* ClipRegion; + XCLIPOBJ ClipRegion; BOOL bRet = FALSE; POINTL BrushOrigin; SURFACE *psurf; @@ -2515,10 +2515,8 @@ if (dc->prgnRao) IntGdiCombineRgn(visrgn, visrgn, dc->prgnRao, RGN_AND); - ClipRegion = IntEngCreateClipRegion(visrgn->rdh.nCount, - visrgn->Buffer, - &visrgn->rdh.rcBound ); - ASSERT(ClipRegion); + IntEngInitClipObj(&ClipRegion); + IntEngUpdateClipRegion(&ClipRegion, visrgn->rdh.nCount, visrgn->Buffer, &visrgn->rdh.rcBound ); BrushOrigin.x = pdcattr->ptlBrushOrigin.x; BrushOrigin.y = pdcattr->ptlBrushOrigin.y; @@ -2526,13 +2524,14 @@ /* FIXME: Handle psurf == NULL !!!! */ bRet = IntEngPaint(&psurf->SurfObj, - ClipRegion, + &ClipRegion.ClipObj, &dc->eboFill.BrushObject, &BrushOrigin, 0xFFFF); // FIXME: Don't know what to put here RGNOBJAPI_Unlock(visrgn); GreDeleteObject(tmpVisRgn); + IntEngFreeClipResources(&ClipRegion); // Fill the region return bRet; Modified: trunk/reactos/win32ss/gdi/ntgdi/wingl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/wingl.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/wingl.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/wingl.c [iso-8859-1] Sat Jul 26 15:41:08 2014 @@ -121,6 +121,8 @@ SURFOBJ *pso = NULL; BOOL Ret = FALSE; + DPRINT1("Setting pixel format from win32k!\n"); + pdc = DC_LockDc(hdc); if (!pdc) { Modified: trunk/reactos/win32ss/user/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/cursor… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/cursoricon.c [iso-8859-1] Sat Jul 26 15:41:08 2014 @@ -1290,7 +1290,7 @@ DC_vPrepareDCsForBlit(pdc, &rcDest, NULL, NULL); /* Get the clip object */ - pdcClipObj = pdc->rosdc.CombinedClip; + pdcClipObj = &pdc->co.ClipObj; /* We now have our destination surface and rectangle */ psurfDest = pdc->dclevel.pSurface; @@ -1475,7 +1475,7 @@ DC_vPrepareDCsForBlit(pdc, &rcDest, NULL, NULL); /* Get the clip object */ - pdcClipObj = pdc->rosdc.CombinedClip; + pdcClipObj = &pdc->co.ClipObj; /* We now have our destination surface and rectangle */ psurfDest = pdc->dclevel.pSurface; 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] Sat Jul 26 15:41:08 2014 @@ -1015,22 +1015,22 @@ HWND FASTCALL UserGethWnd( HDC hdc, PWNDOBJ *pwndo) { - PWNDGDI pWndgdi; + XCLIPOBJ* Clip; PWND Wnd; HWND hWnd; PPROPERTY pprop; hWnd = IntWindowFromDC(hdc); - if (hWnd && !(Wnd = UserGetWindowObject(hWnd))) + if (hWnd && (Wnd = UserGetWindowObject(hWnd))) { pprop = IntGetProp(Wnd, AtomWndObj); - pWndgdi = (WNDGDI *)pprop->Data; - - if ( pWndgdi && pWndgdi->Hwnd == hWnd ) + Clip = (XCLIPOBJ*)pprop->Data; + + if ( Clip && Clip->Hwnd == hWnd ) { - if (pwndo) *pwndo = (PWNDOBJ)pWndgdi; + if (pwndo) *pwndo = &Clip->WndObj; } } return hWnd;

10 years, 5 months

[jgardou] 63738: [WIN32K] - Do not offset the window visible region when creating the WNDOBJ, it's already fine

by jgardou＠svn.reactos.org

Author: jgardou Date: Sat Jul 26 15:40:57 2014 New Revision: 63738 URL: http://svn.reactos.org/svn/reactos?rev=63738&view=rev Log: [WIN32K] - Do not offset the window visible region when creating the WNDOBJ, it's already fine Modified: trunk/reactos/win32ss/gdi/eng/engwindow.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] Sat Jul 26 15:40:57 2014 @@ -65,7 +65,6 @@ hVisRgn = VIS_ComputeVisibleRegion(Window, TRUE, TRUE, TRUE); if (hVisRgn != NULL) { - NtGdiOffsetRgn(hVisRgn, Window->rcClient.left, Window->rcClient.top); visRgn = RGNOBJAPI_Lock(hVisRgn, NULL); if (visRgn != NULL) {

10 years, 5 months

[jgardou] 63737: [WIN32K] - Use debug channel for debug outputs

by jgardou＠svn.reactos.org

Author: jgardou Date: Sat Jul 26 15:40:44 2014 New Revision: 63737 URL: http://svn.reactos.org/svn/reactos?rev=63737&view=rev Log: [WIN32K] - Use debug channel for debug outputs Modified: trunk/reactos/win32ss/gdi/eng/engwindow.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] Sat Jul 26 15:40:44 2014 @@ -7,9 +7,8 @@ */ #include <win32k.h> - -#define NDEBUG #include <debug.h> +DBG_DEFAULT_CHANNEL(EngWnd); INT gcountPWO = 0; @@ -42,7 +41,7 @@ pwo = NULL; } - DPRINT("Calling WNDOBJCHANGEPROC (0x%p), Changed = 0x%x\n", + TRACE("Calling WNDOBJCHANGEPROC (0x%p), Changed = 0x%x\n", WndObjInt->ChangeProc, flChanged); WndObjInt->ChangeProc(pwo, flChanged); } @@ -61,7 +60,7 @@ CLIPOBJ *ClipObj = NULL; CLIPOBJ *OldClipObj; - DPRINT("IntEngWndUpdateClipObj\n"); + TRACE("IntEngWndUpdateClipObj\n"); hVisRgn = VIS_ComputeVisibleRegion(Window, TRUE, TRUE, TRUE); if (hVisRgn != NULL) @@ -74,15 +73,15 @@ { ClipObj = IntEngCreateClipRegion(visRgn->rdh.nCount, visRgn->Buffer, &visRgn->rdh.rcBound); - DPRINT("Created visible region with %lu rects\n", visRgn->rdh.nCount); - DPRINT(" BoundingRect: %d, %d %d, %d\n", + 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++) { - DPRINT(" Rect #%lu: %ld,%ld %ld,%ld\n", i+1, + 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); } @@ -92,13 +91,13 @@ } else { - DPRINT1("Warning: Couldn't lock visible region of window DC\n"); + WARN("Couldn't lock visible region of window DC\n"); } GreDeleteObject(hVisRgn); } else { - DPRINT1("Warning: VIS_ComputeVisibleRegion failed!\n"); + WARN("VIS_ComputeVisibleRegion failed!\n"); } if (ClipObj == NULL) @@ -110,7 +109,7 @@ if (ClipObj == NULL) { - DPRINT1("Warning: IntEngCreateClipRegion() failed!\n"); + ERR("IntEngCreateClipRegion() failed!\n"); return FALSE; } @@ -192,7 +191,7 @@ BOOL calledFromUser; DECLARE_RETURN(WNDOBJ*); - DPRINT1("EngCreateWnd: pso = 0x%p, hwnd = 0x%p, pfn = 0x%p, fl = 0x%lx, pixfmt = %d\n", + TRACE("EngCreateWnd: pso = 0x%p, hwnd = 0x%p, pfn = 0x%p, fl = 0x%lx, pixfmt = %d\n", pso, hWnd, pfn, fl, iPixelFormat); calledFromUser = UserIsEntered(); @@ -211,7 +210,7 @@ WndObjInt = EngAllocMem(0, sizeof (WNDGDI), GDITAG_WNDOBJ); if (WndObjInt == NULL) { - DPRINT1("Failed to allocate memory for a WND structure!\n"); + ERR("Failed to allocate memory for a WND structure!\n"); RETURN( NULL); } @@ -238,7 +237,7 @@ IntSetProp(Window, AtomWndObj, WndObjInt); ++gcountPWO; - DPRINT("EngCreateWnd: SUCCESS!\n"); + TRACE("EngCreateWnd: SUCCESS!\n"); RETURN( WndObjUser); @@ -264,7 +263,7 @@ PWND Window; BOOL calledFromUser; - DPRINT("EngDeleteWnd: pwo = 0x%p\n", pwo); + TRACE("EngDeleteWnd: pwo = 0x%p\n", pwo); calledFromUser = UserIsEntered(); if (!calledFromUser) { @@ -275,7 +274,7 @@ Window = UserGetWindowObject(WndObjInt->Hwnd); if (Window == NULL) { - DPRINT1("Warning: Couldnt get window object for WndObjInt->Hwnd!!!\n"); + ERR("Couldnt get window object for WndObjInt->Hwnd!!!\n"); } else { @@ -307,10 +306,10 @@ WNDGDI *WndObjInt = ObjToGDI(pwo, WND); BOOL Ret; - DPRINT("WNDOBJ_bEnum: pwo = 0x%p, cj = %lu, pul = 0x%p\n", pwo, cj, pul); + TRACE("WNDOBJ_bEnum: pwo = 0x%p, cj = %lu, pul = 0x%p\n", pwo, cj, pul); Ret = CLIPOBJ_bEnum(WndObjInt->ClientClipObj, cj, pul); - DPRINT("WNDOBJ_bEnum: Returning %s\n", Ret ? "True" : "False"); + TRACE("WNDOBJ_bEnum: Returning %s\n", Ret ? "True" : "False"); return Ret; } @@ -329,13 +328,13 @@ WNDGDI *WndObjInt = ObjToGDI(pwo, WND); ULONG Ret; - DPRINT("WNDOBJ_cEnumStart: pwo = 0x%p, iType = %lu, iDirection = %lu, cLimit = %lu\n", + TRACE("WNDOBJ_cEnumStart: pwo = 0x%p, iType = %lu, iDirection = %lu, cLimit = %lu\n", pwo, iType, iDirection, cLimit); /* FIXME: Should we enumerate all rectangles or not? */ Ret = CLIPOBJ_cEnumStart(WndObjInt->ClientClipObj, FALSE, iType, iDirection, cLimit); - DPRINT("WNDOBJ_cEnumStart: Returning 0x%lx\n", Ret); + TRACE("WNDOBJ_cEnumStart: Returning 0x%lx\n", Ret); return Ret; } @@ -351,7 +350,7 @@ { BOOL Hack; - DPRINT("WNDOBJ_vSetConsumer: pwo = 0x%p, pvConsumer = 0x%p\n", pwo, pvConsumer); + TRACE("WNDOBJ_vSetConsumer: pwo = 0x%p, pvConsumer = 0x%p\n", pwo, pvConsumer); Hack = (pwo->pvConsumer == NULL); pwo->pvConsumer = pvConsumer; @@ -366,6 +365,7 @@ */ if (Hack) { + FIXME("Is this hack really needed?\n"); IntEngWndCallChangeProc(pwo, WOC_RGN_CLIENT); IntEngWndCallChangeProc(pwo, WOC_CHANGED); IntEngWndCallChangeProc(pwo, WOC_DRAWN);

10 years, 5 months

[jgardou] 63736: [NTOS/MM] - First implementation of NtProtectVirtualMemory with Transition PTE - Release PTE frame page after erasing the PTE to avoid useless page fault

by jgardou＠svn.reactos.org

Author: jgardou Date: Fri Jul 25 22:13:35 2014 New Revision: 63736 URL: http://svn.reactos.org/svn/reactos?rev=63736&view=rev Log: [NTOS/MM] - First implementation of NtProtectVirtualMemory with Transition PTE - Release PTE frame page after erasing the PTE to avoid useless page fault Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Fri Jul 25 22:13:35 2014 @@ -1310,20 +1310,41 @@ } } + /* Is this a transition PTE */ + if (TempPte.u.Soft.Transition) + { + PVOID InPageBlock = NULL; + /* Lock the PFN database */ + LockIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + + /* Resolve */ + Status = MiResolveTransitionFault(Address, PointerPte, Process, LockIrql, &InPageBlock); + + NT_ASSERT(NT_SUCCESS(Status)); + + /* And now release the lock and leave*/ + KeReleaseQueuedSpinLock(LockQueuePfnLock, LockIrql); + + ASSERT(OldIrql == KeGetCurrentIrql()); + ASSERT(OldIrql <= APC_LEVEL); + ASSERT(KeAreAllApcsDisabled() == TRUE); + return Status; + } + // // The PTE must be invalid but not completely empty. It must also not be a - // prototype PTE as that scenario should've been handled above. These are - // all Windows checks + // prototype or transition PTE as those scenarii should've been handled above. + // These are all Windows checks // ASSERT(TempPte.u.Hard.Valid == 0); ASSERT(TempPte.u.Soft.Prototype == 0); + ASSERT(TempPte.u.Soft.Transition == 0); ASSERT(TempPte.u.Long != 0); // - // No transition or page file software PTEs in ARM3 yet, so this must be a - // demand zero page. These are all ReactOS checks + // No page file software PTEs in ARM3 yet, so this must be a + // demand zero page. This is a ReactOS check. // - ASSERT(TempPte.u.Soft.Transition == 0); ASSERT(TempPte.u.Soft.PageFileHigh == 0); // Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] Fri Jul 25 22:13:35 2014 @@ -292,7 +292,6 @@ ListHead = &MmModifiedPageListByColor[0]; /* Decrease transition page counter */ - ASSERT(Pfn->u3.e1.PrototypePte == 1); /* Only supported ARM3 case */ MmTransitionSharedPages--; } else if (ListHead == &MmModifiedNoWritePageListHead) @@ -984,7 +983,6 @@ ASSERT(Pfn1->OriginalPte.u.Soft.PageFileHigh == 0); /* One more transition page */ - ASSERT(Pfn1->u3.e1.PrototypePte == 1); MmTransitionSharedPages++; /* Increment the number of per-process modified pages */ Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Fri Jul 25 22:13:35 2014 @@ -404,13 +404,36 @@ /* Capture the PTE */ TempPte = *PointerPte; - /* We only support valid PTEs for now */ - ASSERT(TempPte.u.Hard.Valid == 1); + /* See if the PTE is valid */ if (TempPte.u.Hard.Valid == 0) { - /* Invalid PTEs not supported yet */ + /* Prototype PTEs not supported yet */ ASSERT(TempPte.u.Soft.Prototype == 0); - ASSERT(TempPte.u.Soft.Transition == 0); + if (TempPte.u.Soft.Transition) + { + /* Get the PFN entry */ + PageFrameIndex = PFN_FROM_PTE(&TempPte); + Pfn1 = MiGetPfnEntry(PageFrameIndex); + + DPRINT1("Pte %p is transitional!\n", PointerPte); + + /* Destroy the PTE */ + MI_ERASE_PTE(PointerPte); + + /* Drop the reference on the page table. */ + MiDecrementShareCount(MiGetPfnEntry(Pfn1->u4.PteFrame), Pfn1->u4.PteFrame); + + if (Pfn1->u2.ShareCount == 0) + { + NT_ASSERT(Pfn1->u3.e2.ReferenceCount == 0); + /* Mark the page temporarily as valid, we're going to make it free soon */ + Pfn1->u3.e1.PageLocation = ActiveAndValid; + + /* Bring it back into the free list */ + MiInsertPageInFreeList(PageFrameIndex); + } + return; + } } /* Get the PFN entry */ @@ -457,6 +480,9 @@ (ULONG_PTR)Pfn1->PteAddress); } } + + /* Erase it */ + MI_ERASE_PTE(PointerPte); } else { @@ -471,6 +497,9 @@ (ULONG_PTR)Pfn1->PteAddress); } + /* Erase the PTE */ + MI_ERASE_PTE(PointerPte); + /* There should only be 1 shared reference count */ ASSERT(Pfn1->u2.ShareCount == 1); @@ -485,8 +514,7 @@ //CurrentProcess->NumberOfPrivatePages--; } - /* Destroy the PTE and flush the TLB */ - MI_ERASE_PTE(PointerPte); + /* Flush the TLB */ KeFlushCurrentTb(); } @@ -2053,7 +2081,7 @@ /* Check for ROS specific memory area */ MemoryArea = MmLocateMemoryAreaByAddress(&Process->Vm, *BaseAddress); - if ((MemoryArea) && (MemoryArea->Type == MEMORY_AREA_SECTION_VIEW)) + if ((MemoryArea) && (MemoryArea->Type != MEMORY_AREA_OWNED_BY_ARM3)) { /* Evil hack */ return MiRosProtectVirtualMemory(Process, @@ -2231,27 +2259,41 @@ if ((NewAccessProtection & PAGE_NOACCESS) || (NewAccessProtection & PAGE_GUARD)) { - /* The page should be in the WS and we should make it transition now */ - DPRINT1("Making valid page invalid is not yet supported!\n"); - Status = STATUS_NOT_IMPLEMENTED; - /* Unlock the working set */ - MiUnlockProcessWorkingSetUnsafe(Process, Thread); - goto FailPath; + KIRQL OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + + /* Mark the PTE as transition and change its protection */ + PteContents.u.Hard.Valid = 0; + PteContents.u.Soft.Transition = 1; + PteContents.u.Trans.Protection = ProtectionMask; + /* Decrease PFN share count and write the PTE */ + MiDecrementShareCount(Pfn1, PFN_FROM_PTE(&PteContents)); + // FIXME: remove the page from the WS + MI_WRITE_INVALID_PTE(PointerPte, PteContents); +#ifdef CONFIG_SMP + // FIXME: Should invalidate entry in every CPU TLB + ASSERT(FALSE); +#endif + KeInvalidateTlbEntry(MiPteToAddress(PointerPte)); + + /* We are done for this PTE */ + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); } - - /* Write the protection mask and write it with a TLB flush */ - Pfn1->OriginalPte.u.Soft.Protection = ProtectionMask; - MiFlushTbAndCapture(Vad, - PointerPte, - ProtectionMask, - Pfn1, - TRUE); + else + { + /* Write the protection mask and write it with a TLB flush */ + Pfn1->OriginalPte.u.Soft.Protection = ProtectionMask; + MiFlushTbAndCapture(Vad, + PointerPte, + ProtectionMask, + Pfn1, + TRUE); + } } else { /* We don't support these cases yet */ ASSERT(PteContents.u.Soft.Prototype == 0); - ASSERT(PteContents.u.Soft.Transition == 0); + //ASSERT(PteContents.u.Soft.Transition == 0); /* The PTE is already demand-zero, just update the protection mask */ PteContents.u.Soft.Protection = ProtectionMask;

10 years, 5 months

[jgardou] 63735: [WIN32K] - Improve parameter checking in NtGdiExtSelectClipRgn - Update the DC clipping regions before getting the clipbox

by jgardou＠svn.reactos.org

Author: jgardou Date: Fri Jul 25 10:56:50 2014 New Revision: 63735 URL: http://svn.reactos.org/svn/reactos?rev=63735&view=rev Log: [WIN32K] - Improve parameter checking in NtGdiExtSelectClipRgn - Update the DC clipping regions before getting the clipbox Modified: trunk/reactos/win32ss/gdi/ntgdi/cliprgn.c Modified: trunk/reactos/win32ss/gdi/ntgdi/cliprgn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/cliprgn.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/cliprgn.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/cliprgn.c [iso-8859-1] Fri Jul 25 10:56:50 2014 @@ -44,9 +44,9 @@ PREGION prgn, int fnMode) { - if (!prgn) - { - if (fnMode == RGN_COPY) + if (fnMode == RGN_COPY) + { + if (!prgn) { if (dc->dclevel.prgnClip != NULL) { @@ -56,12 +56,14 @@ } return SIMPLEREGION; } - else - { - EngSetLastError(ERROR_INVALID_PARAMETER); - return ERROR; - } - } + + if (!dc->dclevel.prgnClip) + dc->dclevel.prgnClip = IntSysCreateRectpRgn(0, 0, 0, 0); + + return IntGdiCombineRgn(dc->dclevel.prgnClip, prgn, NULL, RGN_COPY); + } + + ASSERT(prgn != NULL); if (!dc->dclevel.prgnClip) { @@ -72,9 +74,6 @@ } dc->fs |= DC_FLAG_DIRTY_RAO; - - if(fnMode == RGN_COPY) - return IntGdiCombineRgn(dc->dclevel.prgnClip, prgn, 0, fnMode); return IntGdiCombineRgn(dc->dclevel.prgnClip, dc->dclevel.prgnClip, prgn, fnMode); } @@ -99,8 +98,15 @@ prgn = REGION_LockRgn(hrgn); - /* IntGdiExtSelectClipRgn takes care of checking for NULL region */ - retval = IntGdiExtSelectClipRgn(dc, prgn, fnMode); + if ((prgn == NULL) && (fnMode != RGN_COPY)) + { + EngSetLastError(ERROR_INVALID_HANDLE); + retval = ERROR; + } + else + { + retval = IntGdiExtSelectClipRgn(dc, prgn, fnMode); + } if (prgn) REGION_UnlockRgn(prgn); @@ -120,6 +126,9 @@ { return ERROR; } + + if (dc->fs & DC_FLAG_DIRTY_RAO) + CLIPPING_UpdateGCRegion(dc); /* FIXME: Rao and Vis only! */ if (dc->prgnAPI) // APIRGN

10 years, 5 months

[tfaber] 63734: [NTOS:CC] - Remove useless list entry from ROS_VACB

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Jul 24 08:40:51 2014 New Revision: 63734 URL: http://svn.reactos.org/svn/reactos?rev=63734&view=rev Log: [NTOS:CC] - Remove useless list entry from ROS_VACB Modified: trunk/reactos/ntoskrnl/cc/fs.c trunk/reactos/ntoskrnl/cc/view.c trunk/reactos/ntoskrnl/include/internal/cc.h Modified: trunk/reactos/ntoskrnl/cc/fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/fs.c?rev=63734… ============================================================================== --- trunk/reactos/ntoskrnl/cc/fs.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/fs.c [iso-8859-1] Thu Jul 24 08:40:51 2014 @@ -168,7 +168,6 @@ if ((current->ReferenceCount == 0) || ((current->ReferenceCount == 1) && current->Dirty)) { RemoveEntryList(&current->CacheMapVacbListEntry); - RemoveEntryList(&current->VacbListEntry); RemoveEntryList(&current->VacbLruListEntry); if (current->Dirty) { Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=637… ============================================================================== --- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Thu Jul 24 08:40:51 2014 @@ -42,7 +42,6 @@ /* GLOBALS *******************************************************************/ static LIST_ENTRY DirtyVacbListHead; -static LIST_ENTRY VacbListHead; static LIST_ENTRY VacbLruListHead; ULONG DirtyPageCount = 0; @@ -331,7 +330,6 @@ ASSERT(!current->MappedCount); RemoveEntryList(&current->CacheMapVacbListEntry); - RemoveEntryList(&current->VacbListEntry); RemoveEntryList(&current->VacbLruListEntry); InsertHeadList(&FreeList, &current->CacheMapVacbListEntry); @@ -688,7 +686,6 @@ InsertHeadList(&SharedCacheMap->CacheMapVacbListHead, &current->CacheMapVacbListEntry); } KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldIrql); - InsertTailList(&VacbListHead, &current->VacbListEntry); InsertTailList(&VacbLruListHead, &current->VacbLruListEntry); KeReleaseGuardedMutex(&ViewLock); @@ -1040,7 +1037,6 @@ { current_entry = RemoveTailList(&SharedCacheMap->CacheMapVacbListHead); current = CONTAINING_RECORD(current_entry, ROS_VACB, CacheMapVacbListEntry); - RemoveEntryList(&current->VacbListEntry); RemoveEntryList(&current->VacbLruListEntry); if (current->Dirty) { @@ -1267,7 +1263,6 @@ { DPRINT("CcInitView()\n"); - InitializeListHead(&VacbListHead); InitializeListHead(&DirtyVacbListHead); InitializeListHead(&VacbLruListHead); KeInitializeGuardedMutex(&ViewLock); Modified: trunk/reactos/ntoskrnl/include/internal/cc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/cc.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/cc.h [iso-8859-1] Thu Jul 24 08:40:51 2014 @@ -135,7 +135,6 @@ /* Entry in the list of VACBs which are dirty. */ LIST_ENTRY DirtyVacbListEntry; /* Entry in the list of VACBs. */ - LIST_ENTRY VacbListEntry; LIST_ENTRY VacbLruListEntry; /* Offset in the file which this view maps. */ LARGE_INTEGER FileOffset;

10 years, 5 months

[tfaber] 63733: [WBEMPROX] - Don't omit lpBytesReturned in DeviceIoControl call ROSTESTS-120 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Wed Jul 23 18:50:09 2014 New Revision: 63733 URL: http://svn.reactos.org/svn/reactos?rev=63733&view=rev Log: [WBEMPROX] - Don't omit lpBytesReturned in DeviceIoControl call ROSTESTS-120 #resolve Modified: trunk/reactos/dll/win32/wbemprox/builtin.c trunk/rostests/winetests/wbemprox/query.c Modified: trunk/reactos/dll/win32/wbemprox/builtin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/builtin… ============================================================================== --- trunk/reactos/dll/win32/wbemprox/builtin.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemprox/builtin.c [iso-8859-1] Wed Jul 23 18:50:09 2014 @@ -1477,6 +1477,7 @@ ULARGE_INTEGER free; DISK_GEOMETRY_EX info; HANDLE handle; + DWORD bytes_returned; free.QuadPart = 512 * 1024 * 1024; GetDiskFreeSpaceExW( dir, NULL, NULL, &free ); @@ -1485,7 +1486,7 @@ handle = CreateFileW( root, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); if (handle != INVALID_HANDLE_VALUE) { - if (DeviceIoControl( handle, IOCTL_DISK_GET_DRIVE_GEOMETRY_EX, NULL, 0, &info, sizeof(info), NULL, NULL )) + if (DeviceIoControl( handle, IOCTL_DISK_GET_DRIVE_GEOMETRY_EX, NULL, 0, &info, sizeof(info), &bytes_returned, NULL )) *disksize = info.DiskSize.QuadPart; CloseHandle( handle ); } Modified: trunk/rostests/winetests/wbemprox/query.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wbemprox/query.… ============================================================================== --- trunk/rostests/winetests/wbemprox/query.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wbemprox/query.c [iso-8859-1] Wed Jul 23 18:50:09 2014 @@ -675,14 +675,7 @@ RPC_C_AUTHN_LEVEL_CALL, RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE ); ok( hr == S_OK, "failed to set proxy blanket %08x\n", hr ); - if (!winetest_interactive) - { - skip("test_select( services ), ROSTESTS-120\n"); - } - else - { - test_select( services ); - } + test_select( services ); test_Win32_Process( services ); test_Win32_Service( services ); test_StdRegProv( services );

10 years, 5 months

[dquintana] 63732: [STOBJECT] * Create skeleton for the SysTray shell service object DLL. No tray icons are created yet. * Tranks Robert Naumann for providing the icon resources, and some file temp...

by dquintana＠svn.reactos.org

Author: dquintana Date: Wed Jul 23 18:00:36 2014 New Revision: 63732 URL: http://svn.reactos.org/svn/reactos?rev=63732&view=rev Log: [STOBJECT] * Create skeleton for the SysTray shell service object DLL. No tray icons are created yet. * Tranks Robert Naumann for providing the icon resources, and some file templates. Added: branches/shell-experiments/dll/win32/stobject/ (with props) branches/shell-experiments/dll/win32/stobject/CMakeLists.txt (with props) branches/shell-experiments/dll/win32/stobject/lang/ (with props) branches/shell-experiments/dll/win32/stobject/lang/de-DE.rc (with props) branches/shell-experiments/dll/win32/stobject/lang/en-US.rc (with props) branches/shell-experiments/dll/win32/stobject/precomp.h (with props) branches/shell-experiments/dll/win32/stobject/resource.h (with props) branches/shell-experiments/dll/win32/stobject/resources/ (with props) branches/shell-experiments/dll/win32/stobject/resources/1.ico (with props) branches/shell-experiments/dll/win32/stobject/resources/2.ico (with props) branches/shell-experiments/dll/win32/stobject/resources/3.ico (with props) branches/shell-experiments/dll/win32/stobject/resources/4.ico (with props) branches/shell-experiments/dll/win32/stobject/resources/rgs/ (with props) branches/shell-experiments/dll/win32/stobject/resources/rgs/systray.rgs (with props) branches/shell-experiments/dll/win32/stobject/stobject.cpp (with props) branches/shell-experiments/dll/win32/stobject/stobject.rc (with props) branches/shell-experiments/dll/win32/stobject/stobject.spec (with props) Modified: branches/shell-experiments/base/shell/rshell/CStartMenu.cpp branches/shell-experiments/dll/win32/CMakeLists.txt Modified: branches/shell-experiments/base/shell/rshell/CStartMenu.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CStartMenu.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CStartMenu.cpp [iso-8859-1] Wed Jul 23 18:00:36 2014 @@ -412,6 +412,8 @@ return hr; hr = SHGetSpecialFolderLocation(NULL, CSIDL_PROGRAMS, &pidlProgramsAbsolute); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; pidlPrograms = ILClone(ILFindLastID(pidlProgramsAbsolute)); ILFree(pidlProgramsAbsolute); Modified: branches/shell-experiments/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/CMa… ============================================================================== --- branches/shell-experiments/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/CMakeLists.txt [iso-8859-1] Wed Jul 23 18:00:36 2014 @@ -193,6 +193,7 @@ add_subdirectory(stdole2.tlb) add_subdirectory(stdole32.tlb) add_subdirectory(sti) +add_subdirectory(stobject) add_subdirectory(sxs) add_subdirectory(syssetup) add_subdirectory(t2embed) Propchange: branches/shell-experiments/dll/win32/stobject/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Wed Jul 23 18:00:36 2014 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/shell-experiments/dll/win32/stobject/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/shell-experiments/dll/win32/stobject/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/shell-experiments/dll/win32/stobject/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/shell-experiments/dll/win32/stobject/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/sto… ============================================================================== --- branches/shell-experiments/dll/win32/stobject/CMakeLists.txt (added) +++ branches/shell-experiments/dll/win32/stobject/CMakeLists.txt [iso-8859-1] Wed Jul 23 18:00:36 2014 @@ -0,0 +1,36 @@ + +project(SHELL) + +set_cpp(WITH_RUNTIME) + +if(NOT MSVC) + # HACK: this should be enabled globally! + add_compile_flags_language("-std=c++11" "CXX") +endif() + +include_directories( + ${REACTOS_SOURCE_DIR}/lib/atl + ${REACTOS_SOURCE_DIR}) + +spec2def(stobject.dll stobject.spec) + +add_library(stobject SHARED + stobject.cpp + stobject.rc + ${CMAKE_CURRENT_BINARY_DIR}/stobject.def) + +set_module_type(stobject win32dll UNICODE) +target_link_libraries(stobject uuid wine atlnew) + +add_importlibs(stobject + advapi32 + ole32 + gdi32 + user32 + comctl32 + shlwapi + msvcrt + kernel32 + ntdll) + +add_cd_file(TARGET stobject DESTINATION reactos/system32 FOR all) Propchange: branches/shell-experiments/dll/win32/stobject/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/shell-experiments/dll/win32/stobject/lang/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Wed Jul 23 18:00:36 2014 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/shell-experiments/dll/win32/stobject/lang/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/shell-experiments/dll/win32/stobject/lang/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/shell-experiments/dll/win32/stobject/lang/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/shell-experiments/dll/win32/stobject/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/sto… ============================================================================== --- branches/shell-experiments/dll/win32/stobject/lang/de-DE.rc (added) +++ branches/shell-experiments/dll/win32/stobject/lang/de-DE.rc [iso-8859-1] Wed Jul 23 18:00:36 2014 @@ -0,0 +1,2 @@ +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + Propchange: branches/shell-experiments/dll/win32/stobject/lang/de-DE.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/shell-experiments/dll/win32/stobject/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/sto… ============================================================================== --- branches/shell-experiments/dll/win32/stobject/lang/en-US.rc (added) +++ branches/shell-experiments/dll/win32/stobject/lang/en-US.rc [iso-8859-1] Wed Jul 23 18:00:36 2014 @@ -0,0 +1 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US Propchange: branches/shell-experiments/dll/win32/stobject/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/shell-experiments/dll/win32/stobject/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/sto… ============================================================================== --- branches/shell-experiments/dll/win32/stobject/precomp.h (added) +++ branches/shell-experiments/dll/win32/stobject/precomp.h [iso-8859-1] Wed Jul 23 18:00:36 2014 @@ -0,0 +1,75 @@ +#pragma once + +#define WIN32_NO_STATUS +#include <stdarg.h> +#include <tchar.h> + +#define COBJMACROS +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#define NTOS_MODE_USER + +#include <windef.h> +#include <winbase.h> +#include <winreg.h> +#include <winuser.h> +#include <wincon.h> +#include <ddeml.h> +#include <shlguid_undoc.h> +#include <shlwapi.h> +#include <shlobj.h> +#include <shlobj_undoc.h> +#include <shlwapi_undoc.h> +#include <tchar.h> +#include <strsafe.h> +#include <atlbase.h> +#include <atlcom.h> + +#include <wine/debug.h> +#include <wine/unicode.h> + +extern const GUID CLSID_SysTray; + +#include "resource.h" + +static __inline ULONG +Win32DbgPrint(const char *filename, int line, const char *lpFormat, ...) +{ + char szMsg[512]; + char *szMsgStart; + const char *fname; + va_list vl; + ULONG uRet; + + fname = strrchr(filename, '\\'); + if (fname == NULL) + { + fname = strrchr(filename, '/'); + } + + if (fname == NULL) + fname = filename; + else + fname++; + + szMsgStart = szMsg + sprintf(szMsg, "[%10lu] %s:%d: ", GetTickCount(), fname, line); + + va_start(vl, lpFormat); + uRet = (ULONG) vsprintf(szMsgStart, lpFormat, vl); + va_end(vl); + + OutputDebugStringA(szMsg); + + return uRet; +} + +#define DbgPrint(fmt, ...) \ + Win32DbgPrint(__FILE__, __LINE__, fmt, ##__VA_ARGS__) + +#if 1 +#define FAILED_UNEXPECTEDLY(hr) (FAILED(hr) && (DbgPrint("Unexpected failure %08x.\n", hr), TRUE)) +#else +#define FAILED_UNEXPECTEDLY(hr) FAILED(hr) +#endif + Propchange: branches/shell-experiments/dll/win32/stobject/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/shell-experiments/dll/win32/stobject/resource.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/sto… ============================================================================== --- branches/shell-experiments/dll/win32/stobject/resource.h (added) +++ branches/shell-experiments/dll/win32/stobject/resource.h [iso-8859-1] Wed Jul 23 18:00:36 2014 @@ -0,0 +1,8 @@ +#pragma once + +#define IDI_ICON1 200 +#define IDI_ICON2 210 +#define IDI_ICON3 230 +#define IDI_ICON4 231 + +#define IDR_SYSTRAY 11001 Propchange: branches/shell-experiments/dll/win32/stobject/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/shell-experiments/dll/win32/stobject/resources/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Wed Jul 23 18:00:36 2014 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/shell-experiments/dll/win32/stobject/resources/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/shell-experiments/dll/win32/stobject/resources/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/shell-experiments/dll/win32/stobject/resources/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/shell-experiments/dll/win32/stobject/resources/1.ico URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/sto… ============================================================================== Binary file - no diff available. Propchange: branches/shell-experiments/dll/win32/stobject/resources/1.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/shell-experiments/dll/win32/stobject/resources/2.ico URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/sto… ============================================================================== Binary file - no diff available. Propchange: branches/shell-experiments/dll/win32/stobject/resources/2.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/shell-experiments/dll/win32/stobject/resources/3.ico URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/sto… ============================================================================== Binary file - no diff available. Propchange: branches/shell-experiments/dll/win32/stobject/resources/3.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/shell-experiments/dll/win32/stobject/resources/4.ico URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/sto… ============================================================================== Binary file - no diff available. Propchange: branches/shell-experiments/dll/win32/stobject/resources/4.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Propchange: branches/shell-experiments/dll/win32/stobject/resources/rgs/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Wed Jul 23 18:00:36 2014 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/shell-experiments/dll/win32/stobject/resources/rgs/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/shell-experiments/dll/win32/stobject/resources/rgs/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/shell-experiments/dll/win32/stobject/resources/rgs/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/shell-experiments/dll/win32/stobject/resources/rgs/systray.rgs URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/sto… ============================================================================== --- branches/shell-experiments/dll/win32/stobject/resources/rgs/systray.rgs (added) +++ branches/shell-experiments/dll/win32/stobject/resources/rgs/systray.rgs [iso-8859-1] Wed Jul 23 18:00:36 2014 @@ -0,0 +1,13 @@ +HKCR +{ + NoRemove CLSID + { + ForceRemove {35CEC8A3-2BE6-11D2-8773-92E220524153} = s 'SysTray' + { + InprocServer32 = s '%MODULE%' + { + val ThreadingModel = s 'Both' + } + } + } +} Propchange: branches/shell-experiments/dll/win32/stobject/resources/rgs/systray.rgs ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/shell-experiments/dll/win32/stobject/stobject.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/sto… ============================================================================== --- branches/shell-experiments/dll/win32/stobject/stobject.cpp (added) +++ branches/shell-experiments/dll/win32/stobject/stobject.cpp [iso-8859-1] Wed Jul 23 18:00:36 2014 @@ -0,0 +1,165 @@ +/* + * PROJECT: ReactOS system libraries + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll\win32\stobject\stobject.c + * PURPOSE: Systray shell service object + * PROGRAMMERS: Copyright 2014 Robert Naumann + */ + +#include "precomp.h" + +#include <olectl.h> + +WINE_DEFAULT_DEBUG_CHANNEL(stobject); + +const GUID CLSID_SysTray = { 0x35CEC8A3, 0x2BE6, 0x11D2, { 0x87, 0x73, 0x92, 0xE2, 0x20, 0x52, 0x41, 0x53 } }; + +class CShellTrayModule : public CComModule +{ +public: +}; + +class CSysTray : + public CComCoClass<CSysTray, &CLSID_SysTray>, + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public IOleCommandTarget +{ + // TODO: keep icon handlers here + +public: + CSysTray() {} + virtual ~CSysTray() {} + + // *** IOleCommandTarget methods *** + virtual HRESULT STDMETHODCALLTYPE QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds [], OLECMDTEXT *pCmdText) + { + UNIMPLEMENTED; + return S_OK; + } + + virtual HRESULT STDMETHODCALLTYPE Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) + { + if (!IsEqualGUID(*pguidCmdGroup, CGID_ShellServiceObject)) + return E_FAIL; + + switch (nCmdID) + { + case OLECMDID_NEW: // init + DbgPrint("CSysTray Init TODO: Initialize tray icon handlers.\n"); + break; + case OLECMDID_SAVE: // shutdown + DbgPrint("CSysTray Shutdown TODO: Shutdown.\n"); + break; + } + return S_OK; + } + + DECLARE_REGISTRY_RESOURCEID(IDR_SYSTRAY) + DECLARE_NOT_AGGREGATABLE(CSysTray) + DECLARE_PROTECT_FINAL_CONSTRUCT() + + BEGIN_COM_MAP(CSysTray) + COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget) + END_COM_MAP() +}; + + +BEGIN_OBJECT_MAP(ObjectMap) + OBJECT_ENTRY(CLSID_SysTray, CSysTray) +END_OBJECT_MAP() + +CShellTrayModule gModule; + +HINSTANCE g_hInstance; + +HRESULT RegisterShellServiceObject(REFGUID guidClass, LPCWSTR lpName, BOOL bRegister) +{ + const LPCWSTR strRegistryLocation = L"Software\\Microsoft\\Windows\\CurrentVersion\\ShellServiceObjectDelayLoad"; + + OLECHAR strGuid[128]; // shouldn't need so much! + LSTATUS ret = 0; + HKEY hKey = 0; + if (StringFromGUID2(guidClass, strGuid, 128)) + { + if (!RegOpenKeyExW(HKEY_LOCAL_MACHINE, strRegistryLocation, 0, KEY_WRITE, &hKey)) + { + if (bRegister) + { + LONG cbGuid = (lstrlenW(strGuid) + 1) * 2; + ret = RegSetValueExW(hKey, lpName, 0, REG_SZ, (const BYTE *) strGuid, cbGuid); + } + else + { + ret = RegDeleteValueW(hKey, lpName); + } + } + } + if (hKey) + RegCloseKey(hKey); + return /*HRESULT_FROM_NT*/(ret); // regsvr32 considers anything != S_OK to be an error + +} + +void *operator new (size_t, void *buf) +{ + return buf; +} + +BOOL +WINAPI +DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) +{ + if (fdwReason == DLL_PROCESS_ATTACH) + { + /* HACK - the global constructors don't run, so I placement new them here */ + new (&gModule) CShellTrayModule; + new (&_AtlWinModule) CAtlWinModule; + new (&_AtlBaseModule) CAtlBaseModule; + new (&_AtlComModule) CAtlComModule; + + g_hInstance = hinstDLL; + DisableThreadLibraryCalls(g_hInstance); + + gModule.Init(ObjectMap, g_hInstance, NULL); + } + else if (fdwReason == DLL_PROCESS_DETACH) + { + g_hInstance = NULL; + gModule.Term(); + } + return TRUE; +} + +HRESULT +WINAPI +DllCanUnloadNow(void) +{ + return gModule.DllCanUnloadNow(); +} + +STDAPI +DllRegisterServer(void) +{ + HRESULT hr = gModule.DllRegisterServer(FALSE); + if (FAILED(hr)) + return hr; + + return RegisterShellServiceObject(CLSID_SysTray, L"SysTray", TRUE); +} + +STDAPI +DllUnregisterServer(void) +{ + RegisterShellServiceObject(CLSID_SysTray, L"SysTray", FALSE); + + return gModule.DllUnregisterServer(FALSE); +} + +STDAPI +DllGetClassObject( + REFCLSID rclsid, + REFIID riid, + LPVOID *ppv) +{ + return gModule.DllGetClassObject(rclsid, riid, ppv); +} Propchange: branches/shell-experiments/dll/win32/stobject/stobject.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/shell-experiments/dll/win32/stobject/stobject.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/sto… ============================================================================== --- branches/shell-experiments/dll/win32/stobject/stobject.rc (added) +++ branches/shell-experiments/dll/win32/stobject/stobject.rc [iso-8859-1] Wed Jul 23 18:00:36 2014 @@ -0,0 +1,26 @@ +#include <windef.h> +#include <winuser.h> +#include <commctrl.h> + +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +IDI_ICON1 ICON "resources/1.ico" +IDI_ICON2 ICON "resources/2.ico" +IDI_ICON3 ICON "resources/3.ico" +IDI_ICON4 ICON "resources/4.ico" + +IDR_SYSTRAY REGISTRY "resources/rgs/systray.rgs" + +/* UTF-8 */ +#pragma code_page(65001) + +#if 0 +#ifdef LANGUAGE_DE_DE + #include "lang/de-DE.rc" +#endif +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif +#endif Propchange: branches/shell-experiments/dll/win32/stobject/stobject.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/shell-experiments/dll/win32/stobject/stobject.spec URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/sto… ============================================================================== --- branches/shell-experiments/dll/win32/stobject/stobject.spec (added) +++ branches/shell-experiments/dll/win32/stobject/stobject.spec [iso-8859-1] Wed Jul 23 18:00:36 2014 @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() Propchange: branches/shell-experiments/dll/win32/stobject/stobject.spec ------------------------------------------------------------------------------ svn:eol-style = native

10 years, 5 months

← Newer
1
2
3
4
5
6
7
8
9
...
12
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2014