Author: khornicek Date: Sat Nov 21 23:05:52 2009 New Revision: 44264
URL: http://svn.reactos.org/svn/reactos?rev=44264&view=rev Log: - consider dest. palette in GreRealizeBrush
Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/brushobj.c
Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/brushobj.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win32... ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/brushobj.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/brushobj.c [iso-8859-1] Sat Nov 21 23:05:52 2009 @@ -300,10 +300,14 @@ RECTL rclDest; HPALETTE hPalette; LONG lWidth; + SURFACE *pSurfDest;
rclDest = (RECTL){0, 0, psurfPattern->SurfObj.sizlBitmap.cx, psurfPattern->SurfObj.sizlBitmap.cy};
- hPalette = NULL;//pDC->pBitmap->hDIBPalette; // FIXME: use dest surface palette! + pSurfDest = CONTAINING_RECORD(OutputObj, SURFACE, SurfObj); + + hPalette = pSurfDest->hDIBPalette; + if (!hPalette) hPalette = pPrimarySurface->DevInfo.hpalDefault;
lWidth = DIB_GetDIBWidthBytes(psurfPattern->SurfObj.sizlBitmap.cx, BitsPerFormat(OutputObj->iBitmapFormat));