[tkreuzer] 66226: [WIN32K] - Make sure PENs and BRUSHes are properly initialized. - Fix BRUSHATTR allocation - enable BRUSHATTR deallocation - Remove some obsolete defines
11 Feb
2015
11 Feb
'15
9:33 p.m.
Author: tkreuzer
Date: Wed Feb 11 21:33:24 2015
New Revision: 66226
URL: http://svn.reactos.org/svn/reactos?rev=66226&view=rev
Log:
[WIN32K]
- Make sure PENs and BRUSHes are properly initialized.
- Fix BRUSHATTR allocation
- enable BRUSHATTR deallocation
- Remove some obsolete defines
Modified:
trunk/reactos/win32ss/gdi/ntgdi/brush.c
trunk/reactos/win32ss/gdi/ntgdi/brush.h
trunk/reactos/win32ss/gdi/ntgdi/color.h
trunk/reactos/win32ss/gdi/ntgdi/pen.c
trunk/reactos/win32ss/gdi/ntgdi/pen.h
Modified: trunk/reactos/win32ss/gdi/ntgdi/brush.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/brush.c?…
==============================================================================
--- trunk/reactos/win32ss/gdi/ntgdi/brush.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/ntgdi/brush.c [iso-8859-1] Wed Feb 11 21:33:24 2015
@@ -11,19 +11,80 @@
#define NDEBUG
#include <debug.h>
-#define GDIOBJATTRFREE 170
-
-typedef struct _GDI_OBJ_ATTR_FREELIST
-{
- LIST_ENTRY Entry;
- DWORD nEntries;
- PVOID AttrList[GDIOBJATTRFREE];
-} GDI_OBJ_ATTR_FREELIST, *PGDI_OBJ_ATTR_FREELIST;
-
-typedef struct _GDI_OBJ_ATTR_ENTRY
-{
- RGN_ATTR Attr[GDIOBJATTRFREE];
-} GDI_OBJ_ATTR_ENTRY, *PGDI_OBJ_ATTR_ENTRY;
+static
+VOID
+BRUSH_vInit(
+ PBRUSH pbr)
+{
+ /* Start with kmode brush attribute */
+ pbr->pBrushAttr = &pbr->BrushAttr;
+}
+
+static
+PBRUSH
+BRUSH_AllocBrushWithHandle(
+ VOID)
+{
+ PBRUSH pbr;
+
+ pbr = (PBRUSH)GDIOBJ_AllocObjWithHandle(GDILoObjType_LO_BRUSH_TYPE, sizeof(BRUSH));
+ if (pbr == NULL)
+ {
+ return NULL;
+ }
+
+ BRUSH_vInit(pbr);
+ return pbr;
+}
+
+static
+BOOL
+BRUSH_bAllocBrushAttr(PBRUSH pbr)
+{
+ PPROCESSINFO ppi;
+ BRUSH_ATTR *pBrushAttr;
+ NT_ASSERT(pbr->pBrushAttr == &pbr->BrushAttr);
+
+ ppi = PsGetCurrentProcessWin32Process();
+ NT_ASSERT(ppi);
+
+ pBrushAttr = GdiPoolAllocate(ppi->pPoolBrushAttr);
+ if (!pBrushAttr)
+ {
+ DPRINT1("Could not allocate brush attr\n");
+ return FALSE;
+ }
+
+ /* Copy the content from the kernel mode dc attr */
+ pbr->pBrushAttr = pBrushAttr;
+ *pbr->pBrushAttr = pbr->BrushAttr;
+
+ /* Set the object attribute in the handle table */
+ GDIOBJ_vSetObjectAttr(&pbr->BaseObject, pBrushAttr);
+
+ DPRINT("BRUSH_bAllocBrushAttr: pbr=%p, pbr->pdcattr=%p\n", pbr,
pbr->pBrushAttr);
+ return TRUE;
+}
+
+static
+VOID
+BRUSH_vFreeBrushAttr(PBRUSH pbr)
+{
+ PPROCESSINFO ppi;
+
+ if (pbr->pBrushAttr == &pbr->BrushAttr) return;
+
+ /* Reset the object attribute in the handle table */
+ GDIOBJ_vSetObjectAttr(&pbr->BaseObject, NULL);
+
+ /* Free memory from the process gdi pool */
+ ppi = PsGetCurrentProcessWin32Process();
+ ASSERT(ppi);
+ GdiPoolFree(ppi->pPoolBrushAttr, pbr->pBrushAttr);
+
+ /* Reset to kmode brush attribute */
+ pbr->pBrushAttr = &pbr->BrushAttr;
+}
BOOL
FASTCALL
@@ -34,16 +95,20 @@
if ((ulOwner == GDI_OBJ_HMGR_PUBLIC) || ulOwner == GDI_OBJ_HMGR_NONE)
{
+ /* Free user mode attribute, if any */
+ BRUSH_vFreeBrushAttr(pbr);
+
// Deny user access to User Data.
GDIOBJ_vSetObjectAttr(&pbr->BaseObject, NULL);
- // FIXME: deallocate brush attr
}
if (ulOwner == GDI_OBJ_HMGR_POWNED)
{
+ /* Allocate a user mode attribute */
+ BRUSH_bAllocBrushAttr(pbr);
+
// Allow user access to User Data.
GDIOBJ_vSetObjectAttr(&pbr->BaseObject, pbr->pBrushAttr);
- // FIXME: Allocate brush attr
}
GDIOBJ_vSetObjectOwner(&pbr->BaseObject, ulOwner);
@@ -62,56 +127,6 @@
Ret = IntGdiSetBrushOwner(pbrush, ulOwner);
BRUSH_ShareUnlockBrush(pbrush);
return Ret;
-}
-
-BOOL
-NTAPI
-BRUSH_bAllocBrushAttr(PBRUSH pbr)
-{
- PPROCESSINFO ppi;
- BRUSH_ATTR *pBrushAttr;
-
- ppi = PsGetCurrentProcessWin32Process();
- ASSERT(ppi);
-
- pBrushAttr = GdiPoolAllocate(ppi->pPoolDcAttr);
- if (!pBrushAttr)
- {
- DPRINT1("Could not allocate brush attr\n");
- return FALSE;
- }
-
- /* Copy the content from the kernel mode dc attr */
- pbr->pBrushAttr = pBrushAttr;
- *pbr->pBrushAttr = pbr->BrushAttr;
-
- /* Set the object attribute in the handle table */
- GDIOBJ_vSetObjectAttr(&pbr->BaseObject, pBrushAttr);
-
- DPRINT("BRUSH_bAllocBrushAttr: pbr=%p, pbr->pdcattr=%p\n", pbr,
pbr->pBrushAttr);
- return TRUE;
-}
-
-
-VOID
-NTAPI
-BRUSH_vFreeBrushAttr(PBRUSH pbr)
-{
-#if 0
- PPROCESSINFO ppi;
-
- if (pbrush->pBrushAttr == &pbrush->BrushAttr) return;
-
- /* Reset the object attribute in the handle table */
- GDIOBJ_vSetObjectAttr(&pbr->BaseObject, NULL);
-
- /* Free memory from the process gdi pool */
- ppi = PsGetCurrentProcessWin32Process();
- ASSERT(ppi);
- GdiPoolFree(ppi->pPoolBrushAttr, pbr->pBrushAttr);
-#endif
- /* Reset to kmode brush attribute */
- pbr->pBrushAttr = &pbr->BrushAttr;
}
VOID
Modified: trunk/reactos/win32ss/gdi/ntgdi/brush.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/brush.h?…
==============================================================================
--- trunk/reactos/win32ss/gdi/ntgdi/brush.h [iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/ntgdi/brush.h [iso-8859-1] Wed Feb 11 21:33:24 2015
@@ -32,12 +32,12 @@
ULONG ulPalTime;
ULONG ulSurfTime;
PVOID ulRealization;
- ULONG Unknown4C[3];
+ //ULONG Unknown4C[3];
POINT ptPenWidth;
ULONG ulPenStyle;
DWORD *pStyle;
ULONG dwStyleCount;
- ULONG Unknown6C;
+ //ULONG Unknown6C;
} BRUSH, *PBRUSH;
typedef struct _EBRUSHOBJ
@@ -86,8 +86,6 @@
#define BR_CACHED_ENGINE 0x00040000
#define BR_CACHED_IS_SOLID 0x80000000
-#define BRUSH_AllocBrush() ((PBRUSH) GDIOBJ_AllocObj(GDIObjType_BRUSH_TYPE))
-#define BRUSH_AllocBrushWithHandle() ((PBRUSH)
GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_BRUSH, sizeof(BRUSH)))
#define BRUSH_FreeBrush(pBrush) GDIOBJ_FreeObj((POBJ)pBrush, GDIObjType_BRUSH_TYPE)
#define BRUSH_FreeBrushByHandle(hBrush) GDIOBJ_FreeObjByHandle((HGDIOBJ)hBrush,
GDI_OBJECT_TYPE_BRUSH)
#define BRUSH_ShareLockBrush(hBrush) ((PBRUSH)GDIOBJ_ShareLockObj((HGDIOBJ)hBrush,
GDI_OBJECT_TYPE_BRUSH))
Modified: trunk/reactos/win32ss/gdi/ntgdi/color.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/color.h?…
==============================================================================
--- trunk/reactos/win32ss/gdi/ntgdi/color.h [iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/ntgdi/color.h [iso-8859-1] Wed Feb 11 21:33:24 2015
@@ -1,8 +1,5 @@
#pragma once
-#ifndef CLR_INVALID
-#define CLR_INVALID 0xffffffff
-#endif
#define PC_SYS_USED 0x80 /* Palentry is used (both system and logical) */
#define PC_SYS_RESERVED 0x40 /* System palentry is not to be mapped to */
#define PC_SYS_MAPPED 0x10 /* Logical palentry is a direct alias for system palentry
*/
Modified: trunk/reactos/win32ss/gdi/ntgdi/pen.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/pen.c?re…
==============================================================================
--- trunk/reactos/win32ss/gdi/ntgdi/pen.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/ntgdi/pen.c [iso-8859-1] Wed Feb 11 21:33:24 2015
@@ -13,9 +13,52 @@
/* PRIVATE FUNCTIONS **********************************************************/
+static
+VOID
+PEN_vInit(
+ PPEN ppen)
+{
+ /* Start with kmode brush attribute */
+ ppen->pBrushAttr = &ppen->BrushAttr;
+}
+
+PBRUSH
+NTAPI
+PEN_AllocPenWithHandle(
+ VOID)
+{
+ PPEN ppen;
+
+ ppen = (PBRUSH)GDIOBJ_AllocObjWithHandle(GDILoObjType_LO_PEN_TYPE, sizeof(PEN));
+ if (ppen == NULL)
+ {
+ return NULL;
+ }
+
+ PEN_vInit(ppen);
+ return ppen;
+}
+
+PBRUSH
+NTAPI
+PEN_AllocExtPenWithHandle(
+ VOID)
+{
+ PPEN ppen;
+
+ ppen = (PBRUSH)GDIOBJ_AllocObjWithHandle(GDILoObjType_LO_EXTPEN_TYPE, sizeof(PEN));
+ if (ppen == NULL)
+ {
+ return NULL;
+ }
+
+ PEN_vInit(ppen);
+ return ppen;
+}
+
PBRUSH
FASTCALL
-PEN_ShareLockPen(HGDIOBJ hobj)
+PEN_ShareLockPen(HPEN hobj)
{
if ((GDI_HANDLE_GET_TYPE(hobj) != GDILoObjType_LO_PEN_TYPE) &&
(GDI_HANDLE_GET_TYPE(hobj) != GDILoObjType_LO_EXTPEN_TYPE))
Modified: trunk/reactos/win32ss/gdi/ntgdi/pen.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/pen.h?re…
==============================================================================
--- trunk/reactos/win32ss/gdi/ntgdi/pen.h [iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/ntgdi/pen.h [iso-8859-1] Wed Feb 11 21:33:24 2015
@@ -2,24 +2,28 @@
/* Internal interface */
-#define PEN_AllocPen() ((HPEN)GDIOBJ_AllocObj(GDIObjType_BRUSH_TYPE))
-#define PEN_AllocPenWithHandle() ((PBRUSH)GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_PEN,
sizeof(BRUSH)))
+typedef BRUSH PEN, *PPEN;
-#define PEN_FreePen(pBMObj) GDIOBJ_FreeObj((POBJ) pBMObj, GDIObjType_BRUSH_TYPE)
-#define PEN_FreePenByHandle(hBMObj) GDIOBJ_FreeObjByHandle((HGDIOBJ) hBMObj,
GDI_OBJECT_TYPE_PEN)
+PPEN
+NTAPI
+PEN_AllocPenWithHandle(
+ VOID);
-#define PEN_AllocExtPen() ((PBRUSH)GDIOBJ_AllocObj(GDIObjType_BRUSH_TYPE))
-#define PEN_AllocExtPenWithHandle()
((PBRUSH)GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_EXTPEN, sizeof(BRUSH)))
-
-#define PEN_FreeExtPen(pBMObj) GDIOBJ_FreeObj((POBJ) pBMObj, GDIObjType_BRUSH_TYPE)
-#define PEN_FreeExtPenByHandle(hBMObj) GDIOBJ_FreeObjByHandle((HGDIOBJ) hBMObj,
GDI_OBJECT_TYPE_EXTPEN)
-
-//#define PEN_LockExtPen(hBMObj) ((PBRUSH)GDIOBJ_LockObj((HGDIOBJ) hBMObj,
GDI_OBJECT_TYPE_EXTPEN))
+PPEN
+NTAPI
+PEN_AllocExtPenWithHandle(
+ VOID);
#define PEN_UnlockPen(pPenObj) GDIOBJ_vUnlockObject((POBJ)pPenObj)
+#define PEN_ShareUnlockPen(ppen) GDIOBJ_vDereferenceObject((POBJ)ppen)
-#define PEN_ShareUnlockPen(ppen) GDIOBJ_vDereferenceObject((POBJ)ppen)
+PPEN
+FASTCALL
+PEN_ShareLockPen(HPEN hpen);
-PBRUSH FASTCALL PEN_ShareLockPen(HGDIOBJ);
-
-INT APIENTRY PEN_GetObject(PBRUSH pPen, INT Count, PLOGPEN Buffer);
+INT
+NTAPI
+PEN_GetObject(
+ _In_ PPEN pPen,
+ _In_ INT Count,
+ _Out_ PLOGPEN Buffer);
3509
days inactive
3509
days old
0 comments
1 participants
participants (1)
-
tkreuzer＠svn.reactos.org