Ros-diffs May 2008

ros-diffs@reactos.org

25 participants
586 discussions

[tkreuzer] 33752: fix palette implementation: use the surface's palette to crate the xlate objects, default to the device default palette. The dc palette defaults to stock object default palette. Implement IntCreateXlateForBlt, used in BitBlt etc functions to perform the needed operations to create the xlate object instead of duplicating the code. This allows for global thermonuclear solitaire again and hopefully doesn't break everything else ; -)

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed May 28 20:17:50 2008 New Revision: 33752 URL: http://svn.reactos.org/svn/reactos?rev=33752&view=rev Log: fix palette implementation: use the surface's palette to crate the xlate objects, default to the device default palette. The dc palette defaults to stock object default palette. Implement IntCreateXlateForBlt, used in BitBlt etc functions to perform the needed operations to create the xlate object instead of duplicating the code. This allows for global thermonuclear solitaire again and hopefully doesn't break everything else ;-) Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/include/intgdi.h trunk/reactos/subsystems/win32/win32k/objects/bitblt.c trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c trunk/reactos/subsystems/win32/win32k/objects/brush.c trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/fillshap.c trunk/reactos/subsystems/win32/win32k/objects/text.c Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] Wed May 28 20:17:50 2008 @@ -311,5 +311,6 @@ HDC FASTCALL IntGdiCreateDisplayDC(HDEV hDev, ULONG DcType, BOOL EmptyDC); BOOL FASTCALL IntGdiCleanDC(HDC hDC); +extern GDIDEVICE PrimarySurface; #endif /* not __WIN32K_DC_H */ Modified: trunk/reactos/subsystems/win32/win32k/include/intgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/intgdi.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/intgdi.h [iso-8859-1] Wed May 28 20:17:50 2008 @@ -7,6 +7,10 @@ XLATEOBJ* FASTCALL IntGdiCreateBrushXlate(PDC Dc, GDIBRUSHOBJ *BrushObj, BOOLEAN *Failed); + +XLATEOBJ* +FASTCALL +IntCreateXlateForBlt(PDC pDCDest, PDC pDCSrc, BITMAPOBJ* pDestSurf, BITMAPOBJ* pSrcSurf); VOID FASTCALL IntGdiInitBrushInstance(GDIBRUSHINST *BrushInst, PGDIBRUSHOBJ BrushObj, XLATEOBJ *XlateObj); Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] Wed May 28 20:17:50 2008 @@ -42,13 +42,11 @@ { PDC DCDest = NULL; PDC DCSrc = NULL; - PDC_ATTR Dc_Attr = NULL; BITMAPOBJ *BitmapDest, *BitmapSrc; RECTL DestRect, SourceRect; BOOL Status; XLATEOBJ *XlateObj; BLENDOBJ BlendObj; - HPALETTE SourcePalette = 0, DestPalette = 0; BlendObj.BlendFunction = BlendFunc; DCDest = DC_LockDc(hDCDest); @@ -87,9 +85,6 @@ { DCSrc = DCDest; } - - Dc_Attr = DCSrc->pDc_Attr; - if (!Dc_Attr) Dc_Attr = &DCSrc->Dc_Attr; /* Offset the destination and source by the origin of their DCs. */ XOriginDest += DCDest->w.DCOrgX; @@ -109,53 +104,43 @@ /* Determine surfaces to be used in the bitblt */ BitmapDest = BITMAPOBJ_LockBitmap(DCDest->w.hBitmap); + if (!BitmapDest) + { + DC_UnlockDc(DCSrc); + DC_UnlockDc(DCDest); + return FALSE; + } if (DCSrc->w.hBitmap == DCDest->w.hBitmap) BitmapSrc = BitmapDest; else + { BitmapSrc = BITMAPOBJ_LockBitmap(DCSrc->w.hBitmap); + if (!BitmapDest) + { + BITMAPOBJ_UnlockBitmap(BitmapDest); + DC_UnlockDc(DCSrc); + DC_UnlockDc(DCDest); + return FALSE; + } + } /* Create the XLATEOBJ. */ - if (DCDest->DcLevel.hpal != 0) - DestPalette = DCDest->DcLevel.hpal; - if (DCSrc->DcLevel.hpal != 0) - SourcePalette = DCSrc->DcLevel.hpal; - - /* KB41464 details how to convert between mono and color */ - if (DCDest->w.bitsPerPixel == 1 && DCSrc->w.bitsPerPixel == 1) - { + XlateObj = IntCreateXlateForBlt(DCDest, DCSrc, BitmapDest, BitmapSrc); + + if (XlateObj == (XLATEOBJ*)-1) + { + DPRINT1("error!!!\n"); + SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); XlateObj = NULL; + Status = FALSE; } else { - if (DCDest->w.bitsPerPixel == 1) - { - XlateObj = IntEngCreateMonoXlate(0, DestPalette, SourcePalette, Dc_Attr->crBackgroundClr); - } - else if (DCSrc->w.bitsPerPixel == 1) - { - XlateObj = IntEngCreateSrcMonoXlate(DestPalette, Dc_Attr->crBackgroundClr, Dc_Attr->crForegroundClr); - } - else - { - XlateObj = IntEngCreateXlate(0, 0, DestPalette, SourcePalette); - } - if (NULL == XlateObj) - { - BITMAPOBJ_UnlockBitmap(BitmapDest); - if (BitmapSrc != BitmapDest) - BITMAPOBJ_UnlockBitmap(BitmapSrc); - DC_UnlockDc(DCDest); - if (hDCSrc != hDCDest) - DC_UnlockDc(DCSrc); - SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); - return FALSE; - } - } - - /* Perform the alpha blend operation */ - Status = IntEngAlphaBlend(&BitmapDest->SurfObj, &BitmapSrc->SurfObj, - DCDest->CombinedClip, XlateObj, - &DestRect, &SourceRect, &BlendObj); + /* Perform the alpha blend operation */ + Status = IntEngAlphaBlend(&BitmapDest->SurfObj, &BitmapSrc->SurfObj, + DCDest->CombinedClip, XlateObj, + &DestRect, &SourceRect, &BlendObj); + } if (XlateObj != NULL) EngDeleteXlate(XlateObj); @@ -186,14 +171,13 @@ { PDC DCDest = NULL; PDC DCSrc = NULL; - PDC_ATTR Dc_Attr = NULL; - BITMAPOBJ *BitmapDest, *BitmapSrc; + PDC_ATTR Dc_Attr = NULL; + BITMAPOBJ *BitmapDest, *BitmapSrc = NULL; RECTL DestRect; POINTL SourcePoint, BrushOrigin; - BOOL Status; + BOOL Status = FALSE; XLATEOBJ *XlateObj = NULL; - HPALETTE SourcePalette = 0, DestPalette = 0; - PGDIBRUSHOBJ BrushObj; + PGDIBRUSHOBJ BrushObj = NULL; GDIBRUSHINST BrushInst; BOOL UsesSource = ROP3_USES_SOURCE(ROP); BOOL UsesPattern = ROP3_USES_PATTERN(ROP); @@ -240,8 +224,8 @@ DCSrc = NULL; } - Dc_Attr = DCDest->pDc_Attr; - if (!Dc_Attr) Dc_Attr = &DCDest->Dc_Attr; + Dc_Attr = DCDest->pDc_Attr; + if (!Dc_Attr) Dc_Attr = &DCDest->Dc_Attr; /* Offset the destination and source by the origin of their DCs. */ XDest += DCDest->w.DCOrgX; @@ -267,12 +251,19 @@ /* Determine surfaces to be used in the bitblt */ BitmapDest = BITMAPOBJ_LockBitmap(DCDest->w.hBitmap); + if (!BitmapDest) + goto cleanup; + if (UsesSource) { if (DCSrc->w.hBitmap == DCDest->w.hBitmap) BitmapSrc = BitmapDest; else + { BitmapSrc = BITMAPOBJ_LockBitmap(DCSrc->w.hBitmap); + if (!BitmapSrc) + goto cleanup; + } } else { @@ -284,21 +275,8 @@ BrushObj = BRUSHOBJ_LockBrush(Dc_Attr->hbrush); if (NULL == BrushObj) { - if (UsesSource && hDCSrc != hDCDest) - { - DC_UnlockDc(DCSrc); - } - if(BitmapDest != NULL) - { - BITMAPOBJ_UnlockBitmap(BitmapDest); - } - if(BitmapSrc != NULL && BitmapSrc != BitmapDest) - { - BITMAPOBJ_UnlockBitmap(BitmapSrc); - } - DC_UnlockDc(DCDest); SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; + goto cleanup; } BrushOrigin = *((PPOINTL)&BrushObj->ptOrigin); IntGdiInitBrushInstance(&BrushInst, BrushObj, DCDest->XlateBrush); @@ -311,55 +289,14 @@ /* Create the XLATEOBJ. */ if (UsesSource) { - if (DCDest->DcLevel.hpal != 0) - DestPalette = DCDest->DcLevel.hpal; - - if (DCSrc->DcLevel.hpal != 0) - SourcePalette = DCSrc->DcLevel.hpal; - - /* KB41464 details how to convert between mono and color */ - if (DCDest->w.bitsPerPixel == 1 && DCSrc->w.bitsPerPixel == 1) - { + XlateObj = IntCreateXlateForBlt(DCDest, DCSrc, BitmapDest, BitmapSrc); + + if (XlateObj == (XLATEOBJ*)-1) + { + DPRINT1("error!\n"); + SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); XlateObj = NULL; - } - else - { - Dc_Attr = DCSrc->pDc_Attr; - if (!Dc_Attr) Dc_Attr = &DCSrc->Dc_Attr; - if (DCDest->w.bitsPerPixel == 1) - { - XlateObj = IntEngCreateMonoXlate(0, DestPalette, SourcePalette, Dc_Attr->crBackgroundClr); - } - else if (DCSrc->w.bitsPerPixel == 1) - { - XlateObj = IntEngCreateSrcMonoXlate(DestPalette, Dc_Attr->crBackgroundClr, Dc_Attr->crForegroundClr); - } - else - { - XlateObj = IntEngCreateXlate(0, 0, DestPalette, SourcePalette); - } - if (NULL == XlateObj) - { - if (UsesSource && hDCSrc != hDCDest) - { - DC_UnlockDc(DCSrc); - } - DC_UnlockDc(DCDest); - if(BitmapDest != NULL) - { - BITMAPOBJ_UnlockBitmap(BitmapDest); - } - if(BitmapSrc != NULL && BitmapSrc != BitmapDest) - { - BITMAPOBJ_UnlockBitmap(BitmapSrc); - } - if(BrushObj != NULL) - { - BRUSHOBJ_UnlockBrush(BrushObj); - } - SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); - return FALSE; - } + goto cleanup; } } @@ -370,6 +307,7 @@ BrushObj ? &BrushInst.BrushObject : NULL, &BrushOrigin, ROP3_TO_ROP4(ROP)); +cleanup: if (UsesSource && XlateObj != NULL) EngDeleteXlate(XlateObj); @@ -410,8 +348,8 @@ { PDC DCDest, DCSrc; RECTL rcDest, rcSrc; - BITMAPOBJ *BitmapDest, *BitmapSrc; - XLATEOBJ *XlateObj; + BITMAPOBJ *BitmapDest, *BitmapSrc = NULL; + XLATEOBJ *XlateObj = NULL; HPALETTE SourcePalette = 0, DestPalette = 0; PPALGDI PalDestGDI, PalSourceGDI; USHORT PalDestMode, PalSrcMode; @@ -459,38 +397,46 @@ xSrc += DCSrc->w.DCOrgX; ySrc += DCSrc->w.DCOrgY; - if(DCDest->DcLevel.hpal) - DestPalette = DCDest->DcLevel.hpal; - - if(DCSrc->DcLevel.hpal) - SourcePalette = DCSrc->DcLevel.hpal; + BitmapDest = BITMAPOBJ_LockBitmap(DCDest->w.hBitmap); + if (!BitmapDest) + { + goto done; + } + + BitmapSrc = BITMAPOBJ_LockBitmap(DCSrc->w.hBitmap); + if (!BitmapSrc) + { + goto done; + } + + DestPalette = BitmapDest->hDIBPalette; + if (!DestPalette) DestPalette = PrimarySurface.DevInfo.hpalDefault; + + SourcePalette = BitmapSrc->hDIBPalette; + if (!SourcePalette) SourcePalette = PrimarySurface.DevInfo.hpalDefault; if(!(PalSourceGDI = PALETTE_LockPalette(SourcePalette))) { - DC_UnlockDc(DCSrc); - DC_UnlockDc(DCDest); SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - if((DestPalette != SourcePalette) && !(PalDestGDI = PALETTE_LockPalette(DestPalette))) - { - PALETTE_UnlockPalette(PalSourceGDI); - DC_UnlockDc(DCSrc); - DC_UnlockDc(DCDest); - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } + goto done; + } + PalSrcMode = PalSourceGDI->Mode; + PALETTE_UnlockPalette(PalSourceGDI); + if(DestPalette != SourcePalette) { + if (!(PalDestGDI = PALETTE_LockPalette(DestPalette))) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + goto done; + } PalDestMode = PalDestGDI->Mode; - PalSrcMode = PalSourceGDI->Mode; PALETTE_UnlockPalette(PalDestGDI); } else { - PalDestMode = PalSrcMode = PalSourceGDI->Mode; - } - PALETTE_UnlockPalette(PalSourceGDI); + PalDestMode = PalSrcMode; + } /* Translate Transparent (RGB) Color to the source palette */ if((XlateObj = (XLATEOBJ*)IntEngCreateXlate(PalSrcMode, PAL_RGB, SourcePalette, NULL))) @@ -501,13 +447,6 @@ /* Create the XLATE object to convert colors between source and destination */ XlateObj = (XLATEOBJ*)IntEngCreateXlate(PalDestMode, PalSrcMode, DestPalette, SourcePalette); - - BitmapDest = BITMAPOBJ_LockBitmap(DCDest->w.hBitmap); - /* FIXME - BitmapDest can be NULL!!!! Don't assert here! */ - ASSERT(BitmapDest); - BitmapSrc = BITMAPOBJ_LockBitmap(DCSrc->w.hBitmap); - /* FIXME - BitmapSrc can be NULL!!!! Don't assert here! */ - ASSERT(BitmapSrc); rcDest.left = xDst; rcDest.top = yDst; @@ -529,9 +468,15 @@ TransparentColor, 0); done: - BITMAPOBJ_UnlockBitmap(BitmapDest); - BITMAPOBJ_UnlockBitmap(BitmapSrc); DC_UnlockDc(DCSrc); + if (BitmapDest) + { + BITMAPOBJ_UnlockBitmap(BitmapDest); + } + if (BitmapSrc) + { + BITMAPOBJ_UnlockBitmap(BitmapSrc); + } if(hdcDst != hdcSrc) { DC_UnlockDc(DCDest); @@ -791,14 +736,13 @@ { PDC DCDest = NULL; PDC DCSrc = NULL; - PDC_ATTR Dc_Attr = NULL; + PDC_ATTR Dc_Attr; BITMAPOBJ *BitmapDest, *BitmapSrc; RECTL DestRect; RECTL SourceRect; BOOL Status; XLATEOBJ *XlateObj = NULL; - HPALETTE SourcePalette = 0, DestPalette = 0; - PGDIBRUSHOBJ BrushObj; + PGDIBRUSHOBJ BrushObj = NULL; BOOL UsesSource = ((ROP & 0xCC0000) >> 2) != (ROP & 0x330000); BOOL UsesPattern = ((ROP & 0xF00000) >> 4) != (ROP & 0x0F0000); @@ -852,6 +796,7 @@ } /* Offset the destination and source by the origin of their DCs. */ + // FIXME: DCOrg is in device coordinates! XOriginDest += DCDest->w.DCOrgX; YOriginDest += DCDest->w.DCOrgY; if (UsesSource) @@ -878,14 +823,7 @@ BitmapSrc = BitmapDest; else BitmapSrc = BITMAPOBJ_LockBitmap(DCSrc->w.hBitmap); - } - else - { - BitmapSrc = NULL; - } - - if ( UsesSource ) - { + int sw = BitmapSrc->SurfObj.sizlBitmap.cx; int sh = BitmapSrc->SurfObj.sizlBitmap.cy; if ( SourceRect.left < 0 ) @@ -936,50 +874,36 @@ Status = FALSE; goto failed; } + + /* Create the XLATEOBJ. */ + XlateObj = IntCreateXlateForBlt(DCDest, DCSrc, BitmapDest, BitmapSrc); + if (XlateObj == (XLATEOBJ*)-1) + { + SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); + Status = FALSE; + goto failed; + } + } + else + { + BitmapSrc = NULL; } if (UsesPattern) { - Dc_Attr = DCDest->pDc_Attr; - if (!Dc_Attr) Dc_Attr = &DCDest->Dc_Attr; + Dc_Attr = DCDest->pDc_Attr; + if (!Dc_Attr) Dc_Attr = &DCDest->Dc_Attr; BrushObj = BRUSHOBJ_LockBrush(Dc_Attr->hbrush); if (NULL == BrushObj) { - if (UsesSource && hDCSrc != hDCDest) - { - DC_UnlockDc(DCSrc); - } - DC_UnlockDc(DCDest); SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; + Status = FALSE; + goto failed; } } else { BrushObj = NULL; - } - - /* Create the XLATEOBJ. */ - if (UsesSource) - { - if (DCDest->DcLevel.hpal != 0) - DestPalette = DCDest->DcLevel.hpal; - - if (DCSrc->DcLevel.hpal != 0) - SourcePalette = DCSrc->DcLevel.hpal; - - /* FIXME: Use the same logic for create XLATEOBJ as in NtGdiBitBlt. */ - XlateObj = (XLATEOBJ*)IntEngCreateXlate(0, 0, DestPalette, SourcePalette); - if (NULL == XlateObj) - { - if (UsesSource && hDCSrc != hDCDest) - { - DC_UnlockDc(DCSrc); - } - DC_UnlockDc(DCDest); - SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); - return FALSE; - } } /* Perform the bitblt operation */ @@ -988,13 +912,15 @@ &DestRect, &SourceRect, NULL, NULL, NULL, COLORONCOLOR); - if (UsesSource) +failed: + if (XlateObj) + { EngDeleteXlate(XlateObj); - if (UsesPattern) + } + if (BrushObj) { BRUSHOBJ_UnlockBrush(BrushObj); } -failed: if (UsesSource && DCSrc->w.hBitmap != DCDest->w.hBitmap) { BITMAPOBJ_UnlockBitmap(BitmapSrc); @@ -1074,7 +1000,7 @@ &DestRect, NULL, NULL, - &BrushInst.BrushObject, + &BrushInst.BrushObject, // use pDC->eboFill &BrushOrigin, ROP3_TO_ROP4(ROP)); } Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Wed May 28 20:17:50 2008 @@ -265,8 +265,9 @@ SurfaceObject = &BitmapObject->SurfObj; if ( BitmapObject ) { - if ( dc->DcLevel.hpal != 0 ) - Pal = dc->DcLevel.hpal; + Pal = BitmapObject->hDIBPalette; + if (!Pal) Pal = PrimarySurface.DevInfo.hpalDefault; + /* FIXME: Verify if it shouldn't be PAL_BGR! */ XlateObj = (XLATEOBJ*)IntEngCreateXlate ( PAL_RGB, 0, NULL, Pal ); if ( XlateObj ) Modified: trunk/reactos/subsystems/win32/win32k/objects/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/brush.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/brush.c [iso-8859-1] Wed May 28 20:17:50 2008 @@ -119,6 +119,16 @@ IntGdiCreateBrushXlate(PDC Dc, GDIBRUSHOBJ *BrushObj, BOOLEAN *Failed) { XLATEOBJ *Result = NULL; + BITMAPOBJ * pSurface; + HPALETTE hPalette = NULL; + + pSurface = BITMAPOBJ_LockBitmap(Dc->w.hBitmap); + if (pSurface) + { + hPalette = pSurface->hDIBPalette; + BITMAPOBJ_UnlockBitmap(pSurface); + } + if (!hPalette) hPalette = PrimarySurface.DevInfo.hpalDefault; if (BrushObj->flAttrs & GDIBRUSH_IS_NULL) { @@ -127,7 +137,7 @@ } else if (BrushObj->flAttrs & GDIBRUSH_IS_SOLID) { - Result = IntEngCreateXlate(0, PAL_RGB, Dc->DcLevel.hpal, NULL); + Result = IntEngCreateXlate(0, PAL_RGB, hPalette, NULL); *Failed = FALSE; } else @@ -143,11 +153,11 @@ if (!Dc_Attr) Dc_Attr = &Dc->Dc_Attr; if (Dc->w.bitsPerPixel != 1) - Result = IntEngCreateSrcMonoXlate(Dc->DcLevel.hpal, Dc_Attr->crForegroundClr, Dc_Attr->crBackgroundClr); + Result = IntEngCreateSrcMonoXlate(hPalette, Dc_Attr->crForegroundClr, Dc_Attr->crBackgroundClr); } else if (BrushObj->flAttrs & GDIBRUSH_IS_DIB) { - Result = IntEngCreateXlate(0, 0, Dc->DcLevel.hpal, Pattern->hDIBPalette); + Result = IntEngCreateXlate(0, 0, hPalette, Pattern->hDIBPalette); } BITMAPOBJ_UnlockBitmap(Pattern); Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] Wed May 28 20:17:50 2008 @@ -29,7 +29,7 @@ // --------------------------------------------------------- File Statics -static GDIDEVICE PrimarySurface; +GDIDEVICE PrimarySurface; static PGDIDEVICE pPrimarySurface = NULL; static KEVENT VideoDriverNeedsPreparation; static KEVENT VideoDriverPrepared; @@ -829,7 +829,8 @@ if (!CreateAsIC) { - NewDC->DcLevel.hpal = PrimarySurface.DevInfo.hpalDefault; + NewDC->DcLevel.hpal = NtGdiGetStockObject(DEFAULT_PALETTE); + nDc_Attr->jROP2 = R2_COPYPEN; NewDC->erclWindow.top = NewDC->erclWindow.left = 0; @@ -1957,12 +1958,10 @@ if(pBmp->dib) { pDC->w.bitsPerPixel = pBmp->dib->dsBmih.biBitCount; - pDC->DcLevel.hpal = pBmp->hDIBPalette; } else { pDC->w.bitsPerPixel = BitsPerFormat(pBmp->SurfObj.iBitmapFormat); - pDC->DcLevel.hpal = ((GDIDEVICE *)pDC->pPDev)->DevInfo.hpalDefault; } /* Regenerate the XLATEOBJs. */ Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] Wed May 28 20:17:50 2008 @@ -1492,6 +1492,7 @@ POINTL DitherOrg; ULONG Mode, i; BOOL Ret; + HPALETTE hDestPalette; ASSERT(dc); ASSERT(pVertex); @@ -1550,13 +1551,19 @@ /* FIXME - BitmapObj can be NULL!!! Don't assert but handle this case gracefully! */ ASSERT(BitmapObj); - PalDestGDI = PALETTE_LockPalette(dc->DcLevel.hpal); - /* FIXME - PalDestGDI can be NULL!!! Don't assert but handle this case gracefully! */ - ASSERT(PalDestGDI); - Mode = PalDestGDI->Mode; - PALETTE_UnlockPalette(PalDestGDI); - - XlateObj = (XLATEOBJ*)IntEngCreateXlate(Mode, PAL_RGB, dc->DcLevel.hpal, NULL); + hDestPalette = BitmapObj->hDIBPalette; + if (!hDestPalette) hDestPalette = PrimarySurface.DevInfo.hpalDefault; + + PalDestGDI = PALETTE_LockPalette(hDestPalette); + if (PalDestGDI) + { + Mode = PalDestGDI->Mode; + PALETTE_UnlockPalette(PalDestGDI); + } + else + Mode = PAL_RGB; + + XlateObj = (XLATEOBJ*)IntEngCreateXlate(Mode, PAL_RGB, hDestPalette, NULL); ASSERT(XlateObj); Ret = IntEngGradientFill(&BitmapObj->SurfObj, Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] Wed May 28 20:17:50 2008 @@ -1547,6 +1547,7 @@ POINT Start; BOOL DoBreak = FALSE; LPCWSTR String, SafeString = NULL; + HPALETTE hDestPalette; // TODO: Write test-cases to exactly match real Windows in different // bad parameters (e.g. does Windows check the DC or the RECT first?). @@ -1629,7 +1630,9 @@ YStart = Start.y + dc->w.DCOrgY; /* Create the brushes */ - PalDestGDI = PALETTE_LockPalette(dc->DcLevel.hpal); + hDestPalette = BitmapObj->hDIBPalette; + if (!hDestPalette) hDestPalette = PrimarySurface.DevInfo.hpalDefault; + PalDestGDI = PALETTE_LockPalette(hDestPalette); if ( !PalDestGDI ) Mode = PAL_RGB; else @@ -1637,7 +1640,7 @@ Mode = PalDestGDI->Mode; PALETTE_UnlockPalette(PalDestGDI); } - XlateObj = (XLATEOBJ*)IntEngCreateXlate(Mode, PAL_RGB, dc->DcLevel.hpal, NULL); + XlateObj = (XLATEOBJ*)IntEngCreateXlate(Mode, PAL_RGB, hDestPalette, NULL); if ( !XlateObj ) { goto fail; @@ -1667,7 +1670,7 @@ } IntGdiInitBrushInstance(&BrushBgInst, BrushBg, NULL); } - XlateObj2 = (XLATEOBJ*)IntEngCreateXlate(PAL_RGB, Mode, NULL, dc->DcLevel.hpal); + XlateObj2 = (XLATEOBJ*)IntEngCreateXlate(PAL_RGB, Mode, NULL, hDestPalette); if ( !XlateObj2 ) { goto fail;

