Ros-diffs December 2006

ros-diffs@reactos.org

16 participants
168 discussions

[greatlrd] 25237: commit same strechblt code for 8, 16, 32, it does not using putpixel anylong for 8 and 32, and small cleanup this code can be makefaster, how remove getpixel that will doing huge incress in speed, split calc to simple 1x 2x .. zoom in/out now we are using 1.1x 2.2x Zoom and 1x 2x zoom same code. if we split it we will see a speed incress.
by greatlrd＠svn.reactos.org 29 Dec '06

29 Dec '06

Author: greatlrd Date: Fri Dec 29 16:16:53 2006 New Revision: 25237 URL: http://svn.reactos.org/svn/reactos?rev=25237&view=rev Log: commit same strechblt code for 8,16,32, it does not using putpixel anylong for 8 and 32, and small cleanup this code can be makefaster, how remove getpixel that will doing huge incress in speed, split calc to simple 1x 2x .. zoom in/out now we are using 1.1x 2.2x Zoom and 1x 2x zoom same code. if we split it we will see a speed incress. Modified: trunk/reactos/subsystems/win32/win32k/dib/dib16bpp.c trunk/reactos/subsystems/win32/win32k/dib/dib32bpp.c trunk/reactos/subsystems/win32/win32k/dib/dib8bpp.c 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 (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib16bpp.c Fri Dec 29 16:16:53 2006 @@ -741,7 +741,6 @@ LONG sy = 0; LONG DesX; LONG DesY; - LONG color; PULONG DestBits; LONG DifflDelta; @@ -784,6 +783,10 @@ sy_max = DesSizeY; sy = SourceRect->top; + DestBits = (PULONG)((PBYTE)DestSurf->pvScan0 + (DestRect->left << 1) + + DestRect->top * DestSurf->lDelta); + + DifflDelta = DestSurf->lDelta - (DesSizeX << 1); switch(SourceSurf->iBitmapFormat) { @@ -792,10 +795,6 @@ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - DestBits = (PULONG)((PBYTE)DestSurf->pvScan0 + (DestRect->left << 1) + - DestRect->top * DestSurf->lDelta); - DifflDelta = DestSurf->lDelta - (DesSizeX << 1); - for (DesY=0; DesY<DesSizeY; DesY++) { sx = SourceRect->left; @@ -803,17 +802,11 @@ for (DesX=0; DesX<DesSizeX; DesX++) { - if(DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0) - { - *DestBits = XLATEOBJ_iXlate(ColorTranslation, 0); - DestBits = (PULONG)((ULONG_PTR)DestBits + 2); - } - else - { - *DestBits = XLATEOBJ_iXlate(ColorTranslation, 1); - DestBits = (PULONG)((ULONG_PTR)DestBits + 2); - } - + *DestBits = XLATEOBJ_iXlate(ColorTranslation, + DIB_1BPP_GetPixel(SourceSurf, sx, sy)); + + DestBits = (PULONG)((ULONG_PTR)DestBits + 2); + sx += SrcZoomXHight; sx_dec += SrcZoomXLow; if (sx_dec >= sx_max) @@ -839,11 +832,6 @@ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - DestBits = (PULONG)((PBYTE)DestSurf->pvScan0 + (DestRect->left << 1) + - DestRect->top * DestSurf->lDelta); - - DifflDelta = DestSurf->lDelta - (DesSizeX << 1); - for (DesY=0; DesY<DesSizeY; DesY++) { sx = SourceRect->left; @@ -851,9 +839,9 @@ for (DesX=0; DesX<DesSizeX; DesX++) { - color = DIB_4BPP_GetPixel(SourceSurf, sx, sy); - color = XLATEOBJ_iXlate(ColorTranslation, color); - *DestBits = color; + *DestBits = XLATEOBJ_iXlate(ColorTranslation, + DIB_4BPP_GetPixel(SourceSurf, sx, sy)); + DestBits = (PULONG)((ULONG_PTR)DestBits + 2); sx += SrcZoomXHight; @@ -881,10 +869,6 @@ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - DestBits = (PULONG)((PBYTE)DestSurf->pvScan0 + (DestRect->left << 1) + - DestRect->top * DestSurf->lDelta); - DifflDelta = DestSurf->lDelta - (DesSizeX << 1); - for (DesY=0; DesY<DesSizeY; DesY++) { sx = SourceRect->left; @@ -892,9 +876,9 @@ for (DesX=0; DesX<DesSizeX; DesX++) { - color = DIB_8BPP_GetPixel(SourceSurf, sx, sy); - color = XLATEOBJ_iXlate(ColorTranslation, color); - *DestBits = color; + *DestBits = XLATEOBJ_iXlate(ColorTranslation, + DIB_8BPP_GetPixel(SourceSurf, sx, sy)); + DestBits = (PULONG)((ULONG_PTR)DestBits + 2); sx += SrcZoomXHight; @@ -935,9 +919,9 @@ for (DesX=0; DesX<DesSizeX; DesX++) { - color = DIB_24BPP_GetPixel(SourceSurf, sx, sy); - color = XLATEOBJ_iXlate(ColorTranslation, color); - *DestBits = color; + *DestBits = XLATEOBJ_iXlate(ColorTranslation, + DIB_24BPP_GetPixel(SourceSurf, sx, sy)); + DestBits = (PULONG)((ULONG_PTR)DestBits + 2); sx += SrcZoomXHight; @@ -965,10 +949,6 @@ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - DestBits = (PULONG)((PBYTE)DestSurf->pvScan0 + (DestRect->left << 1) + - DestRect->top * DestSurf->lDelta); - DifflDelta = DestSurf->lDelta - (DesSizeX << 1); - for (DesY=0; DesY<DesSizeY; DesY++) { sx = SourceRect->left; @@ -976,9 +956,9 @@ for (DesX=0; DesX<DesSizeX; DesX++) { - color = DIB_32BPP_GetPixel(SourceSurf, sx, sy); - color = XLATEOBJ_iXlate(ColorTranslation, color); - *DestBits = color; + *DestBits = XLATEOBJ_iXlate(ColorTranslation, + DIB_32BPP_GetPixel(SourceSurf, sx, sy)); + DestBits = (PULONG)((ULONG_PTR)DestBits + 2); sx += SrcZoomXHight; 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 (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib32bpp.c Fri Dec 29 16:16:53 2006 @@ -475,160 +475,243 @@ CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation, ULONG Mode) { - + LONG SrcSizeY; LONG SrcSizeX; LONG DesSizeY; - LONG DesSizeX; - LONG sx; - LONG sy; + LONG DesSizeX; + LONG sx = 0; + LONG sy = 0; LONG DesX; LONG DesY; - LONG color; PULONG DestBits; LONG DifflDelta; + + LONG SrcZoomXHight; + LONG SrcZoomXLow; + LONG SrcZoomYHight; + LONG SrcZoomYLow; + + LONG sy_dec = 0; + LONG sy_max; + + LONG sx_dec = 0; + LONG sx_max; DPRINT("DIB_32BPP_StretchBlt: Source BPP: %u, srcRect: (%d,%d)-(%d,%d), dstRect: (%d,%d)-(%d,%d)\n", BitsPerFormat(SourceSurf->iBitmapFormat), SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom, DestRect->left, DestRect->top, DestRect->right, DestRect->bottom); + /* Calc the Zoom height of Source */ SrcSizeY = SourceRect->bottom - SourceRect->top; + + /* Calc the Zoom Width of Source */ SrcSizeX = SourceRect->right - SourceRect->left; + /* Calc the Zoom height of Destions */ DesSizeY = DestRect->bottom - DestRect->top; - DesSizeX = DestRect->right - DestRect->left; - + + /* Calc the Zoom width of Destions */ + DesSizeX = DestRect->right - DestRect->left; + + /* Calc the zoom factor of soruce height */ + SrcZoomYHight = SrcSizeY / DesSizeY; + SrcZoomYLow = SrcSizeY - (SrcZoomYHight * DesSizeY); + + /* Calc the zoom factor of soruce width */ + SrcZoomXHight = SrcSizeX / DesSizeX; + SrcZoomXLow = SrcSizeX - (SrcZoomXHight * DesSizeX); + + sx_max = DesSizeX; + sy_max = DesSizeY; + sy = SourceRect->top; + + DestBits = (PULONG)((PBYTE)DestSurf->pvScan0 + (DestRect->left << 2) + + DestRect->top * DestSurf->lDelta); + + DifflDelta = DestSurf->lDelta - (DesSizeX << 2); switch(SourceSurf->iBitmapFormat) { - case BMF_1BPP: - /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ - /* This is a reference implementation, it hasn't been optimized for speed */ - - DestBits = (PULONG)((PBYTE)DestSurf->pvScan0 + (DestRect->left << 2) + - DestRect->top * DestSurf->lDelta); - - DifflDelta = DestSurf->lDelta - (DesSizeX << 2); - + case BMF_1BPP: + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + /* This is a reference implementation, it hasn't been optimized for speed */ for (DesY=0; DesY<DesSizeY; DesY++) - { - sy = ((DesY * SrcSizeY) / DesSizeY) + SourceRect->top; - - for (DesX=0; DesX<DesSizeX; DesX++, DestBits++ ) - { - sx = ((DesX * SrcSizeX) / DesSizeX) + SourceRect->left; - - if(DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0) - { - *DestBits = XLATEOBJ_iXlate(ColorTranslation, 0); - } - else - { - *DestBits = XLATEOBJ_iXlate(ColorTranslation, 1); - } - } + { + sx = SourceRect->left; + sx_dec = 0; + for (DesX=0; DesX<DesSizeX; DesX++) + { + *DestBits = XLATEOBJ_iXlate(ColorTranslation, + DIB_1BPP_GetPixel(SourceSurf, sx, sy)); + + DestBits = (PULONG)((ULONG_PTR)DestBits + 4); + + sx += SrcZoomXHight; + sx_dec += SrcZoomXLow; + if (sx_dec >= sx_max) + { + sx++; + sx_dec -= sx_max; + } + } + DestBits = (PULONG)((ULONG_PTR)DestBits + DifflDelta); - } - - break; - - case BMF_4BPP: + + sy += SrcZoomYHight; + sy_dec += SrcZoomYLow; + if (sy_dec >= sy_max) + { + sy++; + sy_dec -= sy_max; + } + } + break; + + case BMF_4BPP: /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - DestBits = (PULONG)((PBYTE)DestSurf->pvScan0 + (DestRect->left << 2) + - DestRect->top * DestSurf->lDelta); - - DifflDelta = DestSurf->lDelta - (DesSizeX << 2); - for (DesY=0; DesY<DesSizeY; DesY++) - { - sy = ((DesY * SrcSizeY) / DesSizeY) + SourceRect->top; - - for (DesX=0; DesX<DesSizeX; DesX++, DestBits++ ) - { - sx = ((DesX * SrcSizeX) / DesSizeX) + SourceRect->left; - color = DIB_4BPP_GetPixel(SourceSurf, sx, sy); - color = XLATEOBJ_iXlate(ColorTranslation, color); - *DestBits = color; - } - + { + sx = SourceRect->left; + sx_dec = 0; + for (DesX=0; DesX<DesSizeX; DesX++) + { + *DestBits = XLATEOBJ_iXlate(ColorTranslation, + DIB_4BPP_GetPixel(SourceSurf, sx, sy)); + + DestBits = (PULONG)((ULONG_PTR)DestBits + 4); + + sx += SrcZoomXHight; + sx_dec += SrcZoomXLow; + if (sx_dec >= sx_max) + { + sx++; + sx_dec -= sx_max; + } + } + DestBits = (PULONG)((ULONG_PTR)DestBits + DifflDelta); - } + + sy += SrcZoomYHight; + sy_dec += SrcZoomYLow; + if (sy_dec >= sy_max) + { + sy++; + sy_dec -= sy_max; + } + } break; case BMF_8BPP: /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - DestBits = (PULONG)((PBYTE)DestSurf->pvScan0 + (DestRect->left << 2) + - DestRect->top * DestSurf->lDelta); - - DifflDelta = DestSurf->lDelta - (DesSizeX << 2); - for (DesY=0; DesY<DesSizeY; DesY++) - { - sy = ((DesY * SrcSizeY) / DesSizeY) + SourceRect->top; - - for (DesX=0; DesX<DesSizeX; DesX++, DestBits++) - { - sx = ((DesX * SrcSizeX) / DesSizeX) + SourceRect->left; - color = DIB_8BPP_GetPixel(SourceSurf, sx, sy); - color = XLATEOBJ_iXlate(ColorTranslation, color); - *DestBits = color; - } + { + sx = SourceRect->left; + sx_dec = 0; + for (DesX=0; DesX<DesSizeX; DesX++) + { + *DestBits = XLATEOBJ_iXlate(ColorTranslation, + DIB_8BPP_GetPixel(SourceSurf, sx, sy)); + + DestBits = (PULONG)((ULONG_PTR)DestBits + 4); + + sx += SrcZoomXHight; + sx_dec += SrcZoomXLow; + if (sx_dec >= sx_max) + { + sx++; + sx_dec -= sx_max; + } + } + DestBits = (PULONG)((ULONG_PTR)DestBits + DifflDelta); - } + + sy += SrcZoomYHight; + sy_dec += SrcZoomYLow; + if (sy_dec >= sy_max) + { + sy++; + sy_dec -= sy_max; + } + } break; - case BMF_16BPP: + case BMF_16BPP: /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - DestBits = (PULONG)((PBYTE)DestSurf->pvScan0 + (DestRect->left << 2) + - DestRect->top * DestSurf->lDelta); - - DifflDelta = DestSurf->lDelta - (DesSizeX << 2); - for (DesY=0; DesY<DesSizeY; DesY++) - { - sy = ((DesY * SrcSizeY) / DesSizeY) + SourceRect->top; - - for (DesX=0; DesX<DesSizeX; DesX++, DestBits++) - { - sx = ((DesX * SrcSizeX) / DesSizeX) + SourceRect->left; - color = DIB_16BPP_GetPixel(SourceSurf, sx, sy); - color = XLATEOBJ_iXlate(ColorTranslation, color); - *DestBits = color; - } + { + sx = SourceRect->left; + sx_dec = 0; + for (DesX=0; DesX<DesSizeX; DesX++) + { + *DestBits = XLATEOBJ_iXlate(ColorTranslation, + DIB_16BPP_GetPixel(SourceSurf, sx, sy)); + + DestBits = (PULONG)((ULONG_PTR)DestBits + 4); + + sx += SrcZoomXHight; + sx_dec += SrcZoomXLow; + if (sx_dec >= sx_max) + { + sx++; + sx_dec -= sx_max; + } + } + DestBits = (PULONG)((ULONG_PTR)DestBits + DifflDelta); - } - break; + + sy += SrcZoomYHight; + sy_dec += SrcZoomYLow; + if (sy_dec >= sy_max) + { + sy++; + sy_dec -= sy_max; + } + } + break; case BMF_24BPP: /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - DestBits = (PULONG)((PBYTE)DestSurf->pvScan0 + (DestRect->left << 2) + - DestRect->top * DestSurf->lDelta); - - DifflDelta = DestSurf->lDelta - (DesSizeX << 2); - for (DesY=0; DesY<DesSizeY; DesY++) - { - sy = ((DesY * SrcSizeY) / DesSizeY) + SourceRect->top; - - for (DesX=0; DesX<DesSizeX; DesX++, DestBits++) - { - sx = ((DesX * SrcSizeX) / DesSizeX) + SourceRect->left; - color = DIB_24BPP_GetPixel(SourceSurf, sx, sy); - color = XLATEOBJ_iXlate(ColorTranslation, color); - *DestBits = color; - } + { + sx = SourceRect->left; + sx_dec = 0; + for (DesX=0; DesX<DesSizeX; DesX++) + { + *DestBits = XLATEOBJ_iXlate(ColorTranslation, + DIB_24BPP_GetPixel(SourceSurf, sx, sy)); + + DestBits = (PULONG)((ULONG_PTR)DestBits + 4); + + sx += SrcZoomXHight; + sx_dec += SrcZoomXLow; + if (sx_dec >= sx_max) + { + sx++; + sx_dec -= sx_max; + } + } + DestBits = (PULONG)((ULONG_PTR)DestBits + DifflDelta); - } - break; + + sy += SrcZoomYHight; + sy_dec += SrcZoomYLow; + if (sy_dec >= sy_max) + { + sy++; + sy_dec -= sy_max; + } + } + break; case BMF_32BPP: return ScaleRectAvg32(DestSurf, SourceSurf, DestRect, SourceRect, MaskOrigin, BrushOrigin, 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 (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib8bpp.c Fri Dec 29 16:16:53 2006 @@ -463,65 +463,128 @@ LONG SrcSizeY; LONG SrcSizeX; LONG DesSizeY; - LONG DesSizeX; - LONG sx; - LONG sy; + LONG DesSizeX; + LONG sx = 0; + LONG sy = 0; LONG DesX; LONG DesY; - LONG color; + PULONG DestBits; + LONG DifflDelta; + + LONG SrcZoomXHight; + LONG SrcZoomXLow; + LONG SrcZoomYHight; + LONG SrcZoomYLow; + + LONG sy_dec = 0; + LONG sy_max; + + LONG sx_dec = 0; + LONG sx_max; DPRINT("DIB_8BPP_StretchBlt: Source BPP: %u, srcRect: (%d,%d)-(%d,%d), dstRect: (%d,%d)-(%d,%d)\n", BitsPerFormat(SourceSurf->iBitmapFormat), SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom, DestRect->left, DestRect->top, DestRect->right, DestRect->bottom); + /* Calc the Zoom height of Source */ SrcSizeY = SourceRect->bottom - SourceRect->top; + + /* Calc the Zoom Width of Source */ SrcSizeX = SourceRect->right - SourceRect->left; + /* Calc the Zoom height of Destions */ DesSizeY = DestRect->bottom - DestRect->top; + + /* Calc the Zoom width of Destions */ DesSizeX = DestRect->right - DestRect->left; + + /* Calc the zoom factor of soruce height */ + SrcZoomYHight = SrcSizeY / DesSizeY; + SrcZoomYLow = SrcSizeY - (SrcZoomYHight * DesSizeY); + + /* Calc the zoom factor of soruce width */ + SrcZoomXHight = SrcSizeX / DesSizeX; + SrcZoomXLow = SrcSizeX - (SrcZoomXHight * DesSizeX); + + sx_max = DesSizeX; + sy_max = DesSizeY; + sy = SourceRect->top; + + DestBits = (PULONG)((PBYTE)DestSurf->pvScan0 + (DestRect->left) + + DestRect->top * DestSurf->lDelta); + + DifflDelta = DestSurf->lDelta - DesSizeX ; switch(SourceSurf->iBitmapFormat) { case BMF_1BPP: - /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ - /* This is a reference implementation, it hasn't been optimized for speed */ - - for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) - { - sy = (((DesY - DestRect->top) * SrcSizeY) / DesSizeY) + SourceRect->top; - - for (DesX=DestRect->left; DesX<DestRect->right; DesX++) - { - sx = (((DesX - DestRect->left) * SrcSizeX) / DesSizeX) + SourceRect->left; - - if(DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0) - { - DIB_8BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 0)); - } - else - { - DIB_8BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 1)); - } - } - } - - break; - - case BMF_4BPP: /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - - for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) - { - sy = (((DesY - DestRect->top) * SrcSizeY) / DesSizeY) + SourceRect->top; - - for (DesX=DestRect->left; DesX<DestRect->right; DesX++) - { - sx = (((DesX - DestRect->left) * SrcSizeX) / DesSizeX) + SourceRect->left; - color = DIB_4BPP_GetPixel(SourceSurf, sx, sy); - DIB_8BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + for (DesY=0; DesY<DesSizeY; DesY++) + { + sx = SourceRect->left; + sx_dec = 0; + for (DesX=0; DesX<DesSizeX; DesX++) + { + *DestBits = XLATEOBJ_iXlate(ColorTranslation, + DIB_1BPP_GetPixel(SourceSurf, sx, sy)); + + DestBits = (PULONG)((ULONG_PTR)DestBits + 1); + + sx += SrcZoomXHight; + sx_dec += SrcZoomXLow; + if (sx_dec >= sx_max) + { + sx++; + sx_dec -= sx_max; + } } - } + + DestBits = (PULONG)((ULONG_PTR)DestBits + DifflDelta); + + sy += SrcZoomYHight; + sy_dec += SrcZoomYLow; + if (sy_dec >= sy_max) + { + sy++; + sy_dec -= sy_max; + } + } + break; + + case BMF_4BPP: + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + /* This is a reference implementation, it hasn't been optimized for speed */ + for (DesY=0; DesY<DesSizeY; DesY++) + { + sx = SourceRect->left; + sx_dec = 0; + for (DesX=0; DesX<DesSizeX; DesX++) + { + *DestBits = XLATEOBJ_iXlate(ColorTranslation, + DIB_4BPP_GetPixel(SourceSurf, sx, sy)); + + DestBits = (PULONG)((ULONG_PTR)DestBits + 1); + + sx += SrcZoomXHight; + sx_dec += SrcZoomXLow; + if (sx_dec >= sx_max) + { + sx++; + sx_dec -= sx_max; + } + } + + DestBits = (PULONG)((ULONG_PTR)DestBits + DifflDelta); + + sy += SrcZoomYHight; + sy_dec += SrcZoomYLow; + if (sy_dec >= sy_max) + { + sy++; + sy_dec -= sy_max; + } + } break; case BMF_8BPP: @@ -529,56 +592,108 @@ ClipRegion, ColorTranslation, Mode); break; - case BMF_16BPP: + case BMF_16BPP: /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - - for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) - { - sy = (((DesY - DestRect->top) * SrcSizeY) / DesSizeY) + SourceRect->top; - - for (DesX=DestRect->left; DesX<DestRect->right; DesX++) - { - sx = (((DesX - DestRect->left) * SrcSizeX) / DesSizeX) + SourceRect->left; - color = DIB_16BPP_GetPixel(SourceSurf, sx, sy); - DIB_8BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + for (DesY=0; DesY<DesSizeY; DesY++) + { + sx = SourceRect->left; + sx_dec = 0; + for (DesX=0; DesX<DesSizeX; DesX++) + { + *DestBits = XLATEOBJ_iXlate(ColorTranslation, + DIB_16BPP_GetPixel(SourceSurf, sx, sy)); + + DestBits = (PULONG)((ULONG_PTR)DestBits + 1); + + sx += SrcZoomXHight; + sx_dec += SrcZoomXLow; + if (sx_dec >= sx_max) + { + sx++; + sx_dec -= sx_max; + } } - } - break; + + DestBits = (PULONG)((ULONG_PTR)DestBits + DifflDelta); + + sy += SrcZoomYHight; + sy_dec += SrcZoomYLow; + if (sy_dec >= sy_max) + { + sy++; + sy_dec -= sy_max; + } + } + break; case BMF_24BPP: - /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ - /* This is a reference implementation, it hasn't been optimized for speed */ - - for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) - { - sy = (((DesY - DestRect->top) * SrcSizeY) / DesSizeY) + SourceRect->top; - - for (DesX=DestRect->left; DesX<DestRect->right; DesX++) - { - sx = (((DesX - DestRect->left) * SrcSizeX) / DesSizeX) + SourceRect->left; - color = DIB_24BPP_GetPixel(SourceSurf, sx, sy); - DIB_8BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + for (DesY=0; DesY<DesSizeY; DesY++) + { + sx = SourceRect->left; + sx_dec = 0; + for (DesX=0; DesX<DesSizeX; DesX++) + { + *DestBits = XLATEOBJ_iXlate(ColorTranslation, + DIB_24BPP_GetPixel(SourceSurf, sx, sy)); + + DestBits = (PULONG)((ULONG_PTR)DestBits + 1); + + sx += SrcZoomXHight; + sx_dec += SrcZoomXLow; + if (sx_dec >= sx_max) + { + sx++; + sx_dec -= sx_max; + } } - } - break; + + DestBits = (PULONG)((ULONG_PTR)DestBits + DifflDelta); + + sy += SrcZoomYHight; + sy_dec += SrcZoomYLow; + if (sy_dec >= sy_max) + { + sy++; + sy_dec -= sy_max; + } + } + break; case BMF_32BPP: /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - - for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) - { - sy = (((DesY - DestRect->top) * SrcSizeY) / DesSizeY) + SourceRect->top; - - for (DesX=DestRect->left; DesX<DestRect->right; DesX++) - { - sx = (((DesX - DestRect->left) * SrcSizeX) / DesSizeX) + SourceRect->left; - color = DIB_32BPP_GetPixel(SourceSurf, sx, sy); - DIB_8BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + for (DesY=0; DesY<DesSizeY; DesY++) + { + sx = SourceRect->left; + sx_dec = 0; + for (DesX=0; DesX<DesSizeX; DesX++) + { + *DestBits = XLATEOBJ_iXlate(ColorTranslation, + DIB_1BPP_GetPixel(SourceSurf, sx, sy)); + + DestBits = (PULONG)((ULONG_PTR)DestBits + 1); + + sx += SrcZoomXHight; + sx_dec += SrcZoomXLow; + if (sx_dec >= sx_max) + { + sx++; + sx_dec -= sx_max; + } } - } - break; + + DestBits = (PULONG)((ULONG_PTR)DestBits + DifflDelta); + + sy += SrcZoomYHight; + sy_dec += SrcZoomYLow; + if (sy_dec >= sy_max) + { + sy++; + sy_dec -= sy_max; + } + } + break;

