Ros-diffs May 2005

ros-diffs@reactos.org

26 participants
814 discussions

[greatlrd] 15710: small optimze for StretchBlt
by greatlrd＠svn.reactos.com 31 May '05

31 May '05

small optimze for StretchBlt now do only getpixel ones instead call hole time on getpixel for the color value when it stretch to biger BMP the hole stretchblt need to be optimze this code are geting it working bit faster and it is reference implementation Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib1bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib24bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib4bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib8bpp.c _____ Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c --- trunk/reactos/subsys/win32k/dib/dib16bpp.c 2005-05-31 22:06:18 UTC (rev 15709) +++ trunk/reactos/subsys/win32k/dib/dib16bpp.c 2005-05-31 23:58:14 UTC (rev 15710) @@ -627,6 +627,8 @@ int DesY; int color; int zoomX; + int zoomY; + int count; DPRINT("DIB_16BPP_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, @@ -641,13 +643,16 @@ zoomX = DesSizeX / SrcSizeX; if (zoomX==0) zoomX=1; + zoomY = DesSizeY / SrcSizeY; + if (zoomY==0) zoomY=1; + 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=0; DesY<DestRect->bottom; DesY++) + for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) { if (DesSizeY>SrcSizeY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -665,19 +670,25 @@ if (sx > SourceRect->right) break; - if(DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0) + if(DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0) { - if (zoomX>1) - DIB_16BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, 0)); - else - DIB_16BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 0)); + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_16BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, 0)); + else + DIB_16BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, 0)); + } } else { - if (zoomX>1) - DIB_16BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, 1)); - else - DIB_16BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 1)); + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_16BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, 1)); + else + DIB_16BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, 1)); + } } } } @@ -687,7 +698,7 @@ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesY<DestRect->bottom; DesY++) + for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) { if (DesSizeY>SrcSizeY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -709,10 +720,13 @@ color = DIB_4BPP_GetPixel(SourceSurf, sx, sy); - if (zoomX>1) - DIB_16BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); - else - DIB_16BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_16BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_16BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + } } } @@ -722,7 +736,7 @@ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesY<DestRect->bottom; DesY++) + for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) { if (DesSizeY>SrcSizeY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -742,10 +756,13 @@ color = DIB_8BPP_GetPixel(SourceSurf, sx, sy); - if (zoomX>1) - DIB_16BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); - else - DIB_16BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_16BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_16BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + } } } @@ -755,7 +772,7 @@ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesY<DestRect->bottom; DesY++) + for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) { if (DesSizeY>SrcSizeY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -774,10 +791,13 @@ if (sx > SourceRect->right) break; color = DIB_24BPP_GetPixel(SourceSurf, sx, sy); - if (zoomX>1) - DIB_16BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); - else - DIB_16BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_16BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_16BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + } } } break; @@ -786,7 +806,7 @@ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesY<DestRect->bottom; DesY++) + for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) { if (DesSizeY>SrcSizeY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -805,10 +825,13 @@ if (sx > SourceRect->right) break; color = DIB_32BPP_GetPixel(SourceSurf, sx, sy); - if (zoomX>1) - DIB_16BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); - else - DIB_16BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_16BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_16BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + } } } break; _____ Modified: trunk/reactos/subsys/win32k/dib/dib1bpp.c --- trunk/reactos/subsys/win32k/dib/dib1bpp.c 2005-05-31 22:06:18 UTC (rev 15709) +++ trunk/reactos/subsys/win32k/dib/dib1bpp.c 2005-05-31 23:58:14 UTC (rev 15710) @@ -495,6 +495,8 @@ int DesY; int color; int zoomX; + int zoomY; + int count; SrcSizeY = SourceRect->bottom; SrcSizeX = SourceRect->right; @@ -505,14 +507,17 @@ zoomX = DesSizeX / SrcSizeX; if (zoomX==0) zoomX=1; + zoomY = DesSizeY / SrcSizeY; + if (zoomY==0) zoomY=1; + 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=0; DesY<DestRect->bottom; DesY++) + for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) { if (DesSizeY>SrcSizeY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -534,11 +539,15 @@ color = DIB_1BPP_GetPixel(SourceSurf, sx, sy); - if (zoomX>1) - DIB_1BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, color); - else - DIB_1BPP_PutPixel(DestSurf, DesX, DesY, color); + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_1BPP_HLine(DestSurf, DesX, DesX + zoomX, count, color); + else + DIB_1BPP_PutPixel(DestSurf, DesX, count, color); } + + } } break; @@ -546,7 +555,7 @@ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesY<DestRect->bottom; DesY++) + for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) { if (DesSizeY>SrcSizeY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -568,12 +577,14 @@ color = DIB_4BPP_GetPixel(SourceSurf, sx, sy); - if (zoomX>1) - DIB_1BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); - else - DIB_1BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); - + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_1BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_1BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, color)); } + } } break; @@ -581,7 +592,7 @@ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesY<DestRect->bottom; DesY++) + for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) { if (DesSizeY>SrcSizeY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -601,12 +612,15 @@ color = DIB_8BPP_GetPixel(SourceSurf, sx, sy); - if (zoomX>1) - DIB_1BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); - else - DIB_1BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_1BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_1BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + } - } + } } break; @@ -614,7 +628,7 @@ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesY<DestRect->bottom; DesY++) + for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) { if (DesSizeY>SrcSizeY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -634,12 +648,15 @@ color = DIB_16BPP_GetPixel(SourceSurf, sx, sy); - if (zoomX>1) - DIB_1BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); - else - DIB_1BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_1BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_1BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + } - } + } } break; @@ -647,7 +664,7 @@ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesY<DestRect->bottom; DesY++) + for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) { if (DesSizeY>SrcSizeY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -667,19 +684,22 @@ color = DIB_24BPP_GetPixel(SourceSurf, sx, sy); - if (zoomX>1) - DIB_1BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); - else - DIB_1BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_1BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_1BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + } - } + } } break; case BMF_32BPP: /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesY<DestRect->bottom; DesY++) + for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) { if (DesSizeY>SrcSizeY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -699,11 +719,14 @@ color = DIB_32BPP_GetPixel(SourceSurf, sx, sy); - if (zoomX>1) - DIB_1BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); - else - DIB_1BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_1BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_1BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, color)); } + } } break; _____ Modified: trunk/reactos/subsys/win32k/dib/dib24bpp.c --- trunk/reactos/subsys/win32k/dib/dib24bpp.c 2005-05-31 22:06:18 UTC (rev 15709) +++ trunk/reactos/subsys/win32k/dib/dib24bpp.c 2005-05-31 23:58:14 UTC (rev 15710) @@ -319,6 +319,8 @@ int DesY; int color; int zoomX; + int zoomY; + int count; SrcSizeY = SourceRect->bottom; SrcSizeX = SourceRect->right; @@ -329,13 +331,16 @@ zoomX = DesSizeX / SrcSizeX; if (zoomX==0) zoomX=1; + zoomY = DesSizeY / SrcSizeY; + if (zoomY==0) zoomY=1; + 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=0; DesY<DestRect->bottom; DesY++) + for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) { if (DesSizeY>SrcSizeY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -351,21 +356,25 @@ else sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); - if (sx > SourceRect->right) break; - - if(DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0) + if(DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0) { - DIB_24BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 0)); - if (zoomX>1) - DIB_24BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, 0)); - else - DIB_24BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 0)); + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_24BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, 0)); + else + DIB_24BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, 0)); + } + + } else { - } else { - if (zoomX>1) - DIB_24BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, 1)); - else - DIB_24BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 1)); + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_24BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, 1)); + else + DIB_24BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, 1)); + } } } } @@ -375,7 +384,7 @@ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesY<DestRect->bottom; DesY++) + for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) { if (DesSizeY>SrcSizeY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -394,11 +403,15 @@ if (sx > SourceRect->right) break; color = DIB_4BPP_GetPixel(SourceSurf, sx, sy); - if (zoomX>1) - DIB_24BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); - else - DIB_24BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); - } + + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_24BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_24BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + } + } } break; @@ -406,7 +419,7 @@ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesY<DestRect->bottom; DesY++) + for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) { if (DesSizeY>SrcSizeY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -425,11 +438,16 @@ if (sx > SourceRect->right) break; color = DIB_8BPP_GetPixel(SourceSurf, sx, sy); - if (zoomX>1) - DIB_24BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); - else - DIB_24BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_24BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_24BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, color)); } + + } } break; @@ -437,7 +455,7 @@ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesY<DestRect->bottom; DesY++) + for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) { if (DesSizeY>SrcSizeY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -456,11 +474,16 @@ if (sx > SourceRect->right) break; color = DIB_16BPP_GetPixel(SourceSurf, sx, sy); - if (zoomX>1) - DIB_24BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); - else - DIB_24BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_24BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_24BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, color)); } + + } } break; @@ -468,7 +491,7 @@ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesY<DestRect->bottom; DesY++) + for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) { if (DesSizeY>SrcSizeY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -487,11 +510,16 @@ if (sx > SourceRect->right) break; color = DIB_24BPP_GetPixel(SourceSurf, sx, sy); - if (zoomX>1) - DIB_24BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, color); - else - DIB_24BPP_PutPixel(DestSurf, DesX, DesY, color); + + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_24BPP_HLine(DestSurf, DesX, DesX + zoomX, count, color); + else + DIB_24BPP_PutPixel(DestSurf, DesX, count, color); } + + } } break; @@ -499,7 +527,7 @@ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesY<DestRect->bottom; DesY++) + for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) { if (DesSizeY>SrcSizeY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -519,11 +547,14 @@ color = DIB_32BPP_GetPixel(SourceSurf, sx, sy); - if (zoomX>1) - DIB_24BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); - else - DIB_24BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_24BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_24BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, color)); } + } } break; _____ Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c --- trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-05-31 22:06:18 UTC (rev 15709) +++ trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-05-31 23:58:14 UTC (rev 15710) @@ -561,6 +561,8 @@ int DesY; int color; int zoomX; + int zoomY; + int count; DPRINT("DIB_32BPP_StretchBlt: Source BPP: %u, srcRect: (%d,%d)-(%d,%d), dstRect: (%d,%d)-(%d,%d)\n", @@ -575,14 +577,17 @@ zoomX = DesSizeX / SrcSizeX; if (zoomX==0) zoomX=1; - + + zoomY = DesSizeY / SrcSizeY; + if (zoomY==0) zoomY=1; + 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=0; DesY<DestRect->bottom; DesY++) + for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) { if (DesSizeY>SrcSizeY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -602,16 +607,23 @@ if(DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0) { - if (zoomX>1) - DIB_32BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, 0)); - else - DIB_32BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 0)); + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_32BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, 0)); + else + DIB_32BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, 0)); + } } else { - if (zoomX>1) - DIB_32BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, 1)); - else - DIB_32BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 1)); + + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_32BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, 1)); + else + DIB_32BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, 1)); + } } } } @@ -621,7 +633,7 @@ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesY<DestRect->bottom; DesY++) + for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) { if (DesSizeY>SrcSizeY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -644,10 +656,13 @@ color = DIB_4BPP_GetPixel(SourceSurf, sx, sy); - if (zoomX>1) - DIB_32BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); - else - DIB_32BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_32BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_32BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + } } } @@ -657,7 +672,7 @@ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesY<DestRect->bottom; DesY++) + for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) { if (DesSizeY>SrcSizeY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -677,11 +692,16 @@ color = DIB_8BPP_GetPixel(SourceSurf, sx, sy); - if (zoomX>1) - DIB_32BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); - else - DIB_32BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_32BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_32BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, color)); } + + + } } break; @@ -689,7 +709,7 @@ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesY<DestRect->bottom; DesY++) + for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) { if (DesSizeY>SrcSizeY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -708,11 +728,15 @@ if (sx > SourceRect->right) break; color = DIB_16BPP_GetPixel(SourceSurf, sx, sy); - if (zoomX>1) - DIB_32BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); - else - DIB_32BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); - } + + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_32BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_32BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + } + } } break; @@ -720,7 +744,7 @@ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesY<DestRect->bottom; DesY++) + for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) { if (DesSizeY>SrcSizeY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -739,11 +763,16 @@ if (sx > SourceRect->right) break; color = DIB_24BPP_GetPixel(SourceSurf, sx, sy); - if (zoomX>1) - DIB_32BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); - else - DIB_32BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); - } + + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_32BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_32BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + } + + } } break; _____ Modified: trunk/reactos/subsys/win32k/dib/dib4bpp.c --- trunk/reactos/subsys/win32k/dib/dib4bpp.c 2005-05-31 22:06:18 UTC (rev 15709) +++ trunk/reactos/subsys/win32k/dib/dib4bpp.c 2005-05-31 23:58:14 UTC (rev 15710) @@ -373,6 +373,9 @@ int DesY; int color; int zoomX; + int zoomY; + int count; + SrcSizeY = SourceRect->bottom; SrcSizeX = SourceRect->right; @@ -383,13 +386,16 @@ zoomX = DesSizeX / SrcSizeX; if (zoomX==0) zoomX=1; + zoomY = DesSizeY / SrcSizeY; + if (zoomY==0) zoomY=1; + 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=0; DesY<DestRect->bottom; DesY++) + for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) { if (DesSizeY>SrcSizeY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -407,19 +413,25 @@ if (sx > SourceRect->right) break; - if(DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0) + if(DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0) { - if (zoomX>1) - DIB_4BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, 0)); - else - DIB_4BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 0)); + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_4BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, 0)); + else + DIB_4BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, 0)); + } - } else { - if (zoomX>1) - DIB_4BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, 1)); - else - DIB_4BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 1)); + } else { + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_4BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, 1)); + else + DIB_4BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, 1)); + } } } } @@ -429,7 +441,7 @@ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesY<DestRect->bottom; DesY++) + for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) { if (DesSizeY>SrcSizeY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -451,12 +463,15 @@ color = DIB_4BPP_GetPixel(SourceSurf, sx, sy); - if (zoomX>1) - DIB_4BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, color); - else - DIB_4BPP_PutPixel(DestSurf, DesX, DesY, color); + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_4BPP_HLine(DestSurf, DesX, DesX + zoomX, count, color); + else + DIB_4BPP_PutPixel(DestSurf, DesX, count, color); + } - } + } } break; @@ -464,7 +479,7 @@ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesY<DestRect->bottom; DesY++) + for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) { if (DesSizeY>SrcSizeY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -497,7 +512,7 @@ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesY<DestRect->bottom; DesY++) + for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) { if (DesSizeY>SrcSizeY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -517,12 +532,15 @@ color = DIB_16BPP_GetPixel(SourceSurf, sx, sy); - if (zoomX>1) - DIB_4BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); - else - DIB_4BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_4BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_4BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + } - } + } } break; @@ -530,7 +548,7 @@ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesY<DestRect->bottom; DesY++) + for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) { if (DesSizeY>SrcSizeY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -550,12 +568,15 @@ color = DIB_24BPP_GetPixel(SourceSurf, sx, sy); - if (zoomX>1) - DIB_4BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); - else - DIB_4BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_4BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_4BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + } - } + } } break; @@ -563,7 +584,7 @@ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesY<DestRect->bottom; DesY++) + for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) { if (DesSizeY>SrcSizeY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -583,12 +604,14 @@ color = DIB_32BPP_GetPixel(SourceSurf, sx, sy); - if (zoomX>1) - DIB_4BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); - else - DIB_4BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); - + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_4BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_4BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, color)); } + } } break; _____ Modified: trunk/reactos/subsys/win32k/dib/dib8bpp.c --- trunk/reactos/subsys/win32k/dib/dib8bpp.c 2005-05-31 22:06:18 UTC (rev 15709) +++ trunk/reactos/subsys/win32k/dib/dib8bpp.c 2005-05-31 23:58:14 UTC (rev 15710) @@ -551,6 +551,8 @@ int DesY; int color; int zoomX; + int zoomY; + int count; 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, @@ -565,13 +567,16 @@ zoomX = DesSizeX / SrcSizeX; if (zoomX==0) zoomX=1; + zoomY = DesSizeY / SrcSizeY; + if (zoomY==0) zoomY=1; + 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=0; DesY<DestRect->bottom; DesY++) + for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) { if (DesSizeY>SrcSizeY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); [truncated at 1000 lines; 149 more skipped]

1 0

[gvg] 15709: Small present for ion
by gvg＠svn.reactos.com 31 May '05

31 May '05

Small present for ion Modified: trunk/reactos/lib/iphlpapi/iphlpapi.xml _____ Modified: trunk/reactos/lib/iphlpapi/iphlpapi.xml --- trunk/reactos/lib/iphlpapi/iphlpapi.xml 2005-05-31 21:40:24 UTC (rev 15708) +++ trunk/reactos/lib/iphlpapi/iphlpapi.xml 2005-05-31 22:06:18 UTC (rev 15709) @@ -2,7 +2,6 @@ <importlibrary definition="iphlpapi.spec.def" /> <include base="iphlpapi">include</include> <include base="ReactOS">include/wine</include> - <define name="YDEBUG" /> <define name="UNICODE" /> <define name="_UNICODE" /> <define name="__REACTOS__" />

1 0

[gvg] 15708: Update to xen-unstable 1.1602
by gvg＠svn.reactos.com 31 May '05

31 May '05

Update to xen-unstable 1.1602 Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xendisk.c Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xenvideo.c Modified: branches/xen/reactos/include/xen3/private/ctrl_if.h Modified: branches/xen/reactos/include/xen3/private/evtchn.h Added: branches/xen/reactos/include/xen3/private/hypercall.h Modified: branches/xen/reactos/include/xen3/private/hypervisor.h Modified: branches/xen/reactos/include/xen3/public/arch-ia64.h Modified: branches/xen/reactos/include/xen3/public/arch-x86_32.h Modified: branches/xen/reactos/include/xen3/public/arch-x86_64.h Modified: branches/xen/reactos/include/xen3/public/dom0_ops.h Modified: branches/xen/reactos/include/xen3/public/io/blkif.h Modified: branches/xen/reactos/include/xen3/public/io/domain_controller.h Modified: branches/xen/reactos/include/xen3/public/io/netif.h Modified: branches/xen/reactos/include/xen3/public/physdev.h Modified: branches/xen/reactos/include/xen3/public/sched_ctl.h Modified: branches/xen/reactos/include/xen3/public/xen.h _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xendisk.c --- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xendisk.c 2005-05-31 20:47:11 UTC (rev 15707) +++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xendisk.c 2005-05-31 21:40:24 UTC (rev 15708) @@ -413,24 +413,19 @@ for (Disk = 0; Disk < XenDiskCount; Disk++) { XenDiskInfo[Disk].SectorCount = Probe[Disk].capacity; - switch (VDISK_TYPE(Probe[Disk].info)) + if (0 != (Probe[Disk].info & VDISK_REMOVABLE)) { - case VDISK_TYPE_FLOPPY: - XenDiskInfo[Disk].DriveNumber = FloppyNumber++; - break; - case VDISK_TYPE_CDROM: - XenDiskInfo[Disk].DriveNumber = CDRomNumber--; - break; - case VDISK_TYPE_DISK: - XenDiskInfo[Disk].DriveNumber = HarddiskNumber++; - break; - case VDISK_TYPE_TAPE: - case VDISK_TYPE_OPTICAL: - default: - XenDiskInfo[Disk].DriveNumber = 0xff; - break; + XenDiskInfo[Disk].DriveNumber = FloppyNumber++; } - XenDiskInfo[Disk].BytesPerSector = 512; + else if (0 != (Probe[Disk].info & VDISK_CDROM)) + { + XenDiskInfo[Disk].DriveNumber = CDRomNumber--; + } + else + { + XenDiskInfo[Disk].DriveNumber = HarddiskNumber++; + } + XenDiskInfo[Disk].BytesPerSector = Probe[Disk].sector_size; XenDiskInfo[Disk].XenDevice = Probe[Disk].device; XenDiskInfo[Disk].XenInfo = Probe[Disk].info; } _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xenvideo.c --- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xenvideo.c 2005-05-31 20:47:11 UTC (rev 15707) +++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xenvideo.c 2005-05-31 21:40:24 UTC (rev 15708) @@ -106,21 +106,41 @@ { switch(Ch) { + case 0xda: /* top-left single corner */ + case 0xbf: /* top-right single corner */ + case 0xc0: /* bottom-left single corner */ + case 0xd9: /* bottom-right single corner */ case 0xc9: /* top-left double corner */ case 0xbb: /* top-right double corner */ case 0xc8: /* bottom-left double corner */ case 0xbc: /* bottom-right double corner */ + case 0xd5: /* top-left single/double corner */ + case 0xb8: /* top-right single/double corner */ + case 0xd4: /* bottom-left single/double corner */ + case 0xbe: /* bottom-right single/double corner */ + case 0xd6: /* top-left single/double corner */ + case 0xb7: /* top-right single/double corner */ + case 0xd3: /* bottom-left single/double corner */ + case 0xbd: /* bottom-right single/double corner */ Ch = '+'; break; + case 0xc4: /* horizontal single */ case 0xcd: /* horizontal double */ Ch = '-'; break; + case 0xb3: /* vertical single */ case 0xba: /* vertical double */ Ch = '|'; break; case 0xb1: /* dotted pattern */ Ch = ' '; break; + case 0xdb: /* progress bar, completed */ + Ch = '*'; + break; + case 0xb2: /* progress bar, to do */ + Ch = ' '; + break; } } @@ -184,7 +204,11 @@ BufPtr += 2; } } - AnsiMoveToPos(COLS, ROWS); + if (COLS - 1 != CurrentX || ROWS - 1 != CurrentY) + { + AnsiMoveToPos(COLS - 1, ROWS - 1); + } + XenConsFlush(); } VOID _____ Modified: branches/xen/reactos/include/xen3/private/ctrl_if.h --- branches/xen/reactos/include/xen3/private/ctrl_if.h 2005-05-31 20:47:11 UTC (rev 15707) +++ branches/xen/reactos/include/xen3/private/ctrl_if.h 2005-05-31 21:40:24 UTC (rev 15708) @@ -30,7 +30,7 @@ #ifndef __ASM_XEN__CTRL_IF_H__ #define __ASM_XEN__CTRL_IF_H__ -#include <hypervisor.h> +#include <hypercall.h> typedef control_msg_t ctrl_msg_t; _____ Modified: branches/xen/reactos/include/xen3/private/evtchn.h --- branches/xen/reactos/include/xen3/private/evtchn.h 2005-05-31 20:47:11 UTC (rev 15707) +++ branches/xen/reactos/include/xen3/private/evtchn.h 2005-05-31 21:40:24 UTC (rev 15708) @@ -31,19 +31,19 @@ #ifndef __ASM_EVTCHN_H__ #define __ASM_EVTCHN_H__ -#include <hypervisor.h> +#include <hypercall.h> #include <event_channel.h> /* * LOW-LEVEL DEFINITIONS */ -static inline void notify_via_evtchn(int port) +static inline int notify_via_evtchn(int port) { evtchn_op_t op; op.cmd = EVTCHNOP_send; op.u.send.local_port = port; - (void)HYPERVISOR_event_channel_op(&op); + return HYPERVISOR_event_channel_op(&op); } /* _____ Added: branches/xen/reactos/include/xen3/private/hypercall.h --- branches/xen/reactos/include/xen3/private/hypercall.h 2005-05-31 20:47:11 UTC (rev 15707) +++ branches/xen/reactos/include/xen3/private/hypercall.h 2005-05-31 21:40:24 UTC (rev 15708) @@ -0,0 +1,524 @@ +/********************************************************************** ******** + * hypercall.h + * + * Linux-specific hypervisor handling. + * + * Copyright (c) 2002-2004, K A Fraser + * + * This file may be distributed separately from the Linux kernel, or + * incorporated into other software packages, subject to the following license: + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this source file (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, modify, + * merge, publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +#ifndef __HYPERCALL_H__ +#define __HYPERCALL_H__ +#include <xen.h> +#include <dom0_ops.h> +#include <io/domain_controller.h> + +/* + * Assembler stubs for hyper-calls. + */ + +static inline int +HYPERVISOR_set_trap_table( + trap_info_t *table) +{ + int ret; + unsigned long ignore; + + __asm__ __volatile__ ( + TRAP_INSTR + : "=a" (ret), "=b" (ignore) + : "0" (__HYPERVISOR_set_trap_table), "1" (table) + : "memory" ); + + return ret; +} + +static inline int +HYPERVISOR_mmu_update( + mmu_update_t *req, int count, int *success_count, domid_t domid) +{ + int ret; + unsigned long ign1, ign2, ign3, ign4; + + __asm__ __volatile__ ( + TRAP_INSTR + : "=a" (ret), "=b" (ign1), "=c" (ign2), "=d" (ign3), "=S" (ign4) + : "0" (__HYPERVISOR_mmu_update), "1" (req), "2" (count), + "3" (success_count), "4" (domid) + : "memory" ); + + return ret; +} + +static inline int +HYPERVISOR_mmuext_op( + struct mmuext_op *op, int count, int *success_count, domid_t domid) +{ + int ret; + unsigned long ign1, ign2, ign3, ign4; + + __asm__ __volatile__ ( + TRAP_INSTR + : "=a" (ret), "=b" (ign1), "=c" (ign2), "=d" (ign3), "=S" (ign4) + : "0" (__HYPERVISOR_mmuext_op), "1" (op), "2" (count), + "3" (success_count), "4" (domid) + : "memory" ); + + return ret; +} + +static inline int +HYPERVISOR_set_gdt( + unsigned long *frame_list, int entries) +{ + int ret; + unsigned long ign1, ign2; + + __asm__ __volatile__ ( + TRAP_INSTR + : "=a" (ret), "=b" (ign1), "=c" (ign2) + : "0" (__HYPERVISOR_set_gdt), "1" (frame_list), "2" (entries) + : "memory" ); + + + return ret; +} + +static inline int +HYPERVISOR_stack_switch( + unsigned long ss, unsigned long esp) +{ + int ret; + unsigned long ign1, ign2; + + __asm__ __volatile__ ( + TRAP_INSTR + : "=a" (ret), "=b" (ign1), "=c" (ign2) + : "0" (__HYPERVISOR_stack_switch), "1" (ss), "2" (esp) + : "memory" ); + + return ret; +} + +static inline int +HYPERVISOR_set_callbacks( + unsigned long event_selector, unsigned long event_address, + unsigned long failsafe_selector, unsigned long failsafe_address) +{ + int ret; + unsigned long ign1, ign2, ign3, ign4; + + __asm__ __volatile__ ( + TRAP_INSTR + : "=a" (ret), "=b" (ign1), "=c" (ign2), "=d" (ign3), "=S" (ign4) + : "0" (__HYPERVISOR_set_callbacks), "1" (event_selector), + "2" (event_address), "3" (failsafe_selector), "4" (failsafe_address) + : "memory" ); + + return ret; +} + +static inline int +HYPERVISOR_fpu_taskswitch( + int set) +{ + int ret; + unsigned long ign; + + __asm__ __volatile__ ( + TRAP_INSTR + : "=a" (ret), "=b" (ign) + : "0" (__HYPERVISOR_fpu_taskswitch), "1" (set) + : "memory" ); + + return ret; +} + +static inline int +HYPERVISOR_yield( + void) +{ + int ret; + unsigned long ign; + + __asm__ __volatile__ ( + TRAP_INSTR + : "=a" (ret), "=b" (ign) + : "0" (__HYPERVISOR_sched_op), "1" (SCHEDOP_yield) + : "memory" ); + + return ret; +} + +static inline int +HYPERVISOR_block( + void) +{ + int ret; + unsigned long ign1; + __asm__ __volatile__ ( + TRAP_INSTR + : "=a" (ret), "=b" (ign1) + : "0" (__HYPERVISOR_sched_op), "1" (SCHEDOP_block) + : "memory" ); + + return ret; +} + +static inline int +HYPERVISOR_shutdown( + void) +{ + int ret; + unsigned long ign1; + __asm__ __volatile__ ( + TRAP_INSTR + : "=a" (ret), "=b" (ign1) + : "0" (__HYPERVISOR_sched_op), + "1" (SCHEDOP_shutdown | (SHUTDOWN_poweroff << SCHEDOP_reasonshift)) + : "memory" ); + + return ret; +} + +static inline int +HYPERVISOR_reboot( + void) +{ + int ret; + unsigned long ign1; + __asm__ __volatile__ ( + TRAP_INSTR + : "=a" (ret), "=b" (ign1) + : "0" (__HYPERVISOR_sched_op), + "1" (SCHEDOP_shutdown | (SHUTDOWN_reboot << SCHEDOP_reasonshift)) + : "memory" ); + + return ret; +} + +static inline int +HYPERVISOR_suspend( + unsigned long srec) +{ + int ret; + unsigned long ign1, ign2; + + /* NB. On suspend, control software expects a suspend record in %esi. */ + __asm__ __volatile__ ( + TRAP_INSTR + : "=a" (ret), "=b" (ign1), "=S" (ign2) + : "0" (__HYPERVISOR_sched_op), + "b" (SCHEDOP_shutdown | (SHUTDOWN_suspend << SCHEDOP_reasonshift)), + "S" (srec) : "memory"); + + return ret; +} + +static inline int +HYPERVISOR_crash( + void) +{ + int ret; + unsigned long ign1; + __asm__ __volatile__ ( + TRAP_INSTR + : "=a" (ret), "=b" (ign1) + : "0" (__HYPERVISOR_sched_op), + "1" (SCHEDOP_shutdown | (SHUTDOWN_crash << SCHEDOP_reasonshift)) + : "memory" ); + + return ret; +} + +static inline long +HYPERVISOR_set_timer_op( + u64 timeout) +{ + int ret; + unsigned long timeout_hi = (unsigned long)(timeout>>32); + unsigned long timeout_lo = (unsigned long)timeout; + unsigned long ign1, ign2; + + __asm__ __volatile__ ( + TRAP_INSTR + : "=a" (ret), "=b" (ign1), "=c" (ign2) + : "0" (__HYPERVISOR_set_timer_op), "b" (timeout_lo), "c" (timeout_hi) + : "memory"); + + return ret; +} + +static inline int +HYPERVISOR_dom0_op( + dom0_op_t *dom0_op) +{ + int ret; + unsigned long ign1; + + dom0_op->interface_version = DOM0_INTERFACE_VERSION; + __asm__ __volatile__ ( + TRAP_INSTR + : "=a" (ret), "=b" (ign1) + : "0" (__HYPERVISOR_dom0_op), "1" (dom0_op) + : "memory"); + + return ret; +} + +static inline int +HYPERVISOR_set_debugreg( + int reg, unsigned long value) +{ + int ret; + unsigned long ign1, ign2; + __asm__ __volatile__ ( + TRAP_INSTR + : "=a" (ret), "=b" (ign1), "=c" (ign2) + : "0" (__HYPERVISOR_set_debugreg), "1" (reg), "2" (value) + : "memory" ); + + return ret; +} + +static inline unsigned long +HYPERVISOR_get_debugreg( + int reg) +{ + unsigned long ret; + unsigned long ign; + __asm__ __volatile__ ( + TRAP_INSTR + : "=a" (ret), "=b" (ign) + : "0" (__HYPERVISOR_get_debugreg), "1" (reg) + : "memory" ); + + return ret; +} + +static inline int +HYPERVISOR_update_descriptor( + unsigned long ma, unsigned long word1, unsigned long word2) +{ + int ret; + unsigned long ign1, ign2, ign3; + + __asm__ __volatile__ ( + TRAP_INSTR + : "=a" (ret), "=b" (ign1), "=c" (ign2), "=d" (ign3) + : "0" (__HYPERVISOR_update_descriptor), "1" (ma), "2" (word1), + "3" (word2) + : "memory" ); + + return ret; +} + +static inline int +HYPERVISOR_dom_mem_op( + unsigned int op, unsigned long *extent_list, + unsigned long nr_extents, unsigned int extent_order) +{ + int ret; + unsigned long ign1, ign2, ign3, ign4, ign5; + + __asm__ __volatile__ ( + TRAP_INSTR + : "=a" (ret), "=b" (ign1), "=c" (ign2), "=d" (ign3), "=S" (ign4), + "=D" (ign5) + : "0" (__HYPERVISOR_dom_mem_op), "1" (op), "2" (extent_list), + "3" (nr_extents), "4" (extent_order), "5" (DOMID_SELF) + : "memory" ); + + return ret; +} + +static inline int +HYPERVISOR_multicall( + void *call_list, int nr_calls) +{ + int ret; + unsigned long ign1, ign2; + + __asm__ __volatile__ ( + TRAP_INSTR + : "=a" (ret), "=b" (ign1), "=c" (ign2) + : "0" (__HYPERVISOR_multicall), "1" (call_list), "2" (nr_calls) + : "memory" ); + + return ret; +} + +static inline int +HYPERVISOR_update_va_mapping( + unsigned long va, pte_t new_val, unsigned long flags) +{ + int ret; + unsigned long ign1, ign2, ign3; + + __asm__ __volatile__ ( + TRAP_INSTR + : "=a" (ret), "=b" (ign1), "=c" (ign2), "=d" (ign3) + : "0" (__HYPERVISOR_update_va_mapping), + "1" (va), "2" ((new_val).pte_low), "3" (flags) + : "memory" ); + +#ifdef TODO + if ( unlikely(ret < 0) ) + { + printk(KERN_ALERT "Failed update VA mapping: %08lx, %08lx, %08lx\n", + va, (new_val).pte_low, flags); + BUG(); + } +#endif + + return ret; +} + +static inline int +HYPERVISOR_event_channel_op( + void *op) +{ + int ret; + unsigned long ignore; + __asm__ __volatile__ ( + TRAP_INSTR + : "=a" (ret), "=b" (ignore) + : "0" (__HYPERVISOR_event_channel_op), "1" (op) + : "memory" ); + + return ret; +} + +static inline int +HYPERVISOR_xen_version( + int cmd) +{ + int ret; + unsigned long ignore; + + __asm__ __volatile__ ( + TRAP_INSTR + : "=a" (ret), "=b" (ignore) + : "0" (__HYPERVISOR_xen_version), "1" (cmd) + : "memory" ); + + return ret; +} + +static inline int +HYPERVISOR_console_io( + int cmd, int count, char *str) +{ + int ret; + unsigned long ign1, ign2, ign3; + __asm__ __volatile__ ( + TRAP_INSTR + : "=a" (ret), "=b" (ign1), "=c" (ign2), "=d" (ign3) + : "0" (__HYPERVISOR_console_io), "1" (cmd), "2" (count), "3" (str) + : "memory" ); + + return ret; +} + +static inline int +HYPERVISOR_physdev_op( + void *physdev_op) +{ + int ret; + unsigned long ign; + + __asm__ __volatile__ ( + TRAP_INSTR + : "=a" (ret), "=b" (ign) + : "0" (__HYPERVISOR_physdev_op), "1" (physdev_op) + : "memory" ); + + return ret; +} + +static inline int +HYPERVISOR_grant_table_op( + unsigned int cmd, void *uop, unsigned int count) +{ + int ret; + unsigned long ign1, ign2, ign3; + + __asm__ __volatile__ ( + TRAP_INSTR + : "=a" (ret), "=b" (ign1), "=c" (ign2), "=d" (ign3) + : "0" (__HYPERVISOR_grant_table_op), "1" (cmd), "2" (uop), "3" (count) + : "memory" ); + + return ret; +} + +static inline int +HYPERVISOR_update_va_mapping_otherdomain( + unsigned long va, pte_t new_val, unsigned long flags, domid_t domid) +{ + int ret; + unsigned long ign1, ign2, ign3, ign4; + + __asm__ __volatile__ ( + TRAP_INSTR + : "=a" (ret), "=b" (ign1), "=c" (ign2), "=d" (ign3), "=S" (ign4) + : "0" (__HYPERVISOR_update_va_mapping_otherdomain), + "1" (va), "2" ((new_val).pte_low), "3" (flags), "4" (domid) : + "memory" ); + + return ret; +} + +static inline int +HYPERVISOR_vm_assist( + unsigned int cmd, unsigned int type) +{ + int ret; + unsigned long ign1, ign2; + + __asm__ __volatile__ ( + TRAP_INSTR + : "=a" (ret), "=b" (ign1), "=c" (ign2) + : "0" (__HYPERVISOR_vm_assist), "1" (cmd), "2" (type) + : "memory" ); + + return ret; +} + +static inline int +HYPERVISOR_boot_vcpu( + unsigned long vcpu, vcpu_guest_context_t *ctxt) +{ + int ret; + unsigned long ign1, ign2; + + __asm__ __volatile__ ( + TRAP_INSTR + : "=a" (ret), "=b" (ign1), "=c" (ign2) + : "0" (__HYPERVISOR_boot_vcpu), "1" (vcpu), "2" (ctxt) + : "memory"); + + return ret; +} + +#endif /* __HYPERCALL_H__ */ Property changes on: branches/xen/reactos/include/xen3/private/hypercall.h ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: branches/xen/reactos/include/xen3/private/hypervisor.h --- branches/xen/reactos/include/xen3/private/hypervisor.h 2005-05-31 20:47:11 UTC (rev 15707) +++ branches/xen/reactos/include/xen3/private/hypervisor.h 2005-05-31 21:40:24 UTC (rev 15708) @@ -1,541 +1,6 @@ -/********************************************************************** ******** - * hypervisor.h - * - * Linux-specific hypervisor handling. - * - * Copyright (c) 2002-2004, K A Fraser - * - * This file may be distributed separately from the Linux kernel, or - * incorporated into other software packages, subject to the following license: - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this source file (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, modify, - * merge, publish, distribute, sublicense, and/or sell copies of the Software, - * and to permit persons to whom the Software is furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS - * IN THE SOFTWARE. - */ - #ifndef __HYPERVISOR_H__ #define __HYPERVISOR_H__ -#include <xen.h> -#include <dom0_ops.h> -#include <io/domain_controller.h> +#include <hypercall.h> -/* - * Assembler stubs for hyper-calls. - */ - -static inline int -HYPERVISOR_set_trap_table( - trap_info_t *table) -{ - int ret; - unsigned long ignore; - - __asm__ __volatile__ ( - TRAP_INSTR - : "=a" (ret), "=b" (ignore) - : "0" (__HYPERVISOR_set_trap_table), "1" (table) - : "memory" ); - - return ret; -} - -static inline int -HYPERVISOR_mmu_update( - mmu_update_t *req, int count, int *success_count, domid_t domid) -{ - int ret; - unsigned long ign1, ign2, ign3, ign4; - - __asm__ __volatile__ ( - TRAP_INSTR - : "=a" (ret), "=b" (ign1), "=c" (ign2), "=d" (ign3), "=S" (ign4) - : "0" (__HYPERVISOR_mmu_update), "1" (req), "2" (count), - "3" (success_count), "4" (domid) - : "memory" ); - - return ret; -} - -static inline int -HYPERVISOR_mmuext_op( - struct mmuext_op *op, int count, int *success_count, domid_t domid) -{ - int ret; - unsigned long ign1, ign2, ign3, ign4; - - __asm__ __volatile__ ( - TRAP_INSTR - : "=a" (ret), "=b" (ign1), "=c" (ign2), "=d" (ign3), "=S" (ign4) - : "0" (__HYPERVISOR_mmuext_op), "1" (op), "2" (count), - "3" (success_count), "4" (domid) - : "memory" ); - - return ret; -} - -static inline int -HYPERVISOR_set_gdt( - unsigned long *frame_list, int entries) -{ - int ret; - unsigned long ign1, ign2; - - __asm__ __volatile__ ( - TRAP_INSTR - : "=a" (ret), "=b" (ign1), "=c" (ign2) - : "0" (__HYPERVISOR_set_gdt), "1" (frame_list), "2" (entries) - : "memory" ); - - - return ret; -} - -static inline int -HYPERVISOR_stack_switch( - unsigned long ss, unsigned long esp) -{ - int ret; - unsigned long ign1, ign2; - - __asm__ __volatile__ ( - TRAP_INSTR - : "=a" (ret), "=b" (ign1), "=c" (ign2) - : "0" (__HYPERVISOR_stack_switch), "1" (ss), "2" (esp) - : "memory" ); - - return ret; -} - -static inline int -HYPERVISOR_set_callbacks( - unsigned long event_selector, unsigned long event_address, - unsigned long failsafe_selector, unsigned long failsafe_address) -{ - int ret; - unsigned long ign1, ign2, ign3, ign4; - - __asm__ __volatile__ ( - TRAP_INSTR - : "=a" (ret), "=b" (ign1), "=c" (ign2), "=d" (ign3), "=S" (ign4) - : "0" (__HYPERVISOR_set_callbacks), "1" (event_selector), - "2" (event_address), "3" (failsafe_selector), "4" (failsafe_address) - : "memory" ); - - return ret; -} - -static inline int -HYPERVISOR_fpu_taskswitch( - int set) -{ - int ret; - unsigned long ign; - - __asm__ __volatile__ ( - TRAP_INSTR - : "=a" (ret), "=b" (ign) - : "0" (__HYPERVISOR_fpu_taskswitch), "1" (set) - : "memory" ); - - return ret; -} - -static inline int -HYPERVISOR_yield( - void) -{ - int ret; - unsigned long ign; - - __asm__ __volatile__ ( - TRAP_INSTR - : "=a" (ret), "=b" (ign) - : "0" (__HYPERVISOR_sched_op), "1" (SCHEDOP_yield) - : "memory" ); - - return ret; -} - -static inline int -HYPERVISOR_block( - void) -{ - int ret; - unsigned long ign1; - __asm__ __volatile__ ( - TRAP_INSTR - : "=a" (ret), "=b" (ign1) - : "0" (__HYPERVISOR_sched_op), "1" (SCHEDOP_block) - : "memory" ); - - return ret; -} - -static inline int -HYPERVISOR_shutdown( - void) -{ - int ret; - unsigned long ign1; - __asm__ __volatile__ ( - TRAP_INSTR - : "=a" (ret), "=b" (ign1) - : "0" (__HYPERVISOR_sched_op), - "1" (SCHEDOP_shutdown | (SHUTDOWN_poweroff << SCHEDOP_reasonshift)) - : "memory" ); - - return ret; -} - -static inline int -HYPERVISOR_reboot( - void) -{ - int ret; - unsigned long ign1; - __asm__ __volatile__ ( - TRAP_INSTR - : "=a" (ret), "=b" (ign1) - : "0" (__HYPERVISOR_sched_op), - "1" (SCHEDOP_shutdown | (SHUTDOWN_reboot << SCHEDOP_reasonshift)) - : "memory" ); - - return ret; -} - -static inline int -HYPERVISOR_suspend( - unsigned long srec) -{ - int ret; - unsigned long ign1, ign2; - - /* NB. On suspend, control software expects a suspend record in %esi. */ - __asm__ __volatile__ ( - TRAP_INSTR - : "=a" (ret), "=b" (ign1), "=S" (ign2) - : "0" (__HYPERVISOR_sched_op), - "b" (SCHEDOP_shutdown | (SHUTDOWN_suspend << SCHEDOP_reasonshift)), - "S" (srec) : "memory"); - - return ret; -} - -static inline int -HYPERVISOR_crash( - void) -{ - int ret; - unsigned long ign1; - __asm__ __volatile__ ( - TRAP_INSTR - : "=a" (ret), "=b" (ign1) - : "0" (__HYPERVISOR_sched_op), - "1" (SCHEDOP_shutdown | (SHUTDOWN_crash << SCHEDOP_reasonshift)) - : "memory" ); - - return ret; -} - -static inline long -HYPERVISOR_set_timer_op( - u64 timeout) -{ - int ret; - unsigned long timeout_hi = (unsigned long)(timeout>>32); - unsigned long timeout_lo = (unsigned long)timeout; - unsigned long ign1, ign2; - - __asm__ __volatile__ ( - TRAP_INSTR - : "=a" (ret), "=b" (ign1), "=c" (ign2) - : "0" (__HYPERVISOR_set_timer_op), "b" (timeout_lo), "c" (timeout_hi) - : "memory"); - - return ret; -} - -static inline int -HYPERVISOR_dom0_op( - dom0_op_t *dom0_op) -{ - int ret; - unsigned long ign1; - - dom0_op->interface_version = DOM0_INTERFACE_VERSION; - __asm__ __volatile__ ( - TRAP_INSTR - : "=a" (ret), "=b" (ign1) - : "0" (__HYPERVISOR_dom0_op), "1" (dom0_op) - : "memory"); - - return ret; -} - -static inline int -HYPERVISOR_set_debugreg( - int reg, unsigned long value) -{ - int ret; - unsigned long ign1, ign2; - __asm__ __volatile__ ( - TRAP_INSTR - : "=a" (ret), "=b" (ign1), "=c" (ign2) - : "0" (__HYPERVISOR_set_debugreg), "1" (reg), "2" (value) - : "memory" ); - - return ret; -} - -static inline unsigned long -HYPERVISOR_get_debugreg( - int reg) -{ - unsigned long ret; - unsigned long ign; - __asm__ __volatile__ ( - TRAP_INSTR - : "=a" (ret), "=b" (ign) - : "0" (__HYPERVISOR_get_debugreg), "1" (reg) - : "memory" ); - - return ret; -} - -static inline int [truncated at 1000 lines; 1009 more skipped]