16 years, 3 months

[tkreuzer] 33751: reapply Magnus Change to fix build. note to Colin: THAT is the reason why ; -)

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed May 28 18:02:26 2008 New Revision: 33751 URL: http://svn.reactos.org/svn/reactos?rev=33751&view=rev Log: reapply Magnus Change to fix build. note to Colin: THAT is the reason why ;-) Modified: trunk/reactos/dll/win32/usp10/usp10.c trunk/reactos/dll/win32/usp10/usp10.spec Modified: trunk/reactos/dll/win32/usp10/usp10.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10.c?re… ============================================================================== --- trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] Wed May 28 18:02:26 2008 @@ -1726,3 +1726,11 @@ for (i = 0; i < nbchars; i++) widths[i] = glyph_width[i]; return S_OK; } + + +VOID WINAPI LpkPresent() +{ + /* FIXME */ + DbgPrint("LPK: %s is unimplemented, please try again later.\n", __FUNCTION__); +} + Modified: trunk/reactos/dll/win32/usp10/usp10.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10.spec… ============================================================================== --- trunk/reactos/dll/win32/usp10/usp10.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/usp10.spec [iso-8859-1] Wed May 28 18:02:26 2008 @@ -1,4 +1,4 @@ -@ stub LpkPresent +@ stdcall LpkPresent() @ stdcall ScriptApplyDigitSubstitution(ptr ptr ptr) @ stub ScriptApplyLogicalWidth @ stdcall ScriptBreak(ptr long ptr ptr)