1 0

[greatlrd] 25236: freetype cache glyth patch pass last all my test.patch ogrinal author of this patch is royce3, modify by tinus so it work again with trunk, ThePhysicist (timo dot kreuzer at web dot de) did fix the last bugs in it. at last long leave freetype glyth patch, now we got faster text output in reactos. and I where up to 38fps in winquake with this patch (debugbuild + serial debug on). This is very fast. I wonder what speed it give in release build or qemu now. See issue #511 for more
by greatlrd＠svn.reactos.org 29 Dec '06

29 Dec '06

Author: greatlrd Date: Fri Dec 29 03:09:54 2006 New Revision: 25236 URL: http://svn.reactos.org/svn/reactos?rev=25236&view=rev Log: freetype cache glyth patch pass last all my test.patch ogrinal author of this patch is royce3, modify by tinus so it work again with trunk, ThePhysicist (timo dot kreuzer at web dot de) did fix the last bugs in it. at last long leave freetype glyth patch, now we got faster text output in reactos. and I where up to 38fps in winquake with this patch (debugbuild + serial debug on). This is very fast. I wonder what speed it give in release build or qemu now. See issue #511 for more details. Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c Fri Dec 29 03:09:54 2006 @@ -28,6 +28,7 @@ #include <ft2build.h> #include FT_FREETYPE_H +#include FT_GLYPH_H #include <freetype/tttables.h> #include <freetype/fttrigon.h> #include <freetype/ftglyph.h> @@ -53,6 +54,20 @@ static LIST_ENTRY FontListHead; static FAST_MUTEX FontListLock; static BOOL RenderingEnabled = TRUE; + +#define MAX_FONT_CACHE 256 +UINT Hits; +UINT Misses; + +typedef struct _FONT_CACHE_ENTRY { + LIST_ENTRY ListEntry; + int GlyphIndex; + FT_Face Face; + FT_Glyph Glyph; + int Height; +} FONT_CACHE_ENTRY, *PFONT_CACHE_ENTRY; +static LIST_ENTRY FontCacheListHead; +static UINT FontCacheNumEntries; static PWCHAR ElfScripts[32] = { /* these are in the order of the fsCsb[0] bits */ L"Western", /*00*/ @@ -133,6 +148,8 @@ ULONG ulError; InitializeListHead(&FontListHead); + InitializeListHead(&FontCacheListHead); + FontCacheNumEntries = 0; ExInitializeFastMutex(&FontListLock); ExInitializeFastMutex(&FreeTypeLock); @@ -1437,6 +1454,103 @@ UNIMPLEMENTED; return 0; } +FT_Glyph STDCALL +NtGdiGlyphCacheGet( + FT_Face Face, + INT GlyphIndex, + INT Height) +{ + PLIST_ENTRY CurrentEntry; + PFONT_CACHE_ENTRY FontEntry; + +// DbgPrint("CacheGet\n"); + + CurrentEntry = FontCacheListHead.Flink; + while (CurrentEntry != &FontCacheListHead) + { + FontEntry = (PFONT_CACHE_ENTRY)CurrentEntry; + if (FontEntry->Face == Face && + FontEntry->GlyphIndex == GlyphIndex && + FontEntry->Height == Height) + break; + CurrentEntry = CurrentEntry->Flink; + } + + if (CurrentEntry == &FontCacheListHead) { +// DbgPrint("Miss! %x\n", FontEntry->Glyph); + Misses++; + if (Misses>100) { + DbgPrint ("Hits: %d Misses: %d\n", Hits, Misses); + Hits = Misses = 0; + } + return NULL; + } + + RemoveEntryList(CurrentEntry); + InsertHeadList(&FontCacheListHead, CurrentEntry); + +// DbgPrint("Hit! %x\n", FontEntry->Glyph); + Hits++; + if (Hits>100) { + DbgPrint ("Hits: %d Misses: %d\n", Hits, Misses); + Hits = Misses = 0; + } + return FontEntry->Glyph; +} + +FT_Glyph STDCALL +NtGdiGlyphCacheSet( + FT_Face Face, + INT GlyphIndex, + INT Height, + FT_GlyphSlot GlyphSlot, + FT_Render_Mode RenderMode) +{ + FT_Glyph GlyphCopy; + INT error; + PFONT_CACHE_ENTRY NewEntry; + +// DbgPrint("CacheSet.\n"); + + error = FT_Get_Glyph(GlyphSlot, &GlyphCopy); + if (error) + { + DbgPrint("Failure caching glyph.\n"); + return NULL; + }; + error = FT_Glyph_To_Bitmap(&GlyphCopy, RenderMode, 0, 1); + if (error) + { + DbgPrint("Failure rendering glyph.\n"); + return NULL; + }; + + NewEntry = ExAllocatePoolWithTag(PagedPool, sizeof(FONT_CACHE_ENTRY), TAG_FONT); + if (!NewEntry) + { + DbgPrint("Alloc failure caching glyph.\n"); + FT_Done_Glyph(GlyphCopy); + return NULL; + } + + NewEntry->GlyphIndex = GlyphIndex; + NewEntry->Face = Face; + NewEntry->Glyph = GlyphCopy; + NewEntry->Height = Height; + + InsertHeadList(&FontCacheListHead, &NewEntry->ListEntry); + if (FontCacheNumEntries++ > MAX_FONT_CACHE) { + NewEntry = (PFONT_CACHE_ENTRY)FontCacheListHead.Blink; + FT_Done_Glyph(NewEntry->Glyph); + RemoveTailList(&FontCacheListHead); + ExFreePool(NewEntry); + FontCacheNumEntries--; + } + +// DbgPrint("Returning the glyphcopy: %x\n", GlyphCopy); + + return GlyphCopy; +} BOOL STDCALL NtGdiExtTextOut( @@ -1461,6 +1575,8 @@ int error, glyph_index, n, i; FT_Face face; FT_GlyphSlot glyph; + FT_Glyph realglyph; + FT_BitmapGlyph realglyph2; LONGLONG TextLeft, RealXStart; ULONG TextTop, previous, BackgroundLeft; FT_Bool use_kerning; @@ -1727,15 +1843,17 @@ for (i = Start; i < Count; i++) { glyph_index = FT_Get_Char_Index(face, *TempText); + if (!(realglyph = NtGdiGlyphCacheGet(face, glyph_index, TextObj->logfont.lfHeight))) + { error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); - if (error) { DPRINT1("WARNING: Failed to load and render glyph! [index: %u]\n", glyph_index); } glyph = face->glyph; - + realglyph = NtGdiGlyphCacheSet(face, glyph_index, TextObj->logfont.lfHeight, glyph, RenderMode); + } /* retrieve kerning distance */ if (use_kerning && previous && glyph_index) { @@ -1744,7 +1862,7 @@ TextWidth += delta.x; } - TextWidth += glyph->advance.x; + TextWidth += realglyph->advance.x >> 10; previous = glyph_index; TempText++; @@ -1773,16 +1891,21 @@ for (i = 0; i < Count; i++) { glyph_index = FT_Get_Char_Index(face, *String); + if (!(realglyph = NtGdiGlyphCacheGet(face, glyph_index, TextObj->logfont.lfHeight))) + { error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); if (error) { DPRINT1("WARNING: Failed to load and render glyph! [index: %u]\n", glyph_index); - IntUnLockFreeType; + IntUnLockFreeType; goto fail; } - glyph = face->glyph; + realglyph = NtGdiGlyphCacheSet(face, glyph_index, TextObj->logfont.lfHeight, glyph, RenderMode); + } +// DbgPrint("realglyph: %x\n", realglyph); +// DbgPrint("TextLeft: %d\n", TextLeft); /* retrieve kerning distance and move pen position */ if (use_kerning && previous && glyph_index && NULL == Dx) @@ -1791,21 +1914,29 @@ FT_Get_Kerning(face, previous, glyph_index, 0, &delta); TextLeft += delta.x; } - - if (glyph->format == ft_glyph_format_outline) +// DPRINT1("TextLeft: %d\n", TextLeft); +// DPRINT1("TextTop: %d\n", TextTop); + + if (realglyph->format == ft_glyph_format_outline) { - error = FT_Render_Glyph(glyph, RenderMode); + DbgPrint("Should already be done\n"); +// error = FT_Render_Glyph(glyph, RenderMode); + error = FT_Glyph_To_Bitmap(&realglyph, RenderMode, 0, 0); if (error) { DPRINT1("WARNING: Failed to render glyph!\n"); goto fail; } } + realglyph2 = (FT_BitmapGlyph)realglyph; + +// DPRINT1("Pitch: %d\n", pitch); +// DPRINT1("Advance: %d\n", realglyph->advance.x); if (fuOptions & ETO_OPAQUE) { DestRect.left = BackgroundLeft; - DestRect.right = (TextLeft + glyph->advance.x + 32) >> 6; + DestRect.right = (TextLeft + (realglyph->advance.x >> 10) + 32) >> 6; DestRect.top = TextTop + yoff - ((face->size->metrics.ascender + 32) >> 6); DestRect.bottom = TextTop + yoff + ((32 - face->size->metrics.descender) >> 6); IntEngBitBlt( @@ -1823,15 +1954,21 @@ BackgroundLeft = DestRect.right; } - DestRect.left = ((TextLeft + 32) >> 6) + glyph->bitmap_left; - DestRect.right = DestRect.left + glyph->bitmap.width; - DestRect.top = TextTop + yoff - glyph->bitmap_top; - DestRect.bottom = DestRect.top + glyph->bitmap.rows; - - bitSize.cx = glyph->bitmap.width; - bitSize.cy = glyph->bitmap.rows; - MaskRect.right = glyph->bitmap.width; - MaskRect.bottom = glyph->bitmap.rows; + DestRect.left = ((TextLeft + 32) >> 6) + realglyph2->left; + DestRect.right = DestRect.left + realglyph2->bitmap.width; + DestRect.top = TextTop + yoff - realglyph2->top; + DestRect.bottom = DestRect.top + realglyph2->bitmap.rows; + +// DbgPrint("lrtb %d %d %d %d\n", DestRect.left, DestRect.right, +// DestRect.top, DestRect.bottom); +// DbgPrint("specified lrtb %d %d %d %d\n", SpecifiedDestRect.left, SpecifiedDestRect.right, +// SpecifiedDestRect.top, SpecifiedDestRect.bottom); +// DbgPrint ("dc->w.DCOrgX: %d\n", dc->w.DCOrgX); + + bitSize.cx = realglyph2->bitmap.width; + bitSize.cy = realglyph2->bitmap.rows; + MaskRect.right = realglyph2->bitmap.width; + MaskRect.bottom = realglyph2->bitmap.rows; /* * We should create the bitmap out of the loop at the biggest possible @@ -1844,13 +1981,14 @@ * the FreeType bitmap to a temporary bitmap. */ - HSourceGlyph = EngCreateBitmap(bitSize, glyph->bitmap.pitch, - (glyph->bitmap.pixel_mode == ft_pixel_mode_grays) ? + HSourceGlyph = EngCreateBitmap(bitSize, realglyph2->bitmap.pitch, + (realglyph2->bitmap.pixel_mode == ft_pixel_mode_grays) ? BMF_8BPP : BMF_1BPP, BMF_TOPDOWN, - glyph->bitmap.buffer); + realglyph2->bitmap.buffer); if ( !HSourceGlyph ) { DPRINT1("WARNING: EngLockSurface() failed!\n"); + FT_Done_Glyph(realglyph); IntUnLockFreeType; goto fail; } @@ -1901,11 +2039,13 @@ if (NULL == Dx) { - TextLeft += glyph->advance.x; + TextLeft += realglyph->advance.x >> 10; +// DbgPrint("new TextLeft: %d\n", TextLeft); } else { TextLeft += Dx[i] << 6; +// DbgPrint("new TextLeft2: %d\n", TextLeft); } previous = glyph_index;

