};
-ULONG FASTCALL BitmapFormat(WORD Bits, DWORD Compression)
+ULONG FASTCALL BitmapFormat(ULONG cBits, ULONG iCompression)
{
- switch (Compression)
+ switch (iCompression)
{
case BI_RGB:
/* Fall through */
case BI_BITFIELDS:
- switch (Bits)
- {
- case 1:
- return BMF_1BPP;
- case 4:
- return BMF_4BPP;
- case 8:
- return BMF_8BPP;
- case 16:
- return BMF_16BPP;
- case 24:
- return BMF_24BPP;
- case 32:
- return BMF_32BPP;
- }
+ if (cBits <= 1) return BMF_1BPP;
+ if (cBits <= 4) return BMF_4BPP;
+ if (cBits <= 8) return BMF_8BPP;
+ if (cBits <= 16) return BMF_16BPP;
+ if (cBits <= 24) return BMF_24BPP;
+ if (cBits <= 32) return BMF_32BPP;
return 0;
case BI_RLE4:
}
/* Allocate a SURFACE object */
- psurf = (PSURFACE)GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_BITMAP);
+ psurf = (PSURFACE)GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_BITMAP, sizeof(SURFACE));
if (psurf)
{
pso->iType = iType;
pso->iUniq = InterlockedIncrement((PLONG)&giUniqueSurface);
- /* Assign a default palette amd increment its reference count */
+ /* Assign a default palette and increment its reference count */
psurf->ppal = appalSurfaceDefault[iFormat];
- GDIOBJ_IncrementShareCount(&psurf->ppal->BaseObject);
+ GDIOBJ_vReferenceObjectByPointer(&psurf->ppal->BaseObject);
}
return psurf;
/* Is a width in bytes given? */
if (ulWidth)
{
- /* Align the width (Windows compatibility) */
- ulWidth = ((((ulWidth << 3) / cBitsPixel) * cBitsPixel + 31) & ~31) >> 3;
+ /* Align the width (Windows compatibility, drivers expect that) */
+ ulWidth = WIDTH_BYTES_ALIGN32((ulWidth << 3) / cBitsPixel, cBitsPixel);
}
- else
- {
+ else
+ {
/* Calculate width from the bitmap width in pixels */
- ulWidth = ((pso->sizlBitmap.cx * cBitsPixel + 31) & ~31) >> 3;
- }
+ ulWidth = WIDTH_BYTES_ALIGN32(pso->sizlBitmap.cx, cBitsPixel);
+ }
/* Calculate the bitmap size in bytes */
pso->cjBits = ulWidth * pso->sizlBitmap.cy;
{
/* Bail out if that failed */
DPRINT1("SURFACE_bSetBitmapBits failed.\n");
- SURFACE_FreeSurfaceByHandle(hbmp);
+ GDIOBJ_vDeleteObject(&psurf->BaseObject);
return NULL;
}
/* Set public ownership */
- GDIOBJ_SetOwnership(hbmp, NULL);
+ GDIOBJ_vSetObjectOwner(&psurf->BaseObject, GDI_OBJ_HMGR_PUBLIC);
/* Unlock the surface and return */
SURFACE_UnlockSurface(psurf);
hbmp = (HBITMAP)psurf->SurfObj.hsurf;
/* Set public ownership */
- GDIOBJ_SetOwnership(hbmp, NULL);
+ GDIOBJ_vSetObjectOwner(&psurf->BaseObject, GDI_OBJ_HMGR_PUBLIC);
/* Unlock the surface and return */
SURFACE_UnlockSurface(psurf);
hsurf = psurf->SurfObj.hsurf;
/* Set public ownership */
- GDIOBJ_SetOwnership(hsurf, NULL);
+ GDIOBJ_vSetObjectOwner(&psurf->BaseObject, GDI_OBJ_HMGR_PUBLIC);
/* Unlock the surface and return */
SURFACE_UnlockSurface(psurf);
ppdev = (PDEVOBJ*)hdev;
/* Lock the surface */
- psurf = SURFACE_LockSurface(hsurf);
+ psurf = SURFACE_ShareLockSurface(hsurf);
if (!psurf)
{
return FALSE;
/* Get palette */
psurf->ppal = PALETTE_ShareLockPalette(ppdev->devinfo.hpalDefault);
- SURFACE_UnlockSurface(psurf);
+ SURFACE_ShareUnlockSurface(psurf);
return TRUE;
}
PSURFACE psurf;
PDEVOBJ* ppdev;
- psurf = SURFACE_LockSurface(hsurf);
+ psurf = SURFACE_ShareLockSurface(hsurf);
if (psurf == NULL)
{
return FALSE;
/* Get palette */
psurf->ppal = PALETTE_ShareLockPalette(ppdev->devinfo.hpalDefault);
- SURFACE_UnlockSurface(psurf);
+ SURFACE_ShareUnlockSurface(psurf);
return TRUE;
}
APIENTRY
EngDeleteSurface(IN HSURF hsurf)
{
- GDIOBJ_SetOwnership(hsurf, PsGetCurrentProcess());
- SURFACE_FreeSurfaceByHandle(hsurf);
+ PSURFACE psurf;
+
+ psurf = SURFACE_ShareLockSurface(hsurf);
+ if (!psurf)
+ {
+ DPRINT1("Could not reference surface to delete\n");
+ return FALSE;
+ }
+
+ GDIOBJ_vDeleteObject(&psurf->BaseObject);
return TRUE;
}
APIENTRY
EngLockSurface(IN HSURF hsurf)
{
- SURFACE *psurf = GDIOBJ_ShareLockObj(hsurf, GDI_OBJECT_TYPE_BITMAP);
-
- if (psurf != NULL)
- return &psurf->SurfObj;
+ SURFACE *psurf = SURFACE_ShareLockSurface(hsurf);
- return NULL;
+ return psurf ? &psurf->SurfObj : NULL;
}
VOID
APIENTRY
NtGdiEngUnlockSurface(IN SURFOBJ *pso)
{
- EngUnlockSurface(pso);
+ UNIMPLEMENTED;
+ ASSERT(FALSE);
}
VOID
if (pso != NULL)
{
SURFACE *psurf = CONTAINING_RECORD(pso, SURFACE, SurfObj);
- GDIOBJ_ShareUnlockObjByPtr((POBJ)psurf);
+ SURFACE_ShareUnlockSurface(psurf);
}
}