Ros-diffs April 2009

ros-diffs@reactos.org

25 participants
476 discussions

[tkreuzer] 40382: Remove a bunch of useless funtion pointer types

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Apr 6 04:12:48 2009 New Revision: 40382 URL: http://svn.reactos.org/svn/reactos?rev=40382&view=rev Log: Remove a bunch of useless funtion pointer types Modified: trunk/reactos/subsystems/win32/win32k/include/engobjects.h Modified: trunk/reactos/subsystems/win32/win32k/include/engobjects.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/engobjects.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/engobjects.h [iso-8859-1] Mon Apr 6 04:12:48 2009 @@ -88,51 +88,6 @@ PATHOBJ PathObj; } PATHGDI; -typedef BOOL (APIENTRY *PFN_BitBlt)(SURFOBJ *, SURFOBJ *, SURFOBJ *, CLIPOBJ *, - XLATEOBJ *, RECTL *, POINTL *, POINTL *, - BRUSHOBJ *, POINTL *, ROP4); - -typedef BOOL (APIENTRY *PFN_TransparentBlt)(SURFOBJ *, SURFOBJ *, CLIPOBJ *, XLATEOBJ *, RECTL *, RECTL *, ULONG, ULONG); - -typedef BOOL (APIENTRY *PFN_StretchBlt)(SURFOBJ *, SURFOBJ *, SURFOBJ *, CLIPOBJ *, - XLATEOBJ *, COLORADJUSTMENT *, POINTL *, - RECTL *, RECTL *, PPOINT, ULONG); - -typedef BOOL (APIENTRY *PFN_TextOut)(SURFOBJ *, STROBJ *, FONTOBJ *, CLIPOBJ *, - RECTL *, RECTL *, BRUSHOBJ *, BRUSHOBJ *, - POINTL *, MIX); - -typedef BOOL (APIENTRY *PFN_Paint)(SURFOBJ *, CLIPOBJ *, BRUSHOBJ *, POINTL *, MIX); - -typedef BOOL (APIENTRY *PFN_StrokePath)(SURFOBJ *, PATHOBJ *, CLIPOBJ *, XFORMOBJ *, - BRUSHOBJ *, POINTL *, LINEATTRS *, MIX); - -typedef BOOL (APIENTRY *PFN_FillPath)(SURFOBJ *, PATHOBJ *, CLIPOBJ *, BRUSHOBJ *, - POINTL *, MIX, ULONG); - -typedef BOOL (APIENTRY *PFN_StrokeAndFillPath)(SURFOBJ *, PATHOBJ *, CLIPOBJ *, - XFORMOBJ *, BRUSHOBJ *, LINEATTRS *, BRUSHOBJ *, - POINTL *, MIX, ULONG); - -typedef BOOL (APIENTRY *PFN_LineTo)(SURFOBJ *, CLIPOBJ *, BRUSHOBJ *, - LONG, LONG, LONG, LONG, RECTL *, MIX); - -typedef BOOL (APIENTRY *PFN_CopyBits)(SURFOBJ *, SURFOBJ *, CLIPOBJ *, - XLATEOBJ *, RECTL *, POINTL *); - -typedef VOID (APIENTRY *PFN_Synchronize)(DHPDEV, RECTL *); - -typedef VOID (APIENTRY *PFN_MovePointer)(SURFOBJ *, LONG, LONG, RECTL *); - -typedef ULONG (APIENTRY *PFN_SetPointerShape)(SURFOBJ *, SURFOBJ *, SURFOBJ *, XLATEOBJ *, - LONG, LONG, LONG, LONG, RECTL *, FLONG); - -typedef HBITMAP (APIENTRY *PFN_CreateDeviceBitmap)(DHPDEV, SIZEL, ULONG); - -typedef BOOL (APIENTRY *PFN_SetPalette)(DHPDEV, PALOBJ*, ULONG, ULONG, ULONG); - -typedef BOOL (APIENTRY *PFN_GradientFill)(SURFOBJ*, CLIPOBJ*, XLATEOBJ*, TRIVERTEX*, ULONG, PVOID, ULONG, RECTL*, POINTL*, ULONG); - typedef struct _WNDGDI { WNDOBJ WndObj; LIST_ENTRY ListEntry;

15 years, 9 months

[tkreuzer] 40381: - Update the EBRUSHOBJ independent of changing the brush/pen handle in DC_vUpdateFill/LineBrush - Mark the brushes as dirty after change of surface, palette and DIB colot table - Update the EBURHOBJs on demand in IntGdiPolygon and IntRectangle - Fixes bug 4340 See issue #4340 for more details.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Apr 6 03:51:27 2009 New Revision: 40381 URL: http://svn.reactos.org/svn/reactos?rev=40381&view=rev Log: - Update the EBRUSHOBJ independent of changing the brush/pen handle in DC_vUpdateFill/LineBrush - Mark the brushes as dirty after change of surface, palette and DIB colot table - Update the EBURHOBJs on demand in IntGdiPolygon and IntRectangle - Fixes bug 4340 See issue #4340 for more details. Modified: trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c trunk/reactos/subsystems/win32/win32k/objects/dibobj.c trunk/reactos/subsystems/win32/win32k/objects/fillshap.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c [iso-8859-1] Mon Apr 6 03:51:27 2009 @@ -85,11 +85,8 @@ BRUSH_ShareUnlockBrush(pdc->dclevel.pbrFill); pdc->dclevel.pbrFill = pbrFill; - /* ROS HACK, should use surf xlate */ - IntUpdateBrushXlate(pdc, &pdc->rosdc.XlateBrush, pbrFill); - - /* Update eboFill, realizing it, if needed */ - EBRUSHOBJ_vUpdate(&pdc->eboFill, pbrFill, pdc->rosdc.XlateBrush); + /* Mark eboFill as dirty */ + pdcattr->ulDirty_ |= DIRTY_FILL; } else { @@ -98,12 +95,24 @@ } } - /* ROS HACK, should use surf xlate */ - pxlo = pdc->rosdc.XlateBrush; + /* Check if the EBRUSHOBJ needs update */ + if (pdcattr->ulDirty_ & DIRTY_FILL) + { + pbrFill = pdc->dclevel.pbrFill; + + /* ROS HACK, should use surf xlate */ + IntUpdateBrushXlate(pdc, &pdc->rosdc.XlateBrush, pbrFill); + + /* Update eboFill, realizing it, if needed */ + EBRUSHOBJ_vUpdate(&pdc->eboFill, pbrFill, pdc->rosdc.XlateBrush); + } /* Check for DC brush */ if (pdcattr->hbrush == StockObjects[DC_BRUSH]) { + /* ROS HACK, should use surf xlate */ + pxlo = pdc->rosdc.XlateBrush; + /* Update the eboFill's solid color */ EBRUSHOBJ_vSetSolidBrushColor(&pdc->eboFill, pdcattr->crPenClr, pxlo); } @@ -131,11 +140,8 @@ BRUSH_ShareUnlockBrush(pdc->dclevel.pbrLine); pdc->dclevel.pbrLine = pbrLine; - /* ROS HACK, should use surf xlate */ - IntUpdateBrushXlate(pdc, &pdc->rosdc.XlatePen, pbrLine); - - /* Update eboLine, realizing it, if needed */ - EBRUSHOBJ_vUpdate(&pdc->eboLine, pbrLine, pdc->rosdc.XlatePen); + /* Mark eboLine as dirty */ + pdcattr->ulDirty_ |= DIRTY_LINE; } else { @@ -144,12 +150,24 @@ } } - /* ROS HACK, should use surf xlate */ - pxlo = pdc->rosdc.XlatePen; + /* Check if the EBRUSHOBJ needs update */ + if (pdcattr->ulDirty_ & DIRTY_LINE) + { + pbrLine = pdc->dclevel.pbrLine; + + /* ROS HACK, should use surf xlate */ + IntUpdateBrushXlate(pdc, &pdc->rosdc.XlatePen, pbrLine); + + /* Update eboLine, realizing it, if needed */ + EBRUSHOBJ_vUpdate(&pdc->eboLine, pbrLine, pdc->rosdc.XlatePen); + } /* Check for DC pen */ if (pdcattr->hpen == StockObjects[DC_PEN]) { + /* ROS HACK, should use surf xlate */ + pxlo = pdc->rosdc.XlatePen; + /* Update the eboLine's solid color */ EBRUSHOBJ_vSetSolidBrushColor(&pdc->eboLine, pdcattr->crPenClr, pxlo); } @@ -250,13 +268,13 @@ if ((pdc->rosdc.bitsPerPixel <= 8 && ppal->Mode == PAL_INDEXED) || (pdc->rosdc.bitsPerPixel > 8 && ppal->Mode != PAL_INDEXED)) { + /* Get old palette, set new one */ oldPal = pdc->dclevel.hpal; pdc->dclevel.hpal = hpal; - } - else if (pdc->rosdc.bitsPerPixel > 8 && ppal->Mode == PAL_INDEXED) - { - oldPal = pdc->dclevel.hpal; - pdc->dclevel.hpal = hpal; + + /* Mark the brushes invalid */ + pdc->pdcattr->ulDirty_ |= DIRTY_FILL | DIRTY_LINE | + DIRTY_BACKGROUND | DIRTY_TEXT; } PALETTE_UnlockPalette(ppal); @@ -382,7 +400,6 @@ HBITMAP hOrgBmp; PSURFACE psurfBmp, psurfOld; HRGN hVisRgn; - PBRUSH pbrush; if (hDC == NULL || hBmp == NULL) return NULL; @@ -443,20 +460,8 @@ /* Release the exclusive lock */ SURFACE_UnlockSurface(psurfBmp); - /* Regenerate the XLATEOBJs. (hack!) */ - pbrush = BRUSH_LockBrush(pdcattr->hbrush); - if (pbrush) - { - IntUpdateBrushXlate(pDC, &pDC->rosdc.XlateBrush, pbrush); - BRUSH_UnlockBrush(pbrush); - } - - pbrush = PEN_LockPen(pdcattr->hpen); - if (pbrush) - { - IntUpdateBrushXlate(pDC, &pDC->rosdc.XlatePen, pbrush); - PEN_UnlockPen(pbrush); - } + /* Mark the brushes invalid */ + pdcattr->ulDirty_ |= DIRTY_FILL | DIRTY_LINE; DC_UnlockDc(pDC); 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] Mon Apr 6 03:51:27 2009 @@ -128,6 +128,9 @@ } else Entries = 0; + + /* Mark the brushes invalid */ + dc->pdcattr->ulDirty_ |= DIRTY_FILL|DIRTY_LINE|DIRTY_BACKGROUND|DIRTY_TEXT; SURFACE_UnlockSurface(psurf); DC_UnlockDc(dc); 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] Mon Apr 6 03:51:27 2009 @@ -87,11 +87,11 @@ DestRect.bottom = max(DestRect.bottom, Points[CurrentPoint].y); } - if (pdcattr->ulDirty_ & DC_BRUSH_DIRTY) - IntGdiSelectBrush(dc,pdcattr->hbrush); - - if (pdcattr->ulDirty_ & DC_PEN_DIRTY) - IntGdiSelectPen(dc,pdcattr->hpen); + if (pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY)) + DC_vUpdateFillBrush(dc); + + if (pdcattr->ulDirty_ & (DIRTY_LINE | DC_PEN_DIRTY)) + DC_vUpdateLineBrush(dc); /* Special locking order to avoid lock-ups */ pbrFill = dc->dclevel.pbrFill; @@ -568,11 +568,11 @@ DestRect.bottom--; } - if (pdcattr->ulDirty_ & DC_BRUSH_DIRTY) - IntGdiSelectBrush(dc,pdcattr->hbrush); - - if (pdcattr->ulDirty_ & DC_PEN_DIRTY) - IntGdiSelectPen(dc,pdcattr->hpen); + if (pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY)) + DC_vUpdateFillBrush(dc); + + if (pdcattr->ulDirty_ & (DIRTY_LINE | DC_PEN_DIRTY)) + DC_vUpdateLineBrush(dc); pbrFill = dc->dclevel.pbrFill; pbrLine = dc->dclevel.pbrLine;