1 0

[frik85] 15707: update wallpaper list
by frik85＠svn.reactos.com 31 May '05

31 May '05

update wallpaper list Modified: trunk/reactos/media/wallpapers/wallpapers.txt _____ Modified: trunk/reactos/media/wallpapers/wallpapers.txt --- trunk/reactos/media/wallpapers/wallpapers.txt 2005-05-31 20:40:27 UTC (rev 15706) +++ trunk/reactos/media/wallpapers/wallpapers.txt 2005-05-31 20:47:11 UTC (rev 15707) @@ -2,7 +2,7 @@ -ReactOS Wallpapers for Version 0.2.6: +ReactOS Wallpapers for Version 0.3: * ReactOS Wallpaper (original with new text; GNU GPL) http://reactosde.re.funpic.de/mediadetail.php?sec=Graphic%20arts&cat=wal lp&mdnr=92 @@ -19,8 +19,11 @@ * ReactOS Wallpapers (Earth) http://reactosde.re.funpic.de/mediadetail.php?sec=Graphic%20arts&cat=wal lp&mdnr=36 +* Ros Nature (Flowers + Logo) + http://reactosde.re.funpic.de/mediadetail.php?sec=Graphic%20arts&cat=wal lp&mdnr=112 + GPL Wallpapers from kde-look.org: * Nature #1 (Fruit) @@ -63,3 +66,4 @@ History: 2005-02-25 Klemens Friedl +2005-05-31 Klemens Friedl