1 0

[jimtabor] 25235: Implement GetDCDWord, update GetObjectType and printing.c fixups.
by jimtabor＠svn.reactos.org 28 Dec '06

28 Dec '06

Author: jimtabor Date: Fri Dec 29 01:36:53 2006 New Revision: 25235 URL: http://svn.reactos.org/svn/reactos?rev=25235&view=rev Log: Implement GetDCDWord, update GetObjectType and printing.c fixups. Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c trunk/reactos/dll/win32/gdi32/objects/painting.c Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/dc… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/dc.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/dc.c Fri Dec 29 01:36:53 2006 @@ -322,6 +322,17 @@ return NtGdiGetRelAbs(hdc); } + +DWORD +STDCALL +GetDCDWord( HDC hDC, INT u, DWORD Result ) +{ +BOOL Ret = TRUE; //NtGdiGetDCDword( hDC, u, (DWORD*) &u ); + if (!Ret) return Result; + else return u; +} + + /* * @implemented */ @@ -528,10 +539,15 @@ Ret = OBJ_REGION; break; case GDI_OBJECT_TYPE_DC: - Ret = OBJ_DC; - break; - case GDI_OBJECT_TYPE_METADC: - Ret = OBJ_METADC; + if ( GetDCDWord( h, GdiGetIsMemDc, 0)) + { + Ret = OBJ_MEMDC; + } + else + Ret = OBJ_DC; + break; + case GDI_OBJECT_TYPE_COLORSPACE: + Ret = OBJ_COLORSPACE; break; case GDI_OBJECT_TYPE_METAFILE: Ret = OBJ_METAFILE; @@ -559,3 +575,5 @@ SetLastError(ERROR_INVALID_HANDLE); return Ret; } + + Modified: trunk/reactos/dll/win32/gdi32/objects/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/pa… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/painting.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/painting.c Fri Dec 29 01:36:53 2006 @@ -139,8 +139,7 @@ if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) { if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) -// return MFDRV_MetaParam2( hDC, META_MOVETO, x, y); - return FALSE; + return MFDRV_MetaParam2( hDC, META_MOVETO, x, y); else { PLDC pLDC = Dc_Attr->pvLDC; @@ -151,8 +150,7 @@ } if (pLDC->iType == LDC_EMFLDC) { - //if (!EMFDRV_MoveTo( hDC, x, y)) - return FALSE; + if (!EMFDRV_MoveTo( hDC, x, y)) return FALSE; } } } @@ -441,12 +439,8 @@ STDCALL GetPixel( HDC hDC, INT x, INT y ) { - PDC_ATTR Dc_Attr; - if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) return CLR_INVALID; - - if (!GdiGetHandleUserData((HGDIOBJ) hDC, (PVOID) &Dc_Attr)) return CLR_INVALID; - + if (!GdiIsHandleValid((HGDIOBJ) hDC)) return CLR_INVALID; return NtGdiGetPixel( hDC, x, y); }

1 0

[mbosma] 25234: EmuandCo: More applications
by mbosma＠svn.reactos.org 28 Dec '06

28 Dec '06