15 years, 9 months

[gschneider] 40380: - Evgeny Boltik, <BSTSoft AT narod DOT ru>: Add stretching support to TransparentBlt - This should improve themes support & probably show some bitmaps that were hidden before in certain applications - See bug #4337 for more information

by gschneider＠svn.reactos.org

Author: gschneider Date: Mon Apr 6 03:13:09 2009 New Revision: 40380 URL: http://svn.reactos.org/svn/reactos?rev=40380&view=rev Log: - Evgeny Boltik, <BSTSoft AT narod DOT ru>: Add stretching support to TransparentBlt - This should improve themes support & probably show some bitmaps that were hidden before in certain applications - See bug #4337 for more information Modified: trunk/reactos/subsystems/win32/win32k/dib/dib.c trunk/reactos/subsystems/win32/win32k/dib/dib.h trunk/reactos/subsystems/win32/win32k/dib/dib16bpp.c trunk/reactos/subsystems/win32/win32k/dib/dib1bpp.c trunk/reactos/subsystems/win32/win32k/dib/dib24bpp.c trunk/reactos/subsystems/win32/win32k/dib/dib32bpp.c trunk/reactos/subsystems/win32/win32k/dib/dib4bpp.c trunk/reactos/subsystems/win32/win32k/dib/dib8bpp.c trunk/reactos/subsystems/win32/win32k/eng/transblt.c trunk/reactos/subsystems/win32/win32k/objects/bitblt.c Modified: trunk/reactos/subsystems/win32/win32k/dib/dib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib.c [iso-8859-1] Mon Apr 6 03:13:09 2009 @@ -235,7 +235,7 @@ } BOOLEAN Dummy_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, - RECTL* DestRect, POINTL *SourcePoint, + RECTL* DestRect, RECTL *SourceRect, XLATEOBJ *ColorTranslation, ULONG iTransColor) { return FALSE; Modified: trunk/reactos/subsystems/win32/win32k/dib/dib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib.h [iso-8859-1] Mon Apr 6 03:13:09 2009 @@ -42,7 +42,7 @@ typedef VOID (*PFN_DIB_VLine)(SURFOBJ*,LONG,LONG,LONG,ULONG); typedef BOOLEAN (*PFN_DIB_BitBlt)(PBLTINFO); typedef BOOLEAN (*PFN_DIB_StretchBlt)(SURFOBJ*,SURFOBJ*,SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,BRUSHOBJ*,POINTL*,XLATEOBJ*,XLATEOBJ*,ROP4); -typedef BOOLEAN (*PFN_DIB_TransparentBlt)(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG); +typedef BOOLEAN (*PFN_DIB_TransparentBlt)(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,XLATEOBJ*,ULONG); typedef BOOLEAN (*PFN_DIB_ColorFill)(SURFOBJ*, RECTL*, ULONG); typedef BOOLEAN (*PFN_DIB_AlphaBlend)(SURFOBJ*, SURFOBJ*, RECTL*, RECTL*, CLIPOBJ*, XLATEOBJ*, BLENDOBJ*); @@ -68,7 +68,7 @@ VOID Dummy_VLine(SURFOBJ*,LONG,LONG,LONG,ULONG); BOOLEAN Dummy_BitBlt(PBLTINFO); BOOLEAN Dummy_StretchBlt(SURFOBJ*,SURFOBJ*,SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,BRUSHOBJ*,POINTL*,XLATEOBJ*,XLATEOBJ*,ROP4); -BOOLEAN Dummy_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG); +BOOLEAN Dummy_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,XLATEOBJ*,ULONG); BOOLEAN Dummy_ColorFill(SURFOBJ*, RECTL*, ULONG); BOOLEAN Dummy_AlphaBlend(SURFOBJ*, SURFOBJ*, RECTL*, RECTL*, CLIPOBJ*, XLATEOBJ*, BLENDOBJ*); @@ -78,7 +78,7 @@ VOID DIB_1BPP_VLine(SURFOBJ*,LONG,LONG,LONG,ULONG); BOOLEAN DIB_1BPP_BitBlt(PBLTINFO); BOOLEAN DIB_1BPP_BitBltSrcCopy(PBLTINFO); -BOOLEAN DIB_1BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG); +BOOLEAN DIB_1BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,XLATEOBJ*,ULONG); BOOLEAN DIB_1BPP_ColorFill(SURFOBJ*, RECTL*, ULONG); BOOLEAN DIB_1BPP_AlphaBlend(SURFOBJ*, SURFOBJ*, RECTL*, RECTL*, CLIPOBJ*, XLATEOBJ*, BLENDOBJ*); @@ -88,7 +88,7 @@ VOID DIB_4BPP_VLine(SURFOBJ*,LONG,LONG,LONG,ULONG); BOOLEAN DIB_4BPP_BitBlt(PBLTINFO); BOOLEAN DIB_4BPP_BitBltSrcCopy(PBLTINFO); -BOOLEAN DIB_4BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG); +BOOLEAN DIB_4BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,XLATEOBJ*,ULONG); BOOLEAN DIB_4BPP_ColorFill(SURFOBJ*, RECTL*, ULONG); BOOLEAN DIB_4BPP_AlphaBlend(SURFOBJ*, SURFOBJ*, RECTL*, RECTL*, CLIPOBJ*, XLATEOBJ*, BLENDOBJ*); @@ -98,7 +98,7 @@ VOID DIB_8BPP_VLine(SURFOBJ*,LONG,LONG,LONG,ULONG); BOOLEAN DIB_8BPP_BitBlt(PBLTINFO); BOOLEAN DIB_8BPP_BitBltSrcCopy(PBLTINFO); -BOOLEAN DIB_8BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG); +BOOLEAN DIB_8BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,XLATEOBJ*,ULONG); BOOLEAN DIB_8BPP_ColorFill(SURFOBJ*, RECTL*, ULONG); BOOLEAN DIB_8BPP_AlphaBlend(SURFOBJ*, SURFOBJ*, RECTL*, RECTL*, CLIPOBJ*, XLATEOBJ*, BLENDOBJ*); @@ -108,7 +108,7 @@ VOID DIB_16BPP_VLine(SURFOBJ*,LONG,LONG,LONG,ULONG); BOOLEAN DIB_16BPP_BitBlt(PBLTINFO); BOOLEAN DIB_16BPP_BitBltSrcCopy(PBLTINFO); -BOOLEAN DIB_16BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG); +BOOLEAN DIB_16BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,XLATEOBJ*,ULONG); BOOLEAN DIB_16BPP_ColorFill(SURFOBJ*, RECTL*, ULONG); BOOLEAN DIB_16BPP_AlphaBlend(SURFOBJ*, SURFOBJ*, RECTL*, RECTL*, CLIPOBJ*, XLATEOBJ*, BLENDOBJ*); @@ -118,7 +118,7 @@ VOID DIB_24BPP_VLine(SURFOBJ*,LONG,LONG,LONG,ULONG); BOOLEAN DIB_24BPP_BitBlt(PBLTINFO); BOOLEAN DIB_24BPP_BitBltSrcCopy(PBLTINFO); -BOOLEAN DIB_24BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG); +BOOLEAN DIB_24BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,XLATEOBJ*,ULONG); BOOLEAN DIB_24BPP_ColorFill(SURFOBJ*, RECTL*, ULONG); BOOLEAN DIB_24BPP_AlphaBlend(SURFOBJ*, SURFOBJ*, RECTL*, RECTL*, CLIPOBJ*, XLATEOBJ*, BLENDOBJ*); @@ -128,7 +128,7 @@ VOID DIB_32BPP_VLine(SURFOBJ*,LONG,LONG,LONG,ULONG); BOOLEAN DIB_32BPP_BitBlt(PBLTINFO); BOOLEAN DIB_32BPP_BitBltSrcCopy(PBLTINFO); -BOOLEAN DIB_32BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG); +BOOLEAN DIB_32BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,XLATEOBJ*,ULONG); BOOLEAN DIB_32BPP_ColorFill(SURFOBJ*, RECTL*, ULONG); BOOLEAN DIB_32BPP_AlphaBlend(SURFOBJ*, SURFOBJ*, RECTL*, RECTL*, CLIPOBJ*, XLATEOBJ*, BLENDOBJ*); Modified: trunk/reactos/subsystems/win32/win32k/dib/dib16bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib16bpp.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib16bpp.c [iso-8859-1] Mon Apr 6 03:13:09 2009 @@ -455,14 +455,23 @@ BOOLEAN DIB_16BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, - RECTL* DestRect, POINTL *SourcePoint, + RECTL* DestRect, RECTL *SourceRect, XLATEOBJ *ColorTranslation, ULONG iTransColor) { - ULONG RoundedRight, X, Y, SourceX, SourceY, Source, wd, Dest; + ULONG RoundedRight, X, Y, SourceX = 0, SourceY = 0, Source, wd, Dest; ULONG *DestBits; + LONG DstHeight; + LONG DstWidth; + LONG SrcHeight; + LONG SrcWidth; + + DstHeight = DestRect->bottom - DestRect->top; + DstWidth = DestRect->right - DestRect->left; + SrcHeight = SourceRect->bottom - SourceRect->top; + SrcWidth = SourceRect->right - SourceRect->left; + RoundedRight = DestRect->right - ((DestRect->right - DestRect->left) & 0x1); - SourceY = SourcePoint->y; DestBits = (ULONG*)((PBYTE)DestSurf->pvScan0 + (DestRect->left << 1) + DestRect->top * DestSurf->lDelta); @@ -470,41 +479,55 @@ for(Y = DestRect->top; Y < DestRect->bottom; Y++) { - SourceX = SourcePoint->x; + SourceY = SourceRect->top+(Y - DestRect->top) * SrcHeight / DstHeight; for(X = DestRect->left; X < RoundedRight; X += 2, DestBits++, SourceX += 2) { Dest = *DestBits; - Source = DIB_GetSourceIndex(SourceSurf, SourceX, SourceY); - - if(Source != iTransColor) - { - Dest &= 0xFFFF0000; - Dest |= (XLATEOBJ_iXlate(ColorTranslation, Source) & 0xFFFF); - } - - Source = DIB_GetSourceIndex(SourceSurf, SourceX + 1, SourceY); - if(Source != iTransColor) - { - Dest &= 0xFFFF; - Dest |= (XLATEOBJ_iXlate(ColorTranslation, Source) << 16); - } - - *DestBits = Dest; - } - - if(X < DestRect->right) + + SourceX = SourceRect->left+(X - DestRect->left) * SrcWidth / DstWidth; + if (SourceX >= 0 && SourceY >= 0 && + SourceSurf->sizlBitmap.cx > SourceX && SourceSurf->sizlBitmap.cy > SourceY) { Source = DIB_GetSourceIndex(SourceSurf, SourceX, SourceY); if(Source != iTransColor) { - *((USHORT*)DestBits) = (USHORT)XLATEOBJ_iXlate(ColorTranslation, + Dest &= 0xFFFF0000; + Dest |= (XLATEOBJ_iXlate(ColorTranslation, Source) & 0xFFFF); + } + } + + SourceX = SourceRect->left+(X+1 - DestRect->left) * SrcWidth / DstWidth; + if (SourceX >= 0 && SourceY >= 0 && + SourceSurf->sizlBitmap.cx > SourceX && SourceSurf->sizlBitmap.cy > SourceY) + { + Source = DIB_GetSourceIndex(SourceSurf, SourceX, SourceY); + if(Source != iTransColor) + { + Dest &= 0xFFFF; + Dest |= (XLATEOBJ_iXlate(ColorTranslation, Source) << 16); + } + } + + *DestBits = Dest; + } + + if(X < DestRect->right) + { + SourceX = SourceRect->left+(X - DestRect->left) * SrcWidth / DstWidth; + if (SourceX >= 0 && SourceY >= 0 && + SourceSurf->sizlBitmap.cx > SourceX && SourceSurf->sizlBitmap.cy > SourceY) + { + Source = DIB_GetSourceIndex(SourceSurf, SourceX, SourceY); + if(Source != iTransColor) + { + *((USHORT*)DestBits) = (USHORT)XLATEOBJ_iXlate(ColorTranslation, Source); + } } DestBits = (PULONG)((ULONG_PTR)DestBits + 2); } - SourceY++; DestBits = (ULONG*)((ULONG_PTR)DestBits + wd); } Modified: trunk/reactos/subsystems/win32/win32k/dib/dib1bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib1bpp.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib1bpp.c [iso-8859-1] Mon Apr 6 03:13:09 2009 @@ -481,7 +481,7 @@ BOOLEAN DIB_1BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, - RECTL* DestRect, POINTL *SourcePoint, + RECTL* DestRect, RECTL *SourceRect, XLATEOBJ *ColorTranslation, ULONG iTransColor) { return FALSE; Modified: trunk/reactos/subsystems/win32/win32k/dib/dib24bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib24bpp.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib24bpp.c [iso-8859-1] Mon Apr 6 03:13:09 2009 @@ -406,13 +406,22 @@ BOOLEAN DIB_24BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, - RECTL* DestRect, POINTL *SourcePoint, + RECTL* DestRect, RECTL *SourceRect, XLATEOBJ *ColorTranslation, ULONG iTransColor) { - ULONG X, Y, SourceX, SourceY, Source, wd, Dest; + ULONG X, Y, SourceX, SourceY = 0, Source = 0, wd, Dest; BYTE *DestBits; - SourceY = SourcePoint->y; + LONG DstHeight; + LONG DstWidth; + LONG SrcHeight; + LONG SrcWidth; + + DstHeight = DestRect->bottom - DestRect->top; + DstWidth = DestRect->right - DestRect->left; + SrcHeight = SourceRect->bottom - SourceRect->top; + SrcWidth = SourceRect->right - SourceRect->left; + DestBits = (BYTE*)((PBYTE)DestSurf->pvScan0 + (DestRect->left * 3) + DestRect->top * DestSurf->lDelta); @@ -420,19 +429,23 @@ for(Y = DestRect->top; Y < DestRect->bottom; Y++) { - SourceX = SourcePoint->x; - for(X = DestRect->left; X < DestRect->right; X++, DestBits += 3, SourceX++) + SourceY = SourceRect->top+(Y - DestRect->top) * SrcHeight / DstHeight; + for(X = DestRect->left; X < DestRect->right; X++, DestBits += 3) { - Source = DIB_GetSourceIndex(SourceSurf, SourceX, SourceY); - if(Source != iTransColor) - { - Dest = XLATEOBJ_iXlate(ColorTranslation, Source) & 0xFFFFFF; - *(PUSHORT)(DestBits) = Dest & 0xFFFF; - *(DestBits + 2) = Dest >> 16; + SourceX = SourceRect->left+(X - DestRect->left) * SrcWidth / DstWidth; + if (SourceX >= 0 && SourceY >= 0 && + SourceSurf->sizlBitmap.cx > SourceX && SourceSurf->sizlBitmap.cy > SourceY) + { + Source = DIB_GetSourceIndex(SourceSurf, SourceX, SourceY); + if(Source != iTransColor) + { + Dest = XLATEOBJ_iXlate(ColorTranslation, Source) & 0xFFFFFF; + *(PUSHORT)(DestBits) = Dest & 0xFFFF; + *(DestBits + 2) = Dest >> 16; + } } } - SourceY++; DestBits = (BYTE*)((ULONG_PTR)DestBits + wd); } Modified: trunk/reactos/subsystems/win32/win32k/dib/dib32bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib32bpp.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib32bpp.c [iso-8859-1] Mon Apr 6 03:13:09 2009 @@ -279,13 +279,22 @@ BOOLEAN DIB_32BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, - RECTL* DestRect, POINTL *SourcePoint, + RECTL* DestRect, RECTL *SourceRect, XLATEOBJ *ColorTranslation, ULONG iTransColor) { - ULONG X, Y, SourceX, SourceY, Source, wd; + ULONG X, Y, SourceX, SourceY = 0, Source = 0, wd; ULONG *DestBits; - SourceY = SourcePoint->y; + LONG DstHeight; + LONG DstWidth; + LONG SrcHeight; + LONG SrcWidth; + + DstHeight = DestRect->bottom - DestRect->top; + DstWidth = DestRect->right - DestRect->left; + SrcHeight = SourceRect->bottom - SourceRect->top; + SrcWidth = SourceRect->right - SourceRect->left; + DestBits = (ULONG*)((PBYTE)DestSurf->pvScan0 + (DestRect->left << 2) + DestRect->top * DestSurf->lDelta); @@ -293,17 +302,21 @@ for(Y = DestRect->top; Y < DestRect->bottom; Y++) { - SourceX = SourcePoint->x; - for(X = DestRect->left; X < DestRect->right; X++, DestBits++, SourceX++) + SourceY = SourceRect->top+(Y - DestRect->top) * SrcHeight / DstHeight; + for(X = DestRect->left; X < DestRect->right; X++, DestBits++) { - Source = DIB_GetSourceIndex(SourceSurf, SourceX, SourceY); - if(Source != iTransColor) - { - *DestBits = XLATEOBJ_iXlate(ColorTranslation, Source); + SourceX = SourceRect->left+(X - DestRect->left) * SrcWidth / DstWidth; + if (SourceX >= 0 && SourceY >= 0 && + SourceSurf->sizlBitmap.cx > SourceX && SourceSurf->sizlBitmap.cy > SourceY) + { + Source = DIB_GetSourceIndex(SourceSurf, SourceX, SourceY); + if(Source != iTransColor) + { + *DestBits = XLATEOBJ_iXlate(ColorTranslation, Source); + } } } - SourceY++; DestBits = (ULONG*)((ULONG_PTR)DestBits + wd); } Modified: trunk/reactos/subsystems/win32/win32k/dib/dib4bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib4bpp.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib4bpp.c [iso-8859-1] Mon Apr 6 03:13:09 2009 @@ -377,7 +377,7 @@ BOOLEAN DIB_4BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, - RECTL* DestRect, POINTL *SourcePoint, + RECTL* DestRect, RECTL *SourceRect, XLATEOBJ *ColorTranslation, ULONG iTransColor) { return FALSE; Modified: trunk/reactos/subsystems/win32/win32k/dib/dib8bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib8bpp.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib8bpp.c [iso-8859-1] Mon Apr 6 03:13:09 2009 @@ -268,14 +268,23 @@ BOOLEAN DIB_8BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, - RECTL* DestRect, POINTL *SourcePoint, + RECTL* DestRect, RECTL *SourceRect, XLATEOBJ *ColorTranslation, ULONG iTransColor) { - ULONG RoundedRight, X, Y, SourceX, SourceY, Source, wd, Dest; + ULONG RoundedRight, X, Y, SourceX = 0, SourceY = 0, Source, wd, Dest; ULONG *DestBits; + LONG DstHeight; + LONG DstWidth; + LONG SrcHeight; + LONG SrcWidth; + + DstHeight = DestRect->bottom - DestRect->top; + DstWidth = DestRect->right - DestRect->left; + SrcHeight = SourceRect->bottom - SourceRect->top; + SrcWidth = SourceRect->right - SourceRect->left; + RoundedRight = DestRect->right - ((DestRect->right - DestRect->left) & 0x3); - SourceY = SourcePoint->y; DestBits = (ULONG*)((PBYTE)DestSurf->pvScan0 + DestRect->left + (DestRect->top * DestSurf->lDelta)); wd = DestSurf->lDelta - (DestRect->right - DestRect->left); @@ -284,37 +293,57 @@ { DestBits = (ULONG*)((PBYTE)DestSurf->pvScan0 + DestRect->left + (Y * DestSurf->lDelta)); - SourceX = SourcePoint->x; + SourceY = SourceRect->top+(Y - DestRect->top) * SrcHeight / DstHeight; for (X = DestRect->left; X < RoundedRight; X += 4, DestBits++) { Dest = *DestBits; - Source = DIB_GetSourceIndex(SourceSurf, SourceX++, SourceY); - if(Source != iTransColor) - { - Dest &= 0xFFFFFF00; - Dest |= (XLATEOBJ_iXlate(ColorTranslation, Source) & 0xFF); - } - - Source = DIB_GetSourceIndex(SourceSurf, SourceX++, SourceY); - if(Source != iTransColor) - { - Dest &= 0xFFFF00FF; - Dest |= ((XLATEOBJ_iXlate(ColorTranslation, Source) << 8) & 0xFF00); - } - - Source = DIB_GetSourceIndex(SourceSurf, SourceX++, SourceY); - if(Source != iTransColor) - { - Dest &= 0xFF00FFFF; - Dest |= ((XLATEOBJ_iXlate(ColorTranslation, Source) << 16) & 0xFF0000); - } - - Source = DIB_GetSourceIndex(SourceSurf, SourceX++, SourceY); - if(Source != iTransColor) - { - Dest &= 0x00FFFFFF; - Dest |= ((XLATEOBJ_iXlate(ColorTranslation, Source) << 24) & 0xFF000000); + SourceX = SourceRect->left+(X - DestRect->left) * SrcWidth / DstWidth; + if (SourceX >= 0 && SourceY >= 0 && + SourceSurf->sizlBitmap.cx > SourceX && SourceSurf->sizlBitmap.cy > SourceY) + { + Source = DIB_GetSourceIndex(SourceSurf, SourceX, SourceY); + if(Source != iTransColor) + { + Dest &= 0xFFFFFF00; + Dest |= (XLATEOBJ_iXlate(ColorTranslation, Source) & 0xFF); + } + } + + SourceX = SourceRect->left+(X+1 - DestRect->left) * SrcWidth / DstWidth; + if (SourceX >= 0 && SourceY >= 0 && + SourceSurf->sizlBitmap.cx > SourceX && SourceSurf->sizlBitmap.cy > SourceY) + { + Source = DIB_GetSourceIndex(SourceSurf, SourceX, SourceY); + if(Source != iTransColor) + { + Dest &= 0xFFFF00FF; + Dest |= ((XLATEOBJ_iXlate(ColorTranslation, Source) << 8) & 0xFF00); + } + } + + SourceX = SourceRect->left+(X+2 - DestRect->left) * SrcWidth / DstWidth; + if (SourceX >= 0 && SourceY >= 0 && + SourceSurf->sizlBitmap.cx > SourceX && SourceSurf->sizlBitmap.cy > SourceY) + { + Source = DIB_GetSourceIndex(SourceSurf, SourceX, SourceY); + if(Source != iTransColor) + { + Dest &= 0xFF00FFFF; + Dest |= ((XLATEOBJ_iXlate(ColorTranslation, Source) << 16) & 0xFF0000); + } + } + + SourceX = SourceRect->left+(X+3 - DestRect->left) * SrcWidth / DstWidth; + if (SourceX >= 0 && SourceY >= 0 && + SourceSurf->sizlBitmap.cx > SourceX && SourceSurf->sizlBitmap.cy > SourceY) + { + Source = DIB_GetSourceIndex(SourceSurf, SourceX, SourceY); + if(Source != iTransColor) + { + Dest &= 0x00FFFFFF; + Dest |= ((XLATEOBJ_iXlate(ColorTranslation, Source) << 24) & 0xFF000000); + } } *DestBits = Dest; @@ -324,15 +353,19 @@ { for (; X < DestRect->right; X++) { - Source = DIB_GetSourceIndex(SourceSurf, SourceX++, SourceY); - if(Source != iTransColor) - { - *((BYTE*)DestBits) = (BYTE)(XLATEOBJ_iXlate(ColorTranslation, Source) & 0xFF); + SourceX = SourceRect->left+(X - DestRect->left) * SrcWidth / DstWidth; + if (SourceX >= 0 && SourceY >= 0 && + SourceSurf->sizlBitmap.cx > SourceX && SourceSurf->sizlBitmap.cy > SourceY) + { + Source = DIB_GetSourceIndex(SourceSurf, SourceX, SourceY); + if(Source != iTransColor) + { + *((BYTE*)DestBits) = (BYTE)(XLATEOBJ_iXlate(ColorTranslation, Source) & 0xFF); + } } DestBits = (PULONG)((ULONG_PTR)DestBits + 1); } } - SourceY++; } return TRUE; Modified: trunk/reactos/subsystems/win32/win32k/eng/transblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/transblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/transblt.c [iso-8859-1] Mon Apr 6 03:13:09 2009 @@ -47,28 +47,41 @@ INTENG_ENTER_LEAVE EnterLeaveSource, EnterLeaveDest; SURFOBJ *InputObj, *OutputObj; RECTL OutputRect, InputRect; - POINTL Translate, InputPoint; - - InputRect.left = 0; - InputRect.right = DestRect->right - DestRect->left; - InputRect.top = 0; - InputRect.bottom = DestRect->bottom - DestRect->top; + POINTL Translate; + + LONG DstHeight; + LONG DstWidth; + LONG SrcHeight; + LONG SrcWidth; + + InputRect = *SourceRect; if(!IntEngEnter(&EnterLeaveSource, psoSource, &InputRect, TRUE, &Translate, &InputObj)) { return FALSE; } - - InputPoint.x = SourceRect->left + Translate.x; - InputPoint.y = SourceRect->top + Translate.y; + InputRect.left += Translate.x; + InputRect.right += Translate.x; + InputRect.top += Translate.y; + InputRect.bottom += Translate.y; OutputRect = *DestRect; + if (OutputRect.right < OutputRect.left) + { + OutputRect.left = DestRect->right; + OutputRect.right = DestRect->left; + } + if (OutputRect.bottom < OutputRect.top) + { + OutputRect.top = DestRect->bottom; + OutputRect.bottom = DestRect->top; + } + if(Clip) { if(OutputRect.left < Clip->rclBounds.left) { InputRect.left += Clip->rclBounds.left - OutputRect.left; - InputPoint.x += Clip->rclBounds.left - OutputRect.left; OutputRect.left = Clip->rclBounds.left; } if(Clip->rclBounds.right < OutputRect.right) @@ -79,7 +92,6 @@ if(OutputRect.top < Clip->rclBounds.top) { InputRect.top += Clip->rclBounds.top - OutputRect.top; - InputPoint.y += Clip->rclBounds.top - OutputRect.top; OutputRect.top = Clip->rclBounds.top; } if(Clip->rclBounds.bottom < OutputRect.bottom) @@ -110,28 +122,36 @@ ClippingType = (Clip ? Clip->iDComplexity : DC_TRIVIAL); + DstHeight = OutputRect.bottom - OutputRect.top; + DstWidth = OutputRect.right - OutputRect.left; + SrcHeight = InputRect.bottom - InputRect.top; + SrcWidth = InputRect.right - InputRect.left; switch(ClippingType) { case DC_TRIVIAL: { Ret = DibFunctionsForBitmapFormat[psoDest->iBitmapFormat].DIB_TransparentBlt( - OutputObj, InputObj, &OutputRect, &InputPoint, ColorTranslation, iTransColor); + OutputObj, InputObj, &OutputRect, &InputRect, ColorTranslation, iTransColor); break; } case DC_RECT: { RECTL ClipRect, CombinedRect; - POINTL Pt; + RECTL InputToCombinedRect; ClipRect.left = Clip->rclBounds.left + Translate.x; ClipRect.right = Clip->rclBounds.right + Translate.x; ClipRect.top = Clip->rclBounds.top + Translate.y; ClipRect.bottom = Clip->rclBounds.bottom + Translate.y; - EngIntersectRect(&CombinedRect, &OutputRect, &ClipRect); - Pt.x = InputPoint.x + CombinedRect.left - OutputRect.left; - Pt.y = InputPoint.y + CombinedRect.top - OutputRect.top; - Ret = DibFunctionsForBitmapFormat[psoDest->iBitmapFormat].DIB_TransparentBlt( - OutputObj, InputObj, &CombinedRect, &Pt, ColorTranslation, iTransColor); + if (EngIntersectRect(&CombinedRect, &OutputRect, &ClipRect)) + { + InputToCombinedRect.top = InputRect.top + (CombinedRect.top - OutputRect.top) * SrcHeight / DstHeight; + InputToCombinedRect.bottom = InputRect.top + (CombinedRect.bottom - OutputRect.top) * SrcHeight / DstHeight; + InputToCombinedRect.left = InputRect.left + (CombinedRect.left - OutputRect.left) * SrcWidth / DstWidth; + InputToCombinedRect.right = InputRect.left + (CombinedRect.right - OutputRect.left) * SrcWidth / DstWidth; + Ret = DibFunctionsForBitmapFormat[psoDest->iBitmapFormat].DIB_TransparentBlt( + OutputObj, InputObj, &CombinedRect, &InputToCombinedRect, ColorTranslation, iTransColor); + } break; } case DC_COMPLEX: @@ -139,17 +159,16 @@ ULONG Direction, i; RECT_ENUM RectEnum; BOOL EnumMore; - POINTL Pt; if(OutputObj == InputObj) { - if(OutputRect.top < InputPoint.y) + if(OutputRect.top < InputRect.top) { - Direction = OutputRect.left < (InputPoint.x ? CD_RIGHTDOWN : CD_LEFTDOWN); + Direction = OutputRect.left < (InputRect.left ? CD_RIGHTDOWN : CD_LEFTDOWN); } else { - Direction = OutputRect.left < (InputPoint.x ? CD_RIGHTUP : CD_LEFTUP); + Direction = OutputRect.left < (InputRect.left ? CD_RIGHTUP : CD_LEFTUP); } } else @@ -164,19 +183,25 @@ for (i = 0; i < RectEnum.c; i++) { RECTL ClipRect, CombinedRect; + RECTL InputToCombinedRect; ClipRect.left = RectEnum.arcl[i].left + Translate.x; ClipRect.right = RectEnum.arcl[i].right + Translate.x; ClipRect.top = RectEnum.arcl[i].top + Translate.y; ClipRect.bottom = RectEnum.arcl[i].bottom + Translate.y; - EngIntersectRect(&CombinedRect, &OutputRect, &ClipRect); - Pt.x = InputPoint.x + CombinedRect.left - OutputRect.left; - Pt.y = InputPoint.y + CombinedRect.top - OutputRect.top; - Ret = DibFunctionsForBitmapFormat[psoDest->iBitmapFormat].DIB_TransparentBlt( - OutputObj, InputObj, &CombinedRect, &Pt, ColorTranslation, iTransColor); - if(!Ret) + if (EngIntersectRect(&CombinedRect, &OutputRect, &ClipRect)) { - break; + InputToCombinedRect.top = InputRect.top + (CombinedRect.top - OutputRect.top) * SrcHeight / DstHeight; + InputToCombinedRect.bottom = InputRect.top + (CombinedRect.bottom - OutputRect.top) * SrcHeight / DstHeight; + InputToCombinedRect.left = InputRect.left + (CombinedRect.left - OutputRect.left) * SrcWidth / DstWidth; + InputToCombinedRect.right = InputRect.left + (CombinedRect.right - OutputRect.left) * SrcWidth / DstWidth; + + Ret = DibFunctionsForBitmapFormat[psoDest->iBitmapFormat].DIB_TransparentBlt( + OutputObj, InputObj, &CombinedRect, &InputToCombinedRect, ColorTranslation, iTransColor); + if(!Ret) + { + break; + } } } } while(EnumMore && Ret); @@ -209,6 +234,8 @@ RECTL OutputRect, InputClippedRect; SURFACE *psurfDest; SURFACE *psurfSource; + RECTL InputRect; + LONG InputClWidth, InputClHeight, InputWidth, InputHeight; ASSERT(psoDest); ASSERT(psoSource); @@ -232,6 +259,7 @@ InputClippedRect.bottom = DestRect->top; } + InputRect = *SourceRect; /* Clip against the bounds of the clipping region so we won't try to write * outside the surface */ if(Clip) @@ -240,21 +268,27 @@ { return TRUE; } - SourceRect->left += OutputRect.left - DestRect->left; - SourceRect->top += OutputRect.top - DestRect->top; - SourceRect->right += OutputRect.left - DestRect->left; - SourceRect->bottom += OutputRect.top - DestRect->top; + /* Update source rect */ + InputClWidth = InputClippedRect.right - InputClippedRect.left; + InputClHeight = InputClippedRect.bottom - InputClippedRect.top; + InputWidth = InputRect.right - InputRect.left; + InputHeight = InputRect.bottom - InputRect.top; + + InputRect.left += (InputWidth * (OutputRect.left - InputClippedRect.left)) / InputClWidth; + InputRect.right -= (InputWidth * (InputClippedRect.right - OutputRect.right)) / InputClWidth; + InputRect.top += (InputHeight * (OutputRect.top - InputClippedRect.top)) / InputClHeight; + InputRect.bottom -= (InputHeight * (InputClippedRect.bottom - OutputRect.bottom)) / InputClHeight; } else { - OutputRect = *DestRect; + OutputRect = InputClippedRect; } if(psoSource != psoDest) { SURFACE_LockBitmapBits(psurfSource); - MouseSafetyOnDrawStart(psoSource, SourceRect->left, SourceRect->top, - SourceRect->right, SourceRect->bottom); + MouseSafetyOnDrawStart(psoSource, InputRect.left, InputRect.top, + InputRect.right, InputRect.bottom); } SURFACE_LockBitmapBits(psurfDest); MouseSafetyOnDrawStart(psoDest, OutputRect.left, OutputRect.top, @@ -264,7 +298,7 @@ { Ret = GDIDEVFUNCS(psoDest).TransparentBlt( psoDest, psoSource, Clip, ColorTranslation, &OutputRect, - SourceRect, iTransColor, Reserved); + &InputRect, iTransColor, Reserved); } else Ret = FALSE; @@ -272,7 +306,7 @@ if(!Ret) { Ret = EngTransparentBlt(psoDest, psoSource, Clip, ColorTranslation, - &OutputRect, SourceRect, iTransColor, Reserved); + &OutputRect, &InputRect, iTransColor, Reserved); } MouseSafetyOnDrawEnd(psoDest); 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] Mon Apr 6 03:13:09 2009 @@ -455,12 +455,6 @@ rcSrc.right = rcSrc.left + cxSrc; rcSrc.bottom = rcSrc.top + cySrc; IntLPtoDP(DCSrc, (LPPOINT)&rcSrc, 2); - - if((cxDst != cxSrc) || (cyDst != cySrc)) - { - DPRINT1("TransparentBlt() does not support stretching at the moment!\n"); - goto done; - } Ret = IntEngTransparentBlt(&BitmapDest->SurfObj, &BitmapSrc->SurfObj, DCDest->rosdc.CombinedClip, XlateObj, &rcDest, &rcSrc,