1 0

[chorns] 15706: Delete
by chorns＠svn.reactos.com 31 May '05

31 May '05

Delete Deleted: trunk/reactos/apps/utils/rosperf/Makefile _____ Deleted: trunk/reactos/apps/utils/rosperf/Makefile --- trunk/reactos/apps/utils/rosperf/Makefile 2005-05-31 20:39:13 UTC (rev 15705) +++ trunk/reactos/apps/utils/rosperf/Makefile 2005-05-31 20:40:27 UTC (rev 15706) @@ -1,24 +0,0 @@ -PATH_TO_TOP = ../../.. - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = rosperf - -TARGET_SDKLIBS = version.a gdi32.a user32.a kernel32.a ntdll.a - -TARGET_OBJECTS = rosperf.o testlist.o fill.o lines.o - -TARGET_CFLAGS = -Wall -Werror -D__USE_W32API - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# Automatic dependency tracking -DEP_OBJECTS := $(TARGET_OBJECTS) - -include $(PATH_TO_TOP)/tools/depend.mk - -# EOF

1 0

[chorns] 15705: MP configuration
by chorns＠svn.reactos.com 31 May '05

31 May '05

MP configuration Modified: trunk/reactos/ReactOS.xml Modified: trunk/reactos/config.template.xml _____ Modified: trunk/reactos/ReactOS.xml --- trunk/reactos/ReactOS.xml 2005-05-31 19:44:36 UTC (rev 15704) +++ trunk/reactos/ReactOS.xml 2005-05-31 20:39:13 UTC (rev 15705) @@ -10,6 +10,9 @@ <xi:include href="baseaddress.xml" /> <define name="_M_IX86" /> + <if property="MP" value="1"> + <define name="CONFIG_SMP" value="1" /> + </if> <if property="DBG" value="1"> <define name="DBG" value="1" /> <property name="DBG_OR_KDBG" value="true" /> _____ Modified: trunk/reactos/config.template.xml --- trunk/reactos/config.template.xml 2005-05-31 19:44:36 UTC (rev 15704) +++ trunk/reactos/config.template.xml 2005-05-31 20:39:13 UTC (rev 15705) @@ -27,6 +27,12 @@  +<property name="MP" value="0" /> + + + <property name="KDBG" value="0" />

