update for HEAD-2003091401

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

diff --git a/include/win32k/bitmaps.h b/include/win32k/bitmaps.h
index 8196f14..0a54326 100644 (file)
--- a/include/win32k/bitmaps.h
+++ b/include/win32k/bitmaps.h
@@ -8,8 +8,8 @@
 typedef struct _DDBITMAP
 {
   const PDRIVER_FUNCTIONS  pDriverFunctions;
-//  DHPDEV  PDev;
-//  HSURF  Surface;
+/*  DHPDEV  PDev; */
+/*  HSURF  Surface; */
 } DDBITMAP;
 
 /* GDI logical bitmap object */
@@ -28,32 +28,25 @@ typedef struct _BITMAPOBJ
 /*  Internal interface  */
 
 #define  BITMAPOBJ_AllocBitmap()  \
-  ((HBITMAP) GDIOBJ_AllocObj (sizeof (BITMAPOBJ), GO_BITMAP_MAGIC))
+  ((HBITMAP) GDIOBJ_AllocObj (sizeof (BITMAPOBJ), GDI_OBJECT_TYPE_BITMAP, (GDICLEANUPPROC) Bitmap_InternalDelete))
 #define  BITMAPOBJ_FreeBitmap(hBMObj)  \
-  GDIOBJ_FreeObj((HGDIOBJ) hBMObj, GO_BITMAP_MAGIC, GDIOBJFLAG_DEFAULT)
-#define  BITMAPOBJ_HandleToPtr(hBMObj)  \
-  ((PBITMAPOBJ) GDIOBJ_LockObj ((HGDIOBJ) hBMObj, GO_BITMAP_MAGIC))
-#define  BITMAPOBJ_ReleasePtr(hBMObj)  \
-  GDIOBJ_UnlockObj ((HGDIOBJ) hBMObj, GO_BITMAP_MAGIC)
+  GDIOBJ_FreeObj((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_BITMAP, GDIOBJFLAG_DEFAULT)
+#define  BITMAPOBJ_LockBitmap(hBMObj) GDIOBJ_LockObj((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_BITMAP)
+#define  BITMAPOBJ_UnlockBitmap(hBMObj) GDIOBJ_UnlockObj((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_BITMAP)
 
-/*#define  BITMAPOBJ_PtrToHandle(hBMObj)  \
-  ((HBITMAP) GDIOBJ_PtrToHandle ((PGDIOBJ) hBMObj, GO_BITMAP_MAGIC))*/
-#define  BITMAPOBJ_LockBitmap(hBMObj) GDIOBJ_LockObject ((HGDIOBJ) hBMObj)
-#define  BITMAPOBJ_UnlockBitmap(hBMObj) GDIOBJ_UnlockObject ((HGDIOBJ) hBMObj)
-
-INT  BITMAPOBJ_GetWidthBytes (INT bmWidth, INT bpp);
-HBITMAP  BITMAPOBJ_CopyBitmap (HBITMAP  hBitmap);
-int DIB_GetDIBWidthBytes (int  width, int  depth);
-int DIB_GetDIBImageBytes (int  width, int  height, int  depth);
-int DIB_BitmapInfoSize (const BITMAPINFO * info, WORD coloruse);
-INT BITMAP_GetObject(BITMAPOBJ * bmp, INT count, LPVOID buffer);
-BOOL Bitmap_InternalDelete( PBITMAPOBJ pBmp );
-HBITMAP BitmapToSurf(PBITMAPOBJ BitmapObj);
+INT     FASTCALL BITMAPOBJ_GetWidthBytes (INT bmWidth, INT bpp);
+HBITMAP FASTCALL BITMAPOBJ_CopyBitmap (HBITMAP  hBitmap);
+INT     FASTCALL DIB_GetDIBWidthBytes (INT  width, INT  depth);
+int     STDCALL  DIB_GetDIBImageBytes (INT  width, INT  height, INT  depth);
+INT     FASTCALL DIB_BitmapInfoSize (const BITMAPINFO * info, WORD coloruse);
+INT     STDCALL  BITMAP_GetObject(BITMAPOBJ * bmp, INT count, LPVOID buffer);
+BOOL    FASTCALL Bitmap_InternalDelete( PBITMAPOBJ pBmp );
+HBITMAP FASTCALL BitmapToSurf(PBITMAPOBJ BitmapObj);
 
 /*  User Entry Points  */
 BOOL
 STDCALL
-W32kBitBlt (
+NtGdiBitBlt (
        HDC     hDCDest,
        INT     XDest,
        INT     YDest,
@@ -66,7 +59,7 @@ W32kBitBlt (
        );
 HBITMAP
 STDCALL
-W32kCreateBitmap (
+NtGdiCreateBitmap (
        INT             Width,
        INT             Height,
        UINT            Planes,
@@ -75,19 +68,19 @@ W32kCreateBitmap (
        );
 HBITMAP
 STDCALL
-W32kCreateCompatibleBitmap (
+NtGdiCreateCompatibleBitmap (
        HDC     hDC,
        INT     Width,
        INT     Height
        );
 HBITMAP
 STDCALL
-W32kCreateBitmapIndirect (
+NtGdiCreateBitmapIndirect (
        CONST BITMAP    * BM
        );
 HBITMAP
 STDCALL
-W32kCreateDIBitmap (
+NtGdiCreateDIBitmap (
        HDC                     hDC,
        CONST BITMAPINFOHEADER  * bmih,
        DWORD                   Init,
@@ -97,7 +90,7 @@ W32kCreateDIBitmap (
        );
 HBITMAP
 STDCALL
-W32kCreateDIBSection (
+NtGdiCreateDIBSection (
        HDC                     hDC,
        CONST BITMAPINFO        * bmi,
        UINT                    Usage,
@@ -107,14 +100,14 @@ W32kCreateDIBSection (
        );
 HBITMAP
 STDCALL
-W32kCreateDiscardableBitmap (
+NtGdiCreateDiscardableBitmap (
        HDC     hDC,
        INT     Width,
        INT     Height
        );
 BOOL
 STDCALL
-W32kExtFloodFill (
+NtGdiExtFloodFill (
        HDC             hDC,
        INT             XStart,
        INT             YStart,
@@ -123,7 +116,7 @@ W32kExtFloodFill (
        );
 BOOL
 STDCALL
-W32kFloodFill (
+NtGdiFloodFill (
        HDC             hDC,
        INT             XStart,
        INT             YStart,
@@ -131,20 +124,20 @@ W32kFloodFill (
        );
 LONG
 STDCALL
-W32kGetBitmapBits (
+NtGdiGetBitmapBits (
        HBITMAP hBitmap,
        LONG    Buffer,
        LPVOID  Bits
        );
 BOOL
 STDCALL
-W32kGetBitmapDimensionEx (
+NtGdiGetBitmapDimensionEx (
        HBITMAP hBitmap,
        LPSIZE  Dimension
        );
 UINT
 STDCALL
-W32kGetDIBColorTable (
+NtGdiGetDIBColorTable (
        HDC     hDC,
        UINT    StartIndex,
        UINT    Entries,
@@ -152,7 +145,7 @@ W32kGetDIBColorTable (
        );
 INT
 STDCALL
-W32kGetDIBits (
+NtGdiGetDIBits (
        HDC             hDC,
        HBITMAP         hBitmap,
        UINT            StartScan,
@@ -163,14 +156,14 @@ W32kGetDIBits (
        );
 COLORREF
 STDCALL
-W32kGetPixel (
+NtGdiGetPixel (
        HDC     hDC,
        INT     XPos,
        INT     YPos
        );
 BOOL
 STDCALL
-W32kMaskBlt (
+NtGdiMaskBlt (
        HDC     hDCDest,
        INT     XDest,
        INT     YDest,
@@ -186,7 +179,7 @@ W32kMaskBlt (
        );
 BOOL
 STDCALL
-W32kPlgBlt (
+NtGdiPlgBlt (
        HDC             hDCDest,
        CONST POINT     * Point,
        HDC             hDCSrc,
@@ -200,14 +193,14 @@ W32kPlgBlt (
        );
 LONG
 STDCALL
-W32kSetBitmapBits (
+NtGdiSetBitmapBits (
        HBITMAP         hBitmap,
        DWORD           Bytes,
        CONST VOID      * Bits
        );
 BOOL
 STDCALL
-W32kSetBitmapDimensionEx (
+NtGdiSetBitmapDimensionEx (
        HBITMAP hBitmap,
        INT     Width,
        INT     Height,
@@ -215,7 +208,7 @@ W32kSetBitmapDimensionEx (
        );
 UINT
 STDCALL
-W32kSetDIBColorTable (
+NtGdiSetDIBColorTable (
        HDC             hDC,
        UINT            StartIndex,
        UINT            Entries,
@@ -223,7 +216,7 @@ W32kSetDIBColorTable (
        );
 INT
 STDCALL
-W32kSetDIBits (
+NtGdiSetDIBits (
        HDC                     hDC,
        HBITMAP                 hBitmap,
        UINT                    StartScan,
@@ -234,7 +227,7 @@ W32kSetDIBits (
        );
 INT
 STDCALL
-W32kSetDIBitsToDevice (
+NtGdiSetDIBitsToDevice (
        HDC                     hDC,
        INT                     XDest,
        INT                     YDest,
@@ -250,7 +243,7 @@ W32kSetDIBitsToDevice (
        );
 COLORREF
 STDCALL
-W32kSetPixel (
+NtGdiSetPixel (
        HDC             hDC,
        INT             X,
        INT             Y,
@@ -258,7 +251,7 @@ W32kSetPixel (
        );
 BOOL
 STDCALL
-W32kSetPixelV (
+NtGdiSetPixelV (
        HDC             hDC,
        INT             X,
        INT             Y,
@@ -266,7 +259,7 @@ W32kSetPixelV (
        );
 BOOL
 STDCALL
-W32kStretchBlt (
+NtGdiStretchBlt (
        HDC     hDCDest,
        INT     XOriginDest,
        INT     YOriginDest,
@@ -281,7 +274,7 @@ W32kStretchBlt (
        );
 INT
 STDCALL
-W32kStretchDIBits (
+NtGdiStretchDIBits (
        HDC                     hDC,
        INT                     XDest,
        INT                     YDest,