15 years, 9 months

[gschneider] 40379: - GdiIsPlayMetafileDC: function GdiGetHandleUserData might fail - Simplify code to use GdiGetLDC which takes this into consideration, fixes a umode crash in gdi32_winetest metafile

by gschneider＠svn.reactos.org

Author: gschneider Date: Mon Apr 6 01:34:27 2009 New Revision: 40379 URL: http://svn.reactos.org/svn/reactos?rev=40379&view=rev Log: - GdiIsPlayMetafileDC: function GdiGetHandleUserData might fail - Simplify code to use GdiGetLDC which takes this into consideration, fixes a umode crash in gdi32_winetest metafile Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c [iso-8859-1] Mon Apr 6 01:34:27 2009 @@ -1157,17 +1157,10 @@ WINAPI GdiIsPlayMetafileDC(HDC hDC) { - PDC_ATTR Dc_Attr; - PLDC pLDC; - - GdiGetHandleUserData((HGDIOBJ) hDC, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr); - if ( Dc_Attr ) + PLDC pLDC = GdiGetLDC(hDC); + if ( pLDC ) { - pLDC = Dc_Attr->pvLDC; - if ( pLDC ) - { - if ( pLDC->Flags & LDC_PLAY_MFDC ) return TRUE; - } + if ( pLDC->Flags & LDC_PLAY_MFDC ) return TRUE; } return FALSE; }