16 years, 3 months

[tkreuzer] 33750: (Nt)GdiFlushUserBatch: - optmize by moving the locking of the dc to NtGdiFlushUserBatch instead of doing it for every object - fix wrong pointer calculation (GdiFlushUserBatch returns the size of the objects in bytes not in ULONG) - simplify a check - add a comment: on XP NtGdiFlushUserBatch doesn't return NTSTATUS, but a pointer to inside the Teb, maybe random/VOID

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed May 28 17:25:08 2008 New Revision: 33750 URL: http://svn.reactos.org/svn/reactos?rev=33750&view=rev Log: (Nt)GdiFlushUserBatch: - optmize by moving the locking of the dc to NtGdiFlushUserBatch instead of doing it for every object - fix wrong pointer calculation (GdiFlushUserBatch returns the size of the objects in bytes not in ULONG) - simplify a check - add a comment: on XP NtGdiFlushUserBatch doesn't return NTSTATUS, but a pointer to inside the Teb, maybe random/VOID Modified: trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c Modified: trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c [iso-8859-1] Wed May 28 17:25:08 2008 @@ -61,18 +61,13 @@ // ULONG FASTCALL -GdiFlushUserBatch(HDC hDC, PGDIBATCHHDR pHdr) +GdiFlushUserBatch(PDC dc, PGDIBATCHHDR pHdr) { - PDC dc = NULL; PDC_ATTR Dc_Attr = NULL; - if (hDC && !IsObjectDead(hDC)) + if (dc) { - dc = DC_LockDc(hDC); - if (dc) - { - Dc_Attr = dc->pDc_Attr; - if (!Dc_Attr) Dc_Attr = &dc->Dc_Attr; - } + Dc_Attr = dc->pDc_Attr; + if (!Dc_Attr) Dc_Attr = &dc->Dc_Attr; } // The thread is approaching the end of sunset. switch(pHdr->Cmd) @@ -113,7 +108,7 @@ default: break; } - if (dc) DC_UnlockDc(dc); + return pHdr->Size; // Return the full size of the structure. } @@ -146,25 +141,39 @@ if( (GdiBatchCount > 0) && (GdiBatchCount <= (GDIBATCHBUFSIZE/4))) { HDC hDC = (HDC) pTeb->GdiTebBatch.HDC; -// -// If hDC is zero and the buffer fills up with delete objects we need to run -// anyway. So, hard code to the system batch limit. -// - if ((hDC) || ((!hDC) && (GdiBatchCount >= GDI_BATCH_LIMIT))) + + /* If hDC is zero and the buffer fills up with delete objects we need + to run anyway. So, hard code to the system batch limit. */ + if ((hDC) || (GdiBatchCount >= GDI_BATCH_LIMIT)) { - PULONG pHdr = &pTeb->GdiTebBatch.Buffer[0]; + PCHAR pHdr = (PCHAR)&pTeb->GdiTebBatch.Buffer[0]; + PDC pDC = NULL; + + if (hDC && !IsObjectDead(hDC)) + { + pDC = DC_LockDc(hDC); + } + // No need to init anything, just go! for (; GdiBatchCount > 0; GdiBatchCount--) { // Process Gdi Batch! - pHdr += GdiFlushUserBatch( hDC, (PGDIBATCHHDR) pHdr ); + pHdr += GdiFlushUserBatch(pDC, (PGDIBATCHHDR) pHdr); } + + if (pDC) + { + DC_UnlockDc(pDC); + } + // Exit and clear out for the next round. pTeb->GdiTebBatch.Offset = 0; pTeb->GdiBatchCount = 0; pTeb->GdiTebBatch.HDC = 0; } } + + // FIXME: on xp the function returns &pTeb->RealClientId, maybe VOID? return STATUS_SUCCESS; }

