Ros-diffs June 2008

ros-diffs@reactos.org

23 participants
435 discussions

[greatlrd] 33887: Fixed almost all firefox 1.5 crash also sync with trunk thus files

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sat Jun 7 09:34:25 2008 New Revision: 33887 URL: http://svn.reactos.org/svn/reactos?rev=33887&view=rev Log: Fixed almost all firefox 1.5 crash also sync with trunk thus files Modified: branches/win32k-gdi-dx/subsystems/win32/win32k/objects/bitblt.c branches/win32k-gdi-dx/subsystems/win32/win32k/objects/dibobj.c branches/win32k-gdi-dx/subsystems/win32/win32k/objects/fillshap.c branches/win32k-gdi-dx/subsystems/win32/win32k/objects/polyfill.c Modified: branches/win32k-gdi-dx/subsystems/win32/win32k/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/win32k-gdi-dx/subsystems/win32/… ============================================================================== --- branches/win32k-gdi-dx/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] (original) +++ branches/win32k-gdi-dx/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] Sat Jun 7 09:34:25 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); @@ -88,14 +86,11 @@ 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; - YOriginDest += DCDest->w.DCOrgY; - XOriginSrc += DCSrc->w.DCOrgX; - YOriginSrc += DCSrc->w.DCOrgY; + XOriginDest += DCDest->ptlDCOrig.x; + YOriginDest += DCDest->ptlDCOrig.y; + XOriginSrc += DCSrc->ptlDCOrig.x; + YOriginSrc += DCSrc->ptlDCOrig.y; DestRect.left = XOriginDest; DestRect.top = YOriginDest; @@ -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,16 +224,16 @@ 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; - YDest += DCDest->w.DCOrgY; + XDest += DCDest->ptlDCOrig.x; + YDest += DCDest->ptlDCOrig.y; if (UsesSource) { - XSrc += DCSrc->w.DCOrgX; - YSrc += DCSrc->w.DCOrgY; + XSrc += DCSrc->ptlDCOrig.x; + YSrc += DCSrc->ptlDCOrig.y; } DestRect.left = XDest; @@ -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,65 +289,25 @@ /* 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; } } /* Perform the bitblt operation */ - Status = IntEngBitBlt(&BitmapDest->SurfObj, &BitmapSrc->SurfObj, NULL, + Status = IntEngBitBlt( BitmapDest ? &BitmapDest->SurfObj : NULL, BitmapSrc ? &BitmapSrc->SurfObj : NULL, NULL, DCDest->CombinedClip, XlateObj, &DestRect, &SourcePoint, NULL, 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; @@ -454,43 +392,51 @@ } /* Offset positions */ - xDst += DCDest->w.DCOrgX; - yDst += DCDest->w.DCOrgY; - xSrc += DCSrc->w.DCOrgX; - ySrc += DCSrc->w.DCOrgY; - - if(DCDest->DcLevel.hpal) - DestPalette = DCDest->DcLevel.hpal; - - if(DCSrc->DcLevel.hpal) - SourcePalette = DCSrc->DcLevel.hpal; + xDst += DCDest->ptlDCOrig.x; + yDst += DCDest->ptlDCOrig.y; + xSrc += DCSrc->ptlDCOrig.x; + ySrc += DCSrc->ptlDCOrig.y; + + 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 = pPrimarySurface->DevInfo.hpalDefault; + + SourcePalette = BitmapSrc->hDIBPalette; + if (!SourcePalette) SourcePalette = pPrimarySurface->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; - BITMAPOBJ *BitmapDest, *BitmapSrc; + PDC_ATTR Dc_Attr; + BITMAPOBJ *BitmapDest, *BitmapSrc = NULL; 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,12 +796,13 @@ } /* Offset the destination and source by the origin of their DCs. */ - XOriginDest += DCDest->w.DCOrgX; - YOriginDest += DCDest->w.DCOrgY; + // FIXME: ptlDCOrig is in device coordinates! + XOriginDest += DCDest->ptlDCOrig.x; + YOriginDest += DCDest->ptlDCOrig.y; if (UsesSource) { - XOriginSrc += DCSrc->w.DCOrgX; - YOriginSrc += DCSrc->w.DCOrgY; + XOriginSrc += DCSrc->ptlDCOrig.x; + YOriginSrc += DCSrc->ptlDCOrig.y; } DestRect.left = XOriginDest; @@ -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,18 +912,26 @@ &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) + if ( (BitmapSrc) && + (BitmapSrc != BitmapDest)) { BITMAPOBJ_UnlockBitmap(BitmapSrc); } - BITMAPOBJ_UnlockBitmap(BitmapDest); + + if (BitmapDest) + { + BITMAPOBJ_UnlockBitmap(BitmapDest); + } + if (UsesSource && hDCSrc != hDCDest) { DC_UnlockDc(DCSrc); @@ -1038,30 +970,30 @@ { if (Width > 0) { - DestRect.left = XLeft + dc->w.DCOrgX; - DestRect.right = XLeft + Width + dc->w.DCOrgX; + DestRect.left = XLeft + dc->ptlDCOrig.x; + DestRect.right = XLeft + Width + dc->ptlDCOrig.x; } else { - DestRect.left = XLeft + Width + 1 + dc->w.DCOrgX; - DestRect.right = XLeft + dc->w.DCOrgX + 1; + DestRect.left = XLeft + Width + 1 + dc->ptlDCOrig.x; + DestRect.right = XLeft + dc->ptlDCOrig.x + 1; } if (Height > 0) { - DestRect.top = YLeft + dc->w.DCOrgY; - DestRect.bottom = YLeft + Height + dc->w.DCOrgY; + DestRect.top = YLeft + dc->ptlDCOrig.y; + DestRect.bottom = YLeft + Height + dc->ptlDCOrig.y; } else { - DestRect.top = YLeft + Height + dc->w.DCOrgY + 1; - DestRect.bottom = YLeft + dc->w.DCOrgY + 1; + DestRect.top = YLeft + Height + dc->ptlDCOrig.y + 1; + DestRect.bottom = YLeft + dc->ptlDCOrig.y + 1; } IntLPtoDP(dc, (LPPOINT)&DestRect, 2); - BrushOrigin.x = BrushObj->ptOrigin.x + dc->w.DCOrgX; - BrushOrigin.y = BrushObj->ptOrigin.y + dc->w.DCOrgY; + BrushOrigin.x = BrushObj->ptOrigin.x + dc->ptlDCOrig.x; + BrushOrigin.y = BrushObj->ptOrigin.y + dc->ptlDCOrig.y; IntGdiInitBrushInstance(&BrushInst, BrushObj, dc->XlateBrush); @@ -1074,7 +1006,7 @@ &DestRect, NULL, NULL, - &BrushInst.BrushObject, + &BrushInst.BrushObject, // use pDC->eboFill &BrushOrigin, ROP3_TO_ROP4(ROP)); } @@ -1144,10 +1076,18 @@ DWORD ROP) { PGDIBRUSHOBJ BrushObj; - DC *dc = DC_LockDc(hDC); + DC *dc; PDC_ATTR Dc_Attr; BOOL ret; + BOOL UsesSource = ROP3_USES_SOURCE(ROP); + if (UsesSource) + { + /* in this case we call on GdiMaskBlt */ + return NtGdiMaskBlt(hDC, XLeft, YLeft, Width, Height, 0,0,0,0,0,0,ROP,0); + } + + dc = DC_LockDc(hDC); if (dc == NULL) { SetLastWin32Error(ERROR_INVALID_HANDLE); Modified: branches/win32k-gdi-dx/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/branches/win32k-gdi-dx/subsystems/win32/… ============================================================================== --- branches/win32k-gdi-dx/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ branches/win32k-gdi-dx/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Sat Jun 7 09:34:25 2008 @@ -372,8 +372,14 @@ rcDest.left = XDest; rcDest.top = YDest; - rcDest.right = XDest + Width; - rcDest.bottom = YDest + Height; + if (bTransformCoordinates) + { + CoordLPtoDP(pDC, (LPPOINT)&rcDest); + } + rcDest.left += pDC->ptlDCOrig.x; + rcDest.top += pDC->ptlDCOrig.y; + rcDest.right = rcDest.left + Width; + rcDest.bottom = rcDest.top + Height; ptSource.x = XSrc; ptSource.y = YSrc; @@ -758,7 +764,7 @@ INT APIENTRY NtGdiStretchDIBitsInternal( - HDC hDC, + HDC hdc, INT XDest, INT YDest, INT DestWidth, @@ -779,6 +785,7 @@ HDC hdcMem; HPALETTE hPal = NULL; PDC pDC; + HDC hDC = hdc; if (!Bits || !BitsInfo) { @@ -786,15 +793,33 @@ return 0; } + /* if hdc is null we get it, for NtGdiCreateCompatibleDC can not handle NULL hdc */ + if (hDC == NULL) + { + DPRINT1("hdc is NULL we using GetDC(NULL) hdc\n"); + hDC = NtUserGetDC(NULL); + } + hdcMem = NtGdiCreateCompatibleDC(hDC); + if (hdcMem == NULL) + { + DPRINT1("Waring : NtGdiCreateCompatibleDC fails \n"); + } + hBitmap = NtGdiCreateCompatibleBitmap(hDC, BitsInfo->bmiHeader.biWidth, BitsInfo->bmiHeader.biHeight); + + if (hBitmap == NULL) + { + DPRINT1("Waring : NtGdiCreateCompatibleBitmap fails \n"); + } + hOldBitmap = NtGdiSelectBitmap(hdcMem, hBitmap); if(Usage == DIB_PAL_COLORS) { hPal = NtGdiGetDCObject(hDC, GDI_OBJECT_TYPE_PALETTE); - hPal = NtUserSelectPalette(hdcMem, hPal, FALSE); + hPal = GdiSelectPalette(hdcMem, hPal, FALSE); } if (BitsInfo->bmiHeader.biCompression == BI_RLE4 || @@ -811,12 +836,18 @@ } pDC = DC_LockDc(hdcMem); - - IntSetDIBits(pDC, hBitmap, 0, BitsInfo->bmiHeader.biHeight, Bits, + if (pDC != NULL) + { + /* Note BitsInfo->bmiHeader.biHeight is the number of scanline, + * if it negitve we getting to many scanline for scanline is UINT not + * a INT, so we need make the negtive value to positve and that make the + * count correct for negtive bitmap, TODO : we need testcase for this api */ + + IntSetDIBits(pDC, hBitmap, 0, abs(BitsInfo->bmiHeader.biHeight), Bits, BitsInfo, Usage); - DC_UnlockDc(pDC); - + DC_UnlockDc(pDC); + } /* Origin for DIBitmap may be bottom left (positive biHeight) or top left (negative biHeight) */ @@ -830,11 +861,18 @@ SrcWidth, SrcHeight, ROP, 0); if(hPal) - NtUserSelectPalette(hdcMem, hPal, FALSE); + GdiSelectPalette(hdcMem, hPal, FALSE); NtGdiSelectBitmap(hdcMem, hOldBitmap); - NtGdiDeleteObjectApp(hdcMem); - NtGdiDeleteObject(hBitmap); + + if (hdcMem) + NtGdiDeleteObjectApp(hdcMem); + + if (hBitmap) + NtGdiDeleteObject(hBitmap); + + if (hdc == NULL) + UserReleaseDC(NULL, hDC, FALSE); return SrcHeight; } @@ -993,6 +1031,8 @@ HBITMAP hbitmap = 0; DC *dc; BOOL bDesktopDC = FALSE; + + if (!bmi) return hbitmap; // Make sure. // If the reference hdc is null, take the desktop dc if (hDC == 0) Modified: branches/win32k-gdi-dx/subsystems/win32/win32k/objects/fillshap.c URL: http://svn.reactos.org/svn/reactos/branches/win32k-gdi-dx/subsystems/win32/… ============================================================================== --- branches/win32k-gdi-dx/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] (original) +++ branches/win32k-gdi-dx/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] Sat Jun 7 09:34:25 2008 @@ -73,8 +73,8 @@ IntLPtoDP(dc, UnsafePoints, Count); for (CurrentPoint = 0; CurrentPoint < Count; CurrentPoint++) { - UnsafePoints[CurrentPoint].x += dc->w.DCOrgX; - UnsafePoints[CurrentPoint].y += dc->w.DCOrgY; + UnsafePoints[CurrentPoint].x += dc->ptlDCOrig.x; + UnsafePoints[CurrentPoint].y += dc->ptlDCOrig.y; } if (PATH_IsPathOpen(dc->w.path)) @@ -157,7 +157,8 @@ LPINT PolyCounts, int Count) { - while (--Count >=0) + /* crash in POLYGONFILL_MakeEdgeList if we process point 0 */ + while (--Count >=1) { if (!IntGdiPolygon ( dc, Points, *PolyCounts )) return FALSE; @@ -273,10 +274,10 @@ IntLPtoDP(dc, (LPPOINT)&RectBounds, 2); - RectBounds.left += dc->w.DCOrgX; - RectBounds.right += dc->w.DCOrgX; - RectBounds.top += dc->w.DCOrgY; - RectBounds.bottom += dc->w.DCOrgY; + RectBounds.left += dc->ptlDCOrig.x; + RectBounds.right += dc->ptlDCOrig.x; + RectBounds.top += dc->ptlDCOrig.y; + RectBounds.bottom += dc->ptlDCOrig.y; RadiusX = max((RectBounds.right - RectBounds.left) >> 1, 1); RadiusY = max((RectBounds.bottom - RectBounds.top) >> 1, 1); @@ -683,14 +684,14 @@ return FALSE; } - Left += dc->w.DCOrgX; - Right += dc->w.DCOrgX; - Top += dc->w.DCOrgY; - Bottom += dc->w.DCOrgY; - XRadialStart += dc->w.DCOrgX; - YRadialStart += dc->w.DCOrgY; - XRadialEnd += dc->w.DCOrgX; - YRadialEnd += dc->w.DCOrgY; + Left += dc->ptlDCOrig.x; + Right += dc->ptlDCOrig.x; + Top += dc->ptlDCOrig.y; + Bottom += dc->ptlDCOrig.y; + XRadialStart += dc->ptlDCOrig.x; + YRadialStart += dc->ptlDCOrig.y; + XRadialEnd += dc->ptlDCOrig.x; + YRadialEnd += dc->ptlDCOrig.y; RectBounds.left = Left; RectBounds.right = Right; @@ -1047,10 +1048,10 @@ } else { - LeftRect += dc->w.DCOrgX; - RightRect += dc->w.DCOrgX - 1; - TopRect += dc->w.DCOrgY; - BottomRect += dc->w.DCOrgY - 1; + LeftRect += dc->ptlDCOrig.x; + RightRect += dc->ptlDCOrig.x - 1; + TopRect += dc->ptlDCOrig.y; + BottomRect += dc->ptlDCOrig.y - 1; DestRect.left = LeftRect; DestRect.right = RightRect; @@ -1207,10 +1208,10 @@ xradius = xCurveDiameter >> 1; yradius = yCurveDiameter >> 1; - left += dc->w.DCOrgX; - right += dc->w.DCOrgX; - top += dc->w.DCOrgY; - bottom += dc->w.DCOrgY; + left += dc->ptlDCOrig.x; + right += dc->ptlDCOrig.x; + top += dc->ptlDCOrig.y; + bottom += dc->ptlDCOrig.y; RectBounds.left = left; RectBounds.right = right; @@ -1492,6 +1493,7 @@ POINTL DitherOrg; ULONG Mode, i; BOOL Ret; + HPALETTE hDestPalette; ASSERT(dc); ASSERT(pVertex); @@ -1539,8 +1541,8 @@ Extent.bottom = max(Extent.bottom, (pVertex + i)->y); } - DitherOrg.x = dc->w.DCOrgX; - DitherOrg.y = dc->w.DCOrgY; + DitherOrg.x = dc->ptlDCOrig.x; + DitherOrg.y = dc->ptlDCOrig.y; Extent.left += DitherOrg.x; Extent.right += DitherOrg.x; Extent.top += DitherOrg.y; @@ -1550,13 +1552,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 = pPrimarySurface->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: branches/win32k-gdi-dx/subsystems/win32/win32k/objects/polyfill.c URL: http://svn.reactos.org/svn/reactos/branches/win32k-gdi-dx/subsystems/win32/… ============================================================================== --- branches/win32k-gdi-dx/subsystems/win32/win32k/objects/polyfill.c [iso-8859-1] (original) +++ branches/win32k-gdi-dx/subsystems/win32/win32k/objects/polyfill.c [iso-8859-1] Sat Jun 7 09:34:25 2008 @@ -281,6 +281,7 @@ else list->Edges[list->Count++] = e; } + /* notes pionts does not come with paris from IntGdiPolyPolygon */ e = POLYGONFILL_MakeEdge ( Points[CurPt-1], Points[0] ); if ( !e ) goto fail;