15 years, 9 months

[gschneider] 40378: - msvcrt's pow function does not set errno, so there is no need for a hard coded breakpoint, jump labels adjusted accordingly - Allows oleaut32_winetest vartest to finish

by gschneider＠svn.reactos.org

Author: gschneider Date: Mon Apr 6 01:27:39 2009 New Revision: 40378 URL: http://svn.reactos.org/svn/reactos?rev=40378&view=rev Log: - msvcrt's pow function does not set errno, so there is no need for a hard coded breakpoint, jump labels adjusted accordingly - Allows oleaut32_winetest vartest to finish Modified: trunk/reactos/lib/sdk/crt/math/i386/pow_asm.s Modified: trunk/reactos/lib/sdk/crt/math/i386/pow_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/pow_… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/i386/pow_asm.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/i386/pow_asm.s [iso-8859-1] Mon Apr 6 01:27:39 2009 @@ -65,7 +65,7 @@ or ah,al // Set new CF, PF and ZF sahf // Store AH into Flags jb __fpow1 // Re-direct if x < 0 - ja __fpow3 // Re-direct if x > 0 + ja __fpow2 // Re-direct if x > 0 fxch // Swap st, st(1) fcom qword ptr [edi] // Compare y with zero fxch // Restore x as top of stack @@ -76,10 +76,8 @@ and ah, 0b10111010 // Turn off CF, PF and ZF or ah,al // Set new CF, PF and ZF sahf // Store AH into Flags - ja __fpow3 // Re-direct if y > 0 - fstp st(1) // Set new stack top and pop - mov eax,1 // Set domain error (EDOM) - jmp __fpow5 // End of case + ja __fpow2 // Re-direct if y > 0 + jmp __fpow4 // End of case __fpow1: fxch // Put y on top of stack fld st // Duplicate y as st(1) frndint // Round to integer @@ -92,17 +90,12 @@ and ah, 0b10111010 // Turn off CF, PF and ZF or ah,al // Set new CF, PF and ZF sahf // Store AH into Flags - je __fpow2 // Proceed if y = int(y) - fstp st(1) // Set new stack top and pop - fldz // Set result to zero - fstp st(1) // Set new stack top and pop - mov eax,1 // Set domain error (EDOM) - jmp __fpow5 // End of case -__fpow2: fist dword ptr [ebp-12] // Store y as integer + jne __fpow4 // Proceed if y = int(y) + fist dword ptr [ebp-12] // Store y as integer and dword ptr [ebp-12],1 // Set bit if y is odd fxch // Put x on top of stack fabs // x = |x| -__fpow3: fldln2 // Load log base e of 2 +__fpow2: fldln2 // Load log base e of 2 fxch st(1) // Exchange st, st(1) fyl2x // Compute the natural log(x) fmulp // Compute y * ln(x) @@ -118,21 +111,11 @@ fscale // Scale by power of 2 fstp st(1) // Set new stack top and pop test dword ptr [ebp-12],1 // Negation required ? - jz __fpow4 // No, re-direct + jz __fpow3 // No, re-direct fchs // Negate the result -__fpow4: fstp qword ptr [ebp-8] // Save (double)pow(x, y) +__fpow3: fstp qword ptr [ebp-8] // Save (double)pow(x, y) fld qword ptr [ebp-8] // Load (double)pow(x, y) - fxam // Examine st - fstsw ax // Get the FPU status word - cmp ah,5 // Infinity ? - jne __fpow6 // No, end of case - mov eax,2 // Set range error (ERANGE) - // Get errno pointer offset -__fpow5: int 3 - mov edi,0 // TODO: offset flat:__crt_errno - mov edi,[edi] // Get C errno variable pointer - mov dword ptr [edi],eax // Set errno -__fpow6: pop eax // Restore register eax +__fpow4: pop eax // Restore register eax pop edi // Restore register edi mov esp,ebp // Deallocate temporary space pop ebp