Author: mbosma Date: Thu Dec 28 19:52:07 2006 New Revision: 25234 URL: http://svn.reactos.org/svn/reactos?rev=25234&view=rev Log: EmuandCo: More applications Modified: trunk/reactos/base/applications/downloader/apps.xml Modified: trunk/reactos/base/applications/downloader/apps.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/apps.xml (original) +++ trunk/reactos/base/applications/downloader/apps.xml Thu Dec 28 19:52:07 2006 @@ -12,11 +12,14 @@ <description>Mozilla Suite is alive. This is the one and only Browser, Mail, Chat, Composer bundle you will ever need.</description> <location>http://ftp-mozilla.netscape.com/pub/mozilla.org/seamonkey/releases/1.0.7/se…</location> </application> + <application name="Mozilla ActiveX Control"> + <description>Essential Component to get ReactOS Explorer's and other applications Internet Browsing feature running.</description> + <location>http://ovh.dl.sourceforge.net/sourceforge/reactos/MozillaControl1712-ReactO…</location> + </application> <application name="Putty"> <description>A free SSH, Telnet, rlogin, and raw TCP client.</description> <location>http://the.earth.li/~sgtatham/putty/latest/x86/putty-0.58-installer.exe</location> </application> - </category> <category name="Office" icon="2"> <application name="Abiword"> @@ -30,8 +33,12 @@ </category> <category name="Graphics" icon="3"> <application name="IrfanView"> - <description>Viewer for all kinds of graphics.</description> + <description>Viewer for all kinds of graphics/audio files/video files.</description> <location>http://gd.tuwien.ac.at/graphics/irfanview/iview399.exe</location> + </application> + <application name="IrfanView Plugins"> + <description>Additional Plugins for supporting more File types.</description> + <location>http://irfanview.tuwien.ac.at/plugins/irfanview_plugins_399.exe</location> </application> <application name="TuxPaint"> <description>An open source bitmap graphics editor geared towards young children.</description> @@ -47,12 +54,24 @@ </application> </category> <category name="Games & Fun" icon="6"> + <application name="ScummVM"> + <description>SamNMax, Day of Tentacle, etc on ReactOS</description> + <location>http://ovh.dl.sourceforge.net/sourceforge/scummvm/scummvm-0.9.1-win32.exe</location> + </application> </category> <category name="Tools" icon="7"> <application name="7-Zip"> <description>Utility to create and open zip, tar, rar and other archive files.</description> <location>http://ovh.dl.sourceforge.net/sourceforge/sevenzip/7z442.exe</location> </application> + <application name="uTorrent"> + <description>Small and fast Torrent Client.</description> + <location>http://download.utorrent.com/1.6/uTorrent-1.6-install.exe</location> + </application> + <application name="Audio Grabber"> + <description>A very good CD Ripper/File Converter.</description> + <location>http://www.audiograbber.de/files/342677432/agsetup183se.exe</location> + </application> </category> <category name="Others" icon="8"> </category>

1 0

[mbosma] 25233: Merge to state of 0.3.1 branch.
by mbosma＠svn.reactos.org 28 Dec '06

28 Dec '06