16 years, 3 months

[fireball] 33886: - Cleanup leftovers and bugs from GreatLord's fix. I think this is my last "postfix" of GreatLord's commits to trunk.

by fireball＠svn.reactos.org

Author: fireball Date: Sat Jun 7 07:58:48 2008 New Revision: 33886 URL: http://svn.reactos.org/svn/reactos?rev=33886&view=rev Log: - Cleanup leftovers and bugs from GreatLord's fix. I think this is my last "postfix" of GreatLord's commits to trunk. Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Sat Jun 7 07:58:48 2008 @@ -806,9 +806,12 @@ DPRINT1("NtGdiCreateCompatibleBitmap fail create bitmap\n"); DPRINT1("hDC : 0x%08x \n", hDC); DPRINT1("BitsInfo->bmiHeader.biWidth : 0x%08x \n", BitsInfo->bmiHeader.biWidth); - DPRINT1("BitsInfo->bmiHeader.biWidth : 0x%08x \n", BitsInfo->bmiHeader.biHeight); + DPRINT1("BitsInfo->bmiHeader.biHeight : 0x%08x \n", BitsInfo->bmiHeader.biHeight); return 0; } + + /* Select the bitmap into hdcMem, and save a handle to the old bitmap */ + hOldBitmap = NtGdiSelectBitmap(hdcMem, hBitmap); if(Usage == DIB_PAL_COLORS) { @@ -859,10 +862,8 @@ if(hPal) GdiSelectPalette(hdcMem, hPal, FALSE); - if (hOldBitmap != NULL) - { - NtGdiSelectBitmap(hdcMem, hOldBitmap); - } + if (hOldBitmap) + NtGdiSelectBitmap(hdcMem, hOldBitmap); NtGdiDeleteObjectApp(hdcMem);

