Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 20567: fix new strechblt code for dib32, left todo dib1, dib4, dib24
by greatlrd＠svn.reactos.org 05 Jan '06

05 Jan '06

fix new strechblt code for dib32, left todo dib1, dib4, dib24 Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c _____ Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c --- trunk/reactos/subsys/win32k/dib/dib32bpp.c 2006-01-05 00:56:44 UTC (rev 20566) +++ trunk/reactos/subsys/win32k/dib/dib32bpp.c 2006-01-05 01:49:00 UTC (rev 20567) @@ -528,7 +528,6 @@ return TRUE; } - //NOTE: If you change something here, please do the same in other dibXXbpp.c files! BOOLEAN DIB_32BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, RECTL* DestRect, RECTL *SourceRect, @@ -537,21 +536,18 @@ ULONG Mode) { - int SrcSizeY; - int SrcSizeX; - int DesSizeY; - int DesSizeX; - int sx; - int sy; - int DesX; - int DesY; - int color; - int zoomX; - int zoomY; - int count; - int saveX; - int saveY; - BOOLEAN DesIsBiggerY=FALSE; + LONG SrcSizeY; + LONG SrcSizeX; + LONG DesSizeY; + LONG DesSizeX; + LONG sx; + LONG sy; + LONG DesX; + LONG DesY; + LONG color; + PULONG DestBits; + LONG DifflDelta; + 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, @@ -560,654 +556,136 @@ SrcSizeY = SourceRect->bottom - SourceRect->top; SrcSizeX = SourceRect->right - SourceRect->left; - DesSizeY = DestRect->bottom ; - DesSizeX = DestRect->right; + DesSizeY = DestRect->bottom - DestRect->top; + DesSizeX = DestRect->right - DestRect->left; - zoomX = DesSizeX / SrcSizeX; - if (zoomX==0) zoomX=1; - - zoomY = DesSizeY / SrcSizeY; - if (zoomY==0) zoomY=1; - if (DesSizeY>SrcSizeY) - DesIsBiggerY = TRUE; - switch(SourceSurf->iBitmapFormat) { - case BMF_1BPP: - /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ - /* This is a reference implementation, it hasn't been optimized for speed */ - if (zoomX>1) - { - /* Draw one Hline on X - Led to the Des Zoom In*/ - if (DesSizeX>SrcSizeX) - { - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; + 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 << 1); + + 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); + } + } + DestBits = (PULONG)((ULONG_PTR)DestBits + DifflDelta); + } - saveY = DesY+zoomY; + break; - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); - - if (sx > SourceRect->right) break; - - saveX = DesX + zoomX; + 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 << 1); + + 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); + *DestBits = XLATEOBJ_iXlate(ColorTranslation, color); + } + + DestBits = (PULONG)((ULONG_PTR)DestBits + DifflDelta); + } + break; - if (DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0) - for (count=DesY;count<saveY;count++) - DIB_32BPP_HLine(DestSurf, DesX, saveX, count, 0); - else - for (count=DesY;count<saveY;count++) - DIB_32BPP_HLine(DestSurf, DesX, saveX, count, 1); - - } - } - } - else - { - /* Draw one Hline on X - Led to the Des Zoom Out*/ + 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 << 1); + + 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_32BPP_GetPixel(SourceSurf, sx, sy); + *DestBits = XLATEOBJ_iXlate(ColorTranslation, color); + } + DestBits = (PULONG)((ULONG_PTR)DestBits + DifflDelta); + } + break; - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); - - if (sx > SourceRect->right) break; - - saveX = DesX + zoomX; - - if (DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0) - for (count=DesY;count<saveY;count++) - DIB_32BPP_HLine(DestSurf, DesX, saveX, count, 0); - else - for (count=DesY;count<saveY;count++) - DIB_32BPP_HLine(DestSurf, DesX, saveX, count, 1); - - } - } - } - } - else - { - - if (DesSizeX>SrcSizeX) - { - /* Draw one pixel on X - Led to the Des Zoom In*/ - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); - - if (sx > SourceRect->right) break; - - if (DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0) - for (count=DesY;count<saveY;count++) - DIB_32BPP_PutPixel(DestSurf, DesX, count, 0); - else - for (count=DesY;count<saveY;count++) - DIB_32BPP_PutPixel(DestSurf, DesX, count, 1); - - - } - } - } - else - { - /* Draw one pixel on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); - - if (sx > SourceRect->right) break; - - if (DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0) - for (count=DesY;count<saveY;count++) - DIB_32BPP_PutPixel(DestSurf, DesX, count, 0); - else - for (count=DesY;count<saveY;count++) - DIB_32BPP_PutPixel(DestSurf, DesX, count, 1); - - } - } - } - } - break; - - case BMF_4BPP: - /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ - /* This is a reference implementation, it hasn't been optimized for speed */ - if (zoomX>1) - { - /* Draw one Hline on X - Led to the Des Zoom In*/ - if (DesSizeX>SrcSizeX) - { - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_4BPP_GetPixel(SourceSurf, sx, sy)); - - saveX = DesX + zoomX; - for (count=DesY;count<saveY;count++) - DIB_32BPP_HLine(DestSurf, DesX, saveX, count, color); - } - } - } - else - { - /* Draw one Hline on X - Led to the Des Zoom Out*/ - - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_4BPP_GetPixel(SourceSurf, sx, sy)); - - saveX = DesX + zoomX; - for (count=DesY;count<saveY;count++) - DIB_32BPP_HLine(DestSurf, DesX, saveX, count, color); - } - } - } - } - - else - { - - if (DesSizeX>SrcSizeX) - { - /* Draw one pixel on X - Led to the Des Zoom In*/ - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_4BPP_GetPixel(SourceSurf, sx, sy)); - - for (count=DesY;count<saveY;count++) - DIB_32BPP_PutPixel(DestSurf, DesX, count, color); - } - } - } - else - { - /* Draw one pixel on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_4BPP_GetPixel(SourceSurf, sx, sy)); - - for (count=DesY;count<saveY;count++) - DIB_32BPP_PutPixel(DestSurf, DesX, count, color); - } - } - } - } - break; - - case BMF_8BPP: - /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ - /* This is a reference implementation, it hasn't been optimized for speed */ - if (zoomX>1) - { - /* Draw one Hline on X - Led to the Des Zoom In*/ - if (DesSizeX>SrcSizeX) - { - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_8BPP_GetPixel(SourceSurf, sx, sy)); - - saveX = DesX + zoomX; - for (count=DesY;count<saveY;count++) - DIB_32BPP_HLine(DestSurf, DesX, saveX, count, color); - } - } - } - else - { - /* Draw one Hline on X - Led to the Des Zoom Out*/ - - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_8BPP_GetPixel(SourceSurf, sx, sy)); - - saveX = DesX + zoomX; - for (count=DesY;count<saveY;count++) - DIB_32BPP_HLine(DestSurf, DesX, saveX, count, color); - } - } - } - } - - else - { - - if (DesSizeX>SrcSizeX) - { - /* Draw one pixel on X - Led to the Des Zoom In*/ - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_8BPP_GetPixel(SourceSurf, sx, sy)); - - for (count=DesY;count<saveY;count++) - DIB_32BPP_PutPixel(DestSurf, DesX, count, color); - } - } - } - else - { - /* Draw one pixel on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_8BPP_GetPixel(SourceSurf, sx, sy)); - - for (count=DesY;count<saveY;count++) - DIB_32BPP_PutPixel(DestSurf, DesX, count, color); - } - } - } - } - break; - case BMF_16BPP: - /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ - /* This is a reference implementation, it hasn't been optimized for speed */ - if (zoomX>1) - { - /* Draw one Hline on X - Led to the Des Zoom In*/ - if (DesSizeX>SrcSizeX) - { - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; + /* 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 << 1); + + 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); + *DestBits = XLATEOBJ_iXlate(ColorTranslation, color); + } + DestBits = (PULONG)((ULONG_PTR)DestBits + DifflDelta); + } + break; - saveY = DesY+zoomY; + 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 << 1); + + 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); + *DestBits = XLATEOBJ_iXlate(ColorTranslation, color); + } + DestBits = (PULONG)((ULONG_PTR)DestBits + DifflDelta); + } + break; - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_16BPP_GetPixel(SourceSurf, sx, sy)); - - saveX = DesX + zoomX; - for (count=DesY;count<saveY;count++) - DIB_32BPP_HLine(DestSurf, DesX, saveX, count, color); - } - } - } - else - { - /* Draw one Hline on X - Led to the Des Zoom Out*/ - - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_16BPP_GetPixel(SourceSurf, sx, sy)); - - saveX = DesX + zoomX; - for (count=DesY;count<saveY;count++) - DIB_32BPP_HLine(DestSurf, DesX, saveX, count, color); - } - } - } - } - - else - { - - if (DesSizeX>SrcSizeX) - { - /* Draw one pixel on X - Led to the Des Zoom In*/ - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_16BPP_GetPixel(SourceSurf, sx, sy)); - - for (count=DesY;count<saveY;count++) - DIB_32BPP_PutPixel(DestSurf, DesX, count, color); - } - } - } - else - { - /* Draw one pixel on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_16BPP_GetPixel(SourceSurf, sx, sy)); - - for (count=DesY;count<saveY;count++) - DIB_32BPP_PutPixel(DestSurf, DesX, count, color); - } - } - } - } - break; - - case BMF_24BPP: - /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ - /* This is a reference implementation, it hasn't been optimized for speed */ - if (zoomX>1) - { - /* Draw one Hline on X - Led to the Des Zoom In*/ - if (DesSizeX>SrcSizeX) - { - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_24BPP_GetPixel(SourceSurf, sx, sy)); - - saveX = DesX + zoomX; - for (count=DesY;count<saveY;count++) - DIB_32BPP_HLine(DestSurf, DesX, saveX, count, color); - } - } - } - else - { - /* Draw one Hline on X - Led to the Des Zoom Out*/ - - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_24BPP_GetPixel(SourceSurf, sx, sy)); - - saveX = DesX + zoomX; - for (count=DesY;count<saveY;count++) - DIB_32BPP_HLine(DestSurf, DesX, saveX, count, color); - } - } - } - } - - else - { - - if (DesSizeX>SrcSizeX) - { - /* Draw one pixel on X - Led to the Des Zoom In*/ - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_24BPP_GetPixel(SourceSurf, sx, sy)); - - for (count=DesY;count<saveY;count++) - DIB_32BPP_PutPixel(DestSurf, DesX, count, color); - } - } - } - else - { - /* Draw one pixel on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_24BPP_GetPixel(SourceSurf, sx, sy)); - - for (count=DesY;count<saveY;count++) - DIB_32BPP_PutPixel(DestSurf, DesX, count, color); - } - } - } - } - break; - case BMF_32BPP: return ScaleRectAvg32(DestSurf, SourceSurf, DestRect, SourceRect, MaskOrigin, BrushOrigin, ClipRegion, ColorTranslation, Mode);