15 years, 9 months

[mjmartin] 40377: - Create Common Files directory when creating Program Files to match windows fresh install and add registry key for CommonFilesDir. This prevents the key from being incorrectly set using an environment variable.

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Mon Apr 6 00:05:40 2009 New Revision: 40377 URL: http://svn.reactos.org/svn/reactos?rev=40377&view=rev Log: - Create Common Files directory when creating Program Files to match windows fresh install and add registry key for CommonFilesDir. This prevents the key from being incorrectly set using an environment variable. Modified: trunk/reactos/dll/win32/userenv/lang/bg-BG.rc trunk/reactos/dll/win32/userenv/lang/cs-CZ.rc trunk/reactos/dll/win32/userenv/lang/de-DE.rc trunk/reactos/dll/win32/userenv/lang/el-GR.rc trunk/reactos/dll/win32/userenv/lang/en-US.rc trunk/reactos/dll/win32/userenv/lang/es-ES.rc trunk/reactos/dll/win32/userenv/lang/fi-FI.rc trunk/reactos/dll/win32/userenv/lang/fr-FR.rc trunk/reactos/dll/win32/userenv/lang/hu-HU.rc trunk/reactos/dll/win32/userenv/lang/id-ID.rc trunk/reactos/dll/win32/userenv/lang/it-IT.rc trunk/reactos/dll/win32/userenv/lang/ja-JP.rc trunk/reactos/dll/win32/userenv/lang/lt-LT.rc trunk/reactos/dll/win32/userenv/lang/nl-NL.rc trunk/reactos/dll/win32/userenv/lang/no-NO.rc trunk/reactos/dll/win32/userenv/lang/pl-PL.rc trunk/reactos/dll/win32/userenv/lang/ru-RU.rc trunk/reactos/dll/win32/userenv/lang/sk-SK.rc trunk/reactos/dll/win32/userenv/lang/sv-SE.rc trunk/reactos/dll/win32/userenv/lang/th-TH.rc trunk/reactos/dll/win32/userenv/lang/uk-UA.rc trunk/reactos/dll/win32/userenv/resources.h trunk/reactos/dll/win32/userenv/setup.c Modified: trunk/reactos/dll/win32/userenv/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/bg-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/lang/bg-BG.rc [iso-8859-1] Mon Apr 6 00:05:40 2009 @@ -44,4 +44,5 @@ IDS_HISTORY "Ìåñòíè íàñòðîéêè\\Ïîñåòåíè" IDS_COOKIES "Êóðàáèéêè" IDS_PROGRAMFILES "%SystemDrive%\\Program Files" + IDS_COMMONFILES "Common Files" END Modified: trunk/reactos/dll/win32/userenv/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/cs-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/lang/cs-CZ.rc [iso-8859-1] Mon Apr 6 00:05:40 2009 @@ -45,4 +45,5 @@ IDS_HISTORY "Local Settings\\History" IDS_COOKIES "Cookies" IDS_PROGRAMFILES "%SystemDrive%\\Program Files" + IDS_COMMONFILES "Common Files" END Modified: trunk/reactos/dll/win32/userenv/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/lang/de-DE.rc [iso-8859-1] Mon Apr 6 00:05:40 2009 @@ -44,4 +44,5 @@ IDS_HISTORY "Lokale Einstellungen\\Verlauf" IDS_COOKIES "Cookies" IDS_PROGRAMFILES "%SystemDrive%\\Programme" + IDS_COMMONFILES "Common Files" END Modified: trunk/reactos/dll/win32/userenv/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/el-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/lang/el-GR.rc [iso-8859-1] Mon Apr 6 00:05:40 2009 @@ -44,4 +44,5 @@ IDS_HISTORY "Local Settings\\History" IDS_COOKIES "Cookies" IDS_PROGRAMFILES "%SystemDrive%\\Program Files" + IDS_COMMONFILES "Common Files" END Modified: trunk/reactos/dll/win32/userenv/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/lang/en-US.rc [iso-8859-1] Mon Apr 6 00:05:40 2009 @@ -44,4 +44,5 @@ IDS_HISTORY "Local Settings\\History" IDS_COOKIES "Cookies" IDS_PROGRAMFILES "%SystemDrive%\\Program Files" + IDS_COMMONFILES "Common Files" END Modified: trunk/reactos/dll/win32/userenv/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/es-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/lang/es-ES.rc [iso-8859-1] Mon Apr 6 00:05:40 2009 @@ -50,4 +50,5 @@ IDS_HISTORY "Configuración local\\Historial" IDS_COOKIES "Cookies" IDS_PROGRAMFILES "%SystemDrive%\\Archivos de programa" + IDS_COMMONFILES "Common Files" END Modified: trunk/reactos/dll/win32/userenv/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/fi-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/fi-FI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/lang/fi-FI.rc [iso-8859-1] Mon Apr 6 00:05:40 2009 @@ -44,5 +44,6 @@ IDS_HISTORY "Paikalliset Asetukset\\Historia" IDS_COOKIES "Keksit" IDS_PROGRAMFILES "%SystemDrive%\\Program Files" + IDS_COMMONFILES "Common Files" END Modified: trunk/reactos/dll/win32/userenv/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/lang/fr-FR.rc [iso-8859-1] Mon Apr 6 00:05:40 2009 @@ -44,4 +44,5 @@ IDS_HISTORY "Local Settings\\Historique" IDS_COOKIES "Cookies" IDS_PROGRAMFILES "%SystemDrive%\\Program Files" + IDS_COMMONFILES "Common Files" END Modified: trunk/reactos/dll/win32/userenv/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/hu-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/lang/hu-HU.rc [iso-8859-1] Mon Apr 6 00:05:40 2009 @@ -45,4 +45,5 @@ IDS_HISTORY "Local Settings\\History" IDS_COOKIES "Cookies" IDS_PROGRAMFILES "%SystemDrive%\\Program Files" + IDS_COMMONFILES "Common Files" END Modified: trunk/reactos/dll/win32/userenv/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/id-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/lang/id-ID.rc [iso-8859-1] Mon Apr 6 00:05:40 2009 @@ -44,4 +44,5 @@ IDS_HISTORY "Local Settings\\History" IDS_COOKIES "Cookies" IDS_PROGRAMFILES "%SystemDrive%\\Program Files" + IDS_COMMONFILES "Common Files" END Modified: trunk/reactos/dll/win32/userenv/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/lang/it-IT.rc [iso-8859-1] Mon Apr 6 00:05:40 2009 @@ -38,4 +38,5 @@ IDS_HISTORY "Impostazioni locali\\Cronologia" IDS_COOKIES "Cookies" IDS_PROGRAMFILES "%SystemDrive%\\Programmi" + IDS_COMMONFILES "Common Files" END Modified: trunk/reactos/dll/win32/userenv/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/ja-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/lang/ja-JP.rc [iso-8859-1] Mon Apr 6 00:05:40 2009 @@ -26,4 +26,5 @@ IDS_HISTORY "Local Settings\\History" IDS_COOKIES "Cookies" IDS_PROGRAMFILES "%SystemDrive%\\Program Files" + IDS_COMMONFILES "Common Files" END Modified: trunk/reactos/dll/win32/userenv/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/lt-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/lt-LT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/lang/lt-LT.rc [iso-8859-1] Mon Apr 6 00:05:40 2009 @@ -46,4 +46,5 @@ IDS_HISTORY "Local Settings\\History" IDS_COOKIES "Slapukai" IDS_PROGRAMFILES "%SystemDrive%\\Program Files" + IDS_COMMONFILES "Common Files" END Modified: trunk/reactos/dll/win32/userenv/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/nl-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/lang/nl-NL.rc [iso-8859-1] Mon Apr 6 00:05:40 2009 @@ -44,4 +44,5 @@ IDS_HISTORY "Local Settings\\Geschiedenis" IDS_COOKIES "Cookies" IDS_PROGRAMFILES "%SystemDrive%\\Program Files" + IDS_COMMONFILES "Common Files" END Modified: trunk/reactos/dll/win32/userenv/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/no-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/lang/no-NO.rc [iso-8859-1] Mon Apr 6 00:05:40 2009 @@ -47,4 +47,5 @@ IDS_HISTORY "Lokale innstillinger\\Logg" IDS_COOKIES "Informasjonkapsel" IDS_PROGRAMFILES "%SystemDrive%\\Programfiler" + IDS_COMMONFILES "Common Files" END Modified: trunk/reactos/dll/win32/userenv/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/lang/pl-PL.rc [iso-8859-1] Mon Apr 6 00:05:40 2009 @@ -49,4 +49,5 @@ IDS_HISTORY "Ustawienia lokalne\\Historia" IDS_COOKIES "Ciasteczka" IDS_PROGRAMFILES "%SystemDrive%\\Program Files" + IDS_COMMONFILES "Common Files" END Modified: trunk/reactos/dll/win32/userenv/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/lang/ru-RU.rc [iso-8859-1] Mon Apr 6 00:05:40 2009 @@ -44,4 +44,5 @@ IDS_HISTORY "Local Settings\\History" IDS_COOKIES "Cookies" IDS_PROGRAMFILES "%SystemDrive%\\Program Files" + IDS_COMMONFILES "Common Files" END Modified: trunk/reactos/dll/win32/userenv/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/sk-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/lang/sk-SK.rc [iso-8859-1] Mon Apr 6 00:05:40 2009 @@ -48,4 +48,5 @@ IDS_HISTORY "Local Settings\\History" IDS_COOKIES "Cookies" IDS_PROGRAMFILES "%SystemDrive%\\Program Files" + IDS_COMMONFILES "Common Files" END Modified: trunk/reactos/dll/win32/userenv/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/sv-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/lang/sv-SE.rc [iso-8859-1] Mon Apr 6 00:05:40 2009 @@ -44,4 +44,5 @@ IDS_HISTORY "Lokala inställningar\\Tidigare" IDS_COOKIES "Cookies" IDS_PROGRAMFILES "%SystemDrive%\\Program" + IDS_COMMONFILES "Common Files" END Modified: trunk/reactos/dll/win32/userenv/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/th-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/th-TH.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/lang/th-TH.rc [iso-8859-1] Mon Apr 6 00:05:40 2009 @@ -44,4 +44,5 @@ IDS_HISTORY "¡ÒÃµÑé§¤èÒµÑé§µé¹\\»ÃÐÇÑµÔãªé§Ò¹" IDS_COOKIES "¤Ø¡¡Õé" IDS_PROGRAMFILES "%SystemDrive%\\â»Ãá¡ÃÁä¿Åì" + IDS_COMMONFILES "Common Files" END Modified: trunk/reactos/dll/win32/userenv/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/lang/uk-UA.rc [iso-8859-1] Mon Apr 6 00:05:40 2009 @@ -44,4 +44,5 @@ IDS_HISTORY "Local Settings\\History" IDS_COOKIES "Cookies" IDS_PROGRAMFILES "%SystemDrive%\\Program Files" + IDS_COMMONFILES "Common Files" END Modified: trunk/reactos/dll/win32/userenv/resources.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/resource… ============================================================================== --- trunk/reactos/dll/win32/userenv/resources.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/resources.h [iso-8859-1] Mon Apr 6 00:05:40 2009 @@ -49,5 +49,6 @@ #define IDS_HISTORY 22 #define IDS_COOKIES 23 #define IDS_PROGRAMFILES 24 +#define IDS_COMMONFILES 25 /* EOF */ Modified: trunk/reactos/dll/win32/userenv/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/setup.c?… ============================================================================== --- trunk/reactos/dll/win32/userenv/setup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/setup.c [iso-8859-1] Mon Apr 6 00:05:40 2009 @@ -109,6 +109,7 @@ { WCHAR szProfilesPath[MAX_PATH]; WCHAR szProfilePath[MAX_PATH]; + WCHAR szCommonFilesDirPath[MAX_PATH]; WCHAR szBuffer[MAX_PATH]; DWORD dwLength; PFOLDERDATA lpFolderData; @@ -584,6 +585,14 @@ return FALSE; } + if (!LoadStringW(hInstance, + IDS_COMMONFILES, + szCommonFilesDirPath, + MAX_PATH)) + { + DPRINT1("Warning: %lu\n", GetLastError()); + } + /* Expand it */ if (!ExpandEnvironmentStringsW(szBuffer, szProfilesPath, @@ -591,6 +600,17 @@ { DPRINT1("Error: %lu\n", GetLastError()); return FALSE; + } + + wcscpy(szBuffer, szProfilesPath); + wcscat(szBuffer, L"\\"); + wcscat(szBuffer, szCommonFilesDirPath); + + if (!ExpandEnvironmentStringsW(szBuffer, + szCommonFilesDirPath, + MAX_PATH)) + { + DPRINT1("Warning: %lu\n", GetLastError()); } /* Store it */ @@ -621,6 +641,18 @@ return FALSE; } + dwLength = (wcslen(szCommonFilesDirPath) + 1) * sizeof(WCHAR); + Error = RegSetValueExW(hKey, + L"CommonFilesDir", + 0, + REG_SZ, + (LPBYTE)szCommonFilesDirPath, + dwLength); + if (Error != ERROR_SUCCESS) + { + DPRINT1("Warning: %lu\n", Error); + } + RegCloseKey (hKey); /* Create directory */ @@ -630,6 +662,15 @@ { DPRINT1("Error: %lu\n", GetLastError()); return FALSE; + } + } + + /* Create directory */ + if (!CreateDirectoryW(szCommonFilesDirPath, NULL)) + { + if (GetLastError () != ERROR_ALREADY_EXISTS) + { + DPRINT1("Warning: %lu\n", GetLastError()); } }