16 years, 3 months

[greatlrd] 33885: BugFix : NtGdiStretchDIBitsInternal it did not check after some NULL pointer and did crash in firefox. and some reason NtGdiCreateCompatibleBitmap fail in some case, that what happen in firefox 1.5.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sat Jun 7 06:35:53 2008 New Revision: 33885 URL: http://svn.reactos.org/svn/reactos?rev=33885&view=rev Log: BugFix : NtGdiStretchDIBitsInternal it did not check after some NULL pointer and did crash in firefox. and some reason NtGdiCreateCompatibleBitmap fail in some case, that what happen in firefox 1.5. Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Sat Jun 7 06:35:53 2008 @@ -781,7 +781,7 @@ UINT cjMaxBits, HANDLE hcmXform) { - HBITMAP hBitmap, hOldBitmap; + HBITMAP hBitmap, hOldBitmap = NULL; HDC hdcMem; HPALETTE hPal = NULL; PDC pDC; @@ -793,9 +793,22 @@ } hdcMem = NtGdiCreateCompatibleDC(hDC); + if (hdcMem == NULL) + { + DPRINT1("NtGdiCreateCompatibleDC fail create hdc\n"); + return 0; + } + hBitmap = NtGdiCreateCompatibleBitmap(hDC, BitsInfo->bmiHeader.biWidth, BitsInfo->bmiHeader.biHeight); - hOldBitmap = NtGdiSelectBitmap(hdcMem, hBitmap); + if (hBitmap == NULL) + { + DPRINT1("NtGdiCreateCompatibleBitmap fail create bitmap\n"); + DPRINT1("hDC : 0x%08x \n", hDC); + DPRINT1("BitsInfo->bmiHeader.biWidth : 0x%08x \n", BitsInfo->bmiHeader.biWidth); + DPRINT1("BitsInfo->bmiHeader.biWidth : 0x%08x \n", BitsInfo->bmiHeader.biHeight); + return 0; + } if(Usage == DIB_PAL_COLORS) { @@ -817,16 +830,18 @@ } pDC = DC_LockDc(hdcMem); - - /* Note BitsInfo->bmiHeader.biHeight is the number of scanline, - * if it negitve we getting to many scanline for scanline is UINT not - * a INT, so we need make the negtive value to positve and that make the - * count correct for negtive bitmap, TODO : we need testcase for this api */ - - IntSetDIBits(pDC, hBitmap, 0, abs(BitsInfo->bmiHeader.biHeight), Bits, + if (pDC != NULL) + { + /* Note BitsInfo->bmiHeader.biHeight is the number of scanline, + * if it negitve we getting to many scanline for scanline is UINT not + * a INT, so we need make the negtive value to positve and that make the + * count correct for negtive bitmap, TODO : we need testcase for this api */ + + IntSetDIBits(pDC, hBitmap, 0, abs(BitsInfo->bmiHeader.biHeight), Bits, BitsInfo, Usage); - DC_UnlockDc(pDC); + DC_UnlockDc(pDC); + } /* Origin for DIBitmap may be bottom left (positive biHeight) or top @@ -840,11 +855,17 @@ hdcMem, XSrc, abs(BitsInfo->bmiHeader.biHeight) - SrcHeight - YSrc, SrcWidth, SrcHeight, ROP, 0); + /* cleanup */ if(hPal) GdiSelectPalette(hdcMem, hPal, FALSE); - NtGdiSelectBitmap(hdcMem, hOldBitmap); + if (hOldBitmap != NULL) + { + NtGdiSelectBitmap(hdcMem, hOldBitmap); + } + NtGdiDeleteObjectApp(hdcMem); + NtGdiDeleteObject(hBitmap); return SrcHeight;