16 years, 3 months

[cfinck] 33749: Sync usp10 with Wine again, fixes the corrupted text display in AbiWord. Thanks to CMan for regression-testing! Also I removed Magnus' change in r33700. If this is really required, please name the reason and add the change to a usp10_ros.diff file as this is a Wine-synched component. Also don't forget to include a header file for the DbgPrint prototype. See issue #3280 for more details.

by cfinck＠svn.reactos.org

Author: cfinck Date: Wed May 28 16:41:41 2008 New Revision: 33749 URL: http://svn.reactos.org/svn/reactos?rev=33749&view=rev Log: Sync usp10 with Wine again, fixes the corrupted text display in AbiWord. Thanks to CMan for regression-testing! Also I removed Magnus' change in r33700. If this is really required, please name the reason and add the change to a usp10_ros.diff file as this is a Wine-synched component. Also don't forget to include a header file for the DbgPrint prototype. See issue #3280 for more details. Modified: trunk/reactos/dll/win32/usp10/usp10.c trunk/reactos/dll/win32/usp10/usp10.spec Modified: trunk/reactos/dll/win32/usp10/usp10.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10.c?re… ============================================================================== --- trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] Wed May 28 16:41:41 2008 @@ -1407,27 +1407,22 @@ int iReserved, const WORD *pwGlyphs, int cGlyphs, const int *piAdvance, const int *piJustify, const GOFFSET *pGoffset) { - HFONT hfont; HRESULT hr = S_OK; TRACE("(%p, %p, %d, %d, %04x, %p, %p, %p, %d, %p, %d, %p, %p, %p)\n", hdc, psc, x, y, fuOptions, lprc, psa, pwcReserved, iReserved, pwGlyphs, cGlyphs, piAdvance, piJustify, pGoffset); - if (!hdc && psc && !*psc) return E_INVALIDARG; + if (!hdc || !psc) return E_INVALIDARG; if (!piAdvance || !psa || !pwGlyphs) return E_INVALIDARG; - if ((hr = get_script_cache(hdc, psc))) return hr; - - hfont = select_cached_font(psc); fuOptions &= ETO_CLIPPED + ETO_OPAQUE; if (!psa->fNoGlyphIndex) /* Have Glyphs? */ fuOptions |= ETO_GLYPH_INDEX; /* Say don't do translation to glyph */ - if (!ExtTextOutW(get_cache_hdc(psc), x, y, fuOptions, lprc, pwGlyphs, cGlyphs, NULL)) + if (!ExtTextOutW(hdc, x, y, fuOptions, lprc, pwGlyphs, cGlyphs, NULL)) hr = S_FALSE; - unselect_cached_font(psc, hfont); return hr; } @@ -1731,11 +1726,3 @@ for (i = 0; i < nbchars; i++) widths[i] = glyph_width[i]; return S_OK; } - - -VOID WINAPI LpkPresent() -{ - /* FIXME */ - DbgPrint("LPK: %s is unimplemented, please try again later.\n", __FUNCTION__); -} - Modified: trunk/reactos/dll/win32/usp10/usp10.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10.spec… ============================================================================== --- trunk/reactos/dll/win32/usp10/usp10.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/usp10.spec [iso-8859-1] Wed May 28 16:41:41 2008 @@ -1,4 +1,4 @@ -@ stdcall LpkPresent() +@ stub LpkPresent @ stdcall ScriptApplyDigitSubstitution(ptr ptr ptr) @ stub ScriptApplyLogicalWidth @ stdcall ScriptBreak(ptr long ptr ptr)