Author: mbosma Date: Thu Dec 28 19:27:36 2006 New Revision: 25233 URL: http://svn.reactos.org/svn/reactos?rev=25233&view=rev Log: Merge to state of 0.3.1 branch. Modified: branches/cache_manager_rewrite/mm/anonmem.c branches/cache_manager_rewrite/mm/drvlck.c branches/cache_manager_rewrite/mm/elf.inc.h branches/cache_manager_rewrite/mm/marea.c branches/cache_manager_rewrite/mm/mm.c branches/cache_manager_rewrite/mm/mminit.c branches/cache_manager_rewrite/mm/ncache.c branches/cache_manager_rewrite/mm/npool.c branches/cache_manager_rewrite/mm/pagefile.c branches/cache_manager_rewrite/mm/pe.c branches/cache_manager_rewrite/mm/pool.c branches/cache_manager_rewrite/mm/ppool.c branches/cache_manager_rewrite/mm/process.c branches/cache_manager_rewrite/mm/region.c branches/cache_manager_rewrite/mm/virtual.c branches/cache_manager_rewrite/vfat/blockdev.c branches/cache_manager_rewrite/vfat/cleanup.c branches/cache_manager_rewrite/vfat/close.c branches/cache_manager_rewrite/vfat/create.c branches/cache_manager_rewrite/vfat/direntry.c branches/cache_manager_rewrite/vfat/fastio.c branches/cache_manager_rewrite/vfat/fat.c branches/cache_manager_rewrite/vfat/fcb.c branches/cache_manager_rewrite/vfat/flush.c branches/cache_manager_rewrite/vfat/iface.c branches/cache_manager_rewrite/vfat/misc.c branches/cache_manager_rewrite/vfat/rw.c branches/cache_manager_rewrite/vfat/string.c branches/cache_manager_rewrite/vfat/volume.c Modified: branches/cache_manager_rewrite/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/anonme… ============================================================================== --- branches/cache_manager_rewrite/mm/anonmem.c (original) +++ branches/cache_manager_rewrite/mm/anonmem.c Thu Dec 28 19:27:36 2006 @@ -434,7 +434,7 @@ return(STATUS_SUCCESS); } -VOID STATIC +VOID static MmModifyAttributes(PMADDRESS_SPACE AddressSpace, PVOID BaseAddress, ULONG RegionSize, @@ -765,7 +765,7 @@ return(STATUS_SUCCESS); } -VOID STATIC +VOID static MmFreeVirtualMemoryPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address, Modified: branches/cache_manager_rewrite/mm/drvlck.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/drvlck… ============================================================================== --- branches/cache_manager_rewrite/mm/drvlck.c (original) +++ branches/cache_manager_rewrite/mm/drvlck.c Thu Dec 28 19:27:36 2006 @@ -39,8 +39,7 @@ VOID STDCALL MmLockPagableSectionByHandle(IN PVOID ImageSectionHandle) { - // MmLockMemoryArea((MEMORY_AREA *)ImageSectionHandle); - DPRINT1("MmLockPagableSectionByHandle is unimplemented\n"); + UNIMPLEMENTED; } @@ -75,15 +74,19 @@ */ VOID STDCALL MmUnlockPagableImageSection(IN PVOID ImageSectionHandle) -{} - +{ + UNIMPLEMENTED; +} /* * @unimplemented */ -VOID STDCALL +PVOID STDCALL MmPageEntireDriver(IN PVOID AddressWithinSection) -{} +{ + UNIMPLEMENTED; + return NULL; +} /* @@ -91,6 +94,8 @@ */ VOID STDCALL MmResetDriverPaging(IN PVOID AddressWithinSection) -{} +{ + UNIMPLEMENTED; +} /* EOF */ Modified: branches/cache_manager_rewrite/mm/elf.inc.h URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/elf.in… ============================================================================== --- branches/cache_manager_rewrite/mm/elf.inc.h (original) +++ branches/cache_manager_rewrite/mm/elf.inc.h Thu Dec 28 19:27:36 2006 @@ -172,12 +172,12 @@ IN ULONG DataType ) { - PBYTE p; + PUCHAR p; if(DataType == ELF_TARG_DATA) return Input; - p = (PBYTE)&Input; + p = (PUCHAR)&Input; switch(DataType) { @@ -195,12 +195,12 @@ IN ULONG DataType ) { - PBYTE p; + PUCHAR p; if(DataType == ELF_TARG_DATA) return Input; - p = (PBYTE)&Input; + p = (PUCHAR)&Input; switch(DataType) { @@ -218,12 +218,12 @@ IN ULONG DataType ) { - PBYTE p; + PUCHAR p; if(DataType == ELF_TARG_DATA) return Input; - p = (PBYTE)&Input; + p = (PUCHAR)&Input; switch(DataType) { @@ -241,12 +241,12 @@ IN ULONG DataType ) { - PBYTE p; + PUCHAR p; ULONG64 nSafeInput; RtlRetrieveUlonglong(&nSafeInput, Input); - p = (PBYTE)&nSafeInput; + p = (PUCHAR)&nSafeInput; switch(DataType) { @@ -264,7 +264,7 @@ IN ULONG DataType ) { - PBYTE p; + PUCHAR p; ULONG nSafeInput; union { @@ -277,7 +277,7 @@ if(DataType == ELF_TARG_DATA) return nSafeInput; - p = (PBYTE)&nSafeInput; + p = (PUCHAR)&nSafeInput; switch(DataType) { @@ -294,10 +294,7 @@ if(Number == 0) return FALSE; - while((Number % 2) == 0) - Number /= 2; - - return Number == 1; + return (Number & (Number - 1)) == 0; } static __inline Elf_Addr ElfFmtpModPow2 Modified: branches/cache_manager_rewrite/mm/marea.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/marea.… ============================================================================== --- branches/cache_manager_rewrite/mm/marea.c (original) +++ branches/cache_manager_rewrite/mm/marea.c Thu Dec 28 19:27:36 2006 @@ -947,9 +947,9 @@ PMEMORY_AREA MemoryArea; DPRINT("MmCreateMemoryArea(Type %d, BaseAddress %p, " - "*BaseAddress %p, Length %p, Attributes %x, TopDown: %x, " + "*BaseAddress %p, Length %p, AllocationFlags %x, " "FixedAddress %x, Result %p)\n", - Type, BaseAddress, *BaseAddress, Length, Attributes, TopDown, + Type, BaseAddress, *BaseAddress, Length, AllocationFlags, FixedAddress, Result); MmVerifyMemoryAreas(AddressSpace); Modified: branches/cache_manager_rewrite/mm/mm.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/mm.c?r… ============================================================================== --- branches/cache_manager_rewrite/mm/mm.c (original) +++ branches/cache_manager_rewrite/mm/mm.c Thu Dec 28 19:27:36 2006 @@ -110,6 +110,7 @@ */ if (Mode != KernelMode) { + DPRINT1("MmAccessFault(Mode %d, Address %x)\n", Mode, Address); DbgPrint("%s:%d\n",__FILE__,__LINE__); return(STATUS_UNSUCCESSFUL); } @@ -331,21 +332,21 @@ /* * @unimplemented */ -DWORD STDCALL -MmAdjustWorkingSetSize (DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2) +ULONG STDCALL +MmAdjustWorkingSetSize (ULONG Unknown0, + ULONG Unknown1, + ULONG Unknown2) { UNIMPLEMENTED; return (0); } -DWORD +ULONG STDCALL MmDbgTranslatePhysicalAddress ( - DWORD Unknown0, - DWORD Unknown1 + ULONG Unknown0, + ULONG Unknown1 ) { UNIMPLEMENTED; Modified: branches/cache_manager_rewrite/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/mminit… ============================================================================== --- branches/cache_manager_rewrite/mm/mminit.c (original) +++ branches/cache_manager_rewrite/mm/mminit.c Thu Dec 28 19:27:36 2006 @@ -29,16 +29,12 @@ static BOOLEAN IsThisAnNtAsSystem = FALSE; -MM_SYSTEM_SIZE MmSystemSize = MmSmallSystem; +MM_SYSTEMSIZE MmSystemSize = MmSmallSystem; PHYSICAL_ADDRESS MmSharedDataPagePhysicalAddress; PVOID MiNonPagedPoolStart; ULONG MiNonPagedPoolLength; - -extern ULONG init_stack; -extern ULONG init_stack_top; -extern ULONG trap_stack; VOID INIT_FUNCTION NTAPI MmInitVirtualMemory(ULONG_PTR LastKernelAddress, ULONG KernelLength); @@ -62,7 +58,7 @@ /* * @implemented */ -MM_SYSTEM_SIZE STDCALL MmQuerySystemSize(VOID) +MM_SYSTEMSIZE STDCALL MmQuerySystemSize(VOID) { return(MmSystemSize); } @@ -384,7 +380,6 @@ MmInitGlobalKernelPageDirectory(); DbgPrint("Used memory %dKb\n", (MmStats.NrTotalPages * PAGE_SIZE) / 1024); - DPRINT1("Kernel Stack Limits. InitTop = 0x%x, Init = 0x%x\n", init_stack_top, init_stack); LastKernelAddress = (ULONG_PTR)MmInitializePageList( FirstKrnlPhysAddr, @@ -395,10 +390,6 @@ AddressRangeCount); kernel_len = LastKrnlPhysAddr - FirstKrnlPhysAddr; - /* Unmap the guard pages from the initial stacks */ - MmDeleteVirtualMapping(NULL, (PVOID)(init_stack - PAGE_SIZE), FALSE, NULL, NULL); - MmDeleteVirtualMapping(NULL, (PVOID)(trap_stack - PAGE_SIZE), FALSE, NULL, NULL); - /* * Unmap low memory */ @@ -482,7 +473,7 @@ } -VOID STATIC +VOID static MiFreeInitMemoryPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address, PFN_TYPE Page, SWAPENTRY SwapEntry, BOOLEAN Dirty) Modified: branches/cache_manager_rewrite/mm/ncache.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/ncache… ============================================================================== --- branches/cache_manager_rewrite/mm/ncache.c (original) +++ branches/cache_manager_rewrite/mm/ncache.c Thu Dec 28 19:27:36 2006 @@ -84,7 +84,7 @@ return ((PVOID)Result); } -VOID STATIC +VOID static MmFreeNonCachedPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address, PFN_TYPE Page, SWAPENTRY SwapEntry, BOOLEAN Dirty) Modified: branches/cache_manager_rewrite/mm/npool.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/npool.… ============================================================================== --- branches/cache_manager_rewrite/mm/npool.c (original) +++ branches/cache_manager_rewrite/mm/npool.c Thu Dec 28 19:27:36 2006 @@ -95,7 +95,7 @@ #define HDR_FREE_SIZE ROUND_UP(sizeof(HDR_FREE), MM_POOL_ALIGNMENT) -#if defined(NPOOL_REDZONE_CHECK) || #defined(NPOOL_REDZONE_CHECK_FULL) +#if defined(NPOOL_REDZONE_CHECK) || defined(NPOOL_REDZONE_CHECK_FULL) #define HDR_USED_SIZE ROUND_UP(sizeof(HDR_USED) + NPOOL_REDZONE_SIZE, MM_POOL_ALIGNMENT) #else #define HDR_USED_SIZE ROUND_UP(sizeof(HDR_USED), MM_POOL_ALIGNMENT) @@ -760,7 +760,7 @@ #endif /* TAG_STATISTICS_TRACKING */ #if defined(TAG_STATISTICS_TRACKING) -VOID STATIC +VOID static MiDumpTagStats(ULONG CurrentTag, ULONG CurrentNrBlocks, ULONG CurrentSize) { CHAR c1, c2, c3, c4; @@ -1106,7 +1106,7 @@ #endif #if 0 -STATIC VOID +static VOID free_pages(HDR_FREE* blk) { ULONG start; @@ -1154,7 +1154,7 @@ */ { HDR_FREE* current; - BOOL UpdatePrevPtr = FALSE; + BOOLEAN UpdatePrevPtr = FALSE; DPRINT("add_to_free_list (%d)\n", blk->hdr.Size); @@ -1469,10 +1469,10 @@ #if defined(NPOOL_REDZONE_CHECK) || defined(NPOOL_REDZONE_CHECK_FULL) void check_redzone_header(HDR_USED* hdr) { - PBYTE LoZone = (PBYTE)((ULONG_PTR)hdr + HDR_USED_SIZE - NPOOL_REDZONE_SIZE); - PBYTE HiZone = (PBYTE)((ULONG_PTR)hdr + HDR_USED_SIZE + hdr->UserSize); - BOOL LoOK = TRUE; - BOOL HiOK = TRUE; + PUCHAR LoZone = (PUCHAR)((ULONG_PTR)hdr + HDR_USED_SIZE - NPOOL_REDZONE_SIZE); + PUCHAR HiZone = (PUCHAR)((ULONG_PTR)hdr + HDR_USED_SIZE + hdr->UserSize); + BOOLEAN LoOK = TRUE; + BOOLEAN HiOK = TRUE; ULONG i; CHAR c[5]; Modified: branches/cache_manager_rewrite/mm/pagefile.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/pagefi… ============================================================================== --- branches/cache_manager_rewrite/mm/pagefile.c (original) +++ branches/cache_manager_rewrite/mm/pagefile.c Thu Dec 28 19:27:36 2006 @@ -149,7 +149,7 @@ } } -LARGE_INTEGER STATIC +LARGE_INTEGER static MmGetOffsetPageFile(PRETRIEVAL_POINTERS_BUFFER RetrievalPointers, LARGE_INTEGER Offset) { /* Simple binary search */ @@ -498,7 +498,7 @@ return(0); } -STATIC PRETRIEVEL_DESCRIPTOR_LIST FASTCALL +static PRETRIEVEL_DESCRIPTOR_LIST FASTCALL MmAllocRetrievelDescriptorList(ULONG Pairs) { ULONG Size; @@ -551,7 +551,7 @@ if (!(TrapFrame->EFlags & (1 << 17))) { memcpy(&Headers->TrapFrame, TrapFrame, - sizeof(KTRAP_FRAME) - (4 * sizeof(DWORD))); + sizeof(KTRAP_FRAME) - (4 * sizeof(ULONG))); } else { Modified: branches/cache_manager_rewrite/mm/pe.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/pe.c?r… ============================================================================== --- branches/cache_manager_rewrite/mm/pe.c (original) +++ branches/cache_manager_rewrite/mm/pe.c Thu Dec 28 19:27:36 2006 @@ -103,12 +103,8 @@ static __inline BOOLEAN IsPowerOf2(IN ULONG Number) { if(Number == 0) - return FALSE; - - while((Number % 2) == 0) - Number /= 2; - - return Number == 1; + return FALSE; + return (Number & (Number - 1)) == 0; } static __inline ULONG ModPow2(IN ULONG Address, IN ULONG Alignment) Modified: branches/cache_manager_rewrite/mm/pool.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/pool.c… ============================================================================== --- branches/cache_manager_rewrite/mm/pool.c (original) +++ branches/cache_manager_rewrite/mm/pool.c Thu Dec 28 19:27:36 2006 @@ -22,7 +22,7 @@ /* FUNCTIONS ***************************************************************/ -STATIC PVOID STDCALL +static PVOID STDCALL EiAllocatePool(POOL_TYPE PoolType, ULONG NumberOfBytes, ULONG Tag, @@ -213,6 +213,7 @@ /* * @implemented */ +#undef ExFreePool VOID STDCALL ExFreePool(IN PVOID Block) { Modified: branches/cache_manager_rewrite/mm/ppool.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/ppool.… ============================================================================== --- branches/cache_manager_rewrite/mm/ppool.c (original) +++ branches/cache_manager_rewrite/mm/ppool.c Thu Dec 28 19:27:36 2006 @@ -11,13 +11,9 @@ /* INCLUDES *****************************************************************/ -#ifdef PPOOL_UMODE_TEST -#include "ppool_umode.h" -#else//PPOOL_UMODE_TEST #include <ntoskrnl.h> #define NDEBUG #include <internal/debug.h> -#endif//PPOOL_UMODE_TEST #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, MmInitializePagedPool) @@ -34,7 +30,7 @@ #define R_PRINT_ADDRESS(addr) KeRosPrintAddress(addr) #define R_PANIC() KeBugCheck(0) #define R_DEBUG DbgPrint -#define R_GET_STACK_FRAMES(ptr,cnt) KeRosGetStackFrames(ptr,cnt) +#define R_GET_STACK_FRAMES(ptr,cnt) RtlWalkFrameChain((PVOID*)ptr,cnt, 0) #include "rpoolmgr.h" @@ -138,7 +134,7 @@ char* trash[COUNT]; int AllocSize[] = { 15, 31, 63, 127, 255, 511, 1023, 2047 }; const int ALLOCS = sizeof(AllocSize) / sizeof(0[AllocSize]); - DWORD dwStart; + ULONG dwStart; MmPagedPoolSize = 1*1024*1024; MmPagedPoolBase = malloc ( MmPagedPoolSize ); Modified: branches/cache_manager_rewrite/mm/process.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/proces… ============================================================================== --- branches/cache_manager_rewrite/mm/process.c (original) +++ branches/cache_manager_rewrite/mm/process.c Thu Dec 28 19:27:36 2006 @@ -17,7 +17,7 @@ extern ULONG NtMinorVersion; extern ULONG NtOSCSDVersion; extern ULONG NtGlobalFlag; -extern MM_SYSTEM_SIZE MmSystemSize; +extern MM_SYSTEMSIZE MmSystemSize; #define MM_HIGHEST_VAD_ADDRESS \ (PVOID)((ULONG_PTR)MM_HIGHEST_USER_ADDRESS - (16 * PAGE_SIZE)) Modified: branches/cache_manager_rewrite/mm/region.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/region… ============================================================================== --- branches/cache_manager_rewrite/mm/region.c (original) +++ branches/cache_manager_rewrite/mm/region.c Thu Dec 28 19:27:36 2006 @@ -16,7 +16,7 @@ /* FUNCTIONS *****************************************************************/ -VOID STATIC +VOID static InsertAfterEntry(PLIST_ENTRY Previous, PLIST_ENTRY Entry) /* @@ -31,7 +31,7 @@ Previous->Flink = Entry; } -PMM_REGION STATIC +PMM_REGION static MmSplitRegion(PMM_REGION InitialRegion, PVOID InitialBaseAddress, PVOID StartAddress, ULONG Length, ULONG NewType, ULONG NewProtect, PMADDRESS_SPACE AddressSpace, Modified: branches/cache_manager_rewrite/mm/virtual.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/virtua… ============================================================================== --- branches/cache_manager_rewrite/mm/virtual.c (original) +++ branches/cache_manager_rewrite/mm/virtual.c Thu Dec 28 19:27:36 2006 @@ -104,7 +104,7 @@ NumberOfBytesLocked, ObReferenceObjectByHandle, MmCreateMdl, - ObfDereferenceObject, + (PVOID)ObfDereferenceObject, MmProbeAndLockPages, ExFreePool); } Modified: branches/cache_manager_rewrite/vfat/blockdev.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/vfat/bloc… ============================================================================== --- branches/cache_manager_rewrite/vfat/blockdev.c (original) +++ branches/cache_manager_rewrite/vfat/blockdev.c Thu Dec 28 19:27:36 2006 @@ -4,7 +4,6 @@ * FILE: drivers/fs/vfat/blockdev.c * PURPOSE: Temporary sector reading support * PROGRAMMER: David Welch (welch(a)cwcom.net) - * Hartmut Birr * UPDATE HISTORY: */ Modified: branches/cache_manager_rewrite/vfat/cleanup.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/vfat/clea… ============================================================================== --- branches/cache_manager_rewrite/vfat/cleanup.c (original) +++ branches/cache_manager_rewrite/vfat/cleanup.c Thu Dec 28 19:27:36 2006 @@ -4,7 +4,6 @@ * FILE: drivers/fs/vfat/cleanup.c * PURPOSE: VFAT Filesystem * PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com) - * Hartmut Birr */ /* INCLUDES *****************************************************************/ Modified: branches/cache_manager_rewrite/vfat/close.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/vfat/clos… ============================================================================== --- branches/cache_manager_rewrite/vfat/close.c (original) +++ branches/cache_manager_rewrite/vfat/close.c Thu Dec 28 19:27:36 2006 @@ -68,7 +68,7 @@ { vfatDestroyCCB(pCcb); } - CHECKPOINT; + return Status; } Modified: branches/cache_manager_rewrite/vfat/create.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/vfat/crea… ============================================================================== --- branches/cache_manager_rewrite/vfat/create.c (original) +++ branches/cache_manager_rewrite/vfat/create.c Thu Dec 28 19:27:36 2006 @@ -21,7 +21,6 @@ * FILE: drivers/fs/vfat/create.c * PURPOSE: VFAT Filesystem * PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com) - * Hartmut Birr */ /* INCLUDES *****************************************************************/ Modified: branches/cache_manager_rewrite/vfat/direntry.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/vfat/dire… ============================================================================== --- branches/cache_manager_rewrite/vfat/direntry.c (original) +++ branches/cache_manager_rewrite/vfat/direntry.c Thu Dec 28 19:27:36 2006 @@ -5,7 +5,6 @@ * PROJECT: ReactOS kernel * PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com) * Rex Jolliff (rex(a)lvcablemodem.com) - * Hartmut Birr * Herve Poussineau (reactos(a)poussine.freesurf.fr) */ @@ -23,7 +22,7 @@ if (pDeviceExt->FatInfo.FatType == FAT32) { cluster = pFatDirEntry->Fat.FirstCluster | - (pFatDirEntry->Fat.FirstClusterHigh << 16); + (pFatDirEntry->Fat.FirstClusterHigh << 16); } else if (pDeviceExt->Flags & VCB_IS_FATX) { Modified: branches/cache_manager_rewrite/vfat/fastio.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/vfat/fast… ============================================================================== --- branches/cache_manager_rewrite/vfat/fastio.c (original) +++ branches/cache_manager_rewrite/vfat/fastio.c Thu Dec 28 19:27:36 2006 @@ -4,7 +4,6 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PROGRAMMER: Herve Poussineau (hpoussin(a)reactos.org) - * Hartmut Birr */ #define NDEBUG Modified: branches/cache_manager_rewrite/vfat/fat.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/vfat/fat.… ============================================================================== --- branches/cache_manager_rewrite/vfat/fat.c (original) +++ branches/cache_manager_rewrite/vfat/fat.c Thu Dec 28 19:27:36 2006 @@ -4,7 +4,6 @@ * FILE: drivers/fs/vfat/fat.c * PURPOSE: VFAT Filesystem * PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com) - * Hartmut Birr * */ Modified: branches/cache_manager_rewrite/vfat/fcb.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/vfat/fcb.… ============================================================================== --- branches/cache_manager_rewrite/vfat/fcb.c (original) +++ branches/cache_manager_rewrite/vfat/fcb.c Thu Dec 28 19:27:36 2006 @@ -5,7 +5,6 @@ * PROJECT: ReactOS kernel * PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com) * Rex Jolliff (rex(a)lvcablemodem.com) -* Hartmut Birr * Herve Poussineau (reactos(a)poussine.freesurf.fr) */ @@ -605,13 +604,6 @@ while (TRUE) { - DPRINT ("loop : vfatDirFindFile(File:%wZ)\n", FileToFindU); - DPRINT ("loop : Dir Path:%wZ\n", &pDirectoryFCB->PathNameU); - - if (pDirectoryFCB->FileObject == NULL) - { - return STATUS_OBJECT_NAME_NOT_FOUND; - } status = pDeviceExt->GetNextDirEntry(&Context, &Page, pDirectoryFCB, Modified: branches/cache_manager_rewrite/vfat/flush.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/vfat/flus… ============================================================================== --- branches/cache_manager_rewrite/vfat/flush.c (original) +++ branches/cache_manager_rewrite/vfat/flush.c Thu Dec 28 19:27:36 2006 @@ -3,7 +3,7 @@ * PROJECT: ReactOS kernel * FILE: drivers/fs/vfat/flush.c * PURPOSE: VFAT Filesystem - * PROGRAMMER: Hartmut Birr + * PROGRAMMER: */ /* INCLUDES *****************************************************************/ Modified: branches/cache_manager_rewrite/vfat/iface.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/vfat/ifac… ============================================================================== --- branches/cache_manager_rewrite/vfat/iface.c (original) +++ branches/cache_manager_rewrite/vfat/iface.c Thu Dec 28 19:27:36 2006 @@ -21,7 +21,6 @@ * FILE: drivers/fs/vfat/iface.c * PURPOSE: VFAT Filesystem * PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com) - * Hartmut Birr */ /* INCLUDES *****************************************************************/ Modified: branches/cache_manager_rewrite/vfat/misc.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/vfat/misc… ============================================================================== --- branches/cache_manager_rewrite/vfat/misc.c (original) +++ branches/cache_manager_rewrite/vfat/misc.c Thu Dec 28 19:27:36 2006 @@ -3,7 +3,7 @@ * PROJECT: ReactOS kernel * FILE: drivers/fs/vfat/misc.c * PURPOSE: VFAT Filesystem - * PROGRAMMER: Hartmut Birr + * PROGRAMMER: * */ Modified: branches/cache_manager_rewrite/vfat/rw.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/vfat/rw.c… ============================================================================== --- branches/cache_manager_rewrite/vfat/rw.c (original) +++ branches/cache_manager_rewrite/vfat/rw.c Thu Dec 28 19:27:36 2006 @@ -4,7 +4,6 @@ * FILE: drivers/fs/vfat/rw.c * PURPOSE: VFAT Filesystem * PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com) - * Hartmut Birr * */ Modified: branches/cache_manager_rewrite/vfat/string.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/vfat/stri… ============================================================================== --- branches/cache_manager_rewrite/vfat/string.c (original) +++ branches/cache_manager_rewrite/vfat/string.c Thu Dec 28 19:27:36 2006 @@ -4,7 +4,6 @@ * FILE: drivers/fs/vfat/string.c * PURPOSE: VFAT Filesystem * PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com) - * Hartmut Birr * */ Modified: branches/cache_manager_rewrite/vfat/volume.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/vfat/volu… ============================================================================== --- branches/cache_manager_rewrite/vfat/volume.c (original) +++ branches/cache_manager_rewrite/vfat/volume.c Thu Dec 28 19:27:36 2006 @@ -4,7 +4,6 @@ * FILE: drivers/fs/vfat/volume.c * PURPOSE: VFAT Filesystem * PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com) - * Hartmut Birr * Herve Poussineau (reactos(a)poussine.freesurf.fr) */