16 years, 3 months

[greatlrd] 33884: fix one winetest for Bitmap and add note why some alpha blend test fails.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sat Jun 7 05:15:38 2008 New Revision: 33884 URL: http://svn.reactos.org/svn/reactos?rev=33884&view=rev Log: fix one winetest for Bitmap and add note why some alpha blend test fails. Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt.c Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] Sat Jun 7 05:15:38 2008 @@ -1081,10 +1081,13 @@ /* Validate input */ + /* FIXME when WindowOrg.x or .y are negitve this check are not vaild, + * we need convert the inputRect to the windows org and do it right */ InputRect = *SourceRect; if ( (InputRect.top < 0) || (InputRect.bottom < 0) || (InputRect.left < 0) || (InputRect.right < 0) ) { + SetLastWin32Error(ERROR_INVALID_PARAMETER); return FALSE; }

16 years, 3 months

[greatlrd] 33883: Fixed Alphablend crash in win32k

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sat Jun 7 04:43:35 2008 New Revision: 33883 URL: http://svn.reactos.org/svn/reactos?rev=33883&view=rev Log: Fixed Alphablend crash in win32k Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt.c Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] Sat Jun 7 04:43:35 2008 @@ -1064,20 +1064,33 @@ BlendObj->BlendFunction.BlendFlags, BlendObj->BlendFunction.SourceConstantAlpha, BlendObj->BlendFunction.AlphaFormat); + /* Validate input */ - if (DestRect->left >= DestRect->right || DestRect->top >= DestRect->bottom) - { - DPRINT1("Empty destination rectangle!\n"); + OutputRect = *DestRect; + if (OutputRect.right < OutputRect.left) + { + OutputRect.left = DestRect->right; + OutputRect.right = DestRect->left; + } + if (OutputRect.bottom < OutputRect.top) + { + OutputRect.left = DestRect->right; + OutputRect.right = DestRect->left; + } + + + /* Validate input */ + + InputRect = *SourceRect; + if ( (InputRect.top < 0) || (InputRect.bottom < 0) || + (InputRect.left < 0) || (InputRect.right < 0) ) + { return FALSE; } - if (SourceRect->left >= SourceRect->right || SourceRect->top >= SourceRect->bottom) - { - DPRINT1("Empty source rectangle!\n"); - return FALSE; - } + if (Dest == Source && - !(DestRect->left >= SourceRect->right || SourceRect->left >= DestRect->right || - DestRect->top >= SourceRect->bottom || SourceRect->top >= DestRect->bottom)) + !(OutputRect.left >= SourceRect->right || InputRect.left >= OutputRect.right || + OutputRect.top >= SourceRect->bottom || InputRect.top >= OutputRect.bottom)) { DPRINT1("Source and destination rectangles overlap!\n"); return FALSE; @@ -1109,11 +1122,11 @@ } /* Stretch source if needed */ - if (DestRect->right - DestRect->left != SourceRect->right - SourceRect->left || - DestRect->bottom - DestRect->top != SourceRect->bottom - SourceRect->top) - { - SourceStretchedSize.cx = DestRect->right - DestRect->left; - SourceStretchedSize.cy = DestRect->bottom - DestRect->top; + if (OutputRect.right - OutputRect.left != InputRect.right - InputRect.left || + OutputRect.bottom - OutputRect.top != InputRect.bottom - InputRect.top) + { + SourceStretchedSize.cx = OutputRect.right - OutputRect.left; + SourceStretchedSize.cy = OutputRect.bottom - OutputRect.top; Width = DIB_GetDIBWidthBytes(SourceStretchedSize.cx, BitsPerFormat(Source->iBitmapFormat)); /* FIXME: Maybe it is a good idea to use EngCreateDeviceBitmap and IntEngStretchBlt if possible to get a HW accelerated stretch. */ @@ -1142,7 +1155,7 @@ NULL, &SourceStretchedRect, SourceRect, NULL, NULL, NULL, COLORONCOLOR))*/ if (!EngStretchBlt(SourceStretchedObj, Source, NULL, NULL, NULL, - NULL, NULL, &SourceStretchedRect, SourceRect, + NULL, NULL, &SourceStretchedRect, &InputRect, NULL, COLORONCOLOR)) { DPRINT1("EngStretchBlt failed!\n"); @@ -1151,15 +1164,14 @@ EngDeleteSurface((HSURF)SourceStretchedBitmap); return FALSE; } - SourceRect = &SourceStretchedRect; + InputRect.top = SourceStretchedRect.top; + InputRect.bottom = SourceStretchedRect.bottom; + InputRect.left = SourceStretchedRect.left; + InputRect.right = SourceStretchedRect.right; Source = SourceStretchedObj; } /* Now call the DIB function */ - InputRect.left = SourceRect->left; - InputRect.right = SourceRect->right; - InputRect.top = SourceRect->top; - InputRect.bottom = SourceRect->bottom; if (!IntEngEnter(&EnterLeaveSource, Source, &InputRect, TRUE, &Translate, &InputObj)) { if (SourceStretchedObj != NULL) @@ -1173,15 +1185,11 @@ } return FALSE; } - InputRect.left = SourceRect->left + Translate.x; - InputRect.right = SourceRect->right + Translate.x; - InputRect.top = SourceRect->top + Translate.y; - InputRect.bottom = SourceRect->bottom + Translate.y; - - OutputRect.left = DestRect->left; - OutputRect.right = DestRect->right; - OutputRect.top = DestRect->top; - OutputRect.bottom = DestRect->bottom; + InputRect.left += Translate.x; + InputRect.right += Translate.x; + InputRect.top += Translate.y; + InputRect.bottom += Translate.y; + if (!IntEngEnter(&EnterLeaveDest, Dest, &OutputRect, FALSE, &Translate, &OutputObj)) { IntEngLeave(&EnterLeaveSource); @@ -1196,10 +1204,10 @@ } return FALSE; } - OutputRect.left = DestRect->left + Translate.x; - OutputRect.right = DestRect->right + Translate.x; - OutputRect.top = DestRect->top + Translate.y; - OutputRect.bottom = DestRect->bottom + Translate.y; + OutputRect.left += Translate.x; + OutputRect.right += Translate.x; + OutputRect.top += Translate.y; + OutputRect.bottom += Translate.y; Ret = FALSE; ClippingType = (ClipRegion == NULL) ? DC_TRIVIAL : ClipRegion->iDComplexity;