16 years, 3 months

[cfinck] 33748: Sorry, forgot this file

by cfinck＠svn.reactos.org

Author: cfinck Date: Wed May 28 16:37:05 2008 New Revision: 33748 URL: http://svn.reactos.org/svn/reactos?rev=33748&view=rev Log: Sorry, forgot this file Added: trunk/reactos/lib/sdk/crt/except/checkesp.c (with props) Added: trunk/reactos/lib/sdk/crt/except/checkesp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/checkes… ============================================================================== --- trunk/reactos/lib/sdk/crt/except/checkesp.c (added) +++ trunk/reactos/lib/sdk/crt/except/checkesp.c [iso-8859-1] Wed May 28 16:37:05 2008 @@ -1,0 +1,35 @@ +/********************************************************************* +* _chkesp (MSVCRT.@) +* +* Trap to a debugger if the value of the stack pointer has changed. +* +* PARAMS +* None. +* +* RETURNS +* Does not return. +* +* NOTES +* This function is available for iX86 only. +* +* When VC++ generates debug code, it stores the value of the stack pointer +* before calling any external function, and checks the value following +* the call. It then calls this function, which will trap if the values are +* not the same. Usually this means that the prototype used to call +* the function is incorrect. It can also mean that the .spec entry has +* the wrong calling convention or parameters. +*/ + +#ifdef __i386__ + +void _chkesp(void) +{ +} + +#else + +void _chkesp(void) +{ +} + +#endif /* __i386__ */ Propchange: trunk/reactos/lib/sdk/crt/except/checkesp.c ------------------------------------------------------------------------------ svn:eol-style = native