1 0

[jimtabor] 25232: Work to date. Update and add more functions to printing.c.
by jimtabor＠svn.reactos.org 28 Dec '06

28 Dec '06

Author: jimtabor Date: Thu Dec 28 08:53:50 2006 New Revision: 25232 URL: http://svn.reactos.org/svn/reactos?rev=25232&view=rev Log: Work to date. Update and add more functions to printing.c. Modified: trunk/reactos/dll/win32/gdi32/objects/painting.c Modified: trunk/reactos/dll/win32/gdi32/objects/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/pa… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/painting.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/painting.c Thu Dec 28 08:53:50 2006 @@ -1,4 +1,183 @@ #include "precomp.h" + + +typedef union +{ + FLOAT f; + ULONG l; +} gxf_long; + +#define XFPMANT(fp) ((fp.l) & 0x7fffff) +#define XFPEXP(fp) ((fp.l) >> 23) & 0xff) +#define XFPBUILD(e, m) (((e << 23) & 0x7f800000) | (m & 0x7fffff)) + + +VOID FASTCALL +CoordCnvP(MATRIX_S * mx, LPPOINT Point) +{ + FLOAT x, y; + gxf_long a, b; + + x = (FLOAT)Point->x; + y = (FLOAT)Point->y; + + a.l = XFPBUILD( mx->efM11.lExp, mx->efM11.lMant); + b.l = XFPBUILD( mx->efM21.lExp, mx->efM21.lMant); + + Point->x = x * a.f + y * b.f + mx->fxDx; + + a.l = XFPBUILD( mx->efM12.lExp, mx->efM12.lMant); + b.l = XFPBUILD( mx->efM22.lExp, mx->efM22.lMant); + + Point->y = x * a.f + y * b.f + mx->fxDy; +} + + +BOOL +STDCALL +DPtoLP ( HDC hDC, LPPOINT Points, INT Count ) +{ + INT i; + PDC_ATTR Dc_Attr; + + if (!GdiGetHandleUserData((HGDIOBJ) hDC, (PVOID) &Dc_Attr)) return FALSE; + + for ( i = 0; i < Count; i++ ) + CoordCnvP ( &Dc_Attr->mxDevicetoWorld, &Points[i] ); + return TRUE; +} + + +BOOL +STDCALL +LPtoDP ( HDC hDC, LPPOINT Points, INT Count ) +{ + INT i; + PDC_ATTR Dc_Attr; + + if (!GdiGetHandleUserData((HGDIOBJ) hDC, (PVOID) &Dc_Attr)) return FALSE; + + for ( i = 0; i < Count; i++ ) + CoordCnvP ( &Dc_Attr->mxWorldToDevice, &Points[i] ); + return TRUE; +} + + +// Will move to dc.c +HGDIOBJ +STDCALL +GetDCObject( HDC hDC, INT iType) +{ + + if((iType == GDI_OBJECT_TYPE_BRUSH) || + (iType == GDI_OBJECT_TYPE_EXTPEN)|| + (iType == GDI_OBJECT_TYPE_PEN) || + (iType == GDI_OBJECT_TYPE_COLORSPACE)) + { + HGDIOBJ hGO; + PDC_ATTR Dc_Attr; + + if (!GdiGetHandleUserData((HGDIOBJ) hDC, (PVOID) &Dc_Attr)) return NULL; + + switch (iType) + { + case GDI_OBJECT_TYPE_BRUSH: + hGO = Dc_Attr->hbrush; + break; + + case GDI_OBJECT_TYPE_EXTPEN: + case GDI_OBJECT_TYPE_PEN: + hGO = Dc_Attr->hpen; + break; + + case GDI_OBJECT_TYPE_COLORSPACE: + hGO = Dc_Attr->hColorSpace; + break; + } + return hGO; + } + return NtGdiGetDCObject( hDC, iType ); +} + + +BOOL +STDCALL +LineTo( HDC hDC, INT x, INT y ) +{ +// Handle something other than a normal dc object. + if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) + return MFDRV_MetaParam2( hDC, META_LINETO, x, y); + else + { + PLDC pLDC = GdiGetLDC(hDC); + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (pLDC->iType == LDC_EMFLDC) + { + return MFDRV_LineTo( hDC, x, y ) + } + return FALSE; + } + } + return NtGdiLineTo( hDC, x, y); +} + + +BOOL +STDCALL +MoveToEx( HDC hDC, INT x, INT y, LPPOINT Point ) +{ + PDC_ATTR Dc_Attr; + + if (!GdiGetHandleUserData((HGDIOBJ) hDC, (PVOID) &Dc_Attr)) return FALSE; + + if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) +// return MFDRV_MetaParam2( hDC, META_MOVETO, x, y); + return FALSE; + else + { + PLDC pLDC = Dc_Attr->pvLDC; + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (pLDC->iType == LDC_EMFLDC) + { + //if (!EMFDRV_MoveTo( hDC, x, y)) + return FALSE; + } + } + } + + if ( Point ) + { + if ( Dc_Attr->ulDirty_ & DIRTY_PTLCURRENT ) // Double hit! + { + Point->x = Dc_Attr->ptfxCurrent.x; // ret prev before change. + Point->y = Dc_Attr->ptfxCurrent.y; + DPtoLP ( hDC, Point, 1); // reconvert back. + } + else + { + Point->x = Dc_Attr->ptlCurrent.x; + Point->y = Dc_Attr->ptlCurrent.y; + } + } + + Dc_Attr->ptlCurrent.x = x; + Dc_Attr->ptlCurrent.y = y; + + Dc_Attr->ulDirty_ |= ( DIRTY_PTLCURRENT|DIRTY_STYLESTATE); // Set dirty + return TRUE; +} /* @@ -25,8 +204,8 @@ // Call Wine (rewrite of) MFDRV_MetaParam8 return MFDRV_MetaParam8( hDC, META_ARC, a1, a2, a3, a4, a5, a6, a7, a8) else - { - PLDC pLDC = GdiGetLDC(HDC hDC); + { + PLDC pLDC = GdiGetLDC(hDC); if ( !pLDC ) { SetLastError(ERROR_INVALID_HANDLE); @@ -68,8 +247,8 @@ if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) return FALSE; //No meta support for ArcTo else - { - PLDC pLDC = GdiGetLDC(HDC hDC); + { + PLDC pLDC = GdiGetLDC(hDC); if ( !pLDC ) { SetLastError(ERROR_INVALID_HANDLE); @@ -110,8 +289,8 @@ if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) return MFDRV_MetaParam8( hDC, META_CHORD, a1, a2, a3, a4, a5, a6, a7, a8) else - { - PLDC pLDC = GdiGetLDC(HDC hDC); + { + PLDC pLDC = GdiGetLDC(hDC); if ( !pLDC ) { SetLastError(ERROR_INVALID_HANDLE); @@ -152,8 +331,8 @@ if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) return MFDRV_MetaParam8( hDC, META_PIE, a1, a2, a3, a4, a5, a6, a7, a8) else - { - PLDC pLDC = GdiGetLDC(HDC hDC); + { + PLDC pLDC = GdiGetLDC(hDC); if ( !pLDC ) { SetLastError(ERROR_INVALID_HANDLE); @@ -171,3 +350,495 @@ } +BOOL +STDCALL +Ellipse(HDC hDC, INT Left, INT Top, INT Right, INT Bottom) +{ +// Handle something other than a normal dc object. + if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) + return MFDRV_MetaParam4(hDC, META_ELLIPSE, Left, Top, Right, Bottom ); + else + { + PLDC pLDC = GdiGetLDC(hDC); + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (pLDC->iType == LDC_EMFLDC) + { + return EMFDRV_Ellipse( hDC, Left, Top, Right, Bottom ); + } + return FALSE; + } + } + return NtGdiEllipse( hDC, Left, Top, Right, Bottom); +} + + +BOOL +STDCALL +Rectangle(HDC, INT Left, INT Top, INT Right, INT Bottom) +{ +// Handle something other than a normal dc object. + if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) + return MFDRV_MetaParam4(hDC, META_RECTANGLE, Left, Top, Right, Bottom ); + else + { + PLDC pLDC = GdiGetLDC(hDC); + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (pLDC->iType == LDC_EMFLDC) + { + return EMFDRV_Rectangle( hDC, Left, Top, Right, Bottom ); + } + return FALSE; + } + } + return NtGdiRectangle( hDC, Left, Top, Right, Bottom); +} + + +BOOL +STDCALL +RoundRect(HDC, INT Left, INT Top, INT Right, INT Bottom, + INT ell_Width, INT ell_Height) +{ +// Handle something other than a normal dc object. + if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) + return MFDRV_MetaParam6( hDC, META_ROUNDRECT, Left, Top, Right, Bottom, + ell_Width, ell_Height ); + else + { + PLDC pLDC = GdiGetLDC(hDC); + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (pLDC->iType == LDC_EMFLDC) + { + return EMFDRV_RoundRect( hDC, Left, Top, Right, Bottom, + ell_Width, ell_Height ); + } + return FALSE; + } + } + return NtGdiRoundRect( hDc, Left, Top, Right, Bottom, ell_Width, ell_Height); +} + + +COLORREF +STDCALL +GetPixel( HDC hDC, INT x, INT y ) +{ + PDC_ATTR Dc_Attr; + + if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) return CLR_INVALID; + + if (!GdiGetHandleUserData((HGDIOBJ) hDC, (PVOID) &Dc_Attr)) return CLR_INVALID; + + return NtGdiGetPixel( hDC, x, y); +} + + +COLORREF +STDCALL +SetPixel( HDC hDC, INT x, INT y, COLORREF Color ) +{ +// Handle something other than a normal dc object. + if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) + return MFDRV_MetaParam4(hDC, META_SETPIXEL, x, y, HIWORD(Color), + LOWORD(Color)); + else + { + PLDC pLDC = GdiGetLDC(hDC); + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE); + return 0; + } + if (pLDC->iType == LDC_EMFLDC) + { + return EMFDRV_SetPixel( hDC, x, y, Color ); + } + return 0; + } + } + return NtGdiSetPixel( hDC, x, y, Color); +} + + +BOOL +STDCALL +SetPixelV( HDC hDC, INT x, INT y, COLORREF Color ) +{ + COLORREF Cr = SetPixel( hDC, x, y, Color ); + if (Cr) return TRUE; + return FALSE; +} + + +BOOL +STDCALL +FillRgn( HDC hDC, HRGN hRgn, HBRUSH hBrush ) +{ + + if ( (!hRgn) || (!hBrush) ) return FALSE; + +// Handle something other than a normal dc object. + if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) + return MFDRV_FillRgn( hDC, hRgn, hBrush); + else + { + PLDC pLDC = GdiGetLDC(hDC); + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (pLDC->iType == LDC_EMFLDC) + { + return EMFDRV_FillRgn(( hDC, hRgn, hBrush); + } + return FALSE; + } + } + return NtGdiFillRgn( hDC, hRgn, hBrush); +} + + +BOOL +STDCALL +FrameRgn( HDC hDC, HRGN hRgn, HBRUSH hBrush, INT nWidth, INT nHeight ) +{ + + if ( (!hRgn) || (!hBrush) ) return FALSE; + +// Handle something other than a normal dc object. + if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) + return MFDRV_FrameRgn( hDC, hRgn, hBrush, nWidth, nHeight ); + else + { + PLDC pLDC = GdiGetLDC(hDC); + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (pLDC->iType == LDC_EMFLDC) + { + return EMFDRV_FrameRgn( hDC, hRgn, hBrush, nWidth, nHeight ); + } + return FALSE; + } + } + return NtGdiFrameRgn( hDC, hRgn, hBrush, nWidth, nHeight); +} + + +BOOL +STDCALL +InvertRgn( HDC hDC, HRGN hRgn ) +{ + + if ( !hRgn ) return FALSE; + +// Handle something other than a normal dc object. + if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) + return MFDRV_InvertRgn( hDC, HRGN hRgn ); // Use this instead of MFDRV_MetaParam. + else + { + PLDC pLDC = GdiGetLDC(hDC); + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (pLDC->iType == LDC_EMFLDC) + { + return EMFDRV_PaintInvertRgn( hDC, hRgn, EMR_INVERTRGN ); + } + return FALSE; + } + } + return NtGdiInvertRgn( hDC, hRgn); +} + +BOOL +STDCALL +PaintRgn( HDC hDC, HRGN hRgn ) +{ +// Handle something other than a normal dc object. + if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) + return MFDRV_PaintRgn( hDC, HRGN hRgn ); // Use this instead of MFDRV_MetaParam. + else + { + PLDC pLDC = GdiGetLDC(hDC); + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (pLDC->iType == LDC_EMFLDC) + { + return EMFDRV_PaintInvertRgn( hDC, hRgn, EMR_PAINTRGN ); + } + return FALSE; + } + } + // Could just use Dc_Attr->hbrush + HBRUSH hbrush = (HBRUSH) GetDCObject( hDC, GDI_OBJECT_TYPE_BRUSH); + + return NtGdiFillRgn( hDC, hRgn, hBrush); +} + + +BOOL +STDCALL +PolyBezier(HDC hDC ,const POINT* Point, DWORD cPoints) +{ +// Handle something other than a normal dc object. + if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) + /* + * Since MetaFiles don't record Beziers and they don't even record + * approximations to them using lines. + */ + return FALSE; + else + { + PLDC pLDC = GdiGetLDC(hDC); + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (pLDC->iType == LDC_EMFLDC) + { + return FALSE; // Not supported yet. + } + return FALSE; + } + } + return NtGdiPolyPolyDraw( hDC , Point, &cPoints, 1, GdiPolyBezier ); +} + + +BOOL +STDCALL +PolyBezierTo(HDC hDC, const POINT* Point ,DWORD cPoints) +{ +// Handle something other than a normal dc object. + if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) + return FALSE; + else + { + PLDC pLDC = GdiGetLDC(hDC); + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (pLDC->iType == LDC_EMFLDC) + { + return FALSE; // Not supported yet. + } + return FALSE; + } + } + return NtGdiPolyPolyDraw( hDC , Point, &cPoints, 1, GdiPolyBezierTo ); +} + + +BOOL +STDCALL +PolyDraw(HDC hDC, const POINT* Point, const BYTE *lpbTypes, int cCount ) +{ +// Handle something other than a normal dc object. + if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) + return FALSE; + else + { + PLDC pLDC = GdiGetLDC(hDC); + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (pLDC->iType == LDC_EMFLDC) + { + return FALSE; // Not supported yet. + } + return FALSE; + } + } + return NtGdiPolyDraw( hDC , Point, lpbTypes, cCount ); +} + + +BOOL +STDCALL +Polygon(HDC hDC, const POINT *Point, int Count) +{ +// Handle something other than a normal dc object. + if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) + return MFDRV_Polygon( hDC, Point, Count ); + else + { + PLDC pLDC = GdiGetLDC(hDC); + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (pLDC->iType == LDC_EMFLDC) + { + return EMFDRV_Polygon( hDC, Point, Count ); + } + return FALSE; + } + } + return NtGdiPolyPolyDraw( hDC , Point, &Count, 1, GdiPolygon ); +} + + +BOOL +STDCALL +Polyline(HDC hDC, const POINT *Point, int Count) +{ +// Handle something other than a normal dc object. + if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) + return MFDRV_Polyline( hDC, Point, Count ); + else + { + PLDC pLDC = GdiGetLDC(hDC); + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (pLDC->iType == LDC_EMFLDC) + { + return EMFDRV_Polyline( hDC, Point, Count ); + } + return FALSE; + } + } + return NtGdiPolyPolyDraw( hDC , Point, &Count, 1, GdiPolyPolyLine ); +} + + +BOOL +STDCALL +PolylineTo(HDC hDC, const POINT* Point, DWORD Count) +{ +// Handle something other than a normal dc object. + if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) + return FALSE; + else + { + PLDC pLDC = GdiGetLDC(hDC); + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (pLDC->iType == LDC_EMFLDC) + { + return FALSE; // Not supported yet. + } + return FALSE; + } + } + return NtGdiPolyPolyDraw( hDC , Point, &Count, 1, GdiPolyLineTo ); + +} + + +BOOL +STDCALL +PolyPolygon(HDC hDC, const POINT* Point, const INT* Count, int Polys) +{ +// Handle something other than a normal dc object. + if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) + return MFDRV_PolyPolygon( hDC, Point, Count, Polys); + else + { + PLDC pLDC = GdiGetLDC(hDC); + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (pLDC->iType == LDC_EMFLDC) + { + return EMFDRV_PolyPolygon( hDC, Point, Count, Polys ); + } + return FALSE; + } + } + return NtGdiPolyPolyDraw( hDC , Point, Count, Polys, GdiPolygon ); + +} + + +BOOL +STDCALL +PolyPolyline(HDC hDC, const POINT* Point, const DWORD* Counts, DWORD Polys) +{ +// Handle something other than a normal dc object. + if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) + return FALSE; + else + { + PLDC pLDC = GdiGetLDC(hDC); + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (pLDC->iType == LDC_EMFLDC) + { + return EMFDRV_PolyPolyline(hDC, Point, Counts, Polys); + } + return FALSE; + } + } + return NtGdiPolyPolyDraw( hDC , Point, Count, Polys, GdiPolyPolyLine ); +} +