16 years, 3 months

[fireball] 33882: - Revert 33881, PatBlt may be buggy, but what was introduced in 33881 was a non-working hack. Unregresses FF2.0 installer having a black rectangle in the bottom of its window.

by fireball＠svn.reactos.org

Author: fireball Date: Sat Jun 7 04:20:05 2008 New Revision: 33882 URL: http://svn.reactos.org/svn/reactos?rev=33882&view=rev Log: - Revert 33881, PatBlt may be buggy, but what was introduced in 33881 was a non-working hack. Unregresses FF2.0 installer having a black rectangle in the bottom of its window. Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c 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] Sat Jun 7 04:20:05 2008 @@ -1069,13 +1069,10 @@ INT Height, DWORD ROP) { - /* FIXME PatBlt code is wrong, we using NtGdiBitBlt to workaround this bug for now, like random crash, and so on */ -#if 0 PGDIBRUSHOBJ BrushObj; DC *dc; PDC_ATTR Dc_Attr; BOOL ret; -#endif BOOL UsesSource = ROP3_USES_SOURCE(ROP); if (UsesSource) @@ -1084,9 +1081,6 @@ return NtGdiMaskBlt(hDC, XLeft, YLeft, Width, Height, 0,0,0,0,0,0,ROP,0); } - return NtGdiBitBlt( hDC, XLeft, YLeft, Width, Height, 0, 0, 0, ROP, 0, 0); - -#if 0 dc = DC_LockDc(hDC); if (dc == NULL) { @@ -1123,7 +1117,6 @@ DC_UnlockDc(dc); return ret; -#endif } BOOL STDCALL

16 years, 3 months