1 0

[greatlrd] 15704: strechblt
by greatlrd＠svn.reactos.com 31 May '05

31 May '05

strechblt gain very lite perfomen boost Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib1bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib24bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib4bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib8bpp.c _____ Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c --- trunk/reactos/subsys/win32k/dib/dib16bpp.c 2005-05-31 17:30:54 UTC (rev 15703) +++ trunk/reactos/subsys/win32k/dib/dib16bpp.c 2005-05-31 19:44:36 UTC (rev 15704) @@ -626,18 +626,21 @@ int DesX; int DesY; int color; + int zoomX; DPRINT("DIB_16BPP_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); - SrcSizeY = SourceRect->bottom; - SrcSizeX = SourceRect->right; + SrcSizeY = SourceRect->bottom; + SrcSizeX = SourceRect->right; - DesSizeY = DestRect->bottom; - DesSizeX = DestRect->right; + DesSizeY = DestRect->bottom; + DesSizeX = DestRect->right; + + zoomX = DesSizeX / SrcSizeX; + if (zoomX==0) zoomX=1; - switch(SourceSurf->iBitmapFormat) { case BMF_1BPP: @@ -653,7 +656,7 @@ if (sy > SourceRect->bottom) break; - for (DesX=0; DesX<DestRect->right; DesX++) + for (DesX=0; DesX<DestRect->right; DesX+=zoomX) { if (DesSizeX>SrcSizeX) sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -664,9 +667,17 @@ if(DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0) { - DIB_16BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 0)); + if (zoomX>1) + DIB_16BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, 0)); + else + DIB_16BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 0)); + } else { - DIB_16BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 1)); + if (zoomX>1) + DIB_16BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, 1)); + else + DIB_16BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 1)); + } } } @@ -687,7 +698,7 @@ if (sy > SourceRect->bottom) break; - for (DesX=0; DesX<DestRect->right; DesX++) + for (DesX=0; DesX<DestRect->right; DesX+=zoomX) { if (DesSizeX>SrcSizeX) sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -697,7 +708,12 @@ if (sx > SourceRect->right) break; color = DIB_4BPP_GetPixel(SourceSurf, sx, sy); - DIB_16BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + + if (zoomX>1) + DIB_16BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_16BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + } } break; @@ -715,7 +731,7 @@ if (sy > SourceRect->bottom) break; - for (DesX=0; DesX<DestRect->right; DesX++) + for (DesX=0; DesX<DestRect->right; DesX+=zoomX) { if (DesSizeX>SrcSizeX) sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -725,7 +741,12 @@ if (sx > SourceRect->right) break; color = DIB_8BPP_GetPixel(SourceSurf, sx, sy); - DIB_16BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + + if (zoomX>1) + DIB_16BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_16BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + } } break; @@ -743,7 +764,7 @@ if (sy > SourceRect->bottom) break; - for (DesX=0; DesX<DestRect->right; DesX++) + for (DesX=0; DesX<DestRect->right; DesX+=zoomX) { if (DesSizeX>SrcSizeX) sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -753,7 +774,10 @@ if (sx > SourceRect->right) break; color = DIB_24BPP_GetPixel(SourceSurf, sx, sy); - DIB_16BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + if (zoomX>1) + DIB_16BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_16BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); } } break; @@ -771,7 +795,7 @@ if (sy > SourceRect->bottom) break; - for (DesX=0; DesX<DestRect->right; DesX++) + for (DesX=0; DesX<DestRect->right; DesX+=zoomX) { if (DesSizeX>SrcSizeX) sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -780,8 +804,11 @@ if (sx > SourceRect->right) break; - color = DIB_16BPP_GetPixel(SourceSurf, sx, sy); - DIB_32BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + color = DIB_32BPP_GetPixel(SourceSurf, sx, sy); + if (zoomX>1) + DIB_16BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_16BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); } } break; _____ Modified: trunk/reactos/subsys/win32k/dib/dib1bpp.c --- trunk/reactos/subsys/win32k/dib/dib1bpp.c 2005-05-31 17:30:54 UTC (rev 15703) +++ trunk/reactos/subsys/win32k/dib/dib1bpp.c 2005-05-31 19:44:36 UTC (rev 15704) @@ -494,6 +494,7 @@ int DesX; int DesY; int color; + int zoomX; SrcSizeY = SourceRect->bottom; SrcSizeX = SourceRect->right; @@ -501,6 +502,10 @@ DesSizeY = DestRect->bottom; DesSizeX = DestRect->right; + zoomX = DesSizeX / SrcSizeX; + if (zoomX==0) zoomX=1; + + switch(SourceSurf->iBitmapFormat) { case BMF_1BPP: @@ -518,7 +523,7 @@ if (sy > SourceRect->bottom) break; - for (DesX=0; DesX<DestRect->right; DesX++) + for (DesX=0; DesX<DestRect->right; DesX+=zoomX) { if (DesSizeX>SrcSizeX) sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -528,7 +533,11 @@ if (sx > SourceRect->right) break; color = DIB_1BPP_GetPixel(SourceSurf, sx, sy); - DIB_1BPP_PutPixel(DestSurf, DesX, DesY, color); + + if (zoomX>1) + DIB_1BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, color); + else + DIB_1BPP_PutPixel(DestSurf, DesX, DesY, color); } } break; @@ -548,7 +557,7 @@ if (sy > SourceRect->bottom) break; - for (DesX=0; DesX<DestRect->right; DesX++) + for (DesX=0; DesX<DestRect->right; DesX+=zoomX) { if (DesSizeX>SrcSizeX) sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -558,7 +567,12 @@ if (sx > SourceRect->right) break; color = DIB_4BPP_GetPixel(SourceSurf, sx, sy); - DIB_1BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + + if (zoomX>1) + DIB_1BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_1BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + } } break; @@ -576,7 +590,7 @@ if (sy > SourceRect->bottom) break; - for (DesX=0; DesX<DestRect->right; DesX++) + for (DesX=0; DesX<DestRect->right; DesX+=zoomX) { if (DesSizeX>SrcSizeX) sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -586,7 +600,12 @@ if (sx > SourceRect->right) break; color = DIB_8BPP_GetPixel(SourceSurf, sx, sy); - DIB_1BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + + if (zoomX>1) + DIB_1BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_1BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + } } break; @@ -604,7 +623,7 @@ if (sy > SourceRect->bottom) break; - for (DesX=0; DesX<DestRect->right; DesX++) + for (DesX=0; DesX<DestRect->right; DesX+=zoomX) { if (DesSizeX>SrcSizeX) sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -614,7 +633,12 @@ if (sx > SourceRect->right) break; color = DIB_16BPP_GetPixel(SourceSurf, sx, sy); - DIB_1BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + + if (zoomX>1) + DIB_1BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_1BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + } } break; @@ -632,7 +656,7 @@ if (sy > SourceRect->bottom) break; - for (DesX=0; DesX<DestRect->right; DesX++) + for (DesX=0; DesX<DestRect->right; DesX+=zoomX) { if (DesSizeX>SrcSizeX) sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -642,7 +666,12 @@ if (sx > SourceRect->right) break; color = DIB_24BPP_GetPixel(SourceSurf, sx, sy); - DIB_1BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + + if (zoomX>1) + DIB_1BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_1BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + } } break; @@ -659,7 +688,7 @@ if (sy > SourceRect->bottom) break; - for (DesX=0; DesX<DestRect->right; DesX++) + for (DesX=0; DesX<DestRect->right; DesX+=zoomX) { if (DesSizeX>SrcSizeX) sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -669,7 +698,11 @@ if (sx > SourceRect->right) break; color = DIB_32BPP_GetPixel(SourceSurf, sx, sy); - DIB_1BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + + if (zoomX>1) + DIB_1BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_1BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); } } break; _____ Modified: trunk/reactos/subsys/win32k/dib/dib24bpp.c --- trunk/reactos/subsys/win32k/dib/dib24bpp.c 2005-05-31 17:30:54 UTC (rev 15703) +++ trunk/reactos/subsys/win32k/dib/dib24bpp.c 2005-05-31 19:44:36 UTC (rev 15704) @@ -318,13 +318,17 @@ int DesX; int DesY; int color; + int zoomX; SrcSizeY = SourceRect->bottom; SrcSizeX = SourceRect->right; DesSizeY = DestRect->bottom; - DesSizeX = DestRect->right; + DesSizeX = DestRect->right; + zoomX = DesSizeX / SrcSizeX; + if (zoomX==0) zoomX=1; + switch(SourceSurf->iBitmapFormat) { case BMF_1BPP: @@ -340,7 +344,7 @@ if (sy > SourceRect->bottom) break; - for (DesX=0; DesX<DestRect->right; DesX++) + for (DesX=0; DesX<DestRect->right; DesX+=zoomX) { if (DesSizeX>SrcSizeX) sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -352,8 +356,16 @@ if(DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0) { DIB_24BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 0)); + if (zoomX>1) + DIB_24BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, 0)); + else + DIB_24BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 0)); + } else { - DIB_24BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 1)); + if (zoomX>1) + DIB_24BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, 1)); + else + DIB_24BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 1)); } } } @@ -370,11 +382,9 @@ else sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - if (sy > SourceRect->bottom) break; - - for (DesX=0; DesX<DestRect->right; DesX++) + for (DesX=0; DesX<DestRect->right; DesX+=zoomX) { if (DesSizeX>SrcSizeX) sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -384,7 +394,10 @@ if (sx > SourceRect->right) break; color = DIB_4BPP_GetPixel(SourceSurf, sx, sy); - DIB_24BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + if (zoomX>1) + DIB_24BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_24BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); } } break; @@ -402,7 +415,7 @@ if (sy > SourceRect->bottom) break; - for (DesX=0; DesX<DestRect->right; DesX++) + for (DesX=0; DesX<DestRect->right; DesX+=zoomX) { if (DesSizeX>SrcSizeX) sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -412,7 +425,10 @@ if (sx > SourceRect->right) break; color = DIB_8BPP_GetPixel(SourceSurf, sx, sy); - DIB_24BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + if (zoomX>1) + DIB_24BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_24BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); } } break; @@ -430,7 +446,7 @@ if (sy > SourceRect->bottom) break; - for (DesX=0; DesX<DestRect->right; DesX++) + for (DesX=0; DesX<DestRect->right; DesX+=zoomX) { if (DesSizeX>SrcSizeX) sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -440,7 +456,10 @@ if (sx > SourceRect->right) break; color = DIB_16BPP_GetPixel(SourceSurf, sx, sy); - DIB_24BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + if (zoomX>1) + DIB_24BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_24BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); } } break; @@ -458,7 +477,7 @@ if (sy > SourceRect->bottom) break; - for (DesX=0; DesX<DestRect->right; DesX++) + for (DesX=0; DesX<DestRect->right; DesX+=zoomX) { if (DesSizeX>SrcSizeX) sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -468,7 +487,10 @@ if (sx > SourceRect->right) break; color = DIB_24BPP_GetPixel(SourceSurf, sx, sy); - DIB_24BPP_PutPixel(DestSurf, DesX, DesY, color); + if (zoomX>1) + DIB_24BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, color); + else + DIB_24BPP_PutPixel(DestSurf, DesX, DesY, color); } } break; @@ -486,7 +508,7 @@ if (sy > SourceRect->bottom) break; - for (DesX=0; DesX<DestRect->right; DesX++) + for (DesX=0; DesX<DestRect->right; DesX+=zoomX) { if (DesSizeX>SrcSizeX) sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -496,7 +518,11 @@ if (sx > SourceRect->right) break; color = DIB_32BPP_GetPixel(SourceSurf, sx, sy); - DIB_24BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + + if (zoomX>1) + DIB_24BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_24BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); } } break; _____ Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c --- trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-05-31 17:30:54 UTC (rev 15703) +++ trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-05-31 19:44:36 UTC (rev 15704) @@ -560,6 +560,8 @@ int DesX; int DesY; int color; + int zoomX; + 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, @@ -569,8 +571,11 @@ SrcSizeX = SourceRect->right; DesSizeY = DestRect->bottom; - DesSizeX = DestRect->right; + DesSizeX = DestRect->right; + zoomX = DesSizeX / SrcSizeX; + if (zoomX==0) zoomX=1; + switch(SourceSurf->iBitmapFormat) { case BMF_1BPP: @@ -586,7 +591,7 @@ if (sy > SourceRect->bottom) break; - for (DesX=0; DesX<DestRect->right; DesX++) + for (DesX=0; DesX<DestRect->right; DesX+=zoomX) { if (DesSizeX>SrcSizeX) sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -597,9 +602,16 @@ if(DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0) { - DIB_32BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 0)); + if (zoomX>1) + DIB_32BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, 0)); + else + DIB_32BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 0)); + } else { - DIB_32BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 1)); + if (zoomX>1) + DIB_32BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, 1)); + else + DIB_32BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 1)); } } } @@ -620,7 +632,7 @@ if (sy > SourceRect->bottom) break; - for (DesX=0; DesX<DestRect->right; DesX++) + for (DesX=0; DesX<DestRect->right; DesX+=zoomX) { if (DesSizeX>SrcSizeX) sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -629,8 +641,14 @@ if (sx > SourceRect->right) break; + color = DIB_4BPP_GetPixel(SourceSurf, sx, sy); - DIB_32BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + + if (zoomX>1) + DIB_32BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_32BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + } } break; @@ -648,7 +666,7 @@ if (sy > SourceRect->bottom) break; - for (DesX=0; DesX<DestRect->right; DesX++) + for (DesX=0; DesX<DestRect->right; DesX+=zoomX) { if (DesSizeX>SrcSizeX) sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -658,7 +676,11 @@ if (sx > SourceRect->right) break; color = DIB_8BPP_GetPixel(SourceSurf, sx, sy); - DIB_32BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + + if (zoomX>1) + DIB_32BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_32BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); } } break; @@ -676,7 +698,7 @@ if (sy > SourceRect->bottom) break; - for (DesX=0; DesX<DestRect->right; DesX++) + for (DesX=0; DesX<DestRect->right; DesX+=zoomX) { if (DesSizeX>SrcSizeX) sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -686,7 +708,10 @@ if (sx > SourceRect->right) break; color = DIB_16BPP_GetPixel(SourceSurf, sx, sy); - DIB_32BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + if (zoomX>1) + DIB_32BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_32BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); } } break; @@ -704,7 +729,7 @@ if (sy > SourceRect->bottom) break; - for (DesX=0; DesX<DestRect->right; DesX++) + for (DesX=0; DesX<DestRect->right; DesX+=zoomX) { if (DesSizeX>SrcSizeX) sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -714,7 +739,10 @@ if (sx > SourceRect->right) break; color = DIB_24BPP_GetPixel(SourceSurf, sx, sy); - DIB_32BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + if (zoomX>1) + DIB_32BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_32BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); } } break; _____ Modified: trunk/reactos/subsys/win32k/dib/dib4bpp.c --- trunk/reactos/subsys/win32k/dib/dib4bpp.c 2005-05-31 17:30:54 UTC (rev 15703) +++ trunk/reactos/subsys/win32k/dib/dib4bpp.c 2005-05-31 19:44:36 UTC (rev 15704) @@ -372,13 +372,17 @@ int DesX; int DesY; int color; + int zoomX; SrcSizeY = SourceRect->bottom; SrcSizeX = SourceRect->right; DesSizeY = DestRect->bottom; - DesSizeX = DestRect->right; + DesSizeX = DestRect->right; + zoomX = DesSizeX / SrcSizeX; + if (zoomX==0) zoomX=1; + switch(SourceSurf->iBitmapFormat) { case BMF_1BPP: @@ -394,7 +398,7 @@ if (sy > SourceRect->bottom) break; - for (DesX=0; DesX<DestRect->right; DesX++) + for (DesX=0; DesX<DestRect->right; DesX+=zoomX) { if (DesSizeX>SrcSizeX) sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -405,9 +409,17 @@ if(DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0) { - DIB_4BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 0)); - } else { - DIB_4BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 1)); + if (zoomX>1) + DIB_4BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, 0)); + else + DIB_4BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 0)); + + } else { + if (zoomX>1) + DIB_4BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, 1)); + else + DIB_4BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 1)); + } } } @@ -428,7 +440,7 @@ if (sy > SourceRect->bottom) break; - for (DesX=0; DesX<DestRect->right; DesX++) + for (DesX=0; DesX<DestRect->right; DesX+=zoomX) { if (DesSizeX>SrcSizeX) sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -438,7 +450,12 @@ if (sx > SourceRect->right) break; color = DIB_4BPP_GetPixel(SourceSurf, sx, sy); - DIB_4BPP_PutPixel(DestSurf, DesX, DesY, color); + + if (zoomX>1) + DIB_4BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, color); + else + DIB_4BPP_PutPixel(DestSurf, DesX, DesY, color); + } } break; @@ -456,7 +473,7 @@ if (sy > SourceRect->bottom) break; - for (DesX=0; DesX<DestRect->right; DesX++) + for (DesX=0; DesX<DestRect->right; DesX+=zoomX) { if (DesSizeX>SrcSizeX) sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -466,7 +483,12 @@ if (sx > SourceRect->right) break; color = DIB_8BPP_GetPixel(SourceSurf, sx, sy); - DIB_4BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + + if (zoomX>1) + DIB_4BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_4BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + } } break; @@ -484,7 +506,7 @@ if (sy > SourceRect->bottom) break; - for (DesX=0; DesX<DestRect->right; DesX++) + for (DesX=0; DesX<DestRect->right; DesX+=zoomX) { if (DesSizeX>SrcSizeX) sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -494,7 +516,12 @@ if (sx > SourceRect->right) break; color = DIB_16BPP_GetPixel(SourceSurf, sx, sy); - DIB_4BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + + if (zoomX>1) + DIB_4BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_4BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + } } break; @@ -512,7 +539,7 @@ if (sy > SourceRect->bottom) break; - for (DesX=0; DesX<DestRect->right; DesX++) + for (DesX=0; DesX<DestRect->right; DesX+=zoomX) { if (DesSizeX>SrcSizeX) sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -522,7 +549,12 @@ if (sx > SourceRect->right) break; color = DIB_24BPP_GetPixel(SourceSurf, sx, sy); - DIB_4BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + + if (zoomX>1) + DIB_4BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_4BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + } } break; @@ -540,7 +572,7 @@ if (sy > SourceRect->bottom) break; - for (DesX=0; DesX<DestRect->right; DesX++) + for (DesX=0; DesX<DestRect->right; DesX+=zoomX) { if (DesSizeX>SrcSizeX) sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -550,7 +582,12 @@ if (sx > SourceRect->right) break; color = DIB_32BPP_GetPixel(SourceSurf, sx, sy); - DIB_4BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + + if (zoomX>1) + DIB_4BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_4BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + } } break; _____ Modified: trunk/reactos/subsys/win32k/dib/dib8bpp.c --- trunk/reactos/subsys/win32k/dib/dib8bpp.c 2005-05-31 17:30:54 UTC (rev 15703) +++ trunk/reactos/subsys/win32k/dib/dib8bpp.c 2005-05-31 19:44:36 UTC (rev 15704) @@ -550,11 +550,21 @@ int DesX; int DesY; int color; + int zoomX; 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); + SrcSizeY = SourceRect->bottom; + SrcSizeX = SourceRect->right; + + DesSizeY = DestRect->bottom; + DesSizeX = DestRect->right; + + zoomX = DesSizeX / SrcSizeX; + if (zoomX==0) zoomX=1; + switch(SourceSurf->iBitmapFormat) { case BMF_1BPP: @@ -570,7 +580,7 @@ if (sy > SourceRect->bottom) break; - for (DesX=0; DesX<DestRect->right; DesX++) + for (DesX=0; DesX<DestRect->right; DesX+=zoomX) { if (DesSizeX>SrcSizeX) sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -581,9 +591,15 @@ if(DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0) { - DIB_8BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 0)); + if (zoomX>1) + DIB_8BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, 0)); + else + DIB_8BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 0)); } else { - DIB_8BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 1)); + if (zoomX>1) + DIB_8BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, 1)); + else + DIB_8BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 1)); } } } @@ -604,7 +620,7 @@ if (sy > SourceRect->bottom) break; - for (DesX=0; DesX<DestRect->right; DesX++) + for (DesX=0; DesX<DestRect->right; DesX+=zoomX) { if (DesSizeX>SrcSizeX) sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -614,7 +630,11 @@ if (sx > SourceRect->right) break; color = DIB_4BPP_GetPixel(SourceSurf, sx, sy); - DIB_8BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + + if (zoomX>1) + DIB_8BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_8BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); } } break; @@ -632,7 +652,7 @@ if (sy > SourceRect->bottom) break; - for (DesX=0; DesX<DestRect->right; DesX++) + for (DesX=0; DesX<DestRect->right; DesX+=zoomX) { if (DesSizeX>SrcSizeX) sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -642,7 +662,12 @@ if (sx > SourceRect->right) break; color = DIB_16BPP_GetPixel(SourceSurf, sx, sy); - DIB_8BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + + if (zoomX>1) + DIB_8BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_8BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + } } break; @@ -660,7 +685,7 @@ if (sy > SourceRect->bottom) break; - for (DesX=0; DesX<DestRect->right; DesX++) + for (DesX=0; DesX<DestRect->right; DesX+=zoomX) { if (DesSizeX>SrcSizeX) sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -670,7 +695,12 @@ if (sx > SourceRect->right) break; color = DIB_24BPP_GetPixel(SourceSurf, sx, sy); - DIB_8BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + + if (zoomX>1) + DIB_8BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_8BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + } } break; @@ -688,7 +718,7 @@ if (sy > SourceRect->bottom) break; - for (DesX=0; DesX<DestRect->right; DesX++) + for (DesX=0; DesX<DestRect->right; DesX+=zoomX) { if (DesSizeX>SrcSizeX) sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -698,7 +728,12 @@ if (sx > SourceRect->right) break; color = DIB_32BPP_GetPixel(SourceSurf, sx, sy); - DIB_8BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + + if (zoomX>1) + DIB_8BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_8BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + } } break;

1 0

[chorns] 15703: Generate SMP friendly temporary filenames
by chorns＠svn.reactos.com 31 May '05

31 May '05

Generate SMP friendly temporary filenames Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-05-31 15:46:26 UTC (rev 15702) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-05-31 17:30:54 UTC (rev 15703) @@ -912,8 +912,9 @@ dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); string objectFilename = GetObjectFilename ( sourceFilename, &clean_files ); - string rciFilename = ros_temp + module.name + ".rci.tmp"; - string resFilename = ros_temp + module.name + ".res.tmp"; + string sourceFilenamePart = ReplaceExtension ( GetFilename ( sourceFilename ), "" ); + string rciFilename = ros_temp + module.name + "." + sourceFilenamePart + ".rci.tmp"; + string resFilename = ros_temp + module.name + "." + sourceFilenamePart + ".res.tmp"; if ( module.useWRC ) { fprintf ( fMakefile,

1 0

[hpoussin] 15692: Read resource requirements list for devices enumerated by Root bus
by hpoussin＠svn.reactos.com 31 May '05

31 May '05

Read resource requirements list for devices enumerated by Root bus Modified: trunk/reactos/ntoskrnl/io/pnproot.c _____ Modified: trunk/reactos/ntoskrnl/io/pnproot.c --- trunk/reactos/ntoskrnl/io/pnproot.c 2005-05-30 22:55:09 UTC (rev 15691) +++ trunk/reactos/ntoskrnl/io/pnproot.c 2005-05-30 23:01:37 UTC (rev 15692) @@ -294,8 +294,6 @@ ResourceList->ListSize = ResourceListSize; Irp->IoStatus.Information = (ULONG_PTR)ResourceList; - - return STATUS_SUCCESS; } else { @@ -309,9 +307,9 @@ DeviceExtension->ResourceRequirementsList, DeviceExtension->ResourceRequirementsList->ListSize); Irp->IoStatus.Information = (ULONG_PTR)ResourceList; + } - return STATUS_NOT_IMPLEMENTED; - } + return STATUS_SUCCESS; } @@ -424,6 +422,96 @@ /* Functional Device Object routines */ +static NTSTATUS +PnpRootReadRegistryBinary( + IN PWSTR KeyName, + IN PWSTR ValueKeyName, + OUT PVOID* Buffer) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyNameU; + UNICODE_STRING ValueKeyNameU; + KEY_VALUE_PARTIAL_INFORMATION Size; + PKEY_VALUE_PARTIAL_INFORMATION Data = NULL; + ULONG DataSize = sizeof(KEY_VALUE_PARTIAL_INFORMATION); + HANDLE KeyHandle; + NTSTATUS Status; + + DPRINT("Called\n"); + + RtlInitUnicodeString(&KeyNameU, KeyName); + RtlInitUnicodeString(&ValueKeyNameU, ValueKeyName); + + InitializeObjectAttributes( + &ObjectAttributes, + &KeyNameU, + OBJ_CASE_INSENSITIVE, + NULL, /* Root dir */ + NULL); /* Security descriptor */ + Status = ZwOpenKey(&KeyHandle, KEY_READ, &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT("ZwOpenKey() failed (Status 0x%08lx)\n", Status); + return Status; + } + + Status = ZwQueryValueKey( + KeyHandle, + &ValueKeyNameU, + KeyValuePartialInformation, + &Size, DataSize, + &DataSize); + if (Status != STATUS_BUFFER_OVERFLOW) + { + DPRINT("ZwQueryValueKey() failed (Status 0x%08lx)\n", Status); + ZwClose(KeyHandle); + return Status; + } + + while (Status == STATUS_BUFFER_OVERFLOW) + { + if (Data) + ExFreePoolWithTag(Data, TAG_PNP_ROOT); + Data = (PKEY_VALUE_PARTIAL_INFORMATION)ExAllocatePoolWithTag(PagedPool, DataSize, TAG_PNP_ROOT); + if (!Data) + { + DPRINT("ExAllocatePoolWithTag() failed\n", Status); + ZwClose(KeyHandle); + return Status; + } + + Status = ZwQueryValueKey( + KeyHandle, + &ValueKeyNameU, + KeyValuePartialInformation, + Data, DataSize, + &DataSize); + if (NT_SUCCESS(Status)) + { + *Buffer = ExAllocatePoolWithTag(PagedPool, Data->DataLength, TAG_PNP_ROOT); + if (!*Buffer) + { + DPRINT("ExAllocatePoolWithTag() failed\n", Status); + ExFreePoolWithTag(Data, TAG_PNP_ROOT); + ZwClose(KeyHandle); + return Status; + } + + RtlCopyMemory( + *Buffer, + Data->Data, + Data->DataLength); + break; + } + } + + if (Data) + ExFreePoolWithTag(Data, TAG_PNP_ROOT); + ZwClose(KeyHandle); + + return Status; +} + NTSTATUS PnpRootFdoReadDeviceInfo( PPNPROOT_DEVICE Device) @@ -448,6 +536,7 @@ DPRINT("KeyName %S\n", KeyName); + /* 1. Read informations in instance key */ RtlZeroMemory(QueryTable, sizeof(QueryTable)); RtlInitUnicodeString(DeviceDesc, NULL); @@ -457,13 +546,13 @@ QueryTable[0].EntryContext = DeviceDesc; Status = RtlQueryRegistryValues( - RTL_REGISTRY_ABSOLUTE, + RTL_REGISTRY_ABSOLUTE | RTL_REGISTRY_OPTIONAL, KeyName, QueryTable, NULL, NULL); - DPRINT("RtlQueryRegistryValues() returned status %x\n", Status); + DPRINT("RtlQueryRegistryValues() returned status 0x%08lx\n", Status); if (!NT_SUCCESS(Status)) { @@ -472,6 +561,22 @@ DPRINT("Got device description: %S\n", DeviceDesc->Buffer); + /* 2. Read informations in instance key, LogConf subkey */ + RtlZeroMemory(QueryTable, sizeof(QueryTable)); + wcscat(KeyName, L"\\LogConf"); + + Status = PnpRootReadRegistryBinary( + KeyName, + L"BasicConfigVector", + (PVOID*)&Device->ResourceRequirementsList); + + DPRINT("PnpRootReadRegistryBinary() returned status 0x%08lx\n", Status); + + if (!NT_SUCCESS(Status)) + { + /* FIXME: */ + } + return STATUS_SUCCESS; } @@ -785,7 +890,7 @@ } DPRINT("ResourceRequirementsList: %p PDO %p\n", - &PdoDeviceExtension->ResourceRequirementsList, + PdoDeviceExtension->ResourceRequirementsList, Device->Pdo); }

2 1

[greatlrd] 15702: complete dummy hal
by greatlrd＠svn.reactos.com 31 May '05

31 May '05

complete dummy hal Modified: trunk/reactos/lib/ddraw/ddraw_hal.c _____ Modified: trunk/reactos/lib/ddraw/ddraw_hal.c --- trunk/reactos/lib/ddraw/ddraw_hal.c 2005-05-31 15:19:10 UTC (rev 15701) +++ trunk/reactos/lib/ddraw/ddraw_hal.c 2005-05-31 15:46:26 UTC (rev 15702) @@ -1,21 +1,3 @@ -/* DirectDraw HAL driver - * - * Copyright 2001 TransGaming Technologies Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ @@ -322,7 +304,7 @@ *pIface = OsThunkDdCreateDirectDrawObject(desktop); if (pIface == NULL) hr == DDERR_NODIRECTDRAWHW; - return hr; + return DDERR_UNSUPPORTED; } static IDirectDraw7Vtbl HAL_DirectDraw_VTable =

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 May 2005