1 0

[ion] 20566: - fix build on dbg=0. Thanks to Andrew
by ion＠svn.reactos.org 05 Jan '06

05 Jan '06

- fix build on dbg=0. Thanks to Andrew Modified: trunk/reactos/ntoskrnl/ex/pushlock.c _____ Modified: trunk/reactos/ntoskrnl/ex/pushlock.c --- trunk/reactos/ntoskrnl/ex/pushlock.c 2006-01-04 23:48:15 UTC (rev 20565) +++ trunk/reactos/ntoskrnl/ex/pushlock.c 2006-01-05 00:56:44 UTC (rev 20566) @@ -164,8 +164,10 @@ /* Sanity check */ ASSERT(!WaitBlock->Signaled); +#ifdef DBG /* We are about to get signaled */ WaitBlock->Signaled = TRUE; +#endif /* Set the Wait Bit in the Wait Block */ if (!InterlockedBitTestAndReset(&WaitBlock->Flags, 1))

1 0

[gvg] 20565: Avoid using uninitialized variables
by gvg＠svn.reactos.org 04 Jan '06

04 Jan '06

Avoid using uninitialized variables Modified: trunk/reactos/apps/utils/net/ftp/ftp.c _____ Modified: trunk/reactos/apps/utils/net/ftp/ftp.c --- trunk/reactos/apps/utils/net/ftp/ftp.c 2006-01-04 23:28:10 UTC (rev 20564) +++ trunk/reactos/apps/utils/net/ftp/ftp.c 2006-01-04 23:48:15 UTC (rev 20565) @@ -211,13 +211,16 @@ int n, aflag = 0; user = pass = acct = 0; - if (ruserpass(host, &puser, &ppass, &pacct) < 0) { + n = ruserpass(host, &puser, &ppass, &pacct); + if (n < 0) { code = -1; return(0); } - user = puser; - pass = ppass; - acct = pacct; + if (0 != n) { + user = puser; + pass = ppass; + acct = pacct; + } while (user == NULL) { const char *myname = "none"; // This needs to become the usename env

1 0

[gvg] 20564: Only use the Folder class handler if we're actually executing a folder.
by gvg＠svn.reactos.org 04 Jan '06

04 Jan '06

Only use the Folder class handler if we're actually executing a folder. Fixes bug 1235. Modified: trunk/reactos/lib/shell32/shlexec.c _____ Modified: trunk/reactos/lib/shell32/shlexec.c --- trunk/reactos/lib/shell32/shlexec.c 2006-01-04 22:46:45 UTC (rev 20563) +++ trunk/reactos/lib/shell32/shlexec.c 2006-01-04 23:28:10 UTC (rev 20564) @@ -1200,7 +1200,9 @@ UINT_PTR retval = 31; WCHAR wcmd[1024]; WCHAR buffer[MAX_PATH]; + WCHAR target[MAX_PATH]; BOOL done; + DWORD attribs; /* make a local copy of the LPSHELLEXECUTEINFO structure and work with this from now on */ memcpy(&sei_tmp, sei, sizeof(sei_tmp)); @@ -1315,9 +1317,20 @@ strcpyW(wszApplicationName, wExplorer); sei_tmp.fMask &= ~SEE_MASK_INVOKEIDLIST; - } else if (HCR_GetExecuteCommandW(0, wszFolder, sei_tmp.lpVerb?sei_tmp.lpVerb:wszOpen, buffer, sizeof(buffer))) { - SHELL_ArgifyW(wszApplicationName, sizeof(wszApplicationName)/sizeof(WCHAR), buffer, NULL, sei_tmp.lpIDList, NULL); - + } else { + /* Check if we're executing a directory and if so use the + handler for the Folder class */ + strcpyW(target, buffer); + attribs = GetFileAttributesW(buffer); + if (attribs != INVALID_FILE_ATTRIBUTES && + 0 != (attribs & FILE_ATTRIBUTE_DIRECTORY) && + HCR_GetExecuteCommandW(0, wszFolder, + sei_tmp.lpVerb?sei_tmp.lpVerb:wszOpen, + buffer, sizeof(buffer))) { + SHELL_ArgifyW(wszApplicationName, + sizeof(wszApplicationName)/sizeof(WCHAR), + buffer, target, sei_tmp.lpIDList, NULL); + } sei_tmp.fMask &= ~SEE_MASK_INVOKEIDLIST; } }