16 years, 3 months

[dreimer] 33746: Add winhlp32 to bootcd.

by dreimer＠svn.reactos.org

Author: dreimer Date: Wed May 28 15:10:50 2008 New Revision: 33746 URL: http://svn.reactos.org/svn/reactos?rev=33746&view=rev Log: Add winhlp32 to bootcd. Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Wed May 28 15:10:50 2008 @@ -71,6 +71,7 @@ base\applications\shutdown\shutdown.exe 1 base\applications\sndvol32\sndvol32.exe 1 base\applications\taskmgr\taskmgr.exe 1 +base\applications\winhlp32\winhlp32.exe 1 base\applications\wordpad\wordpad.exe 1 base\services\dhcp\dhcp.exe 1

16 years, 3 months

[tkreuzer] 33745: DCOrg is in device coordinates, fix a comment accordingly

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed May 28 15:03:36 2008 New Revision: 33745 URL: http://svn.reactos.org/svn/reactos?rev=33745&view=rev Log: DCOrg is in device coordinates, fix a comment accordingly Modified: trunk/reactos/subsystems/win32/win32k/objects/line.c Modified: trunk/reactos/subsystems/win32/win32k/objects/line.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/line.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/line.c [iso-8859-1] Wed May 28 15:03:36 2008 @@ -129,7 +129,7 @@ IntLPtoDP(dc, Points, 2); - /* FIXME: Is it correct to do this after the transformation? */ + /* The DCOrg is in device coordinates */ Points[0].x += dc->w.DCOrgX; Points[0].y += dc->w.DCOrgY; Points[1].x += dc->w.DCOrgX;