1 0

[greatlrd] 25152: Do not crash in GetDC, mplayer company we do not have a backbuffer now. good news, instead for a crash
by greatlrd＠svn.reactos.org 13 Dec '06

13 Dec '06

Author: greatlrd Date: Thu Dec 14 02:19:20 2006 New Revision: 25152 URL: http://svn.reactos.org/svn/reactos?rev=25152&view=rev Log: Do not crash in GetDC, mplayer company we do not have a backbuffer now. good news, instead for a crash Modified: trunk/reactos/dll/directx/ddraw/main/surface_main.c Modified: trunk/reactos/dll/directx/ddraw/main/surface_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/sur… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/surface_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/surface_main.c Thu Dec 14 02:19:20 2006 @@ -493,20 +493,7 @@ This = (LPDDRAWI_DDRAWSURFACE_INT)iface; - /* - FIXME check if the surface exists or not - for now we aussme the surface exits and create the hDC for it - */ - - if ((HDC)This->lpLcl->hDC == NULL) - { - This->lpLcl->hDC = (ULONG_PTR)GetDC((HWND)This->lpLcl->lpGbl->lpDD->lpExclusiveOwner->hWnd); - *phDC = (HDC)This->lpLcl->hDC; - } - else - { - *phDC = (HDC)This->lpLcl->hDC; - } + *phDC = This->lpLcl->lpSurfMore->lpDD_lcl->hDC; return DD_OK; }

1 0