[greatlrd] 33881: disable NtGdiPatBlt code, in some case it can cause random crash and have some graphic glichters it need be rewrite.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sat Jun 7 02:58:39 2008 New Revision: 33881 URL: http://svn.reactos.org/svn/reactos?rev=33881&view=rev Log: disable NtGdiPatBlt code, in some case it can cause random crash and have some graphic glichters it need be rewrite. Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c 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] Sat Jun 7 02:58:39 2008 @@ -1069,18 +1069,24 @@ INT Height, DWORD ROP) { + /* FIXME PatBlt code is wrong, we using NtGdiBitBlt to workaround this bug for now, like random crash, and so on */ +#if 0 PGDIBRUSHOBJ BrushObj; DC *dc; PDC_ATTR Dc_Attr; + BOOL ret; +#endif + BOOL UsesSource = ROP3_USES_SOURCE(ROP); - BOOL ret; - if (UsesSource) { /* in this case we call on GdiMaskBlt */ return NtGdiMaskBlt(hDC, XLeft, YLeft, Width, Height, 0,0,0,0,0,0,ROP,0); } + return NtGdiBitBlt( hDC, XLeft, YLeft, Width, Height, 0, 0, 0, ROP, 0, 0); + +#if 0 dc = DC_LockDc(hDC); if (dc == NULL) { @@ -1117,6 +1123,7 @@ DC_UnlockDc(dc); return ret; +#endif } BOOL STDCALL

16 years, 3 months

[greatlrd] 33880: revert some change I did in r33877 for buch.c object it cause to many regress

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sat Jun 7 02:22:09 2008 New Revision: 33880 URL: http://svn.reactos.org/svn/reactos?rev=33880&view=rev Log: revert some change I did in r33877 for buch.c object it cause to many regress Modified: trunk/reactos/subsystems/win32/win32k/objects/brush.c 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] Sat Jun 7 02:22:09 2008 @@ -178,14 +178,7 @@ } else if (BrushObj->flAttrs & GDIBRUSH_IS_SOLID) { - if (XlateObj) - { BrushInst->BrushObject.iSolidColor = XLATEOBJ_iXlate(XlateObj, BrushObj->BrushAttr.lbColor); - } - else - { - BrushInst->BrushObject.iSolidColor = 0xFFFFFFFF; - } } else {

16 years, 3 months