16 years, 3 months

[greatlrd] 33744: This file will be share between dxg and win32k explain why will follow in documentations that Z98 helping me writing at moment. they will be release to public fast explain windows xp and higher have two gdi table, it is better reuse same macro for both, that rewrite it one more time.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Wed May 28 15:03:10 2008 New Revision: 33744 URL: http://svn.reactos.org/svn/reactos?rev=33744&view=rev Log: This file will be share between dxg and win32k explain why will follow in documentations that Z98 helping me writing at moment. they will be release to public fast explain windows xp and higher have two gdi table, it is better reuse same macro for both, that rewrite it one more time. Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h [iso-8859-1] Wed May 28 15:03:10 2008 @@ -51,7 +51,6 @@ */ /*@{*/ #define GDI_OBJECT_TYPE_DC 0x00010000 -#define GDI_OBJECT_TYPE_DIRECTDRAW 0x00020000 /* Should be moved away from gdi objects */ #define GDI_OBJECT_TYPE_DD_SURFACE 0x00030000 /* Should be moved away from gdi objects */ #define GDI_OBJECT_TYPE_REGION 0x00040000 #define GDI_OBJECT_TYPE_BITMAP 0x00050000 @@ -66,9 +65,13 @@ #define GDI_OBJECT_TYPE_DD_MOTIONCOMP 0x00140000 /* Should be moved away from gdi objects */ #define GDI_OBJECT_TYPE_ENUMFONT 0x00160000 +/* Confrim on XP value is taken from NtGdiCreateDirectDrawObject */ +#define GDI_OBJECT_TYPE_DIRECTDRAW 0x00200000 + /* Following object types are derived types from the above base types use 0x001f0000 as mask to get the base type */ #define GDI_OBJECT_TYPE_EMF 0x00210000 + #define GDI_OBJECT_TYPE_METAFILE 0x00260000 #define GDI_OBJECT_TYPE_ENHMETAFILE 0x00460000 #define GDI_OBJECT_TYPE_PEN 0x00300000