15 years, 9 months

[cgutman] 40376: - Revert r40367 - Fixes abyss server startup after installing

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun Apr 5 22:11:24 2009 New Revision: 40376 URL: http://svn.reactos.org/svn/reactos?rev=40376&view=rev Log: - Revert r40367 - Fixes abyss server startup after installing Modified: trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c Modified: trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] Sun Apr 5 22:11:24 2009 @@ -139,11 +139,11 @@ } -NTSTATUS FileCloseAddress(PTDI_REQUEST Request) -/* - * FUNCTION: Closes an address file object - * ARGUMENTS: - * AddrFile = Pointer to address file object to close +VOID DeleteAddress(PADDRESS_FILE AddrFile) +/* + * FUNCTION: Deletes an address file object + * ARGUMENTS: + * AddrFile = Pointer to address file object to delete */ { KIRQL OldIrql; @@ -151,15 +151,15 @@ PLIST_ENTRY NextEntry; PDATAGRAM_SEND_REQUEST SendRequest; PDATAGRAM_RECEIVE_REQUEST ReceiveRequest; - PADDRESS_FILE AddrFile = Request->Handle.AddressHandle; - - TI_DbgPrint(MID_TRACE, ("Called.\n")); + + TI_DbgPrint(MID_TRACE, ("Called.\n")); + + /* Remove address file from the global list */ + TcpipAcquireSpinLock(&AddressFileListLock, &OldIrql); + RemoveEntryList(&AddrFile->ListEntry); + TcpipReleaseSpinLock(&AddressFileListLock, OldIrql); TcpipAcquireSpinLock(&AddrFile->Lock, &OldIrql); - - /* Set address file object exclusive to us */ - AF_SET_BUSY(AddrFile); - AF_CLR_VALID(AddrFile); /* FIXME: Kill TCP connections on this address file object */ @@ -197,9 +197,9 @@ TcpipReleaseSpinLock(&AddrFile->Lock, OldIrql); - TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); - - return STATUS_SUCCESS; + (*AddrFile->Free)(AddrFile); + + TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); } @@ -339,7 +339,7 @@ * RETURNS: * Status of operation */ -NTSTATUS FileFreeAddress( +NTSTATUS FileCloseAddress( PTDI_REQUEST Request) { KIRQL OldIrql; @@ -350,10 +350,13 @@ AddrFile = Request->Handle.AddressHandle; - /* Remove address file from the global list */ - TcpipAcquireSpinLock(&AddressFileListLock, &OldIrql); - RemoveEntryList(&AddrFile->ListEntry); - TcpipReleaseSpinLock(&AddressFileListLock, OldIrql); + TcpipAcquireSpinLock(&AddrFile->Lock, &OldIrql); + + /* Set address file object exclusive to us */ + AF_SET_BUSY(AddrFile); + AF_CLR_VALID(AddrFile); + + TcpipReleaseSpinLock(&AddrFile->Lock, OldIrql); /* Protocol specific handling */ switch (AddrFile->Protocol) { @@ -369,9 +372,33 @@ UDPFreePort( AddrFile->Port ); break; } - TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); - - (*AddrFile->Free)(AddrFile); + + TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); + + return Status; +} + + +/* + * FUNCTION: Closes an address file object + * ARGUMENTS: + * Request = Pointer to TDI request structure for this request + * RETURNS: + * Status of operation + */ +NTSTATUS FileFreeAddress( + PTDI_REQUEST Request) +{ + PADDRESS_FILE AddrFile; + NTSTATUS Status = STATUS_SUCCESS; + + AddrFile = Request->Handle.AddressHandle; + + TI_DbgPrint(MID_TRACE, ("Called.\n")); + + DeleteAddress(AddrFile); + + TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); return Status; }