[jimtabor] 33879: This does fix bug 3237. I've run this patch for two months now, it is still in the rough and needs cleaning up. Separates Owned and Class styles and gives them their own DCes.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Fri Jun 6 21:58:15 2008 New Revision: 33879 URL: http://svn.reactos.org/svn/reactos?rev=33879&view=rev Log: This does fix bug 3237. I've run this patch for two months now, it is still in the rough and needs cleaning up. Separates Owned and Class styles and gives them their own DCes. Modified: trunk/reactos/subsystems/win32/win32k/include/dce.h trunk/reactos/subsystems/win32/win32k/ntuser/class.c trunk/reactos/subsystems/win32/win32k/ntuser/windc.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/include/dce.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dce.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/dce.h [iso-8859-1] Fri Jun 6 21:58:15 2008 @@ -30,10 +30,8 @@ HWND hwndCurrent; HWND hwndDC; HRGN hClipRgn; - PVOID Class; DWORD DCXFlags; PEPROCESS pProcess; - DWORD Count; HANDLE Self; } DCE; /* PDCE already declared at top of file */ @@ -58,5 +56,6 @@ void FASTCALL DceFreeWindowDCE(PWINDOW_OBJECT Window); void FASTCALL DceEmptyCache(void); VOID FASTCALL DceResetActiveDCEs(PWINDOW_OBJECT Window); +void FASTCALL DceFreeClassDCE(HDC); #endif /* _WIN32K_DCE_H */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] Fri Jun 6 21:58:15 2008 @@ -76,6 +76,12 @@ CallProc = NextCallProc; } + if (Class->Dce) + { + DceFreeClassDCE(((PDCE)Class->Dce)->hDC); + Class->Dce = NULL; + } + IntFreeClassMenuName(Class); } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] Fri Jun 6 21:58:15 2008 @@ -73,29 +73,8 @@ { PDCE pDce; PWINDOW Wnd = NULL; - PVOID Class = NULL; if (Window) Wnd = Window->Wnd; - - if (Wnd) Class = Wnd->Class; - - if (Type == DCE_CLASS_DC) - { - PDCE pdce; - KeEnterCriticalRegion(); - pdce = FirstDce; - do - { - if (pdce->Class == Class) - { - pdce->Count++; - KeLeaveCriticalRegion(); - return pdce; - } - pdce = (PDCE)pdce->List.Flink; - } while (pdce != FirstDce); - KeLeaveCriticalRegion(); - } pDce = ExAllocatePoolWithTag(PagedPool, sizeof(DCE), TAG_PDCE); if(!pDce) @@ -111,8 +90,6 @@ pDce->hwndCurrent = (Window ? Window->hSelf : NULL); pDce->hClipRgn = NULL; pDce->pProcess = NULL; - pDce->Class = Class; - pDce->Count = 1; KeEnterCriticalRegion(); if (FirstDce == NULL) @@ -233,7 +210,6 @@ // Clean the DC if (!IntGdiCleanDC(dce->hDC)) return 0; - dce->DCXFlags &= ~DCX_DCEBUSY; if (dce->DCXFlags & DCX_DCEDIRTY) { /* don't keep around invalidated entries @@ -254,12 +230,13 @@ DC_UnlockDc(dc); } } + dce->DCXFlags &= ~DCX_DCEBUSY; DPRINT("Exit!!!!! DCX_CACHE!!!!!! hDC-> %x \n", dce->hDC); if (!IntGdiSetDCOwnerEx( dce->hDC, GDI_OBJ_HMGR_NONE, FALSE)) return 0; dce->pProcess = NULL; // Reset ownership. } - return 1; + return 1; // Released! } static VOID FASTCALL @@ -352,40 +329,54 @@ { PWINDOW_OBJECT Parent; ULONG DcxFlags; - DCE* Dce; + DCE* Dce = NULL; BOOL UpdateVisRgn = TRUE; BOOL UpdateClipOrigin = FALSE; PWINDOW Wnd = NULL; + HDC hDC = NULL; if (NULL == Window) - { // Do the same as GetDC with a NULL. -// Window = UserGetWindowObject(IntGetDesktopWindow()); -// if (Window) Wnd = Window->Wnd; -// else - Flags &= ~DCX_USESTYLE; + { + Flags &= ~DCX_USESTYLE; + Flags |= DCX_CACHE; } else Wnd = Window->Wnd; - if (NULL == Window || NULL == Window->Dce) - { - Flags |= DCX_CACHE; - } - + if (Flags & (DCX_WINDOW | DCX_PARENTCLIP)) Flags |= DCX_CACHE; + + // When GetDC is called with hWnd nz, DCX_CACHE & _WINDOW are clear w _USESTYLE set. if (Flags & DCX_USESTYLE) { Flags &= ~(DCX_CLIPCHILDREN | DCX_CLIPSIBLINGS | DCX_PARENTCLIP); - - if (Wnd->Style & WS_CLIPSIBLINGS) - { - Flags |= DCX_CLIPSIBLINGS; - } - - if (!(Flags & DCX_WINDOW)) + if (!(Flags & DCX_WINDOW)) // not window rectangle { if (Wnd->Class->Style & CS_PARENTDC) { Flags |= DCX_PARENTCLIP; + } + + if (!(Flags & DCX_CACHE) && // Not on the cheap wine list. + !(Wnd->Class->Style & CS_OWNDC) ) + { + if (!(Wnd->Class->Style & CS_CLASSDC)) + // The window is not POWNED or has any CLASS, so we are looking for cheap wine. + Flags |= DCX_CACHE; + else + { + if (Wnd->Class->Dce) hDC = ((PDCE)Wnd->Class->Dce)->hDC; + DPRINT("We have CLASS!!\n"); + } + } +/* else // For Testing! + { + DPRINT1("We have POWNER!!\n"); + if (Window->Dce) DPRINT1("We have POWNER with DCE!!\n"); + } +*/ + if (Wnd->Style & WS_CLIPSIBLINGS) + { + Flags |= DCX_CLIPSIBLINGS; } if (Wnd->Style & WS_CLIPCHILDREN && @@ -396,9 +387,12 @@ } else { + if (Wnd->Style & WS_CLIPSIBLINGS) Flags |= DCX_CLIPSIBLINGS; Flags |= DCX_CACHE; } } + + if (Flags & DCX_WINDOW) Flags &= ~DCX_CLIPCHILDREN; if (Flags & DCX_NOCLIPCHILDREN) { @@ -406,20 +400,19 @@ Flags &= ~(DCX_PARENTCLIP | DCX_CLIPCHILDREN); } - if (Flags & DCX_WINDOW) - { - Flags = (Flags & ~DCX_CLIPCHILDREN) | DCX_CACHE; - } - Parent = (Window ? Window->Parent : NULL); if (NULL == Window || !(Wnd->Style & WS_CHILD) || NULL == Parent) { Flags &= ~DCX_PARENTCLIP; - } - else if (Flags & DCX_PARENTCLIP) - { - Flags |= DCX_CACHE; + Flags |= DCX_CLIPSIBLINGS; + } + + /* it seems parent clip is ignored when clipping siblings or children */ + if (Flags & (DCX_CLIPSIBLINGS | DCX_CLIPCHILDREN)) Flags &= ~DCX_PARENTCLIP; + + if (Flags & DCX_PARENTCLIP) + { if ((Wnd->Style & WS_VISIBLE) && (Parent->Wnd->Style & WS_VISIBLE)) { @@ -431,10 +424,26 @@ } } + // Window nz, check to see if we still own this or it is just cheap wine tonight. + if (!(Flags & DCX_CACHE)) + { + if ( Wnd->ti != GetW32ThreadInfo()) Flags |= DCX_CACHE; // Ah~ Not Powned! Forced to be cheap~ + // Can only have one POWNED or CLASS. + if ( !Window->Dce && (Wnd->Class->Style & CS_OWNDC)) + Window->Dce = DceAllocDCE(NULL, DCE_WINDOW_DC); + else + Flags |= DCX_CACHE; + + if ( !Wnd->Class->Dce && (Wnd->Class->Style & CS_CLASSDC)) + Wnd->Class->Dce = DceAllocDCE(NULL, DCE_CLASS_DC); + else + Flags |= DCX_CACHE; + } + DcxFlags = Flags & DCX_CACHECOMPAREMASK; if (Flags & DCX_CACHE) - { + { // Scan the cheap wine list for our match. DCE* DceEmpty = NULL; DCE* DceUnused = NULL; KeEnterCriticalRegion(); @@ -444,6 +453,7 @@ // The reason for this you may ask? // Well, it seems ReactOS calls GetDC with out first creating a desktop DC window! // Need to test for null here. Not sure if this is a bug or a feature. +// First time use hax, need to use DceAllocDCE during window display init. if (!Dce) break; if ((Dce->DCXFlags & (DCX_CACHE | DCX_DCEBUSY)) == DCX_CACHE) @@ -474,26 +484,41 @@ { Dce = DceAllocDCE(NULL, DCE_CACHE_DC); } - } - else - { - Dce = Window->Dce; + + Dce->hwndCurrent = (Window ? Window->hSelf : NULL); + } + else // If we are here, we are POWNED or having CLASS. + { + KeEnterCriticalRegion(); + Dce = FirstDce; + do + { // Check for Window handle than HDC match for CLASS. + if ((Dce->hwndCurrent == Window->hSelf) || (Dce->hDC == hDC)) break; + Dce = (PDCE)Dce->List.Flink; + } while (Dce != FirstDce); + KeLeaveCriticalRegion(); + + DPRINT("DCX:Flags -> %x:%x\n",Dce->DCXFlags & DCX_CACHE, Flags & DCX_CACHE); + if (Dce->hwndCurrent == Window->hSelf) { - UpdateVisRgn = FALSE; /* updated automatically, via DCHook() */ + DPRINT("Owned DCE!\n"); + UpdateVisRgn = FALSE; /* updated automatically, via DCHook() */ } else { + DPRINT("Owned/Class DCE\n"); /* we should free dce->clip_rgn here, but Windows apparently doesn't */ - Dce->DCXFlags &= ~(DCX_EXCLUDERGN | DCX_INTERSECTRGN); - Dce->hClipRgn = NULL; - } + Dce->DCXFlags &= ~(DCX_EXCLUDERGN | DCX_INTERSECTRGN); + Dce->hClipRgn = NULL; + } + #if 1 /* FIXME */ UpdateVisRgn = TRUE; #endif - - } - + } + +// First time use hax, need to use DceAllocDCE during window display init. if (NULL == Dce) { return(NULL); @@ -501,15 +526,14 @@ if (!GDIOBJ_ValidateHandle(Dce->hDC, GDI_OBJECT_TYPE_DC)) { - DPRINT1("FIXME: Got DCE with invalid hDC!\n"); + DPRINT1("FIXME: Got DCE with invalid hDC! 0x%x\n", Dce->hDC); Dce->hDC = DceCreateDisplayDC(); /* FIXME: Handle error */ } - Dce->hwndCurrent = (Window ? Window->hSelf : NULL); Dce->DCXFlags = Flags | DCX_DCEBUSY; - - if (0 == (Flags & (DCX_EXCLUDERGN | DCX_INTERSECTRGN)) && NULL != ClipRegion) + + if (!(Flags & (DCX_EXCLUDERGN | DCX_INTERSECTRGN)) && ClipRegion) { if (!(Flags & DCX_KEEPCLIPRGN)) NtGdiDeleteObject(ClipRegion); @@ -583,10 +607,12 @@ if (Force && !GDIOBJ_OwnedByCurrentProcess(pdce->hDC)) { - DPRINT1("Change ownership for DCE!\n"); + DPRINT("Change ownership for DCE! -> %x\n" , pdce); // Note: Windows sets W32PF_OWNDCCLEANUP and moves on. if (!IsObjectDead((HGDIOBJ) pdce->hDC)) + { DC_SetOwnership( pdce->hDC, PsGetCurrentProcess()); + } else { DPRINT1("Attempted to change ownership of an DCEhDC 0x%x currently being destroyed!!!\n",pdce->hDC); @@ -614,6 +640,7 @@ return ret; } + /*********************************************************************** * DceFreeWindowDCE @@ -681,6 +708,25 @@ KeLeaveCriticalRegion(); } +void FASTCALL +DceFreeClassDCE(HDC hDC) +{ + PDCE pDCE = FirstDce; + KeEnterCriticalRegion(); + do + { + if(!pDCE) break; + if (pDCE->hDC == hDC) + { + pDCE = DceFreeDCE(pDCE, FALSE); + if(!pDCE) break; + continue; + } + pDCE = (PDCE)pDCE->List.Flink; + } while (pDCE != FirstDce); + KeLeaveCriticalRegion(); +} + VOID FASTCALL DceEmptyCache() { @@ -713,6 +759,7 @@ if(!pDCE) return; // Another null test! do { + if(!pDCE) break; if (0 == (pDCE->DCXFlags & DCX_DCEEMPTY)) { if (Window->hSelf == pDCE->hwndCurrent) @@ -774,23 +821,6 @@ } pDCE =(PDCE) pDCE->List.Flink; } while (pDCE != FirstDce); -} - -HDC -FASTCALL -IntGetDC(PWINDOW_OBJECT Window) -{ - if (!Window) - { // MSDN: - //"hWnd [in] Handle to the window whose DC is to be retrieved. - // If this value is NULL, GetDC retrieves the DC for the entire screen." - Window = UserGetWindowObject(IntGetDesktopWindow()); - if (Window) - return UserGetDCEx(Window, NULL, DCX_CACHE | DCX_WINDOW); - else - return NULL; - } - return UserGetDCEx(Window, NULL, DCX_USESTYLE); } HWND FASTCALL @@ -825,6 +855,7 @@ KeEnterCriticalRegion(); do { + if(!dce) break; if (dce->hDC == hDc) { Hit = TRUE; @@ -863,7 +894,6 @@ { RETURN(NULL); } - RETURN( UserGetDCEx(Wnd, ClipRegion, Flags)); CLEANUP: @@ -893,7 +923,8 @@ HDC STDCALL NtUserGetDC(HWND hWnd) { -// We have a problem here! Should call IntGetDC. + DPRINT("NtUGetDC -> %x:%x\n", hWnd, !hWnd ? DCX_CACHE | DCX_WINDOW : DCX_USESTYLE ); + return NtUserGetDCEx(hWnd, NULL, NULL == hWnd ? DCX_CACHE | DCX_WINDOW : DCX_USESTYLE); } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Fri Jun 6 21:58:15 2008 @@ -1791,9 +1791,11 @@ InsertTailList (&PsGetCurrentThreadWin32Thread()->WindowListHead, &Window->ThreadListEntry); /* Handle "CS_CLASSDC", it is tested first. */ - if (dwStyle & CS_CLASSDC) Window->Dce = DceAllocDCE(Window, DCE_CLASS_DC); + if ((Wnd->Class->Style & CS_CLASSDC) && !(Wnd->Class->Dce)) // One DCE per class to have CLASS. + Wnd->Class->Dce = DceAllocDCE(Window, DCE_CLASS_DC); /* Allocate a DCE for this window. */ - else if (dwStyle & CS_OWNDC) Window->Dce = DceAllocDCE(Window, DCE_WINDOW_DC); + else if ( Wnd->Class->Style & CS_OWNDC) + Window->Dce = DceAllocDCE(Window, DCE_WINDOW_DC); Pos.x = x; Pos.y = y;

16 years, 3 months

[greatlrd] 33878: small cleanup thx irc: aicom for notice this.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Fri Jun 6 20:18:55 2008 New Revision: 33878 URL: http://svn.reactos.org/svn/reactos?rev=33878&view=rev Log: small cleanup thx irc: aicom for notice this. Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt.c Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] Fri Jun 6 20:18:55 2008 @@ -601,7 +601,6 @@ if (DestSurf == NULL) return FALSE; - ASSERT(DestSurf); DestObj = CONTAINING_RECORD(DestSurf, BITMAPOBJ, SurfObj); ASSERT(DestObj);

16 years, 3 months

← Newer
1
...
32
33
34
35
36
37
38
...
44
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 June 2008