16 years, 3 months

[tkreuzer] 33743: EngLineTo: if pco == NULL use a private clip object, initialized with bounds rect

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed May 28 15:00:03 2008 New Revision: 33743 URL: http://svn.reactos.org/svn/reactos?rev=33743&view=rev Log: EngLineTo: if pco == NULL use a private clip object, initialized with bounds rect Modified: trunk/reactos/subsystems/win32/win32k/eng/lineto.c Modified: trunk/reactos/subsystems/win32/win32k/eng/lineto.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/lineto.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/lineto.c [iso-8859-1] Wed May 28 15:00:03 2008 @@ -348,6 +348,7 @@ INTENG_ENTER_LEAVE EnterLeave; RECT_ENUM RectEnum; BOOL EnumMore; + CLIPOBJ *pcoPriv = NULL; if (x1 < x2) { @@ -373,6 +374,15 @@ if (! IntEngEnter(&EnterLeave, DestObj, &DestRect, FALSE, &Translate, &OutputObj)) { return FALSE; + } + + if (!Clip) + { + Clip = pcoPriv = IntEngCreateClipRegion(0, 0, RectBounds); + if (!Clip) + { + return FALSE; + } } x1 += Translate.x; @@ -485,6 +495,11 @@ SEtoNW(OutputObj, Clip, Brush, x, y, deltax, deltay, &Translate); } } + } + + if (pcoPriv) + { + IntEngDeleteClipRegion(pcoPriv); } return IntEngLeave(&EnterLeave);

16 years, 3 months

[dchapyshev] 33742: - Add baseaddress for shimgvw.dll

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Wed May 28 14:53:41 2008 New Revision: 33742 URL: http://svn.reactos.org/svn/reactos?rev=33742&view=rev Log: - Add baseaddress for shimgvw.dll Modified: trunk/reactos/baseaddress.rbuild Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=337… ============================================================================== --- trunk/reactos/baseaddress.rbuild [iso-8859-1] (original) +++ trunk/reactos/baseaddress.rbuild [iso-8859-1] Wed May 28 14:53:41 2008 @@ -21,6 +21,7 @@ <property name="BASEADDRESS_UEXT2" value="0x5b7a0000" /> <property name="BASEADDRESS_SLAYER" value="0x5c7e0000" /> <property name="BASEADDRESS_USRMGR" value="0x5c900000" /> + <property name="BASEADDRESS_SHIMGVW" value="0x5cb00000" /> <property name="BASEADDRESS_COMMCTRL" value="0x5d090000" /> <property name="BASEADDRESS_DPLAYX" value="0x5e080000" /> <property name="BASEADDRESS_INPUT" value ="0x5e400000" />

16 years, 3 months

← Newer
1
2
3
4
5
6
7
8
...
59
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2008