15 years, 9 months

[janderwald] 40375: - Check if allocation of work item succeeded - Thanks Ged, aicom - Fix leaking of a work item on close event / irp stream run out

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Apr 5 20:39:51 2009 New Revision: 40375 URL: http://svn.reactos.org/svn/reactos?rev=40375&view=rev Log: - Check if allocation of work item succeeded - Thanks Ged, aicom - Fix leaking of a work item on close event / irp stream run out Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c [iso-8859-1] Sun Apr 5 20:39:51 2009 @@ -135,6 +135,13 @@ /* allocate create item */ portcls_ext->CreateItems = AllocateItem(NonPagedPool, MaxObjects * sizeof(KSOBJECT_CREATE_ITEM), TAG_PORTCLASS); + if (!portcls_ext->CreateItems) + { + /* not enough resources */ + IoDeleteDevice(fdo); + return STATUS_INSUFFICIENT_RESOURCES; + } + /* store the physical device object */ portcls_ext->PhysicalDeviceObject = PhysicalDeviceObject; /* set up the start device function */ @@ -152,6 +159,17 @@ /* allocate work item */ portcls_ext->WorkItem = IoAllocateWorkItem(fdo); + if (!portcls_ext->WorkItem) + { + /* not enough resources */ + FreeItem(portcls_ext->CreateItems, TAG_PORTCLASS); + /* delete created fdo */ + IoDeleteDevice(fdo); + /* return error code */ + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* allocate the device header */ status = KsAllocateDeviceHeader(&portcls_ext->KsDeviceHeader, MaxObjects, portcls_ext->CreateItems); /* did we succeed */ @@ -159,6 +177,8 @@ { /* free previously allocated create items */ FreeItem(portcls_ext->CreateItems, TAG_PORTCLASS); + /* free allocated work item */ + IoFreeWorkItem(portcls_ext->WorkItem); /* delete created fdo */ IoDeleteDevice(fdo); /* return error code */ @@ -180,6 +200,8 @@ KsFreeDeviceHeader(portcls_ext->KsDeviceHeader); /* free previously allocated create items */ FreeItem(portcls_ext->CreateItems, TAG_PORTCLASS); + /* free allocated work item */ + IoFreeWorkItem(portcls_ext->WorkItem); /* delete created fdo */ IoDeleteDevice(fdo); /* return error code */ Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] Sun Apr 5 20:39:51 2009 @@ -215,20 +215,20 @@ IN PVOID SystemArgument1, IN PVOID SystemArgument2) { + PDEVICE_OBJECT DeviceObject; + PPCLASS_DEVICE_EXTENSION DeviceExtension; IPortPinWaveCyclicImpl * This = (IPortPinWaveCyclicImpl*)DeferredContext; - PIO_WORKITEM WorkItem; if (This->IrpQueue->lpVtbl->NumMappings(This->IrpQueue)) return; - WorkItem = IoAllocateWorkItem(GetDeviceObject(This->Port)); - if (!WorkItem) - return; - - IoQueueWorkItem(WorkItem, StopStreamWorkerRoutine, DelayedWorkQueue, (PVOID)This); -} - - + /* Get device object */ + DeviceObject = GetDeviceObject(This->Port); + /* Get device extension */ + DeviceExtension = (PPCLASS_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + /* queue the work item */ + IoQueueWorkItem(DeviceExtension->WorkItem, StopStreamWorkerRoutine, DelayedWorkQueue, (PVOID)This); +} static VOID @@ -248,7 +248,6 @@ KeInsertQueueDpc(&This->Dpc, NULL, NULL); return; } - Status = This->Stream->lpVtbl->GetPosition(This->Stream, &Position); DPRINT("Position %u Buffer %p BufferSize %u ActiveIrpOffset %u\n", Position, Buffer, This->CommonBufferSize, BufferSize); @@ -692,23 +691,26 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - PIO_WORKITEM WorkItem; - + PPCLASS_DEVICE_EXTENSION DeviceExtension; IPortPinWaveCyclicImpl * This = (IPortPinWaveCyclicImpl*)iface; if (This->Stream) { - WorkItem = IoAllocateWorkItem(DeviceObject); - if (WorkItem) + if (Irp) { - if (Irp) - { - This->CloseIrp = Irp; - IoMarkIrpPending(Irp); - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_PENDING; - } - IoQueueWorkItem(WorkItem, CloseStreamRoutine, DelayedWorkQueue, (PVOID)This); + This->CloseIrp = Irp; + IoMarkIrpPending(Irp); + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_PENDING; + } + /* Get device extension */ + DeviceExtension = (PPCLASS_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + /* defer work item */ + IoQueueWorkItem(DeviceExtension->WorkItem, CloseStreamRoutine, DelayedWorkQueue, (PVOID)This); + + if (Irp) + { + /* The WaveCyclic filter passes close request with NULL / IRP */ return STATUS_PENDING; } }