1 0

[gvg] 20563: Fix (so far harmless) typo
by gvg＠svn.reactos.org 04 Jan '06

04 Jan '06

Fix (so far harmless) typo Modified: trunk/reactos/ntoskrnl/ex/work.c _____ Modified: trunk/reactos/ntoskrnl/ex/work.c --- trunk/reactos/ntoskrnl/ex/work.c 2006-01-04 22:40:48 UTC (rev 20562) +++ trunk/reactos/ntoskrnl/ex/work.c 2006-01-04 22:46:45 UTC (rev 20563) @@ -523,7 +523,7 @@ /* Protect against greedy registry modifications */ ExpAdditionalDelayedWorkerThreads = - min(ExpAdditionalCriticalWorkerThreads, 16); + min(ExpAdditionalDelayedWorkerThreads, 16); ExpAdditionalCriticalWorkerThreads = min(ExpAdditionalCriticalWorkerThreads, 16);

1 0

[gvg] 20562: Let oskit tell us when sending should be blocked 'cause its stuffed upto its
by gvg＠svn.reactos.org 04 Jan '06

04 Jan '06

Let oskit tell us when sending should be blocked 'cause its stuffed upto its nose with data waiting to be sent. Bug 1232. Modified: trunk/reactos/drivers/lib/ip/transport/tcp/event.c Modified: trunk/reactos/drivers/lib/ip/transport/tcp/tcp.c Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp/interface.c Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp/sleep.c Modified: trunk/reactos/drivers/net/afd/afd/write.c Modified: trunk/reactos/drivers/net/tcpip/include/tcp.h Modified: trunk/reactos/drivers/net/tcpip/include/titypes.h Modified: trunk/reactos/drivers/net/tcpip/tcpip/dispatch.c _____ Modified: trunk/reactos/drivers/lib/ip/transport/tcp/event.c --- trunk/reactos/drivers/lib/ip/transport/tcp/event.c 2006-01-04 20:45:58 UTC (rev 20561) +++ trunk/reactos/drivers/lib/ip/transport/tcp/event.c 2006-01-04 22:40:48 UTC (rev 20562) @@ -121,6 +121,11 @@ KeInitializeEvent( &SleepingThread->Event, NotificationEvent, FALSE ); SleepingThread->SleepToken = token; + /* We're going to sleep and need to release the lock, otherwise + it's impossible to re-enter oskittcp to deliver the event that's + going to wake us */ + TcpipRecursiveMutexLeave( &TCPLock ); + TcpipAcquireFastMutex( &SleepingThreadsLock ); InsertTailList( &SleepingThreadsList, &SleepingThread->Entry ); TcpipReleaseFastMutex( &SleepingThreadsLock ); @@ -136,6 +141,8 @@ RemoveEntryList( &SleepingThread->Entry ); TcpipReleaseFastMutex( &SleepingThreadsLock ); + TcpipRecursiveMutexEnter( &TCPLock, TRUE ); + PoolFreeBuffer( SleepingThread ); } TI_DbgPrint(DEBUG_TCP,("Waiting finished: %x\n", token)); _____ Modified: trunk/reactos/drivers/lib/ip/transport/tcp/tcp.c --- trunk/reactos/drivers/lib/ip/transport/tcp/tcp.c 2006-01-04 20:45:58 UTC (rev 20561) +++ trunk/reactos/drivers/lib/ip/transport/tcp/tcp.c 2006-01-04 22:40:48 UTC (rev 20562) @@ -153,7 +153,64 @@ } } } + if( NewState & SEL_WRITE ) { + TI_DbgPrint(DEBUG_TCP,("Writeable: irp list %s\n", + IsListEmpty(&Connection->ReceiveRequest) ? + "empty" : "nonempty")); + while( !IsListEmpty( &Connection->SendRequest ) ) { + OSK_UINT SendLen = 0, Sent = 0; + OSK_PCHAR SendBuffer = 0; + + Entry = RemoveHeadList( &Connection->SendRequest ); + Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); + Complete = Bucket->Request.RequestNotifyObject; + + Irp = Bucket->Request.RequestContext; + Mdl = Irp->MdlAddress; + + TI_DbgPrint(DEBUG_TCP, + ("Getting the user buffer from %x\n", Mdl)); + + NdisQueryBuffer( Mdl, &SendBuffer, &SendLen ); + + TI_DbgPrint(DEBUG_TCP, + ("Writing %d bytes to %x\n", SendLen, SendBuffer)); + + TI_DbgPrint(DEBUG_TCP, ("Connection: %x\n", Connection)); + TI_DbgPrint + (DEBUG_TCP, + ("Connection->SocketContext: %x\n", + Connection->SocketContext)); + + Status = TCPTranslateError + ( OskitTCPSend( Connection->SocketContext, + SendBuffer, + SendLen, + &Sent, + 0 ) ); + + TI_DbgPrint(DEBUG_TCP,("TCP Bytes: %d\n", Sent)); + + if( Status == STATUS_SUCCESS ) { + TI_DbgPrint(DEBUG_TCP,("Sent %d bytes with status %x\n", + Sent, Status)); + + Complete( Bucket->Request.RequestContext, + STATUS_SUCCESS, Sent ); + } else if( Status == STATUS_PENDING ) { + InsertHeadList + ( &Connection->SendRequest, &Bucket->Entry ); + break; + } else { + TI_DbgPrint(DEBUG_TCP, + ("Completing Send request: %x %x\n", + Bucket->Request, Status)); + Complete( Bucket->Request.RequestContext, Status, 0 ); + } + } + } + if( NewState & SEL_FIN ) { PLIST_ENTRY ListsToErase[4]; NTSTATUS IrpStatus[4]; @@ -209,6 +266,7 @@ InitializeListHead(&Connection->ConnectRequest); InitializeListHead(&Connection->ListenRequest); InitializeListHead(&Connection->ReceiveRequest); + InitializeListHead(&Connection->SendRequest); /* Save client context pointer */ Connection->ClientContext = ClientContext; @@ -656,11 +714,18 @@ NTSTATUS TCPSendData ( PCONNECTION_ENDPOINT Connection, PCHAR BufferData, - ULONG PacketSize, - PULONG DataUsed, - ULONG Flags) { + ULONG SendLength, + PULONG BytesSent, + ULONG Flags, + PTCP_COMPLETION_ROUTINE Complete, + PVOID Context ) { + UINT Sent = 0; NTSTATUS Status; + PTDI_BUCKET Bucket; + TI_DbgPrint(DEBUG_TCP,("Called for %d bytes (on socket %x)\n", + SendLength, Connection->SocketContext)); + ASSERT_KM_POINTER(Connection->SocketContext); TcpipRecursiveMutexEnter( &TCPLock, TRUE ); @@ -669,12 +734,38 @@ TI_DbgPrint(DEBUG_TCP,("Connection->SocketContext = %x\n", Connection->SocketContext)); - Status = OskitTCPSend( Connection->SocketContext, - (OSK_PCHAR)BufferData, PacketSize, - (PUINT)DataUsed, 0 ); + Status = TCPTranslateError + ( OskitTCPSend( Connection->SocketContext, + (OSK_PCHAR)BufferData, SendLength, + &Sent, 0 ) ); + TI_DbgPrint(DEBUG_TCP,("OskitTCPSend: %x, %d\n", Status, Sent)); + + /* Keep this request around ... there was no data yet */ + if( Status == STATUS_PENDING ) { + /* Freed in TCPSocketState */ + Bucket = ExAllocatePool( NonPagedPool, sizeof(*Bucket) ); + if( !Bucket ) { + TI_DbgPrint(DEBUG_TCP,("Failed to allocate bucket\n")); + TcpipRecursiveMutexLeave( &TCPLock ); + return STATUS_NO_MEMORY; + } + + Bucket->Request.RequestNotifyObject = Complete; + Bucket->Request.RequestContext = Context; + *BytesSent = 0; + + InsertHeadList( &Connection->SendRequest, &Bucket->Entry ); + TI_DbgPrint(DEBUG_TCP,("Queued write irp\n")); + } else { + TI_DbgPrint(DEBUG_TCP,("Got status %x, bytes %d\n", Status, Sent)); + *BytesSent = Sent; + } + TcpipRecursiveMutexLeave( &TCPLock ); + TI_DbgPrint(DEBUG_TCP,("Status %x\n", Status)); + return Status; } @@ -729,14 +820,14 @@ PTDI_BUCKET Bucket; UINT i = 0; - ListHead[0] = &Endpoint->ReceiveRequest; - ListHead[1] = &Endpoint->ConnectRequest; - ListHead[2] = &Endpoint->ListenRequest; - ListHead[3] = 0; + ListHead[0] = &Endpoint->SendRequest; + ListHead[1] = &Endpoint->ReceiveRequest; + ListHead[2] = &Endpoint->ConnectRequest; + ListHead[3] = &Endpoint->ListenRequest; TcpipAcquireSpinLock( &Endpoint->Lock, &OldIrql ); - for( i = 0; ListHead[i]; i++ ) { + for( i = 0; i < sizeof( ListHead ) / sizeof( ListHead[0] ); i++ ) { for( Entry = ListHead[i]->Flink; Entry != ListHead[i]; Entry = Entry->Flink ) { _____ Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp/interface.c --- trunk/reactos/drivers/lib/oskittcp/oskittcp/interface.c 2006-01-04 20:45:58 UTC (rev 20561) +++ trunk/reactos/drivers/lib/oskittcp/oskittcp/interface.c 2006-01-04 22:40:48 UTC (rev 20562) @@ -256,12 +256,26 @@ int OskitTCPSend( void *socket, OSK_PCHAR Data, OSK_UINT Len, OSK_UINT *OutLen, OSK_UINT flags ) { - struct mbuf* m = m_devget( Data, Len, 0, NULL, NULL ); - int error = 0; - if ( !m ) - return ENOBUFS; - error = sosend( socket, NULL, NULL, m, NULL, 0 ); - *OutLen = Len; + int error; + struct uio uio; + struct iovec iov; + + iov.iov_len = Len; + iov.iov_base = Data; + uio.uio_iov = &iov; + uio.uio_iovcnt = 1; + uio.uio_offset = 0; + uio.uio_resid = Len; + uio.uio_segflg = UIO_SYSSPACE; + uio.uio_rw = UIO_WRITE; + uio.uio_procp = NULL; + + error = sosend( socket, NULL, &uio, NULL, NULL, 0 ); + if (OSK_EWOULDBLOCK == error) { + ((struct socket *) socket)->so_snd.sb_flags |= SB_WAIT; + } + *OutLen = uio.uio_offset; + return error; } _____ Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp/sleep.c --- trunk/reactos/drivers/lib/oskittcp/oskittcp/sleep.c 2006-01-04 20:45:58 UTC (rev 20561) +++ trunk/reactos/drivers/lib/oskittcp/oskittcp/sleep.c 2006-01-04 22:40:48 UTC (rev 20562) @@ -35,6 +35,10 @@ OS_DbgPrint(OSK_MID_TRACE,("Socket readable\n")); flags |= SEL_READ; } + if( 0 < sbspace(&so->so_snd) ) { + OS_DbgPrint(OSK_MID_TRACE,("Socket writeable\n")); + flags |= SEL_WRITE; + } if( so->so_state & SS_CANTRCVMORE ) { OS_DbgPrint(OSK_MID_TRACE,("Socket can't be read any longer\n")); flags |= SEL_FIN; _____ Modified: trunk/reactos/drivers/net/afd/afd/write.c --- trunk/reactos/drivers/net/afd/afd/write.c 2006-01-04 20:45:58 UTC (rev 20561) +++ trunk/reactos/drivers/net/afd/afd/write.c 2006-01-04 22:40:48 UTC (rev 20562) @@ -1,4 +1,4 @@ -/* $Id$ +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: drivers/net/afd/afd/write.c @@ -17,7 +17,6 @@ PIRP Irp, PVOID Context ) { NTSTATUS Status = Irp->IoStatus.Status; - PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); PAFD_FCB FCB = (PAFD_FCB)Context; PLIST_ENTRY NextIrpEntry; PIRP NextIrp = NULL; @@ -26,6 +25,15 @@ PAFD_MAPBUF Map; UINT TotalBytesCopied = 0, SpaceAvail, i, CopySize = 0; + /* + * The Irp parameter passed in is the IRP of the stream between AFD and + * TDI driver. It's not very usefull to us. We need the IRPs of the stream + * between usermode and AFD. Those are chained from + * FCB->PendingIrpList[FUNCTION_SEND] and you'll see them in the code + * below as "NextIrp" ('cause they are the next usermode IRP to be + * processed). + */ + AFD_DbgPrint(MID_TRACE,("Called, status %x, %d bytes used\n", Irp->IoStatus.Status, Irp->IoStatus.Information)); @@ -78,7 +86,7 @@ !IsListEmpty( &FCB->PendingIrpList[FUNCTION_SEND] ) && NT_SUCCESS(Status) ) { NextIrpEntry = - RemoveHeadList(&FCB->PendingIrpList[FUNCTION_RECV]); + RemoveHeadList(&FCB->PendingIrpList[FUNCTION_SEND]); NextIrp = CONTAINING_RECORD(NextIrpEntry, IRP, Tail.Overlay.ListEntry); NextIrpSp = IoGetCurrentIrpStackLocation( NextIrp ); @@ -89,8 +97,7 @@ SpaceAvail = FCB->Send.Size - FCB->Send.BytesUsed; - for( i = 0; FCB->Send.BytesUsed < FCB->Send.Content && - i < SendReq->BufferCount; i++ ) { + for( i = 0; i < SendReq->BufferCount; i++ ) { Map[i].BufferAddress = MmMapLockedPages( Map[i].Mdl, KernelMode ); @@ -101,7 +108,7 @@ Map[i].BufferAddress, CopySize ); - MmUnmapLockedPages( Map[i].Mdl, KernelMode ); + MmUnmapLockedPages( Map[i].BufferAddress, Map[i].Mdl ); FCB->Send.BytesUsed += CopySize; TotalBytesCopied += CopySize; @@ -116,7 +123,7 @@ SocketCalloutEnter( FCB ); Status = TdiSend( &FCB->SendIrp.InFlightRequest, - IrpSp->FileObject, + FCB->Connection.Object, 0, FCB->Send.Window, FCB->Send.BytesUsed, @@ -138,13 +145,13 @@ AFD_DbgPrint(MID_TRACE,("Dismissing request: %x\n", Status)); - return UnlockAndMaybeComplete( FCB, Status, Irp, TotalBytesCopied, + return UnlockAndMaybeComplete( FCB, Status, NextIrp, TotalBytesCopied, NULL, TRUE ); } else if( NextIrp ) { AFD_DbgPrint(MID_TRACE,("Could not do any more with Irp %x\n", NextIrp)); InsertHeadList( &FCB->PendingIrpList[FUNCTION_SEND], - &Irp->Tail.Overlay.ListEntry ); + &NextIrp->Tail.Overlay.ListEntry ); } SocketStateUnlock( FCB ); _____ Modified: trunk/reactos/drivers/net/tcpip/include/tcp.h --- trunk/reactos/drivers/net/tcpip/include/tcp.h 2006-01-04 20:45:58 UTC (rev 20561) +++ trunk/reactos/drivers/net/tcpip/include/tcp.h 2006-01-04 22:40:48 UTC (rev 20562) @@ -150,7 +150,9 @@ PCHAR Buffer, ULONG DataSize, PULONG DataUsed, - ULONG Flags); + ULONG Flags, + PTCP_COMPLETION_ROUTINE Complete, + PVOID Context); NTSTATUS TCPClose( PCONNECTION_ENDPOINT Connection ); _____ Modified: trunk/reactos/drivers/net/tcpip/include/titypes.h --- trunk/reactos/drivers/net/tcpip/include/titypes.h 2006-01-04 20:45:58 UTC (rev 20561) +++ trunk/reactos/drivers/net/tcpip/include/titypes.h 2006-01-04 22:40:48 UTC (rev 20562) @@ -302,6 +302,7 @@ LIST_ENTRY ConnectRequest; /* Queued connect rqueusts */ LIST_ENTRY ListenRequest; /* Queued listen requests */ LIST_ENTRY ReceiveRequest; /* Queued receive requests */ + LIST_ENTRY SendRequest; /* Queued send requests */ /* Signals */ LIST_ENTRY SignalList; /* Entry in the list of sockets waiting for _____ Modified: trunk/reactos/drivers/net/tcpip/tcpip/dispatch.c --- trunk/reactos/drivers/net/tcpip/tcpip/dispatch.c 2006-01-04 20:45:58 UTC (rev 20561) +++ trunk/reactos/drivers/net/tcpip/tcpip/dispatch.c 2006-01-04 22:40:48 UTC (rev 20562) @@ -898,15 +898,15 @@ */ { PIO_STACK_LOCATION IrpSp; - PTDI_REQUEST_KERNEL_RECEIVE ReceiveInfo; + PTDI_REQUEST_KERNEL_SEND SendInfo; PTRANSPORT_CONTEXT TranContext; NTSTATUS Status; - ULONG BytesReceived; + ULONG BytesSent; TI_DbgPrint(DEBUG_IRP, ("Called.\n")); IrpSp = IoGetCurrentIrpStackLocation(Irp); - ReceiveInfo = (PTDI_REQUEST_KERNEL_RECEIVE)&(IrpSp->Parameters); + SendInfo = (PTDI_REQUEST_KERNEL_SEND)&(IrpSp->Parameters); TranContext = IrpSp->FileObject->FsContext; if (TranContext == NULL) @@ -938,12 +938,14 @@ Status = TCPSendData( TranContext->Handle.ConnectionContext, Data, - ReceiveInfo->ReceiveLength, - &BytesReceived, - ReceiveInfo->ReceiveFlags); + SendInfo->SendLength, + &BytesSent, + SendInfo->SendFlags, + DispDataRequestComplete, + Irp); if (Status != STATUS_PENDING) { - DispDataRequestComplete(Irp, Status, BytesReceived); + DispDataRequestComplete(Irp, Status, BytesSent); } else IoMarkIrpPending( Irp ); }

1 0

[ion] 20561: - Fix worker thread priorities. A quick check of the DDK and ProcesXP confirmed that there was a bug (thanks GvG!). Turns out I had forgotten to use the -base- priority kernel call. Renamed some variables to make it clearer and fixed the bug. The correct priorities are 12, 13, 15.
by ion＠svn.reactos.org 04 Jan '06

04 Jan '06

- Fix worker thread priorities. A quick check of the DDK and ProcesXP confirmed that there was a bug (thanks GvG!). Turns out I had forgotten to use the -base- priority kernel call. Renamed some variables to make it clearer and fixed the bug. The correct priorities are 12, 13, 15. Modified: trunk/reactos/ntoskrnl/ex/work.c Modified: trunk/reactos/ntoskrnl/ke/kthread.c _____ Modified: trunk/reactos/ntoskrnl/ex/work.c --- trunk/reactos/ntoskrnl/ex/work.c 2006-01-04 14:26:06 UTC (rev 20560) +++ trunk/reactos/ntoskrnl/ex/work.c 2006-01-04 20:45:58 UTC (rev 20561) @@ -19,17 +19,17 @@ /* DATA **********************************************************************/ /* Number of worker threads for each Queue */ -#define EX_HYPERCRITICAL_WORK_THREADS 1 -#define EX_DELAYED_WORK_THREADS 3 -#define EX_CRITICAL_WORK_THREADS 5 +#define EX_HYPERCRITICAL_WORK_THREADS 1 +#define EX_DELAYED_WORK_THREADS 3 +#define EX_CRITICAL_WORK_THREADS 5 /* Magic flag for dynamic worker threads */ -#define EX_DYNAMIC_WORK_THREAD 0x80000000 +#define EX_DYNAMIC_WORK_THREAD 0x80000000 -/* Worker thread priorities */ -#define EX_HYPERCRITICAL_QUEUE_PRIORITY 7 -#define EX_CRITICAL_QUEUE_PRIORITY 5 -#define EX_DELAYED_QUEUE_PRIORITY 4 +/* Worker thread priority increments (added to base priority) */ +#define EX_HYPERCRITICAL_QUEUE_PRIORITY_INCREMENT 7 +#define EX_CRITICAL_QUEUE_PRIORITY_INCREMENT 5 +#define EX_DELAYED_QUEUE_PRIORITY_INCREMENT 4 /* The actual worker queue array */ EX_WORK_QUEUE ExWorkerQueue[MaximumWorkQueue]; @@ -284,17 +284,17 @@ if (WorkQueueType == DelayedWorkQueue) { /* Priority == 4 */ - Priority = EX_DELAYED_QUEUE_PRIORITY; + Priority = EX_DELAYED_QUEUE_PRIORITY_INCREMENT; } else if (WorkQueueType == CriticalWorkQueue) { /* Priority == 5 */ - Priority = EX_CRITICAL_QUEUE_PRIORITY; + Priority = EX_CRITICAL_QUEUE_PRIORITY_INCREMENT; } else { /* Priority == 7 */ - Priority = EX_HYPERCRITICAL_QUEUE_PRIORITY; + Priority = EX_HYPERCRITICAL_QUEUE_PRIORITY_INCREMENT; } /* Get the Thread */ @@ -306,7 +306,7 @@ NULL); /* Set the Priority */ - KeSetPriorityThread(&Thread->Tcb, Priority); + KeSetBasePriorityThread(&Thread->Tcb, Priority); /* Dereference and close handle */ ObDereferenceObject(Thread); @@ -431,7 +431,7 @@ /* Raise our priority above all other worker threads */ KeSetBasePriorityThread(KeGetCurrentThread(), - EX_CRITICAL_QUEUE_PRIORITY + 1); + EX_CRITICAL_QUEUE_PRIORITY_INCREMENT + 1); /* Setup the timer */ KeInitializeTimer(&Timer); _____ Modified: trunk/reactos/ntoskrnl/ke/kthread.c --- trunk/reactos/ntoskrnl/ke/kthread.c 2006-01-04 14:26:06 UTC (rev 20560) +++ trunk/reactos/ntoskrnl/ke/kthread.c 2006-01-04 20:45:58 UTC (rev 20561) @@ -1177,15 +1177,12 @@ } /* - * Sets thread's base priority relative to the process' base priority - * Should only be passed in THREAD_PRIORITY_ constants in pstypes.h - * * @implemented */ LONG STDCALL -KeSetBasePriorityThread (PKTHREAD Thread, - LONG Increment) +KeSetBasePriorityThread(PKTHREAD Thread, + LONG Increment) { KIRQL OldIrql; PKPROCESS Process;

1 0

[weiden] 20560: fixed gcc4 warnings
by weiden＠svn.reactos.org 04 Jan '06

04 Jan '06

fixed gcc4 warnings Modified: trunk/rosapps/demos/ddraw/ddraw.xml Modified: trunk/rosapps/sysutils/regexpl/ShellCommandValue.cpp Modified: trunk/rosapps/tests/combotst/combotst.c Modified: trunk/rosapps/tests/hivetest/hivetest.c _____ Modified: trunk/rosapps/demos/ddraw/ddraw.xml --- trunk/rosapps/demos/ddraw/ddraw.xml 2006-01-04 06:44:52 UTC (rev 20559) +++ trunk/rosapps/demos/ddraw/ddraw.xml 2006-01-04 14:26:06 UTC (rev 20560) @@ -1,4 +1,4 @@ -<module name="ddraw_demo" type="win32gui" installbase="system32" installname="ddraw_demo.exe"> +<module name="ddraw_demo" type="win32gui" installbase="system32" installname="ddraw_demo.exe" allowwarnings="true"> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> _____ Modified: trunk/rosapps/sysutils/regexpl/ShellCommandValue.cpp --- trunk/rosapps/sysutils/regexpl/ShellCommandValue.cpp 2006-01-04 06:44:52 UTC (rev 20559) +++ trunk/rosapps/sysutils/regexpl/ShellCommandValue.cpp 2006-01-04 14:26:06 UTC (rev 20560) @@ -243,7 +243,7 @@ default: { TCHAR Buffer[256]; - DWORD i; + DWORD i, j; for (i = 0 ; i < dwValueSize ; i++) { if (i%16 == 0) @@ -266,7 +266,7 @@ if (i && (i%16 == 15)) { // if this is the last byte in line // Dump text representation - for (DWORD j = i-15; j <= i; j += blnUnicodeDump?2:1)\ + for (j = i-15; j <= i; j += blnUnicodeDump?2:1)\ { if ((j%8 == 0)&&(j%16 != 0)) { // this is the additional space between 7th and 8th byte in current line @@ -321,7 +321,7 @@ if (k && (k%16 == 15)) { // if this is the last byte in line ASSERT((k-15)%16 == 0); // k-15 must point at begin of last line - for (DWORD j = k-15; j < i; j += j += blnUnicodeDump?2:1) + for (j = k-15; j < i; j += blnUnicodeDump?2:1) { if (blnUnicodeDump&&(j+1 >= i)) { // ok, buffer size is odd number, so we don't display last byte. _____ Modified: trunk/rosapps/tests/combotst/combotst.c --- trunk/rosapps/tests/combotst/combotst.c 2006-01-04 06:44:52 UTC (rev 20559) +++ trunk/rosapps/tests/combotst/combotst.c 2006-01-04 14:26:06 UTC (rev 20560) @@ -545,7 +545,7 @@ PrintTextXY("CBN_EDITCHANGE notification",NOTIFYX,NOTIFYY,27,srect); break; - case CBN_ERRSPACE: + case (WORD)CBN_ERRSPACE: ScrollWindow (hwnd, 0, SCROLLAMOUNT, &srect, &srect); PrintTextXY("CBN_ERRSPACE notification",NOTIFYX,NOTIFYY,25,srect); break; _____ Modified: trunk/rosapps/tests/hivetest/hivetest.c --- trunk/rosapps/tests/hivetest/hivetest.c 2006-01-04 06:44:52 UTC (rev 20559) +++ trunk/rosapps/tests/hivetest/hivetest.c 2006-01-04 14:26:06 UTC (rev 20560) @@ -804,7 +804,7 @@ LONG dwError; TOKEN_PRIVILEGES NewPrivileges; HANDLE Token,hKey; - LUID Luid; + LUID Luid = {0}; BOOLEAN bRes; Status=NtOpenProcessToken(GetCurrentProcess() ,TOKEN_ADJUST_PRIVILEGES,&Token);

1 0

[jimtabor] 20559: Clean up and fixed NtUserGetMenuItemRect. Needs more testing. I watch mplayerc swip all the menu items with crashing.
by jimtabor＠svn.reactos.org 04 Jan '06

04 Jan '06

Clean up and fixed NtUserGetMenuItemRect. Needs more testing. I watch mplayerc swip all the menu items with crashing. Modified: trunk/reactos/subsys/win32k/ntuser/menu.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/menu.c --- trunk/reactos/subsys/win32k/ntuser/menu.c 2006-01-03 23:41:57 UTC (rev 20558) +++ trunk/reactos/subsys/win32k/ntuser/menu.c 2006-01-04 06:44:52 UTC (rev 20559) @@ -1696,16 +1696,11 @@ LPRECT lprcItem) { ROSMENUINFO mi; - ROSMENUITEMINFO mii; HWND referenceHwnd; - LPPOINT lpPoints; - LPRECT lpRect = NULL; - POINT FromOffset; - LONG XMove, YMove; - ULONG i; + RECT Rect; NTSTATUS Status; PMENU_OBJECT Menu; - PWINDOW_OBJECT ReferenceWnd; + PMENU_ITEM MenuItem; DECLARE_RETURN(BOOL); DPRINT("Enter NtUserGetMenuItemRect\n"); @@ -1716,41 +1711,26 @@ RETURN(FALSE); } - if(!UserMenuItemInfo(Menu, uItem, MF_BYPOSITION, &mii, FALSE)) - RETURN( FALSE); - + if (IntGetMenuItemByFlag(Menu, uItem, MF_BYPOSITION, &MenuItem, NULL) > -1) + Rect = MenuItem->Rect; + else + RETURN(FALSE); + referenceHwnd = hWnd; - + if(!hWnd) { if(!UserMenuInfo(Menu, &mi, FALSE)) RETURN( FALSE); if(mi.Wnd == 0) RETURN( FALSE); - referenceHwnd = mi.Wnd; + referenceHwnd = mi.Wnd; /* Okay we found it, so now what do we do? */ } if (lprcItem == NULL) RETURN( FALSE); - *lpRect = mii.Rect; - lpPoints = (LPPOINT)lpRect; - ReferenceWnd = UserGetWindowObject(referenceHwnd); - if (!ReferenceWnd || !UserGetClientOrigin(ReferenceWnd, &FromOffset)) - { - RETURN( FALSE); - } - - XMove = FromOffset.x; - YMove = FromOffset.y; - - for (i = 0; i < 2; i++) - { - lpPoints[i].x += XMove; - lpPoints[i].y += YMove; - } - - Status = MmCopyToCaller(lprcItem, lpPoints, sizeof(RECT)); + Status = MmCopyToCaller(lprcItem, &Rect, sizeof(RECT)); if (! NT_SUCCESS(Status)) { SetLastNtError(Status);

1 0

[gedmurphy] 20558: - Display a temporary note in ipconfig to avoid user confusion.
by gedmurphy＠svn.reactos.org 03 Jan '06

03 Jan '06

- Display a temporary note in ipconfig to avoid user confusion. - Requires fixing of GetAdaptersInfo Modified: trunk/reactos/apps/utils/net/ipconfig/ipconfig.c _____ Modified: trunk/reactos/apps/utils/net/ipconfig/ipconfig.c --- trunk/reactos/apps/utils/net/ipconfig/ipconfig.c 2006-01-03 23:36:05 UTC (rev 20557) +++ trunk/reactos/apps/utils/net/ipconfig/ipconfig.c 2006-01-03 23:41:57 UTC (rev 20558) @@ -144,12 +144,14 @@ } pAdapter = pAdapterInfo; - //HKEY hKey; - //LPCTSTR lpSubKey = _T("SYSTEM\\ControlSet\\Control\\Network"); + /* temp note until GetAdatersInfo is fixed */ + _tprintf(_T("Note - ipconfig is currently returning incorrect information\n")); + _tprintf(_T("If your adapter is configured correctly, it will usually \n")); + _tprintf(_T("display the loopback, otherwise an error will be displayed\n\n")); + _tprintf(_T("\nReactOS IP Configuration\n\n")); - if (bAll) { _tprintf(_T("\tHost Name . . . . . . . . . . . . : %s\n"), pFixedInfo->HostName);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs