* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS Win32k subsystem
* PURPOSE: Functions for creation and destruction of DCs
- * FILE: subsystems/win32/win32k/objects/dcobjs.c
+ * FILE: win32ss/gdi/ntgdi/dcobjs.c
* PROGRAMER: Timo Kreuzer (timo.kreuzer@rectos.org)
*/
/* Check for DC brush */
if (pdcattr->hbrush == StockObjects[DC_BRUSH])
{
- /* ROS HACK, should use surf xlate */
/* Update the eboFill's solid color */
- EBRUSHOBJ_vSetSolidRGBColor(&pdc->eboFill, pdcattr->crPenClr);
+ EBRUSHOBJ_vSetSolidRGBColor(&pdc->eboFill, pdcattr->crBrushClr);
}
/* Clear flags */
*
* @implemented
*/
-_Success_(return != FALSE)
+_Success_(return!=FALSE)
+__kernel_entry
BOOL
APIENTRY
NtGdiSetBrushOrg(
_In_ INT y,
_Out_opt_ LPPOINT pptOut)
{
- PDC pdc;
-
- /* Lock the DC */
- pdc = DC_LockDc(hdc);
- if (pdc == NULL)
- {
- EngSetLastError(ERROR_INVALID_HANDLE);
- return FALSE;
- }
- /* Check if the old origin was requested */
- if (pptOut != NULL)
- {
- /* Enter SEH for buffer transfer */
- _SEH2_TRY
- {
- /* Probe and copy the old origin */
- ProbeForWrite(pptOut, sizeof(POINT), 1);
- *pptOut = pdc->pdcattr->ptlBrushOrigin;
- }
- _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
- {
- DC_UnlockDc(pdc);
- _SEH2_YIELD(return FALSE);
- }
- _SEH2_END;
- }
-
- /* Call the internal function */
- DC_vSetBrushOrigin(pdc, x, y);
-
- /* Unlock the DC and return success */
- DC_UnlockDc(pdc);
- return TRUE;
+ POINT ptOut;
+ /* Call the internal function */
+ BOOL Ret = GreSetBrushOrg( hdc, x, y, &ptOut);
+ if (Ret)
+ {
+ /* Check if the old origin was requested */
+ if (pptOut != NULL)
+ {
+ /* Enter SEH for buffer transfer */
+ _SEH2_TRY
+ {
+ /* Probe and copy the old origin */
+ ProbeForWrite(pptOut, sizeof(POINT), 1);
+ *pptOut = ptOut;
+ }
+ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
+ {
+ _SEH2_YIELD(return FALSE);
+ }
+ _SEH2_END;
+ }
+ }
+ return Ret;
}
HPALETTE
return NULL;
}
+ /// FIXME: we shouldn't dereference pSurface when the PDEV is not locked
/* Is this a valid palette for this depth? */
if ((!pdc->dclevel.pSurface) ||
(BitsPerFormat(pdc->dclevel.pSurface->SurfObj.iBitmapFormat) <= 8
/* DIB sections are always compatible */
if (psurf->hSecure != NULL) return TRUE;
+ /* See if this is the same PDEV */
+ if (psurf->SurfObj.hdev == (HDEV)pdc->ppdev)
+ return TRUE;
+
/* Get the bit depth of the bitmap */
cBitsPixel = gajBitsPerFormat[psurf->SurfObj.iBitmapFormat];
PDC pdc;
HBITMAP hbmpOld;
PSURFACE psurfNew, psurfOld;
- PREGION VisRgn;
HDC hdcOld;
ASSERT_NOGDILOCKS();
return NULL;
}
- /* Check if the bitmap is compatile with the dc */
+ /* Check if the bitmap is compatible with the dc */
if (!DC_bIsBitmapCompatible(pdc, psurfNew))
{
/* Dereference the bitmap, unlock the DC and fail. */
SURFACE_ShareUnlockSurface(psurfOld);
}
- /* Mark the dc brushes invalid */
+ /* Mark the DC brushes and the RAO region invalid */
pdc->pdcattr->ulDirty_ |= DIRTY_FILL | DIRTY_LINE;
+ pdc->fs |= DC_FLAG_DIRTY_RAO;
- /* FIXME: Improve by using a region without a handle and selecting it */
- VisRgn = IntSysCreateRectpRgn( 0,
- 0,
- pdc->dclevel.sizl.cx,
- pdc->dclevel.sizl.cy);
-
- if (VisRgn)
- {
- GdiSelectVisRgn(hdc, VisRgn);
- REGION_Delete(VisRgn);
- }
+ /* Update the system region */
+ REGION_SetRectRgn(pdc->prgnVis,
+ 0,
+ 0,
+ pdc->dclevel.sizl.cx,
+ pdc->dclevel.sizl.cy);
/* Unlock the DC */
DC_UnlockDc(pdc);
int Mode)
{
PREGION RgnPath;
- PPATH pPath;
+ PPATH pPath, pNewPath;
BOOL success = FALSE;
PDC_ATTR pdcattr;
PDC pdc;
if (pPath->state != PATH_Closed)
{
EngSetLastError(ERROR_CAN_NOT_COMPLETE);
- DC_UnlockDc(pdc);
- return FALSE;
+ success = FALSE;
+ goto Exit;
}
/* Construct a region from the path */
return FALSE;
}
- if (!PATH_PathToRegion(pPath, pdcattr->jFillMode, RgnPath))
- {
- EngSetLastError(ERROR_CAN_NOT_COMPLETE);
- REGION_Delete(RgnPath);
- DC_UnlockDc(pdc);
- return FALSE;
- }
+ pNewPath = PATH_FlattenPath(pPath);
- success = IntGdiExtSelectClipRgn(pdc, RgnPath, Mode) != ERROR;
- REGION_Delete(RgnPath);
+ success = PATH_PathToRegion(pNewPath, pdcattr->jFillMode, RgnPath);
- /* Empty the path */
- if (success)
- PATH_EmptyPath(pPath);
+ PATH_UnlockPath(pNewPath);
+ PATH_Delete(pNewPath->BaseObject.hHmgr);
- /* FIXME: Should this function delete the path even if it failed? */
+ if (success) success = IntGdiExtSelectClipRgn(pdc, RgnPath, Mode) != ERROR;
+ REGION_Delete(RgnPath);
+
+Exit:
PATH_UnlockPath(pPath);
+ PATH_Delete(pdc->dclevel.hPath);
+ pdc->dclevel.flPath &= ~DCPATH_ACTIVE;
+ pdc->dclevel.hPath = NULL;
+
DC_UnlockDc(pdc);
return success;
{
ret = IntGdiCombineRgn(prgnDest, prgnSrc, 0, RGN_COPY) == ERROR ? -1 : 1;
if ((ret == 1) && (iCode == SYSRGN))
- IntGdiOffsetRgn(prgnDest, pdc->ptlDCOrig.x, pdc->ptlDCOrig.y);
+ {
+ /// \todo FIXME This is not really correct, since we already modified the region
+ ret = REGION_bOffsetRgn(prgnDest, pdc->ptlDCOrig.x, pdc->ptlDCOrig.y);
+ }
REGION_UnlockRgn(prgnDest);
}
else
projects / reactos.git / blobdiff