15 years, 9 months

[khornicek] 40374: - add a stub for D3DParseUnknownCommand

by khornicek＠svn.reactos.org

Author: khornicek Date: Sun Apr 5 20:29:45 2009 New Revision: 40374 URL: http://svn.reactos.org/svn/reactos?rev=40374&view=rev Log: - add a stub for D3DParseUnknownCommand Added: trunk/reactos/dll/directx/wine/ddraw/stubs.c (with props) Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw.rbuild trunk/reactos/dll/directx/wine/ddraw/ddraw.spec Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… ============================================================================== --- trunk/reactos/dll/directx/wine/ddraw/ddraw.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/ddraw/ddraw.rbuild [iso-8859-1] Sun Apr 5 20:29:45 2009 @@ -30,6 +30,7 @@ <file>palette.c</file> <file>parent.c</file> <file>regsvr.c</file> + <file>stubs.c</file> <file>surface.c</file> <file>surface_thunks.c</file> <file>texture.c</file> Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… ============================================================================== --- trunk/reactos/dll/directx/wine/ddraw/ddraw.spec [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/ddraw/ddraw.spec [iso-8859-1] Sun Apr 5 20:29:45 2009 @@ -26,3 +26,4 @@ @ stub VidMemFree @ stub VidMemInit @ stub VidMemLargestFree +@ stdcall D3DParseUnknownCommand(ptr ptr) Added: trunk/reactos/dll/directx/wine/ddraw/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/stu… ============================================================================== --- trunk/reactos/dll/directx/wine/ddraw/stubs.c (added) +++ trunk/reactos/dll/directx/wine/ddraw/stubs.c [iso-8859-1] Sun Apr 5 20:29:45 2009 @@ -1,0 +1,8 @@ +#include "ddraw_private.h" + +HRESULT WINAPI +D3DParseUnknownCommand( LPVOID lpCmd, + LPVOID *lpRetCmd) +{ + return DD_OK; +} Propchange: trunk/reactos/dll/directx/wine/ddraw/stubs.c ------------------------------------------------------------------------------ svn:eol-style = native

15 years, 9 months

[janderwald] 40373: - Fix leaking of work item for each detected audio device

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Apr 5 20:05:54 2009 New Revision: 40373 URL: http://svn.reactos.org/svn/reactos?rev=40373&view=rev Log: - Fix leaking of work item for each detected audio device Modified: trunk/reactos/drivers/wdm/audio/sysaudio/deviface.c trunk/reactos/drivers/wdm/audio/sysaudio/main.c Modified: trunk/reactos/drivers/wdm/audio/sysaudio/deviface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/deviface.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/deviface.c [iso-8859-1] Sun Apr 5 20:05:54 2009 @@ -17,7 +17,7 @@ NTAPI FilterPinWorkerRoutine( IN PDEVICE_OBJECT DeviceObject, - IN PVOID Context) + IN PVOID Context) { KSPROPERTY PropertyRequest; KSP_PIN PinRequest; @@ -27,6 +27,7 @@ ULONG Count, Index; NTSTATUS Status; ULONG BytesReturned; + PSYSAUDIODEVEXT DeviceExtension; PKSAUDIO_DEVICE_ENTRY DeviceEntry = (PKSAUDIO_DEVICE_ENTRY)Context; @@ -40,17 +41,22 @@ Status = KsSynchronousIoControlDevice(DeviceEntry->FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&PropertyRequest, sizeof(KSPROPERTY), (PVOID)&Count, sizeof(ULONG), &BytesReturned); if (!NT_SUCCESS(Status)) { + ExFreePool(DeviceEntry); return; } if (!Count) + { + ExFreePool(DeviceEntry); return; + } /* allocate pin array */ DeviceEntry->Pins = ExAllocatePool(NonPagedPool, Count * sizeof(PIN_INFO)); if (!DeviceEntry->Pins) { /* no memory */ + ExFreePool(DeviceEntry); return; } /* clear array */ @@ -96,6 +102,12 @@ } DPRINT1("Num Pins %u Num WaveIn Pins %u Name WaveOut Pins %u\n", DeviceEntry->NumberOfPins, DeviceEntry->NumWaveInPin, DeviceEntry->NumWaveOutPin); + + DeviceExtension = (PSYSAUDIODEVEXT)DeviceObject->DeviceExtension; + + InsertTailList(&DeviceExtension->KsAudioDeviceList, &DeviceEntry->Entry); + DeviceExtension->NumberOfKsAudioDevices++; + } NTSTATUS @@ -153,6 +165,7 @@ DEVICE_INTERFACE_CHANGE_NOTIFICATION * Event; NTSTATUS Status = STATUS_SUCCESS; PSYSAUDIODEVEXT DeviceExtension; + PKSAUDIO_DEVICE_ENTRY DeviceEntry; PDEVICE_OBJECT DeviceObject = (PDEVICE_OBJECT)Context; DeviceExtension = (PSYSAUDIODEVEXT)DeviceObject->DeviceExtension; @@ -163,10 +176,6 @@ &GUID_DEVICE_INTERFACE_ARRIVAL)) { /* a new device has arrived */ - - PKSAUDIO_DEVICE_ENTRY DeviceEntry; - PIO_WORKITEM WorkItem; - DeviceEntry = ExAllocatePool(NonPagedPool, sizeof(KSAUDIO_DEVICE_ENTRY)); if (!DeviceEntry) { @@ -206,16 +215,11 @@ return Status; } - DPRINT1("Successfully opened audio device %u handle %p file object %p device object %p\n", DeviceExtension->KsAudioDeviceList, DeviceEntry->Handle, DeviceEntry->FileObject, DeviceEntry->FileObject->DeviceObject); - DeviceExtension->NumberOfKsAudioDevices++; - - WorkItem = IoAllocateWorkItem(DeviceObject); - if (WorkItem) - { - IoQueueWorkItem(WorkItem, FilterPinWorkerRoutine, DelayedWorkQueue, (PVOID)DeviceEntry); - } - InsertTailList(&DeviceExtension->KsAudioDeviceList, &DeviceEntry->Entry); - + DPRINT1("Successfully opened audio device %u handle %p file object %p device object %p\n", DeviceExtension->NumberOfKsAudioDevices, DeviceEntry->Handle, DeviceEntry->FileObject, DeviceEntry->FileObject->DeviceObject); + + //FIXME + // mutal exclusion + IoQueueWorkItem(DeviceExtension->WorkItem, FilterPinWorkerRoutine, DelayedWorkQueue, (PVOID)DeviceEntry); return Status; } else Modified: trunk/reactos/drivers/wdm/audio/sysaudio/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/main.c [iso-8859-1] Sun Apr 5 20:05:54 2009 @@ -131,6 +131,22 @@ goto cleanup; } + /* allocate work item */ + DeviceExtension->WorkItem = IoAllocateWorkItem(DeviceObject); + if (!DeviceExtension->WorkItem) + { + DPRINT1("Failed to allocate work item\n"); + goto cleanup; + } + + /* allocate work item context */ + DeviceExtension->WorkerContext = ExAllocatePool(NonPagedPool, sizeof(PIN_WORKER_CONTEXT)); + if (!DeviceExtension->WorkerContext) + { + DPRINT1("Failed to allocate work item context\n"); + goto cleanup; + } + /* Register device notification hooks */ Status = SysAudioRegisterNotifications(DriverObject, DeviceObject); @@ -139,23 +155,6 @@ DPRINT1("Failed to register device notifications\n"); goto cleanup; } - - /* allocate work item */ - DeviceExtension->WorkItem = IoAllocateWorkItem(DeviceObject); - if (!DeviceExtension->WorkItem) - { - DPRINT1("Failed to allocate work item\n"); - goto cleanup; - } - - /* allocate work item context */ - DeviceExtension->WorkerContext = ExAllocatePool(NonPagedPool, sizeof(PIN_WORKER_CONTEXT)); - if (!DeviceExtension->WorkerContext) - { - DPRINT1("Failed to allocate work item context\n"); - goto cleanup; - } - /* Load kmixer */ Status = SysAudioOpenKMixer(DeviceExtension);

15 years, 9 months

← Newer
1
...
38
39
40
41
42
43
44
...
48
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2009