update for HEAD-2003091401

[reactos.git] / include / win32k / pen.h

diff --git a/include/win32k/pen.h b/include/win32k/pen.h
index 0c317e6..0d9a814 100644 (file)
--- a/include/win32k/pen.h
+++ b/include/win32k/pen.h
@@ -13,24 +13,18 @@ typedef struct
 /*  Internal interface  */
 
 #define  PENOBJ_AllocPen()  \
-  ((HPEN) GDIOBJ_AllocObj (sizeof (PENOBJ), GO_PEN_MAGIC))
-#define  PENOBJ_FreePen(hBMObj)  GDIOBJ_FreeObj((HGDIOBJ) hBMObj, GO_PEN_MAGIC, GDIOBJFLAG_DEFAULT)
-/*
-#define  PENOBJ_HandleToPtr(hBMObj)  \
-  ((PPENOBJ) GDIOBJ_HandleToPtr ((HGDIOBJ) hBMObj, GO_PEN_MAGIC))
-#define  PENOBJ_PtrToHandle(hBMObj)  \
-  ((HPEN) GDIOBJ_PtrToHandle ((PGDIOBJ) hBMObj, GO_PEN_MAGIC))
-*/
-#define  PENOBJ_LockPen(hBMObj) ((PPENOBJ)GDIOBJ_LockObj ((HGDIOBJ) hBMObj, GO_PEN_MAGIC))
-#define  PENOBJ_UnlockPen(hBMObj) GDIOBJ_UnlockObj ((HGDIOBJ) hBMObj, GO_PEN_MAGIC)
-
-HPEN STDCALL W32kCreatePen(INT  PenStyle,
+  ((HPEN) GDIOBJ_AllocObj (sizeof (PENOBJ), GDI_OBJECT_TYPE_PEN, NULL))
+#define  PENOBJ_FreePen(hBMObj)  GDIOBJ_FreeObj((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_PEN, GDIOBJFLAG_DEFAULT)
+#define  PENOBJ_LockPen(hBMObj) ((PPENOBJ)GDIOBJ_LockObj ((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_PEN))
+#define  PENOBJ_UnlockPen(hBMObj) GDIOBJ_UnlockObj ((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_PEN)
+
+HPEN STDCALL NtGdiCreatePen(INT  PenStyle,
                     INT  Width,
                     COLORREF  Color);
 
-HPEN STDCALL W32kCreatePenIndirect(CONST PLOGPEN  lgpn);
+HPEN STDCALL NtGdiCreatePenIndirect(CONST PLOGPEN  lgpn);
 
-HPEN STDCALL W32kExtCreatePen(DWORD  PenStyle,
+HPEN STDCALL NtGdiExtCreatePen(DWORD  PenStyle,
                        DWORD  Width,
                        CONST PLOGBRUSH  lb,
                        DWORD  StyleCount,