[greatlrd] 25151: exprement code for GetPxielformat, (manger crash mplayer (the gui version) in the GetDC api, and maybe for we do not have the clipper implement. yet.
by greatlrd＠svn.reactos.org 13 Dec '06

13 Dec '06

Author: greatlrd Date: Thu Dec 14 02:06:48 2006 New Revision: 25151 URL: http://svn.reactos.org/svn/reactos?rev=25151&view=rev Log: exprement code for GetPxielformat, (manger crash mplayer (the gui version) in the GetDC api, and maybe for we do not have the clipper implement. yet. Modified: trunk/reactos/dll/directx/ddraw/main/surface_main.c Modified: trunk/reactos/dll/directx/ddraw/main/surface_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/sur… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/surface_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/surface_main.c Thu Dec 14 02:06:48 2006 @@ -43,6 +43,7 @@ } } return This->dwIntRefCnt; + } @@ -554,9 +555,20 @@ Main_DDrawSurface_GetPixelFormat(LPDIRECTDRAWSURFACE7 iface, LPDDPIXELFORMAT pDDPixelFormat) { - DX_WINDBG_trace(); - - DX_STUB; + LPDDRAWI_DDRAWSURFACE_INT This = (LPDDRAWI_DDRAWSURFACE_INT)iface; + HRESULT retVale = DDERR_INVALIDPARAMS; + + DX_WINDBG_trace(); + + /* FIXME is this right ?? */ + if (pDDPixelFormat != NULL) + { + memcpy(pDDPixelFormat,&This->lpLcl->lpSurfMore-> + lpDD_lcl->lpGbl->vmiData.ddpfDisplay,sizeof(DDPIXELFORMAT)); + + retVale = DD_OK; + } + return retVale; } HRESULT WINAPI

1 0

[spetreolle] 25150: build wordpad with unicode="yes/no"
by spetreolle＠svn.reactos.org 13 Dec '06

13 Dec '06

Author: spetreolle Date: Thu Dec 14 01:05:14 2006 New Revision: 25150 URL: http://svn.reactos.org/svn/reactos?rev=25150&view=rev Log: build wordpad with unicode="yes/no" Modified: trunk/reactos/base/applications/wordpad/misc.c trunk/reactos/base/applications/wordpad/wordpad.c trunk/reactos/base/applications/wordpad/wordpad.rbuild Modified: trunk/reactos/base/applications/wordpad/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/misc.c (original) +++ trunk/reactos/base/applications/wordpad/misc.c Thu Dec 14 01:05:14 2006 @@ -47,7 +47,7 @@ uID); if (ln++ > 0) { - (*lpTarget) = (LPWSTR)LocalAlloc(LMEM_FIXED, + (*lpTarget) = (LPTSTR)LocalAlloc(LMEM_FIXED, ln * sizeof(TCHAR)); if ((*lpTarget) != NULL) { Modified: trunk/reactos/base/applications/wordpad/wordpad.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/wordpad.c (original) +++ trunk/reactos/base/applications/wordpad/wordpad.c Thu Dec 14 01:05:14 2006 @@ -4,9 +4,9 @@ HANDLE ProcessHeap; int WINAPI -WinMain(HINSTANCE hThisInstance, +_tWinMain(HINSTANCE hThisInstance, HINSTANCE hPrevInstance, - LPSTR lpCmdLine, + LPTSTR lpCmdLine, int nCmdShow) { LPTSTR lpAppName, lpVersion, lpTitle; Modified: trunk/reactos/base/applications/wordpad/wordpad.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/wordpad.rbuild (original) +++ trunk/reactos/base/applications/wordpad/wordpad.rbuild Thu Dec 14 01:05:14 2006 @@ -1,9 +1,7 @@ <?xml version="1.0"?> <rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> - <module name="wordpad" type="win32gui" installbase="system32" installname="wordpad.exe"> + <module name="wordpad" type="win32gui" installbase="system32" installname="wordpad.exe" unicode="yes"> <include base="wordpad">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x0600</define> <define name="_WIN32_WINNT">0x0501</define> @@ -25,4 +23,4 @@ <file>wordpad.rc</file> <pch>precomp.h</pch> </module> -</rbuild> +</rbuild>

1 0

[greatlrd] 25149: more cleanup, 1. fixed more tab to space 2. rewrite addref for some inteface.
by greatlrd＠svn.reactos.org 13 Dec '06

13 Dec '06

Author: greatlrd Date: Thu Dec 14 00:48:35 2006 New Revision: 25149 URL: http://svn.reactos.org/svn/reactos?rev=25149&view=rev Log: more cleanup, 1. fixed more tab to space 2. rewrite addref for some inteface. Modified: trunk/reactos/dll/directx/ddraw/iface_clipper.c trunk/reactos/dll/directx/ddraw/iface_color.c trunk/reactos/dll/directx/ddraw/iface_gamma.c trunk/reactos/dll/directx/ddraw/iface_kernel.c trunk/reactos/dll/directx/ddraw/iface_palette.c trunk/reactos/dll/directx/ddraw/iface_videoport.c trunk/reactos/dll/directx/ddraw/main/surface_main.c trunk/reactos/dll/directx/ddraw/rosdraw.h Modified: trunk/reactos/dll/directx/ddraw/iface_clipper.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/iface_cl… ============================================================================== --- trunk/reactos/dll/directx/ddraw/iface_clipper.c (original) +++ trunk/reactos/dll/directx/ddraw/iface_clipper.c Thu Dec 14 00:48:35 2006 @@ -13,45 +13,35 @@ ULONG WINAPI DirectDrawClipper_Release(LPDIRECTDRAWCLIPPER iface) -{ - +{ LPDDRAWI_DDRAWCLIPPER_INT This = (LPDDRAWI_DDRAWCLIPPER_INT)iface; - ULONG ref=0; - + DX_WINDBG_trace(); - - if (iface!=NULL) - { - ref = InterlockedDecrement( (PLONG) &This->dwIntRefCnt); - - if (ref == 0) - { - /* Add here if we need releae some memory pointer before - * exists - */ - - if (This!=NULL) - { - HeapFree(GetProcessHeap(), 0, This); - } - } - } - return ref; + /* FIXME + This is not right exiame how it should be done + */ + DX_STUB_str("FIXME This is not right exiame how it should be done\n"); + return This->dwIntRefCnt; } ULONG WINAPI DirectDrawClipper_AddRef (LPDIRECTDRAWCLIPPER iface) -{ - LPDDRAWI_DDRAWCLIPPER_INT This = (LPDDRAWI_DDRAWCLIPPER_INT)iface; - ULONG ref=0; +{ + LPDDRAWI_DDRAWCLIPPER_INT This = (LPDDRAWI_DDRAWCLIPPER_INT)iface; - DX_WINDBG_trace(); - - if (iface!=NULL) - { - ref = InterlockedIncrement( (PLONG) &This->dwIntRefCnt); - } - return ref; + DX_WINDBG_trace(); + + if (iface!=NULL) + { + This->dwIntRefCnt++; + This->lpLcl->dwLocalRefCnt++; + + if (This->lpLcl->lpGbl != NULL) + { + This->lpLcl->lpGbl->dwRefCnt++; + } + } + return This->dwIntRefCnt; } HRESULT WINAPI Modified: trunk/reactos/dll/directx/ddraw/iface_color.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/iface_co… ============================================================================== --- trunk/reactos/dll/directx/ddraw/iface_color.c (original) +++ trunk/reactos/dll/directx/ddraw/iface_color.c Thu Dec 14 00:48:35 2006 @@ -13,48 +13,40 @@ ULONG WINAPI DirectDrawColorControl_AddRef( LPDIRECTDRAWCOLORCONTROL iface) { - LPDDRAWI_DDCOLORCONTROL_INT This = (LPDDRAWI_DDCOLORCONTROL_INT)iface; - ULONG ref=0; + LPDDRAWI_DDCOLORCONTROL_INT This = (LPDDRAWI_DDCOLORCONTROL_INT)iface; DX_WINDBG_trace(); - - if (iface!=NULL) - { - ref = InterlockedIncrement( (PLONG) &This->dwIntRefCnt); - } - return ref; + + if (iface!=NULL) + { + This->dwIntRefCnt++; + // This->lpLcl->dwLocalRefCnt++; + + + //if (This->lpLcl->lpGbl != NULL) + //{ + // This->lpLcl->lpGbl->dwRefCnt++; + //} + } + return This->dwIntRefCnt; } ULONG WINAPI DirectDrawColorControl_Release( LPDIRECTDRAWCOLORCONTROL iface) -{ +{ LPDDRAWI_DDCOLORCONTROL_INT This = (LPDDRAWI_DDCOLORCONTROL_INT)iface; - ULONG ref=0; - DX_WINDBG_trace(); - - if (iface!=NULL) - { - ref = InterlockedDecrement( (PLONG) &This->dwIntRefCnt); - - if (ref == 0) - { - /* Add here if we need releae some memory pointer before - * exists - */ - - if (This!=NULL) - { - HeapFree(GetProcessHeap(), 0, This); - } - } - } - return ref; + DX_WINDBG_trace(); + /* FIXME + This is not right exiame how it should be done + */ + DX_STUB_str("FIXME This is not right exiame how it should be done\n"); + return This->dwIntRefCnt; } HRESULT WINAPI DirectDrawColorControl_QueryInterface( LPDIRECTDRAWCOLORCONTROL iface, - REFIID riid, + REFIID riid, LPVOID* ppvObj) { DX_WINDBG_trace(); Modified: trunk/reactos/dll/directx/ddraw/iface_gamma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/iface_ga… ============================================================================== --- trunk/reactos/dll/directx/ddraw/iface_gamma.c (original) +++ trunk/reactos/dll/directx/ddraw/iface_gamma.c Thu Dec 14 00:48:35 2006 @@ -15,53 +15,41 @@ { LPDDRAWI_DDGAMMACONTROL_INT This = (LPDDRAWI_DDGAMMACONTROL_INT)iface; - ULONG ref=0; - DX_WINDBG_trace(); - - if (iface!=NULL) - { - This->dwIntRefCnt++; - ref = This->dwIntRefCnt; - } - return ref; + DX_WINDBG_trace(); + + if (iface!=NULL) + { + This->dwIntRefCnt++; + //This->lpLcl->dwLocalRefCnt++; + + //if (This->lpLcl->lpGbl != NULL) + //{ + // This->lpLcl->lpGbl->dwRefCnt++; + //} + } + return This->dwIntRefCnt; } ULONG WINAPI DirectDrawGammaControl_Release( LPDIRECTDRAWGAMMACONTROL iface) { LPDDRAWI_DDGAMMACONTROL_INT This = (LPDDRAWI_DDGAMMACONTROL_INT)iface; - ULONG ref=0; - DX_WINDBG_trace(); - - if (iface!=NULL) - { - This->dwIntRefCnt--; - - if (This->dwIntRefCnt == 0) - { - /* Add here if we need releae some memory pointer before - * exists - */ - - if (This!=NULL) - { - HeapFree(GetProcessHeap(), 0, This); - } - } - - ref = This->dwIntRefCnt; - } - return ref; + DX_WINDBG_trace(); + /* FIXME + This is not right exiame how it should be done + */ + DX_STUB_str("FIXME This is not right exiame how it should be done\n"); + return This->dwIntRefCnt; } HRESULT WINAPI DirectDrawGammaControl_QueryInterface( LPDIRECTDRAWGAMMACONTROL iface, REFIID riid, - LPVOID *ppObj) + LPVOID *ppObj) { DX_WINDBG_trace(); - DX_STUB; + DX_STUB; } HRESULT WINAPI Modified: trunk/reactos/dll/directx/ddraw/iface_kernel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/iface_ke… ============================================================================== --- trunk/reactos/dll/directx/ddraw/iface_kernel.c (original) +++ trunk/reactos/dll/directx/ddraw/iface_kernel.c Thu Dec 14 00:48:35 2006 @@ -89,44 +89,32 @@ { LPDDRAWI_DDKERNELSURFACE_INT This = (LPDDRAWI_DDKERNELSURFACE_INT)iface; - ULONG ref=0; DX_WINDBG_trace(); - - if (iface!=NULL) - { - This->dwIntRefCnt++; - ref = This->dwIntRefCnt; - } - return ref; + + if (iface!=NULL) + { + This->dwIntRefCnt++; + //This->lpLcl->dwLocalRefCnt++; + + //if (This->lpLcl->lpGbl != NULL) + //{ + // This->lpLcl->lpGbl->dwRefCnt++; + //} + } + return This->dwIntRefCnt; } ULONG WINAPI DDSurfaceKernel_Release ( LPDIRECTDRAWSURFACEKERNEL iface) { LPDDRAWI_DDKERNELSURFACE_INT This = (LPDDRAWI_DDKERNELSURFACE_INT)iface; - ULONG ref=0; - DX_WINDBG_trace(); - - if (iface!=NULL) - { - This->dwIntRefCnt--; - - if (This->dwIntRefCnt == 0) - { - /* Add here if we need releae some memory pointer before - * exists - */ - - if (This!=NULL) - { - HeapFree(GetProcessHeap(), 0, This); - } - } - - ref = This->dwIntRefCnt; - } - return ref; + DX_WINDBG_trace(); + /* FIXME + This is not right exiame how it should be done + */ + DX_STUB_str("FIXME This is not right exiame how it should be done\n"); + return This->dwIntRefCnt; } HRESULT WINAPI Modified: trunk/reactos/dll/directx/ddraw/iface_palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/iface_pa… ============================================================================== --- trunk/reactos/dll/directx/ddraw/iface_palette.c (original) +++ trunk/reactos/dll/directx/ddraw/iface_palette.c Thu Dec 14 00:48:35 2006 @@ -14,42 +14,33 @@ DirectDrawPalette_Release( LPDIRECTDRAWPALETTE iface) { LPDDRAWI_DDRAWPALETTE_INT This = (LPDDRAWI_DDRAWPALETTE_INT)iface; - ULONG ref=0; - DX_WINDBG_trace(); - - if (iface!=NULL) - { - ref = InterlockedDecrement( (PLONG) &This->dwIntRefCnt); - - if (ref == 0) - { - /* Add here if we need releae some memory pointer before - * exists - */ - - if (This!=NULL) - { - DxHeapMemFree(This); - } - } - } - return ref; + DX_WINDBG_trace(); + /* FIXME + This is not right exiame how it should be done + */ + DX_STUB_str("FIXME This is not right exiame how it should be done\n"); + return This->dwIntRefCnt; } ULONG WINAPI DirectDrawPalette_AddRef( LPDIRECTDRAWPALETTE iface) { LPDDRAWI_DDRAWPALETTE_INT This = (LPDDRAWI_DDRAWPALETTE_INT)iface; - ULONG ref=0; DX_WINDBG_trace(); - - if (iface!=NULL) - { - ref = InterlockedIncrement( (PLONG) &This->dwIntRefCnt); - } - return ref; + + if (iface!=NULL) + { + This->dwIntRefCnt++; + This->lpLcl->dwLocalRefCnt++; + + if (This->lpLcl->lpGbl != NULL) + { + This->lpLcl->lpGbl->dwRefCnt++; + } + } + return This->dwIntRefCnt; } HRESULT WINAPI Modified: trunk/reactos/dll/directx/ddraw/iface_videoport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/iface_vi… ============================================================================== --- trunk/reactos/dll/directx/ddraw/iface_videoport.c (original) +++ trunk/reactos/dll/directx/ddraw/iface_videoport.c Thu Dec 14 00:48:35 2006 @@ -25,42 +25,33 @@ Main_DirectDrawVideoPort_AddRef (LPDIRECTDRAWVIDEOPORT iface) { LPDDRAWI_DDVIDEOPORT_INT This = (LPDDRAWI_DDVIDEOPORT_INT)iface; - ULONG ref=0; - - DX_WINDBG_trace(); - - if (iface!=NULL) - { - ref = InterlockedIncrement( (PLONG) &This->dwIntRefCnt); - } - return ref; + + DX_WINDBG_trace(); + + if (iface!=NULL) + { + This->dwIntRefCnt++; + //This->lpLcl->dwLocalRefCnt++; + + //if (This->lpLcl->lpGbl != NULL) + //{ + // This->lpLcl->lpGbl->dwRefCnt++; + //} + } + return This->dwIntRefCnt; } ULONG WINAPI Main_DirectDrawVideoPort_Release (LPDIRECTDRAWVIDEOPORT iface) { LPDDRAWI_DDVIDEOPORT_INT This = (LPDDRAWI_DDVIDEOPORT_INT)iface; - ULONG ref=0; - - DX_WINDBG_trace(); - - if (iface!=NULL) - { - ref = InterlockedDecrement( (PLONG) &This->dwIntRefCnt); - - if (ref == 0) - { - /* Add here if we need releae some memory pointer before - * exists - */ - - if (This!=NULL) - { - DxHeapMemFree(This); - } - } - } - return ref; + + DX_WINDBG_trace(); + /* FIXME + This is not right exiame how it should be done + */ + DX_STUB_str("FIXME This is not right exiame how it should be done\n"); + return This->dwIntRefCnt; } HRESULT WINAPI Modified: trunk/reactos/dll/directx/ddraw/main/surface_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/sur… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/surface_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/surface_main.c Thu Dec 14 00:48:35 2006 @@ -22,37 +22,38 @@ HRESULT WINAPI Main_DDrawSurface_Initialize (LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAW pDD, LPDDSURFACEDESC2 pDDSD2) -{ - return DDERR_ALREADYINITIALIZED; +{ + return DDERR_ALREADYINITIALIZED; } ULONG WINAPI Main_DDrawSurface_AddRef(LPDIRECTDRAWSURFACE7 iface) { - LPDDRAWI_DDRAWSURFACE_INT This = (LPDDRAWI_DDRAWSURFACE_INT)iface; - - DX_WINDBG_trace(); - - if (iface!=NULL) - { - This->dwIntRefCnt++; - This->lpLcl->dwLocalRefCnt++; - - if (This->lpLcl->lpGbl != NULL) - { - This->lpLcl->lpGbl->dwRefCnt++; - } - } + LPDDRAWI_DDRAWSURFACE_INT This = (LPDDRAWI_DDRAWSURFACE_INT)iface; + + DX_WINDBG_trace(); + + if (iface!=NULL) + { + This->dwIntRefCnt++; + This->lpLcl->dwLocalRefCnt++; + + if (This->lpLcl->lpGbl != NULL) + { + This->lpLcl->lpGbl->dwRefCnt++; + } + } return This->dwIntRefCnt; } + ULONG WINAPI Main_DDrawSurface_Release(LPDIRECTDRAWSURFACE7 iface) { LPDDRAWI_DDRAWSURFACE_INT This = (LPDDRAWI_DDRAWSURFACE_INT)iface; - /* FIXME - This is not right exiame how it should be done + /* FIXME + This is not right exiame how it should be done */ - DX_STUB_str("FIXME This is not right exiame how it should be done\n"); + DX_STUB_str("FIXME This is not right exiame how it should be done\n"); return This->dwIntRefCnt; } Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/rosdraw.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/rosdraw.h (original) +++ trunk/reactos/dll/directx/ddraw/rosdraw.h Thu Dec 14 00:48:35 2006 @@ -650,6 +650,8 @@ } \ return DDERR_UNSUPPORTED; + + #define DX_STUB_DD_OK \ { \ static BOOL firstcall = TRUE; \

1 0

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 December 2006