Ros-diffs August 2005

ros-diffs@reactos.org

23 participants
669 discussions

[gvg] 17429: Add generation of 32bpp DIB code

by gvg＠svn.reactos.com

Add generation of 32bpp DIB code Modified: trunk/reactos/subsys/win32k/dib/dib.h Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c Modified: trunk/reactos/subsys/win32k/win32k.xml Modified: trunk/reactos/tools/gendib/gendib.c Modified: trunk/reactos/tools/gendib/gendib.mak Property changes on: trunk/reactos/subsys/win32k/dib ___________________________________________________________________ Name: svn:ignore - *.d *.o *.sym dib16gen.c + *.d *.o *.sym dib*gen.c _____ Modified: trunk/reactos/subsys/win32k/dib/dib.h --- trunk/reactos/subsys/win32k/dib/dib.h 2005-08-18 15:21:57 UTC (rev 17428) +++ trunk/reactos/subsys/win32k/dib/dib.h 2005-08-18 19:26:37 UTC (rev 17429) @@ -129,12 +129,6 @@ BOOLEAN DIB_32BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULON G); BOOLEAN DIB_32BPP_ColorFill(SURFOBJ*, RECTL*, ULONG); -BOOLEAN FASTCALL DIB_32DstInvert(PBLTINFO); - -BOOLEAN FASTCALL DIB32_SrcPaint(PBLTINFO); -BOOLEAN FASTCALL DIB32_NotSrcErase(PBLTINFO); -BOOLEAN FASTCALL DIB32_SrcErase(PBLTINFO); - extern unsigned char notmask[2]; extern unsigned char altnotmask[2]; #define MASK1BPP(x) (1<<(7-((x)&7))) _____ Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c --- trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-08-18 15:21:57 UTC (rev 17428) +++ trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-08-18 19:26:37 UTC (rev 17429) @@ -325,382 +325,7 @@ return TRUE; } -BOOLEAN -DIB_32BPP_BitBlt(PBLTINFO BltInfo) -{ - ULONG DestX, DestY; - ULONG SourceX, SourceY; - ULONG PatternY = 0, PatternX = 0, orgPatternX = 0; - ULONG Source = 0, Pattern = 0; - BOOL UsesSource; - BOOL UsesPattern; - PULONG DestBits; - ULONG Delta; - - switch (BltInfo->Rop4) - { - case ROP4_DSTINVERT: - return DIB_32DstInvert(BltInfo); - break; - - case ROP4_SRCPAINT: - return DIB32_SrcPaint(BltInfo); - break; - - case ROP4_NOTSRCERASE: - return DIB32_NotSrcErase(BltInfo); - break; - - case ROP4_SRCERASE: - return DIB32_SrcErase(BltInfo); - break; - - default: - break; - } - - UsesSource = ROP4_USES_SOURCE(BltInfo->Rop4); - UsesPattern = ROP4_USES_PATTERN(BltInfo->Rop4); - - SourceY = BltInfo->SourcePoint.y; - DestBits = (PULONG)((PBYTE)BltInfo->DestSurface->pvScan0 + (BltInfo->DestRect.left << 2) + - BltInfo->DestRect.top * BltInfo->DestSurface->lDelta); - - Delta = BltInfo->DestSurface->lDelta - ((BltInfo->DestRect.right - BltInfo->DestRect.left) << 2); - - if ((UsesSource) && (BltInfo->PatternSurface)) - { - if (UsesPattern) - { - PatternY = (BltInfo->DestRect.top + BltInfo->BrushOrigin.y) % - BltInfo->PatternSurface->sizlBitmap.cy; - } - - orgPatternX = (BltInfo->DestRect.left + BltInfo->BrushOrigin.x) % BltInfo->PatternSurface->sizlBitmap.cx; - - - for (DestY = BltInfo->DestRect.top; DestY < BltInfo->DestRect.bottom; DestY++) - { - SourceX = BltInfo->SourcePoint.x; - - PatternX = orgPatternX; - - for (DestX = BltInfo->DestRect.left; DestX < BltInfo->DestRect.right; DestX++, DestBits++, SourceX++) - { - - Source = DIB_GetSource(BltInfo->SourceSurface, SourceX, SourceY, BltInfo->XlateSourceToDest); - - Pattern = DIB_GetSource(BltInfo->PatternSurface, PatternX, PatternY, BltInfo->XlatePatternToDest); - - *DestBits = DIB_DoRop(BltInfo->Rop4, *DestBits, Source, Pattern); - - PatternX++; - PatternX %= BltInfo->PatternSurface->sizlBitmap.cx; - - } - - SourceY++; - - PatternY++; - PatternY %= BltInfo->PatternSurface->sizlBitmap.cy; - - DestBits = (PULONG)((ULONG_PTR)DestBits + Delta); - } - } - - else if ((UsesSource) && (!BltInfo->PatternSurface)) - { - if (UsesPattern) - { - Pattern = BltInfo->Brush->iSolidColor; - } - - for (DestY = BltInfo->DestRect.top; DestY < BltInfo->DestRect.bottom; DestY++) - { - SourceX = BltInfo->SourcePoint.x; - - for (DestX = BltInfo->DestRect.left; DestX < BltInfo->DestRect.right; DestX++, DestBits++, SourceX++) - { - Source = DIB_GetSource(BltInfo->SourceSurface, SourceX, SourceY, BltInfo->XlateSourceToDest); - - *DestBits = DIB_DoRop(BltInfo->Rop4, *DestBits, Source, Pattern); - } - - SourceY++; - DestBits = (PULONG)((ULONG_PTR)DestBits + Delta); - } - } - - else if ((!UsesSource) && (BltInfo->PatternSurface)) - { - if (UsesPattern) - { - PatternY = (BltInfo->DestRect.top + BltInfo->BrushOrigin.y) % - BltInfo->PatternSurface->sizlBitmap.cy; - } - - orgPatternX = (BltInfo->DestRect.left + BltInfo->BrushOrigin.x) % BltInfo->PatternSurface->sizlBitmap.cx; - - for (DestY = BltInfo->DestRect.top; DestY < BltInfo->DestRect.bottom; DestY++) - { - - PatternX = orgPatternX; - - for (DestX = BltInfo->DestRect.left; DestX < BltInfo->DestRect.right; DestX++, DestBits++) - { - - Pattern = DIB_GetSource(BltInfo->PatternSurface, PatternX, PatternY, BltInfo->XlatePatternToDest); - *DestBits = DIB_DoRop(BltInfo->Rop4, *DestBits, 0, Pattern); - - PatternX++; - PatternX %= BltInfo->PatternSurface->sizlBitmap.cx; - } - - PatternY++; - PatternY %= BltInfo->PatternSurface->sizlBitmap.cy; - - DestBits = (PULONG)((ULONG_PTR)DestBits + Delta); - } - } - else if ((!UsesSource) && (!BltInfo->PatternSurface)) - { - - if (UsesPattern) - { - Pattern = BltInfo->Brush->iSolidColor; - } - - for (DestY = BltInfo->DestRect.top; DestY < BltInfo->DestRect.bottom; DestY++) - { - - for (DestX = BltInfo->DestRect.left; DestX < BltInfo->DestRect.right; DestX++, DestBits++) - { - *DestBits = DIB_DoRop(BltInfo->Rop4, *DestBits, 0, Pattern); - } - - DestBits = (PULONG)((ULONG_PTR)DestBits + Delta); - } - } - - return TRUE; -} - - -/* Optimize functions for bitblt */ - -BOOLEAN -FASTCALL -DIB_32DstInvert(PBLTINFO BltInfo) -{ - ULONG DestX, DestY; - PULONG DestBits; - - ULONG bottom = BltInfo->DestRect.bottom; - ULONG right = BltInfo->DestRect.right; - ULONG delta = BltInfo->DestSurface->lDelta - ((BltInfo->DestRect.right - BltInfo->DestRect.left) <<2) ; - - DestBits = (PULONG)((PBYTE)BltInfo->DestSurface->pvScan0 + (BltInfo->DestRect.left << 2) + - BltInfo->DestRect.top * BltInfo->DestSurface->lDelta); - - for (DestY = BltInfo->DestRect.top; DestY < bottom; DestY++) - { - for (DestX = BltInfo->DestRect.left; DestX < right; DestX++, DestBits++) - { - *DestBits = ~*DestBits ; - } - - DestBits = (PULONG)((ULONG_PTR)DestBits + delta); - } - - - /* Return TRUE */ - return TRUE; -} - BOOLEAN -FASTCALL -DIB32_SrcErase(PBLTINFO BltInfo) -{ - BOOLEAN status = FALSE; - - switch (BltInfo->SourceSurface->iBitmapFormat) - { - case BMF_1BPP: - case BMF_4BPP: - case BMF_16BPP: - case BMF_24BPP: - case BMF_32BPP: - { - ULONG DestX, DestY; - ULONG SourceX, SourceY; - PULONG DestBits; - - ULONG bottom = BltInfo->DestRect.bottom; - ULONG right = BltInfo->DestRect.right; - ULONG delta = BltInfo->DestSurface->lDelta - ((BltInfo->DestRect.right - BltInfo->DestRect.left) <<2) ; - - DestBits = (PULONG)((PBYTE)BltInfo->DestSurface->pvScan0 + (BltInfo->DestRect.left << 2) + - BltInfo->DestRect.top * BltInfo->DestSurface->lDelta); - - SourceY = BltInfo->SourcePoint.y; - - for (DestY = BltInfo->DestRect.top; DestY < bottom; DestY++) - { - SourceX = BltInfo->SourcePoint.x; - for (DestX = BltInfo->DestRect.left; DestX < right; DestX++, DestBits++, SourceX++) - { - *DestBits = ~(*DestBits & DIB_GetSource(BltInfo->SourceSurface, SourceX, - SourceY, BltInfo->XlateSourceToDest)); - } - - DestBits = (PULONG)((ULONG_PTR)DestBits + delta); - SourceY++; - } - } - status = TRUE; - break; - - - default: - break; - } - - return status; -} - -BOOLEAN -FASTCALL -DIB32_NotSrcErase(PBLTINFO BltInfo) -{ - BOOLEAN status = FALSE; - - switch (BltInfo->SourceSurface->iBitmapFormat) - { - case BMF_1BPP: - case BMF_4BPP: - case BMF_16BPP: - case BMF_24BPP: - case BMF_32BPP: - { - ULONG DestX, DestY; - ULONG SourceX, SourceY; - PULONG DestBits; - - ULONG bottom = BltInfo->DestRect.bottom; - ULONG right = BltInfo->DestRect.right; - ULONG delta = BltInfo->DestSurface->lDelta - ((BltInfo->DestRect.right - BltInfo->DestRect.left) <<2); - - DestBits = (PULONG)((PBYTE)BltInfo->DestSurface->pvScan0 + (BltInfo->DestRect.left << 2) + - BltInfo->DestRect.top * BltInfo->DestSurface->lDelta); - - SourceY = BltInfo->SourcePoint.y; - - for (DestY = BltInfo->DestRect.top; DestY < bottom; DestY++) - { - SourceX = BltInfo->SourcePoint.x; - for (DestX = BltInfo->DestRect.left; DestX < right; DestX++, DestBits++, SourceX++) - { - *DestBits = ~(*DestBits | DIB_GetSource(BltInfo->SourceSurface, SourceX, - SourceY, BltInfo->XlateSourceToDest)); - } - - DestBits = (PULONG)((ULONG_PTR)DestBits + delta); - SourceY++; - } - - } - status = TRUE; - break; - - default: - break; - } - - return status; -} - -BOOLEAN -FASTCALL -DIB32_SrcPaint(PBLTINFO BltInfo) -{ - BOOLEAN status = FALSE; - - switch (BltInfo->SourceSurface->iBitmapFormat) - { - case BMF_1BPP: - case BMF_4BPP: - case BMF_16BPP: - case BMF_24BPP: - { - ULONG DestX, DestY; - ULONG SourceX, SourceY; - PULONG DestBits; - - ULONG bottom = BltInfo->DestRect.bottom; - ULONG right = BltInfo->DestRect.right; - ULONG delta = BltInfo->DestSurface->lDelta - ((BltInfo->DestRect.right - BltInfo->DestRect.left) <<2) ; - - DestBits = (PULONG)((PBYTE)BltInfo->DestSurface->pvScan0 + (BltInfo->DestRect.left << 2) + - BltInfo->DestRect.top * BltInfo->DestSurface->lDelta); - - SourceY = BltInfo->SourcePoint.y; - - for (DestY = BltInfo->DestRect.top; DestY < bottom; DestY++) - { - SourceX = BltInfo->SourcePoint.x; - for (DestX = BltInfo->DestRect.left; DestX < right; DestX++, DestBits++, SourceX++) - { - *DestBits = (*DestBits | DIB_GetSource(BltInfo->SourceSurface, SourceX, - SourceY, BltInfo->XlateSourceToDest)); - } - - DestBits = (PULONG)((ULONG_PTR)DestBits + delta); - SourceY++; - } - - } - status = TRUE; - break; - - case BMF_32BPP: - { - ULONG DestX, DestY; - ULONG SourceX, SourceY; - PULONG DestBits; - - ULONG bottom = BltInfo->DestRect.bottom; - ULONG right = BltInfo->DestRect.right; - ULONG delta = BltInfo->DestSurface->lDelta - ((BltInfo->DestRect.right - BltInfo->DestRect.left) <<2) ; - - DestBits = (PULONG)((PBYTE)BltInfo->DestSurface->pvScan0 + (BltInfo->DestRect.left << 2) + - BltInfo->DestRect.top * BltInfo->DestSurface->lDelta); - - SourceY = BltInfo->SourcePoint.y; - - for (DestY = BltInfo->DestRect.top; DestY < bottom; DestY++) - { - SourceX = BltInfo->SourcePoint.x; - for (DestX = BltInfo->DestRect.left; DestX < right; DestX++, DestBits++, SourceX++) - { - *DestBits = (*DestBits | DIB_32BPP_GetPixel(BltInfo->SourceSurface, SourceX, SourceY)); - } - - DestBits = (PULONG)((ULONG_PTR)DestBits + delta); - SourceY++; - } - - } - status = TRUE; - break; - - default: - break; - } - - return status; -} - -BOOLEAN DIB_32BPP_ColorFill(SURFOBJ* DestSurface, RECTL* DestRect, ULONG color) { ULONG DestY; _____ Modified: trunk/reactos/subsys/win32k/win32k.xml --- trunk/reactos/subsys/win32k/win32k.xml 2005-08-18 15:21:57 UTC (rev 17428) +++ trunk/reactos/subsys/win32k/win32k.xml 2005-08-18 19:26:37 UTC (rev 17429) @@ -18,6 +18,7 @@ <file>dib16gen.c</file> <file>dib24bpp.c</file> <file>dib32bpp.c</file> + <file>dib32gen.c</file> <file>dib.c</file> </directory> <directory name="eng"> _____ Modified: trunk/reactos/tools/gendib/gendib.c --- trunk/reactos/tools/gendib/gendib.c 2005-08-18 15:21:57 UTC (rev 17428) +++ trunk/reactos/tools/gendib/gendib.c 2005-08-18 19:26:37 UTC (rev 17429) @@ -423,7 +423,14 @@ Output(Out, ") & 0x%x)", (1 << SourceBpp) - 1); } } - Output(Out, " & 0xffff)%s;\n", After); + if (32 == Bpp) + { + Output(Out, ")%s;\n", After); + } + else + { + Output(Out, " & 0x%x)%s;\n", (1 << Bpp) - 1, After); + } if (SourceBpp <= 16) { Output(Out, "SourcePixels--;\n"); @@ -436,20 +443,29 @@ } static void -CreateCounts(FILE *Out) +CreateCounts(FILE *Out, unsigned Bpp) { MARK(Out); - Output(Out, "LeftCount = ((ULONG_PTR) DestBase >> 1) & 0x01;\n"); - Output(Out, "CenterCount = (BltInfo->DestRect.right - BltInfo->DestRect.left -\n"); - Output(Out, " LeftCount) / 2;\n"); - Output(Out, "RightCount = (BltInfo->DestRect.right - BltInfo->DestRect.left -\n"); - Output(Out, " LeftCount - 2 * CenterCount);\n"); + if (32 != Bpp) + { + Output(Out, "LeftCount = ((ULONG_PTR) DestBase >> 1) & 0x01;\n"); + Output(Out, "CenterCount = (BltInfo->DestRect.right - BltInfo->DestRect.left -\n"); + Output(Out, " LeftCount) / 2;\n"); + Output(Out, "RightCount = (BltInfo->DestRect.right - BltInfo->DestRect.left -\n"); + Output(Out, " LeftCount - 2 * CenterCount);\n"); + } + else + { + Output(Out, "CenterCount = BltInfo->DestRect.right - BltInfo->DestRect.left;\n"); + } } static void CreateBitCase(FILE *Out, unsigned Bpp, PROPINFO RopInfo, int Flags, unsigned SourceBpp) { + unsigned Partial; + MARK(Out); if (RopInfo->UsesSource) { @@ -458,7 +474,7 @@ CreateBase(Out, 1, Flags, SourceBpp); } CreateBase(Out, 0, Flags, Bpp); - CreateCounts(Out); + CreateCounts(Out, Bpp); MARK(Out); } if (RopInfo->UsesPattern && 0 != (Flags & FLAG_PATTERNSURFACE)) @@ -518,56 +534,67 @@ else { Output(Out, "\n"); - Output(Out, "if (0 != LeftCount)\n"); - Output(Out, "{\n"); - if (RopInfo->UsesSource && 0 == (Flags & FLAG_FORCENOUSESSOURCE)) + if (32 != Bpp) { - CreateGetSource(Out, Bpp, RopInfo, Flags | FLAG_FORCERAWSOURCEAVAIL, - SourceBpp, 0); + Output(Out, "if (0 != LeftCount)\n"); + Output(Out, "{\n"); + if (RopInfo->UsesSource && 0 == (Flags & FLAG_FORCENOUSESSOURCE)) + { + CreateGetSource(Out, Bpp, RopInfo, Flags | FLAG_FORCERAWSOURCEAVAIL, + SourceBpp, 0); + MARK(Out); + } + if (RopInfo->UsesPattern && 0 != (Flags & FLAG_PATTERNSURFACE)) + { + Output(Out, "Pattern = DIB_GetSource(BltInfo->PatternSurface, PatternX, PatternY, BltInfo->XlatePatternToDest);\n"); + Output(Out, "if (BltInfo->PatternSurface->sizlBitmap.cx <= ++PatternX)\n"); + Output(Out, "{\n"); + Output(Out, "PatternX -= BltInfo->PatternSurface->sizlBitmap.cx;\n"); + Output(Out, "}\n"); + } + if ((RopInfo->UsesSource && 0 == (Flags & FLAG_FORCENOUSESSOURCE) && + Bpp != SourceBpp) || + (RopInfo->UsesPattern && 0 != (Flags & FLAG_PATTERNSURFACE))) + { + Output(Out, "\n"); + } + CreateOperation(Out, Bpp, RopInfo, SourceBpp, 16); + Output(Out, ";\n"); MARK(Out); - } - if (RopInfo->UsesPattern && 0 != (Flags & FLAG_PATTERNSURFACE)) - { - Output(Out, "Pattern = DIB_GetSource(BltInfo->PatternSurface, PatternX, PatternY, BltInfo->XlatePatternToDest);\n"); - Output(Out, "if (BltInfo->PatternSurface->sizlBitmap.cx <= ++PatternX)\n"); - Output(Out, "{\n"); - Output(Out, "PatternX -= BltInfo->PatternSurface->sizlBitmap.cx;\n"); + Output(Out, "\n"); + Output(Out, "DestPtr = (PULONG)((char *) DestPtr + 2);\n"); Output(Out, "}\n"); - } - if ((RopInfo->UsesSource && 0 == (Flags & FLAG_FORCENOUSESSOURCE) && - Bpp != SourceBpp) || - (RopInfo->UsesPattern && 0 != (Flags & FLAG_PATTERNSURFACE))) - { Output(Out, "\n"); } - CreateOperation(Out, Bpp, RopInfo, SourceBpp, 16); - Output(Out, ";\n"); - MARK(Out); - Output(Out, "\n"); - Output(Out, "DestPtr = (PULONG)((char *) DestPtr + 2);\n"); - Output(Out, "}\n"); - Output(Out, "\n"); Output(Out, "for (i = 0; i < CenterCount; i++)\n"); Output(Out, "{\n"); if (RopInfo->UsesSource && 0 == (Flags & FLAG_FORCENOUSESSOURCE)) { - CreateGetSource(Out, Bpp, RopInfo, Flags, SourceBpp, 0); - CreateGetSource(Out, Bpp, RopInfo, Flags, SourceBpp, 16); - MARK(Out); + for (Partial = 0; Partial < 32 / Bpp; Partial++) + { + CreateGetSource(Out, Bpp, RopInfo, Flags, SourceBpp, + Partial * Bpp); + MARK(Out); + } Output(Out, "\n"); } if (RopInfo->UsesPattern && 0 != (Flags & FLAG_PATTERNSURFACE)) { - Output(Out, "Pattern = DIB_GetSource(BltInfo->PatternSurface, PatternX, PatternY, BltInfo->XlatePatternToDest);\n"); - Output(Out, "if (BltInfo->PatternSurface->sizlBitmap.cx <= ++PatternX)\n"); - Output(Out, "{\n"); - Output(Out, "PatternX -= BltInfo->PatternSurface->sizlBitmap.cx;\n"); - Output(Out, "}\n"); - Output(Out, "Pattern |= DIB_GetSource(BltInfo->PatternSurface, PatternX, PatternY, BltInfo->XlatePatternToDest) << 16;\n"); - Output(Out, "if (BltInfo->PatternSurface->sizlBitmap.cx <= ++PatternX)\n"); - Output(Out, "{\n"); - Output(Out, "PatternX -= BltInfo->PatternSurface->sizlBitmap.cx;\n"); - Output(Out, "}\n"); + for (Partial = 0; Partial < 32 / Bpp; Partial++) + { + if (0 == Partial) + { + Output(Out, "Pattern = DIB_GetSource(BltInfo->PatternSurface, PatternX, PatternY, BltInfo->XlatePatternToDest);\n"); + } + else + { + Output(Out, "Pattern |= DIB_GetSource(BltInfo->PatternSurface, PatternX, PatternY, BltInfo->XlatePatternToDest) << %u;\n", Partial * Bpp); + } + Output(Out, "if (BltInfo->PatternSurface->sizlBitmap.cx <= ++PatternX)\n"); + Output(Out, "{\n"); + Output(Out, "PatternX -= BltInfo->PatternSurface->sizlBitmap.cx;\n"); + Output(Out, "}\n"); + } Output(Out, "\n"); } CreateOperation(Out, Bpp, RopInfo, SourceBpp, 32); @@ -577,27 +604,30 @@ Output(Out, "DestPtr++;\n"); Output(Out, "}\n"); Output(Out, "\n"); - Output(Out, "if (0 != RightCount)\n"); - Output(Out, "{\n"); - if (RopInfo->UsesSource && 0 == (Flags & FLAG_FORCENOUSESSOURCE)) + if (32 != Bpp) { - CreateGetSource(Out, Bpp, RopInfo, Flags, SourceBpp, 0); + Output(Out, "if (0 != RightCount)\n"); + Output(Out, "{\n"); + if (RopInfo->UsesSource && 0 == (Flags & FLAG_FORCENOUSESSOURCE)) + { + CreateGetSource(Out, Bpp, RopInfo, Flags, SourceBpp, 0); + MARK(Out); + } + if (RopInfo->UsesPattern && 0 != (Flags & FLAG_PATTERNSURFACE)) + { + Output(Out, "Pattern = DIB_GetSource(BltInfo->PatternSurface, PatternX, PatternY, BltInfo->XlatePatternToDest);\n"); + } + if ((RopInfo->UsesSource && 0 == (Flags & FLAG_FORCENOUSESSOURCE)) || + (RopInfo->UsesPattern && 0 != (Flags & FLAG_PATTERNSURFACE))) + { + Output(Out, "\n"); + } + CreateOperation(Out, Bpp, RopInfo, SourceBpp, 16); + Output(Out, ";\n"); MARK(Out); - } - if (RopInfo->UsesPattern && 0 != (Flags & FLAG_PATTERNSURFACE)) - { - Output(Out, "Pattern = DIB_GetSource(BltInfo->PatternSurface, PatternX, PatternY, BltInfo->XlatePatternToDest);\n"); - } - if ((RopInfo->UsesSource && 0 == (Flags & FLAG_FORCENOUSESSOURCE)) || - (RopInfo->UsesPattern && 0 != (Flags & FLAG_PATTERNSURFACE))) - { + Output(Out, "}\n"); Output(Out, "\n"); } - CreateOperation(Out, Bpp, RopInfo, SourceBpp, 16); - Output(Out, ";\n"); - MARK(Out); - Output(Out, "}\n"); - Output(Out, "\n"); if (RopInfo->UsesPattern && 0 != (Flags & FLAG_PATTERNSURFACE)) { if (0 == (Flags & FLAG_BOTTOMUP)) @@ -716,6 +746,7 @@ CreatePrimitive(FILE *Out, unsigned Bpp, PROPINFO RopInfo) { int First; + unsigned Partial; MARK(Out); Output(Out, "\n"); @@ -741,12 +772,6 @@ { Output(Out, "ULONG LineIndex, LineCount;\n"); Output(Out, "ULONG i;\n"); -#ifdef TODO - if (RopInfo->UsesSource) - { - Output(Out, "ULONG SourceX, SourceY;\n"); - } -#endif if (RopInfo->UsesPattern) { Output(Out, "ULONG PatternX =0, PatternY = 0, BasePatternX = 0;\n"); @@ -775,7 +800,14 @@ Output(Out, "ULONG RawSource;\n"); Output(Out, "unsigned SourcePixels, BaseSourcePixels;\n"); } - Output(Out, "ULONG LeftCount, CenterCount, RightCount;\n"); + if (32 == Bpp) + { + Output(Out, "ULONG CenterCount;\n"); + } + else + { + Output(Out, "ULONG LeftCount, CenterCount, RightCount;\n"); + } if (ROPCODE_GENERIC == RopInfo->RopCode) { Output(Out, "BOOLEAN UsesDest, UsesSource, UsesPattern;\n"); @@ -788,7 +820,7 @@ if (! RopInfo->UsesSource) { CreateBase(Out, 0, 0, Bpp); - CreateCounts(Out); + CreateCounts(Out, Bpp); MARK(Out); } Output(Out, "LineCount = BltInfo->DestRect.bottom - BltInfo->DestRect.top;\n"); @@ -815,8 +847,26 @@ Output(Out, "if (UsesPattern)\n"); Output(Out, "{\n"); } - Output(Out, "Pattern = BltInfo->Brush->iSolidColor |\n"); - Output(Out, " (BltInfo->Brush->iSolidColor << 16);\n"); + for (Partial = 0; Partial < 32 / Bpp; Partial++) + { + if (0 == Partial) + { + Output(Out, "Pattern = BltInfo->Brush->iSolidColor"); + } + else + { + Output(Out, " (BltInfo->Brush->iSolidColor << %d)", + Partial * Bpp); + } + if (32 / Bpp <= Partial + 1) + { + Output(Out, ";\n"); + } + else + { + Output(Out, " |\n"); + } + } if (ROPCODE_PATINVERT == RopInfo->RopCode || ROPCODE_MERGECOPY == RopInfo->RopCode) { @@ -892,16 +942,29 @@ Output(Out, "}\n"); } -int -main(int argc, char *argv[]) +static void +Generate(char *OutputDir, unsigned Bpp) { FILE *Out; unsigned RopCode; - unsigned Bpp; PROPINFO RopInfo; + char *FileName; - Bpp = 16; - Out = fopen(argv[1], "w"); + FileName = malloc(strlen(OutputDir) + 12); + if (NULL == FileName) + { + fprintf(stderr, "Out of memory\n"); + exit(1); + } + strcpy(FileName, OutputDir); + if ('/' != FileName[strlen(FileName) - 1]) + { + strcat(FileName, "/"); + } + sprintf(FileName + strlen(FileName), "dib%ugen.c", Bpp); + + Out = fopen(FileName, "w"); + free(FileName); if (NULL == Out) { perror("Error opening output file"); @@ -928,6 +991,19 @@ CreateBitBlt(Out, Bpp); fclose(Out); +} +int +main(int argc, char *argv[]) +{ + unsigned Index; + static unsigned DestBpp[] = + { 16, 32 }; + + for (Index = 0; Index < sizeof(DestBpp) / sizeof(DestBpp[0]); Index++) + { + Generate(argv[1], DestBpp[Index]); + } + return 0; } _____ Modified: trunk/reactos/tools/gendib/gendib.mak --- trunk/reactos/tools/gendib/gendib.mak 2005-08-18 15:21:57 UTC (rev 17428) +++ trunk/reactos/tools/gendib/gendib.mak 2005-08-18 19:26:37 UTC (rev 17429) @@ -41,11 +41,12 @@ -@$(rm) $(GENDIB_TARGET) $(GENDIB_OBJECTS) 2>$(NUL) clean: gendib_clean -GENDIB_16BPP_FILE = subsys$(SEP)win32k$(SEP)dib$(SEP)dib16gen.c +GENDIB_DIB_DIR = subsys$(SEP)win32k$(SEP)dib GENDIB_DIB_FILES = \ - $(GENDIB_16BPP_FILE) + $(GENDIB_DIB_DIR)$(SEP)dib16gen.c \ + $(GENDIB_DIB_DIR)$(SEP)dib32gen.c $(GENDIB_DIB_FILES): $(GENDIB_TARGET) $(ECHO_GENDIB) - $(Q)$(GENDIB_TARGET) $(GENDIB_DIB_FILES) + $(Q)$(GENDIB_TARGET) $(GENDIB_DIB_DIR)

19 years, 4 months

[turner] 17428: make dir change errorlevel to 0 on success.

by turner＠svn.reactos.com

make dir change errorlevel to 0 on success. Modified: trunk/reactos/subsys/system/cmd/dir.c _____ Modified: trunk/reactos/subsys/system/cmd/dir.c --- trunk/reactos/subsys/system/cmd/dir.c 2005-08-18 15:04:04 UTC (rev 17427) +++ trunk/reactos/subsys/system/cmd/dir.c 2005-08-18 15:21:57 UTC (rev 17428) @@ -2007,6 +2007,7 @@ &nLine, &stFlags); + nErrorLevel = 0; return 0; }

19 years, 4 months

[turner] 17427: Test commit, adding myself to the cmd credits.

by turner＠svn.reactos.com

Test commit, adding myself to the cmd credits. Modified: trunk/reactos/subsys/system/cmd/readme.txt _____ Modified: trunk/reactos/subsys/system/cmd/readme.txt --- trunk/reactos/subsys/system/cmd/readme.txt 2005-08-18 11:51:27 UTC (rev 17426) +++ trunk/reactos/subsys/system/cmd/readme.txt 2005-08-18 15:04:04 UTC (rev 17427) @@ -54,6 +54,7 @@ Eric Kohl <ekohl(a)rz-online.de> Emanuele Aliberti <ea(a)iol.it> Paolo Pantaleo <paolopan(a)freemail.it> + Brandon Turner <turnerb7(a)msu.edu> Bugs

19 years, 4 months

[hbirr] 17426: Fixed the directory index for FATX in FATXAddEntry.

by hbirr＠svn.reactos.com

Fixed the directory index for FATX in FATXAddEntry. Modified: trunk/reactos/drivers/fs/vfat/dirwr.c _____ Modified: trunk/reactos/drivers/fs/vfat/dirwr.c --- trunk/reactos/drivers/fs/vfat/dirwr.c 2005-08-17 20:41:15 UTC (rev 17425) +++ trunk/reactos/drivers/fs/vfat/dirwr.c 2005-08-18 11:51:27 UTC (rev 17426) @@ -530,6 +530,7 @@ OEM_STRING NameA; VFAT_DIRENTRY_CONTEXT DirContext; PFATX_DIR_ENTRY pFatXDirEntry; + ULONG Index; DPRINT ("addEntry: Name='%wZ', Dir='%wZ'\n", NameU, &ParentFcb->PathNameU); @@ -547,7 +548,7 @@ { return STATUS_DISK_FULL; } - DirContext.DirIndex = DirContext.StartIndex; + Index = DirContext.DirIndex = DirContext.StartIndex; if (!vfatFCBIsRoot(ParentFcb)) { DirContext.DirIndex += 2; @@ -578,6 +579,18 @@ /* set dates and times */ KeQuerySystemTime (&SystemTime); +#if 0 + { + TIME_FIELDS tf; + RtlTimeToTimeFields (&SystemTime, &tf); + DPRINT1("%d.%d.%d %02d:%02d:%02d.%03d '%wZ'\n", + tf.Day, tf.Month, tf.Year, tf.Hour, + tf.Minute, tf.Second, tf.Milliseconds, + NameU); + } +#endif + + FsdSystemTimeToDosDateTime(DeviceExt, &SystemTime, &DirContext.DirEntry.FatX.CreationDate, &DirContext.DirEntry.FatX.CreationTime); DirContext.DirEntry.FatX.UpdateDate = DirContext.DirEntry.FatX.CreationDate; @@ -587,7 +600,7 @@ /* add entry into parent directory */ FileOffset.u.HighPart = 0; - FileOffset.u.LowPart = DirContext.StartIndex * sizeof(FATX_DIR_ENTRY); + FileOffset.u.LowPart = Index * sizeof(FATX_DIR_ENTRY); CcPinRead(ParentFcb->FileObject, &FileOffset, sizeof(FATX_DIR_ENTRY), TRUE, &Context, (PVOID*)&pFatXDirEntry); RtlCopyMemory(pFatXDirEntry, &DirContext.DirEntry.FatX, sizeof(FATX_DIR_ENTRY));

19 years, 4 months

[hbirr] 17425: Load the symbols from ntoskrn.exe from the boot cd, if it is possible.

by hbirr＠svn.reactos.com

Load the symbols from ntoskrn.exe from the boot cd, if it is possible. Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c _____ Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c --- trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c 2005-08-17 18:56:57 UTC (rev 17424) +++ trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c 2005-08-17 20:41:15 UTC (rev 17425) @@ -19,6 +19,7 @@ */ #include <freeldr.h> +#include <reactos/rossym.h> #include <debug.h> #include <arch.h> #include <disk.h> @@ -42,7 +43,22 @@ #define USE_UI +static BOOLEAN +FreeldrReadFile(PVOID FileContext, PVOID Buffer, ULONG Size) +{ + ULONG BytesRead; + return FsReadFile((PFILE) FileContext, (ULONG) Size, &BytesRead, Buffer) + && Size == BytesRead; +} + +static BOOLEAN +FreeldrSeekFile(PVOID FileContext, ULONG_PTR Position) +{ + FsSetFilePointer((PFILE) FileContext, (ULONG) Position); + return TRUE; +} + static BOOL LoadKernel(PCHAR szSourcePath, PCHAR szFileName) { @@ -108,7 +124,61 @@ return(TRUE); } +static BOOL +LoadKernelSymbols(PCHAR szSourcePath, PCHAR szFileName) +{ + static ROSSYM_CALLBACKS FreeldrCallbacks = + { + MmAllocateMemory, + MmFreeMemory, + FreeldrReadFile, + FreeldrSeekFile + }; + CHAR szFullName[256]; + PFILE FilePointer; + PROSSYM_INFO RosSymInfo; + ULONG Size; + ULONG_PTR Base; + if (szSourcePath[0] != '\\') + { + strcpy(szFullName, "\\"); + strcat(szFullName, szSourcePath); + } + else + { + strcpy(szFullName, szSourcePath); + } + + if (szFullName[strlen(szFullName)] != '\\') + { + strcat(szFullName, "\\"); + } + + if (szFileName[0] != '\\') + { + strcat(szFullName, szFileName); + } + else + { + strcat(szFullName, szFileName + 1); + } + + RosSymInit(&FreeldrCallbacks); + + FilePointer = FsOpenFile(szFullName); + if (FilePointer && RosSymCreateFromFile(FilePointer, &RosSymInfo)) + { + Base = FrLdrCreateModule("NTOSKRNL.SYM"); + Size = RosSymGetRawDataLength(RosSymInfo); + RosSymGetRawData(RosSymInfo, (PVOID)Base); + FrLdrCloseModule(Base, Size); + RosSymDelete(RosSymInfo); + return TRUE; + } + return FALSE; +} + static BOOL LoadDriver(PCHAR szSourcePath, PCHAR szFileName) { @@ -388,6 +458,8 @@ if (!LoadDriver(SourcePath, "hal.dll")) return; + /* Create ntoskrnl.sym */ + LoadKernelSymbols(SourcePath, "ntoskrnl.exe"); /* Export the hardware hive */ Base = FrLdrCreateModule ("HARDWARE");

19 years, 4 months

[ion] 17424: Add back MessageData to PQUEUED_MESSAGE. It was accidentally removed

by ion＠svn.reactos.com

Add back MessageData to PQUEUED_MESSAGE. It was accidentally removed Modified: trunk/reactos/lib/rtl/thread.c Modified: trunk/reactos/ntoskrnl/include/internal/port.h _____ Modified: trunk/reactos/lib/rtl/thread.c --- trunk/reactos/lib/rtl/thread.c 2005-08-17 18:01:47 UTC (rev 17423) +++ trunk/reactos/lib/rtl/thread.c 2005-08-17 18:56:57 UTC (rev 17424) @@ -192,7 +192,7 @@ OBJECT_ATTRIBUTES ObjectAttributes; CONTEXT Context; - DPRINT1("RtlCreateUserThread: (hProcess: %lx, Suspended: %lx," + DPRINT("RtlCreateUserThread: (hProcess: %lx, Suspended: %lx," "ZeroBits: %lx, StackReserve: %lx, StackCommit: %lx," "StartAddress: %p, Parameter: %lx)\n", ProcessHandle, CreateSuspended, StackZeroBits, StackReserve, StackCommit, _____ Modified: trunk/reactos/ntoskrnl/include/internal/port.h --- trunk/reactos/ntoskrnl/include/internal/port.h 2005-08-17 18:01:47 UTC (rev 17423) +++ trunk/reactos/ntoskrnl/include/internal/port.h 2005-08-17 18:56:57 UTC (rev 17424) @@ -88,6 +88,7 @@ PEPORT Sender; LIST_ENTRY QueueListEntry; PORT_MESSAGE Message; + UCHAR MessageData[0x130]; /* FIXME: HACK */ } QUEUEDMESSAGE, *PQUEUEDMESSAGE; typedef struct _LPC_DBG_MESSAGE

19 years, 4 months

[greatlrd] 17423: implemented batch redirection by saving batch info in tagBATCHCONTEXT by Brandon Turner

by greatlrd＠svn.reactos.com

implemented batch redirection by saving batch info in tagBATCHCONTEXT by Brandon Turner Modified: trunk/reactos/subsys/system/cmd/batch.c Modified: trunk/reactos/subsys/system/cmd/batch.h Modified: trunk/reactos/subsys/system/cmd/call.c Modified: trunk/reactos/subsys/system/cmd/cmd.c Modified: trunk/reactos/subsys/system/cmd/for.c _____ Modified: trunk/reactos/subsys/system/cmd/batch.c --- trunk/reactos/subsys/system/cmd/batch.c 2005-08-17 07:23:05 UTC (rev 17422) +++ trunk/reactos/subsys/system/cmd/batch.c 2005-08-17 18:01:47 UTC (rev 17423) @@ -218,10 +218,10 @@ BOOL Batch (LPTSTR fullname, LPTSTR firstword, LPTSTR param) { HANDLE hFile; - + SetLastError(0); hFile = CreateFile (fullname, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | - FILE_FLAG_SEQUENTIAL_SCAN, NULL); + FILE_FLAG_SEQUENTIAL_SCAN, NULL); #ifdef _DEBUG DebugPrintf (_T("Batch: (\'%s\', \'%s\', \'%s\') hFile = %x\n"), @@ -251,6 +251,9 @@ n->prev = bc; bc = n; + bc->In[0] = _T('\0'); + bc->Out[0] = _T('\0'); + bc->Err[0] = _T('\0'); } else if (bc->hBatchFile != INVALID_HANDLE_VALUE) { @@ -261,6 +264,7 @@ } bc->hBatchFile = hFile; + SetFilePointer (bc->hBatchFile, 0, NULL, FILE_BEGIN); bc->bEcho = bEcho; /* Preserve echo across batch calls */ bc->shiftlevel = 0; @@ -276,7 +280,19 @@ return TRUE; } +VOID AddBatchRedirection(TCHAR * ifn, TCHAR * ofn, TCHAR * efn) +{ + if(!bc) + return; + if(_tcslen(ifn)) + _tcscpy(bc->In,ifn); + if(_tcslen(ofn)) + _tcscpy(bc->Out,ofn); + if(_tcslen(efn)) + _tcscpy(bc->Err,efn); +} + /* * Read and return the next executable line form the current batch file * @@ -405,7 +421,6 @@ continue; } - #ifdef _DEBUG DebugPrintf (_T("ReadBatchLine(): textline: \'%s\'\n"), textline); #endif _____ Modified: trunk/reactos/subsys/system/cmd/batch.h --- trunk/reactos/subsys/system/cmd/batch.h 2005-08-17 07:23:05 UTC (rev 17422) +++ trunk/reactos/subsys/system/cmd/batch.h 2005-08-17 18:01:47 UTC (rev 17423) @@ -18,6 +18,9 @@ INT shiftlevel; BOOL bEcho; /* Preserve echo flag across batch calls */ HANDLE hFind; /* Preserve find handle when doing a for */ + TCHAR In[MAX_PATH]; + TCHAR Out[MAX_PATH]; + TCHAR Err[MAX_PATH]; TCHAR forvar; } BATCH_CONTEXT, *LPBATCH_CONTEXT; @@ -39,5 +42,6 @@ VOID ExitBatch (LPTSTR); BOOL Batch (LPTSTR, LPTSTR, LPTSTR); LPTSTR ReadBatchLine (LPBOOL); +VOID AddBatchRedirection(TCHAR *, TCHAR *, TCHAR *); #endif /* _BATCH_H_INCLUDED_ */ _____ Modified: trunk/reactos/subsys/system/cmd/call.c --- trunk/reactos/subsys/system/cmd/call.c 2005-08-17 07:23:05 UTC (rev 17422) +++ trunk/reactos/subsys/system/cmd/call.c 2005-08-17 18:01:47 UTC (rev 17423) @@ -72,8 +72,20 @@ bc->shiftlevel = 0; bc->forvar = 0; /* HBP004 */ bc->forproto = NULL; /* HBP004 */ - ParseCommandLine (param); + if (bc->prev) + { + _tcscpy(bc->In, bc->prev->In); + _tcscpy(bc->Out, bc->prev->Out); + _tcscpy(bc->Err, bc->prev->Err); + } + else + { + bc->In[0] = _T('\0'); + bc->Out[0] = _T('\0'); + bc->Err[0] = _T('\0'); + } + /* Wasn't a batch file so remove conext */ if (bc->hBatchFile == INVALID_HANDLE_VALUE) _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-08-17 07:23:05 UTC (rev 17422) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-08-17 18:01:47 UTC (rev 17423) @@ -603,7 +603,7 @@ INT nRedirFlags = 0; INT Length; UINT Attributes; - + BOOL bNewBatch = TRUE; HANDLE hOldConIn; HANDLE hOldConOut; HANDLE hOldConErr; @@ -656,6 +656,20 @@ ; _tcscpy (err, t); + if(bc && !_tcslen (in) && _tcslen (bc->In)) + _tcscpy(in, bc->In); + if(bc && !out[0] && _tcslen(bc->Out)) + { + nRedirFlags |= OUTPUT_APPEND; + _tcscpy(out, bc->Out); + } + if(bc && !_tcslen (err) && _tcslen (bc->Err)) + { + nRedirFlags |= ERROR_APPEND; + _tcscpy(err, bc->Err); + } + + /* Set up the initial conditions ... */ /* preserve STDIN, STDOUT and STDERR handles */ hOldConIn = GetStdHandle (STD_INPUT_HANDLE); @@ -675,7 +689,7 @@ hFile = CreateFile (in, GENERIC_READ, FILE_SHARE_READ, &sa, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (hFile == INVALID_HANDLE_VALUE) - { + { LoadString(CMD_ModuleHandle, STRING_CMD_ERROR1, szMsg, RC_STRING_MAX_SIZE); ConErrPrintf(szMsg, in); return; @@ -766,7 +780,7 @@ /* we need make sure the LastError msg is zero before calling CreateFile */ SetLastError(0); - hFile = CreateFile (out, GENERIC_WRITE, FILE_SHARE_READ, &sa, + hFile = CreateFile (out, GENERIC_WRITE, FILE_SHARE_WRITE, &sa, (nRedirFlags & OUTPUT_APPEND) ? OPEN_ALWAYS : CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); @@ -782,7 +796,7 @@ } out[size]=_T('\0'); - hFile = CreateFile (out, GENERIC_WRITE, FILE_SHARE_READ, &sa, + hFile = CreateFile (out, GENERIC_WRITE, FILE_SHARE_WRITE, &sa, (nRedirFlags & OUTPUT_APPEND) ? OPEN_ALWAYS : CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); @@ -884,12 +898,17 @@ CloseHandle (hErr); hOldConErr = INVALID_HANDLE_VALUE; } + + if(bc) + bNewBatch = FALSE; #endif /* process final command */ DoCommand (s); #ifdef FEATURE_REDIRECTION + if(bNewBatch && bc) + AddBatchRedirection(in, out, err); /* close old stdin file */ #if 0 /* buggy implementation */ SetStdHandle (STD_INPUT_HANDLE, hOldConIn); _____ Modified: trunk/reactos/subsys/system/cmd/for.c --- trunk/reactos/subsys/system/cmd/for.c 2005-08-17 07:23:05 UTC (rev 17422) +++ trunk/reactos/subsys/system/cmd/for.c 2005-08-17 18:01:47 UTC (rev 17423) @@ -141,7 +141,11 @@ bc->bEcho = bc->prev->bEcho; else bc->bEcho = bEcho; + bc->In[0] = _T('\0'); + bc->Out[0] = _T('\0'); + bc->Err[0] = _T('\0'); + return 0; }

19 years, 4 months

[gvg] 17422: Samuel Bronson <naesten@gmail.com>:

by gvg＠svn.reactos.com

Samuel Bronson <naesten(a)gmail.com>: Reduce the time it takes GDB to attach Modified: trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c _____ Modified: trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c --- trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c 2005-08-17 07:07:43 UTC (rev 17421) +++ trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c 2005-08-17 07:23:05 UTC (rev 17422) @@ -242,6 +242,7 @@ { GdbPutChar ('+'); /* successful transfer */ +#if 0 /* if a sequence char is present, reply the sequence ID */ if (Buffer[2] == ':') { @@ -250,6 +251,7 @@ return &Buffer[3]; } +#endif return &Buffer[0]; } @@ -860,10 +862,12 @@ GspMem2Hex ((PCHAR) &ThreadCount, &GspOutBuffer[2], 1, TRUE); } #endif +#if 0 else if (strncmp (Command, "Offsets", 7) == 0) { strcpy (GspOutBuffer, "Text=0;Data=0;Bss=0"); } +#endif } VOID @@ -1064,6 +1068,7 @@ } +static BOOL gdb_attached_yet = TRUE; /* * This function does all command procesing for interfacing to gdb. */ @@ -1079,7 +1084,6 @@ LONG SigVal; LONG NewPC; PCHAR ptr; - LONG Esp; /* FIXME: Stop on other CPUs too */ /* Disable hardware debugging while we are inside the stub */ @@ -1098,7 +1102,7 @@ { GspAccessLocation = NULL; GspMemoryError = TRUE; - TrapFrame->Eip += 2; + TrapFrame->Eip += 3; } else { @@ -1111,36 +1115,45 @@ GspDbgThread = NULL; } - /* reply to host that an exception has occurred */ - SigVal = GspComputeSignal (ExceptionRecord->ExceptionCode); + /* ugly hack to avoid attempting to send status at the very + * beginning, right when GDB is trying to query the stub */ + if (gdb_attached_yet) { + LONG Esp; + + stop_reply: + /* reply to host that an exception has occurred */ + SigVal = GspComputeSignal (ExceptionRecord->ExceptionCode); + + ptr = &GspOutBuffer[0]; - ptr = &GspOutBuffer[0]; + *ptr++ = 'T'; /* notify gdb with signo, PC, FP and SP */ + *ptr++ = HexChars[(SigVal >> 4) & 0xf]; + *ptr++ = HexChars[SigVal & 0xf]; - *ptr++ = 'T'; /* notify gdb with signo, PC, FP and SP */ - *ptr++ = HexChars[(SigVal >> 4) & 0xf]; - *ptr++ = HexChars[SigVal & 0xf]; + *ptr++ = HexChars[ESP]; + *ptr++ = ':'; + + Esp = GspGetEspFromTrapFrame (TrapFrame); /* SP */ + ptr = GspMem2Hex ((PCHAR) &Esp, ptr, 4, 0); + *ptr++ = ';'; + + *ptr++ = HexChars[EBP]; + *ptr++ = ':'; + ptr = GspMem2Hex ((PCHAR) &TrapFrame->Ebp, ptr, 4, 0); /* FP */ + *ptr++ = ';'; + + *ptr++ = HexChars[PC]; + *ptr++ = ':'; + ptr = GspMem2Hex((PCHAR) &TrapFrame->Eip, ptr, 4, 0); /* PC */ + *ptr++ = ';'; - *ptr++ = HexChars[ESP]; - *ptr++ = ':'; + *ptr = '\0'; - Esp = GspGetEspFromTrapFrame (TrapFrame); /* SP */ - ptr = GspMem2Hex ((PCHAR) &Esp, ptr, 4, 0); - *ptr++ = ';'; - - *ptr++ = HexChars[EBP]; - *ptr++ = ':'; - ptr = GspMem2Hex ((PCHAR) &TrapFrame->Ebp, ptr, 4, 0); /* FP */ - *ptr++ = ';'; - - *ptr++ = HexChars[PC]; - *ptr++ = ':'; - ptr = GspMem2Hex((PCHAR) &TrapFrame->Eip, ptr, 4, 0); /* PC */ - *ptr++ = ';'; - - *ptr = '\0'; - - GspPutPacket (&GspOutBuffer[0]); - + GspPutPacket (&GspOutBuffer[0]); + } else { + gdb_attached_yet = 1; + } + Stepping = FALSE; while (TRUE) @@ -1152,6 +1165,8 @@ switch (*ptr++) { case '?': + /* a little hack to send more complete status information */ + goto stop_reply; GspOutBuffer[0] = 'S'; GspOutBuffer[1] = HexChars[SigVal >> 4]; GspOutBuffer[2] = HexChars[SigVal % 16];

19 years, 4 months

[ion] 17421: Add beginning of lpc docs

by ion＠svn.reactos.com

Add beginning of lpc docs Added: trunk/reactos/media/doc/LPC.txt _____ Added: trunk/reactos/media/doc/LPC.txt --- trunk/reactos/media/doc/LPC.txt 2005-08-17 07:06:59 UTC (rev 17420) +++ trunk/reactos/media/doc/LPC.txt 2005-08-17 07:07:43 UTC (rev 17421) @@ -0,0 +1,53 @@ +============================================================== += = += NOTES FROM THE UNDERGROUND = += = +============================================================== +Below are some of Alex's notes on the mysterious LPC Subsystem + +========================= +1. Sizes, sizes, sizes... +========================= + +There are four imporant LPC Sizes to keep in mind. Try to understand them: + +/* + * This determines the absolute maximum message size (0x100 bytes). For + * larger values, use a section-backed message. + */ +#define PORT_MAXIMUM_MESSAGE_LENGTH 256 + +/* + * This determines the maximum length of an LPC request. It is the largest + * amount of bytes that an LPC request can take. To calculate this, assume + * that this is a CONNECTION_REQUEST message, which includes the additionnal + * LPCP_CONNECTION_MESSAGE structure as well. Therefore, we add the kernel LPC, + * header, the maximum port size and the size of the connection request + * structure. This gives a value of 0x15C. However, one must note that NT + * allocates the Lookaside List using a 16-byte aligned value, making this + * number 0x160. + */ +#define LPCP_MAX_MESSAGE_SIZE ROUND_UP(PORT_MAXIMUM_MESSAGE_LENGTH + \ + sizeof(LPCP_MESSAGE) + \ + sizeof(LPCP_CONNECTION_MESSAGE), 16) + +/* + * Now, for an actual LPC Request size, we remove the kernel LPC header, which + * yields the size of the actual LPC Data that follows the Header, making this + * number 0x148. + */ +#define LPC_MAX_MESSAGE_LENGTH (LPCP_MAX_MESSAGE_SIZE - \ + FIELD_OFFSET(LPCP_MESSAGE, Request)) + +/* + * Finally, we'll calculate the maximum size of the Connection Info, giving us + * 0x104 + */ +#define LPC_MAX_DATA_LENGTH (LPC_MAX_MESSAGE_LENGTH - \ + sizeof(PORT_MESSAGE) - \ + sizeof(LPCP_CONNECTION_MESSAGE)) + +========================== +2. Structures +========================== +SOON. TODO. \ No newline at end of file

19 years, 4 months

[ion] 17420: Major cleanup of NDK. I've decided that it would be much cleaner to accumulate all types, regardless of their um/km availabilty, into each header. Thus, umtypes.h now only contains the equivalent of ntdef.h and is automatically not-included if the DDK is. Similary, I've removed all the NTIFS hacks and added a single ifssupp.h file, which is automatically removed if the IFS is added. That file will be deleted then the Longhorn WDK is made public (it contains the IFS/DDK). Nothing has

by ion＠svn.reactos.com

Major cleanup of NDK. I've decided that it would be much cleaner to accumulate all types, regardless of their um/km availabilty, into each header. Thus, umtypes.h now only contains the equivalent of ntdef.h and is automatically not-included if the DDK is. Similary, I've removed all the NTIFS hacks and added a single ifssupp.h file, which is automatically removed if the IFS is added. That file will be deleted then the Longhorn WDK is made public (it contains the IFS/DDK). Nothing has changed on the includer-side, the same rules still apply Modified: trunk/reactos/drivers/storage/scsiport/scsiport_int.h Modified: trunk/reactos/include/drivers/diskdump/diskdump.h Modified: trunk/reactos/include/ndk/arch/ketypes.h Added: trunk/reactos/include/ndk/cmtypes.h Modified: trunk/reactos/include/ndk/extypes.h Modified: trunk/reactos/include/ndk/fixmes.txt Modified: trunk/reactos/include/ndk/i386/mmtypes.h Added: trunk/reactos/include/ndk/ifssupp.h Modified: trunk/reactos/include/ndk/iotypes.h Modified: trunk/reactos/include/ndk/kdfuncs.h Modified: trunk/reactos/include/ndk/kefuncs.h Modified: trunk/reactos/include/ndk/ketypes.h Modified: trunk/reactos/include/ndk/lpctypes.h Modified: trunk/reactos/include/ndk/mmtypes.h Modified: trunk/reactos/include/ndk/ntndk.h Modified: trunk/reactos/include/ndk/obtypes.h Modified: trunk/reactos/include/ndk/pstypes.h Modified: trunk/reactos/include/ndk/rtlfuncs.h Modified: trunk/reactos/include/ndk/rtltypes.h Modified: trunk/reactos/include/ndk/umfuncs.h Modified: trunk/reactos/include/ndk/umtypes.h Modified: trunk/reactos/include/ndk/zwfuncs.h Modified: trunk/reactos/include/ndk/zwtypes.h Modified: trunk/reactos/w32api/include/basetsd.h Modified: trunk/reactos/w32api/include/winnt.h _____ Modified: trunk/reactos/drivers/storage/scsiport/scsiport_int.h --- trunk/reactos/drivers/storage/scsiport/scsiport_int.h 2005-08-17 06:14:55 UTC (rev 17419) +++ trunk/reactos/drivers/storage/scsiport/scsiport_int.h 2005-08-17 07:06:59 UTC (rev 17420) @@ -7,8 +7,12 @@ #define VERSION "0.0.3" +#ifndef PAGE_ROUND_UP #define PAGE_ROUND_UP(x) ( (((ULONG_PTR)x)%PAGE_SIZE) ? ((((ULONG_PTR)x)&(~(PAGE_SIZE-1)))+PAGE_SIZE) : ((ULONG_PTR)x) ) +#endif +#ifndef ROUND_UP #define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S)) +#endif #define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) _____ Modified: trunk/reactos/include/drivers/diskdump/diskdump.h --- trunk/reactos/include/drivers/diskdump/diskdump.h 2005-08-17 06:14:55 UTC (rev 17419) +++ trunk/reactos/include/drivers/diskdump/diskdump.h 2005-08-17 07:06:59 UTC (rev 17420) @@ -2,7 +2,7 @@ #define __DISKDUMP_H #include <ddk/ntddscsi.h> -#include <ndk/ketypes.h> +#include <ndk/ntndk.h> #define MM_CORE_DUMP_HEADER_MAGIC (0xdeafbead) #define MM_CORE_DUMP_HEADER_VERSION (0x1) _____ Modified: trunk/reactos/include/ndk/arch/ketypes.h --- trunk/reactos/include/ndk/arch/ketypes.h 2005-08-17 06:14:55 UTC (rev 17419) +++ trunk/reactos/include/ndk/arch/ketypes.h 2005-08-17 07:06:59 UTC (rev 17420) @@ -9,7 +9,7 @@ #ifndef _ARCH_KETYPES_H #define _ARCH_KETYPES_H -/* Shared structure needed by Arch-specific headers */ +/* Shared structures needed by Arch-specific headers */ typedef struct _KDPC_DATA { LIST_ENTRY DpcListHead; @@ -18,6 +18,12 @@ ULONG DpcCount; } KDPC_DATA, *PKDPC_DATA; +typedef struct _PP_LOOKASIDE_LIST +{ + struct _GENERAL_LOOKASIDE *P; + struct _GENERAL_LOOKASIDE *L; +} PP_LOOKASIDE_LIST, *PPP_LOOKASIDE_LIST; + #ifdef _M_IX86 #include <ndk/i386/ketypes.h> #else _____ Added: trunk/reactos/include/ndk/cmtypes.h --- trunk/reactos/include/ndk/cmtypes.h 2005-08-17 06:14:55 UTC (rev 17419) +++ trunk/reactos/include/ndk/cmtypes.h 2005-08-17 07:06:59 UTC (rev 17420) @@ -0,0 +1,129 @@ +/* + * PROJECT: ReactOS Native Headers + * FILE: include/ndk/cmtypes.h + * PURPOSE: Definitions for Config Manager Types not defined in DDK/IFS + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + * UPDATE HISTORY: + * Created 06/10/04 + */ + +#ifndef _CMTYPES_H +#define _CMTYPES_H + +/* DEPENDENCIES **************************************************************/ + +/* EXPORTED DATA *************************************************************/ + +/* CONSTANTS *****************************************************************/ + +/* ENUMERATIONS **************************************************************/ + +#ifdef NTOS_MODE_USER +typedef enum _KEY_INFORMATION_CLASS +{ + KeyBasicInformation, + KeyNodeInformation, + KeyFullInformation, + KeyNameInformation, + KeyCachedInformation, + KeyFlagsInformation +} KEY_INFORMATION_CLASS; + +typedef enum _KEY_VALUE_INFORMATION_CLASS +{ + KeyValueBasicInformation, + KeyValueFullInformation, + KeyValuePartialInformation, + KeyValueFullInformationAlign64, + KeyValuePartialInformationAlign64 +} KEY_VALUE_INFORMATION_CLASS; + +typedef enum _KEY_SET_INFORMATION_CLASS +{ + KeyWriteTimeInformation, + KeyUserFlagsInformation, + MaxKeySetInfoClass +} KEY_SET_INFORMATION_CLASS; + +/* TYPES *********************************************************************/ + +typedef struct _KEY_WRITE_TIME_INFORMATION +{ + LARGE_INTEGER LastWriteTime; +} KEY_WRITE_TIME_INFORMATION, *PKEY_WRITE_TIME_INFORMATION; + +typedef struct _KEY_USER_FLAGS_INFORMATION +{ + ULONG UserFlags; +} KEY_USER_FLAGS_INFORMATION, *PKEY_USER_FLAGS_INFORMATION; + +typedef struct _KEY_FULL_INFORMATION +{ + LARGE_INTEGER LastWriteTime; + ULONG TitleIndex; + ULONG ClassOffset; + ULONG ClassLength; + ULONG SubKeys; + ULONG MaxNameLen; + ULONG MaxClassLen; + ULONG Values; + ULONG MaxValueNameLen; + ULONG MaxValueDataLen; + WCHAR Class[1]; +} KEY_FULL_INFORMATION, *PKEY_FULL_INFORMATION; + +typedef struct _KEY_NODE_INFORMATION +{ + LARGE_INTEGER LastWriteTime; + ULONG TitleIndex; + ULONG ClassOffset; + ULONG ClassLength; + ULONG NameLength; + WCHAR Name[1]; +} KEY_NODE_INFORMATION, *PKEY_NODE_INFORMATION; + +typedef struct _KEY_VALUE_ENTRY +{ + PUNICODE_STRING ValueName; + ULONG DataLength; + ULONG DataOffset; + ULONG Type; +} KEY_VALUE_ENTRY, *PKEY_VALUE_ENTRY; + +typedef struct _KEY_VALUE_PARTIAL_INFORMATION +{ + ULONG TitleIndex; + ULONG Type; + ULONG DataLength; + UCHAR Data[1]; +} KEY_VALUE_PARTIAL_INFORMATION, *PKEY_VALUE_PARTIAL_INFORMATION; + +typedef struct _KEY_VALUE_BASIC_INFORMATION +{ + ULONG TitleIndex; + ULONG Type; + ULONG NameLength; + WCHAR Name[1]; +} KEY_VALUE_BASIC_INFORMATION, *PKEY_VALUE_BASIC_INFORMATION; + +typedef struct _KEY_VALUE_FULL_INFORMATION +{ + ULONG TitleIndex; + ULONG Type; + ULONG DataOffset; + ULONG DataLength; + ULONG NameLength; + WCHAR Name[1]; +} KEY_VALUE_FULL_INFORMATION, *PKEY_VALUE_FULL_INFORMATION; + +typedef struct _KEY_BASIC_INFORMATION +{ + LARGE_INTEGER LastWriteTime; + ULONG TitleIndex; + ULONG NameLength; + WCHAR Name[1]; +} KEY_BASIC_INFORMATION, *PKEY_BASIC_INFORMATION; + +#endif +#endif + _____ Modified: trunk/reactos/include/ndk/extypes.h --- trunk/reactos/include/ndk/extypes.h 2005-08-17 06:14:55 UTC (rev 17419) +++ trunk/reactos/include/ndk/extypes.h 2005-08-17 07:06:59 UTC (rev 17420) @@ -11,36 +11,37 @@ #define _EXTYPES_H /* DEPENDENCIES **************************************************************/ -#include "ketypes.h" /* EXPORTED DATA *************************************************************/ +#ifndef NTOS_MODE_USER extern POBJECT_TYPE NTOSAPI ExIoCompletionType; extern NTOSAPI POBJECT_TYPE ExMutantObjectType; extern NTOSAPI POBJECT_TYPE ExTimerType; +#endif /* CONSTANTS *****************************************************************/ - +#ifndef NTOS_MODE_USER #define INVALID_HANDLE_VALUE (HANDLE)-1 +#endif /* Increments */ #define MUTANT_INCREMENT 1 -/* Callback Object Access Rights */ -#define CALLBACK_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0x0001) -#define CALLBACK_EXECUTE (STANDARD_RIGHTS_EXECUTE|SYNCHRONIZE|0x0001) -#define CALLBACK_WRITE (STANDARD_RIGHTS_WRITE|SYNCHRONIZE|0x0001) -#define CALLBACK_READ (STANDARD_RIGHTS_READ|SYNCHRONIZE|0x0001) +/* Executive Object Access Rights */ +#define CALLBACK_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0x0001) +#define CALLBACK_EXECUTE (STANDARD_RIGHTS_EXECUTE|SYNCHRONIZE|0x0001) +#define CALLBACK_WRITE (STANDARD_RIGHTS_WRITE|SYNCHRONIZE|0x0001) +#define CALLBACK_READ (STANDARD_RIGHTS_READ|SYNCHRONIZE|0x0001) +#ifdef NTOS_MODE_USER +#define EVENT_QUERY_STATE 0x0001 +#define SEMAPHORE_QUERY_STATE 0x0001 +#endif /* ENUMERATIONS **************************************************************/ /* TYPES *********************************************************************/ -/* You'll need the IFS for this, so use an equivalent version */ -#ifndef _NTIFS_ -typedef PVOID EX_RUNDOWN_REF; -typedef PVOID EX_PUSH_LOCK; -#endif - +#ifndef NTOS_MODE_USER typedef struct _EX_QUEUE_WORKER_INFO { UCHAR QueueDisabled:1; @@ -120,4 +121,5 @@ } HANDLE_TABLE, *PHANDLE_TABLE; #endif +#endif _____ Modified: trunk/reactos/include/ndk/fixmes.txt --- trunk/reactos/include/ndk/fixmes.txt 2005-08-17 06:14:55 UTC (rev 17419) +++ trunk/reactos/include/ndk/fixmes.txt 2005-08-17 07:06:59 UTC (rev 17420) @@ -33,45 +33,10 @@ Priority 4: - FIXED: Kernel and Memory Types are not architecture-specific (Eric) [ketypes.h, mmtypes.h] - FIXED: Win32K Builds with windows.h (Filip) [extypes.h, ketypes.h] - - Move out stuff from umtypes.h into the actual header where they should go. Use ifdeffing - directly in that file to protect user-mode versus kernel-mode types. umtypes.h will only - end up containing the misc types that are needed for compatibility. This would create a - significant cleanup. + - FIXED: Modify design of NDK so that all the types are in their respective files (Alex) [*.h] Priority 5: - FIXED: LPC Types are totally wrong. (Alex) [lpctypes.h] - Missing System Info Classes [zwtypes.h] - FIXED: Process Priority Classes are messed up (Alex) [pstypes.h] -Generic Note: - One of the most difficult things is when certain structures require the IFS for some of their - members. Up until some time ago, the IFS was 1000$, so it was senseless to require it in order - to allow people to use the NDK. Recently, however, the IFS price went down to 100$. This is - still way too much. Even though the GNU NTIFS.H exists, I don't want to fallback on it. The - good news is that the WDK (Windows Driver Kit), which will supplant the DDK in about a year, - includes the IFS. At that point we can remove all the #ifndef/ifdef NTIFS hacks, since it'll - be OK to "force" IFS usage. - - UPDATE: - However, I'm giving serious consideration of making the IFS a requirement, and suggesting - usage of the GNU IFS for anyone that needs it. The problem, however, is that the official - GNU IFS is outdated and quite invalid in many ways, compared to the ReactOS IFS (which still - isn't perfect yet). Also, this would include many more definitions then needed. A third - option that I'm considering is creating a new header, until the WDK is out, which will be - called ifstypes. It would be the brother of umtypes, but for kernel mode. Only a small - number of types will need to be included, and hence they will be easy to locate in case - the official ones change (by the time they do, the WDK will be out however, so no worries). - It would reduce all the ifdeffing to a single file. - - UPDATE2: - No. This is a bad idea. I've just added a note to purge out large parts of umtypes.h into the - actual xxtypes.h files, and then use iffdefing. This is a direct contradiction to my idea of - generalizing all the IFS stuff together. - - UPDATE3: - No. This is different...the user-mode types will always be unavailable in kernel-mode, and - dissipating them into the real files is a good thing, because they will never move out and - they are much easier to maintain. However, once the WDK comes out, all #ifdef ntifs will - become obsolete, and they will have to be hunted down and removed. Having a single file that - is automatically added if the IFS is not detected is much easier to remove once the time - comes. _____ Modified: trunk/reactos/include/ndk/i386/mmtypes.h --- trunk/reactos/include/ndk/i386/mmtypes.h 2005-08-17 06:14:55 UTC (rev 17419) +++ trunk/reactos/include/ndk/i386/mmtypes.h 2005-08-17 07:06:59 UTC (rev 17420) @@ -9,4 +9,17 @@ #ifndef _I386_MMTYPES_H #define _I386_MMTYPES_H +/* DEPENDENCIES **************************************************************/ + +/* EXPORTED DATA *************************************************************/ + +/* CONSTANTS *****************************************************************/ + +#define PAGE_SIZE 0x1000 +#define PAGE_SHIFT 12L + +/* ENUMERATIONS **************************************************************/ + +/* TYPES *********************************************************************/ + #endif _____ Added: trunk/reactos/include/ndk/ifssupp.h --- trunk/reactos/include/ndk/ifssupp.h 2005-08-17 06:14:55 UTC (rev 17419) +++ trunk/reactos/include/ndk/ifssupp.h 2005-08-17 07:06:59 UTC (rev 17420) @@ -0,0 +1,116 @@ +/* + * PROJECT: ReactOS Native Headers + * FILE: include/ndk/ifssupp.h + * PURPOSE: Defintions present in IFS, required for NDK usage. + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + * UPDATE HISTORY: + * Created 08/16/05 + */ +#ifndef _NTIFS_ +#define _NTIFS_ + +/* DEPENDENCIES **************************************************************/ + +/* EXPORTED DATA *************************************************************/ + +/* CONSTANTS *****************************************************************/ + +/* TYPES *********************************************************************/ + +typedef PVOID PRTL_HEAP_PARAMETERS; + +#if defined(USE_LPC6432) +#define LPC_CLIENT_ID CLIENT_ID64 +#define LPC_SIZE_T ULONGLONG +#define LPC_PVOID ULONGLONG +#define LPC_HANDLE ULONGLONG +#else +#define LPC_CLIENT_ID CLIENT_ID +#define LPC_SIZE_T SIZE_T +#define LPC_PVOID PVOID +#define LPC_HANDLE HANDLE +#endif + +typedef struct _PORT_MESSAGE +{ + union + { + struct + { + CSHORT DataLength; + CSHORT TotalLength; + } s1; + ULONG Length; + } u1; + union + { + struct + { + CSHORT Type; + CSHORT DataInfoOffset; + } s2; + ULONG ZeroInit; + } u2; + union + { + LPC_CLIENT_ID ClientId; + double DoNotUseThisField; + }; + ULONG MessageId; + union + { + LPC_SIZE_T ClientViewSize; + ULONG CallbackId; + }; +} PORT_MESSAGE, *PPORT_MESSAGE; + +typedef struct _PORT_VIEW +{ + ULONG Length; + LPC_HANDLE SectionHandle; + ULONG SectionOffset; + LPC_SIZE_T ViewSize; + LPC_PVOID ViewBase; + LPC_PVOID ViewRemoteBase; +} PORT_VIEW, *PPORT_VIEW; + +typedef struct _REMOTE_PORT_VIEW +{ + ULONG Length; + LPC_SIZE_T ViewSize; + LPC_PVOID ViewBase; +} REMOTE_PORT_VIEW, *PREMOTE_PORT_VIEW; + +typedef struct _KAPC_STATE +{ + LIST_ENTRY ApcListHead[2]; + PKPROCESS Process; + BOOLEAN KernelApcInProgress; + BOOLEAN KernelApcPending; + BOOLEAN UserApcPending; +} KAPC_STATE, *PKAPC_STATE, *RESTRICTED_POINTER PRKAPC_STATE; + +typedef struct _KQUEUE +{ + DISPATCHER_HEADER Header; + LIST_ENTRY EntryListHead; + ULONG CurrentCount; + ULONG MaximumCount; + LIST_ENTRY ThreadListHead; +} KQUEUE, *PKQUEUE, *RESTRICTED_POINTER PRKQUEUE; + +typedef PVOID EX_RUNDOWN_REF; +typedef PVOID EX_PUSH_LOCK; + +typedef struct _SECURITY_CLIENT_CONTEXT +{ + SECURITY_QUALITY_OF_SERVICE SecurityQos; + PACCESS_TOKEN ClientToken; + BOOLEAN DirectlyAccessClientToken; + BOOLEAN DirectAccessEffectiveOnly; + BOOLEAN ServerIsRemote; + TOKEN_CONTROL ClientTokenControl; +} SECURITY_CLIENT_CONTEXT, *PSECURITY_CLIENT_CONTEXT; + +#endif + _____ Modified: trunk/reactos/include/ndk/iotypes.h --- trunk/reactos/include/ndk/iotypes.h 2005-08-17 06:14:55 UTC (rev 17419) +++ trunk/reactos/include/ndk/iotypes.h 2005-08-17 07:06:59 UTC (rev 17420) @@ -11,17 +11,82 @@ #define _IOTYPES_H /* DEPENDENCIES **************************************************************/ -#include "potypes.h" /* EXPORTED DATA *************************************************************/ +#ifndef NTOS_MODE_USER extern POBJECT_TYPE NTOSAPI IoAdapterObjectType; extern POBJECT_TYPE NTOSAPI IoDeviceHandlerObjectType; extern POBJECT_TYPE NTOSAPI IoDeviceObjectType; extern POBJECT_TYPE NTOSAPI IoDriverObjectType; extern POBJECT_TYPE NTOSAPI IoFileObjectType; +#endif /* CONSTANTS *****************************************************************/ +#ifdef NTOS_MODE_USER +/* Object Access Rights */ +#define SYMBOLIC_LINK_QUERY 0x0001 +#define SYMBOLIC_LINK_ALL_ACCESS STANDARD_RIGHTS_REQUIRED | 0x0001 +#endif + +/* File Result Flags */ +#define FILE_SUPERSEDED 0x00000000 +#define FILE_OPENED 0x00000001 +#define FILE_CREATED 0x00000002 +#define FILE_OVERWRITTEN 0x00000003 +#define FILE_EXISTS 0x00000004 +#define FILE_DOES_NOT_EXIST 0x00000005 + +/* Pipe Flags */ +#define FILE_PIPE_BYTE_STREAM_MODE 0x00000000 +#define FILE_PIPE_MESSAGE_MODE 0x00000001 +#define FILE_PIPE_QUEUE_OPERATION 0x00000000 +#define FILE_PIPE_COMPLETE_OPERATION 0x00000001 +#define FILE_PIPE_INBOUND 0x00000000 +#define FILE_PIPE_OUTBOUND 0x00000001 +#define FILE_PIPE_FULL_DUPLEX 0x00000002 +#define FILE_PIPE_CLIENT_END 0x00000000 +#define FILE_PIPE_SERVER_END 0x00000001 + +/* File Attributes */ +#define FILE_ATTRIBUTE_VALID_FLAGS 0x00007fb7 +#define FILE_ATTRIBUTE_VALID_SET_FLAGS 0x000031a7 + +/* File Flags */ +#define FILE_SUPERSEDE 0x00000000 +#define FILE_OPEN 0x00000001 +#define FILE_CREATE 0x00000002 +#define FILE_OPEN_IF 0x00000003 +#define FILE_OVERWRITE 0x00000004 +#define FILE_OVERWRITE_IF 0x00000005 +#define FILE_MAXIMUM_DISPOSITION 0x00000005 + +/* File Types */ +#define FILE_DIRECTORY_FILE 0x00000001 +#define FILE_WRITE_THROUGH 0x00000002 +#define FILE_SEQUENTIAL_ONLY 0x00000004 +#define FILE_NO_INTERMEDIATE_BUFFERING 0x00000008 +#define FILE_SYNCHRONOUS_IO_ALERT 0x00000010 +#define FILE_SYNCHRONOUS_IO_NONALERT 0x00000020 +#define FILE_NON_DIRECTORY_FILE 0x00000040 +#define FILE_CREATE_TREE_CONNECTION 0x00000080 +#define FILE_COMPLETE_IF_OPLOCKED 0x00000100 +#define FILE_NO_EA_KNOWLEDGE 0x00000200 +#define FILE_OPEN_FOR_RECOVERY 0x00000400 +#define FILE_RANDOM_ACCESS 0x00000800 +#define FILE_DELETE_ON_CLOSE 0x00001000 +#define FILE_OPEN_BY_FILE_ID 0x00002000 +#define FILE_OPEN_FOR_BACKUP_INTENT 0x00004000 +#define FILE_NO_COMPRESSION 0x00008000 +#define FILE_RESERVE_OPFILTER 0x00100000 +#define FILE_OPEN_REPARSE_POINT 0x00200000 +#define FILE_OPEN_NO_RECALL 0x00400000 +#define FILE_OPEN_FOR_FREE_SPACE_QUERY 0x00800000 + +/* Device Charactertics */ +#define FILE_REMOVABLE_MEDIA 0x00000001 +#define FILE_REMOTE_DEVICE 0x00000010 + /* Device Object Extension Flags */ #define DOE_UNLOAD_PENDING 0x1 #define DOE_DELETE_PENDING 0x2 @@ -67,6 +132,90 @@ #define DNUF_NOT_DISABLEABLE 0x0008 /* ENUMERATIONS **************************************************************/ + +#ifdef NTOS_MODE_USER +typedef enum _INTERFACE_TYPE +{ + InterfaceTypeUndefined = -1, + Internal, + Isa, + Eisa, + MicroChannel, + TurboChannel, + PCIBus, + VMEBus, + NuBus, + PCMCIABus, + CBus, + MPIBus, + MPSABus, + ProcessorInternal, + InternalPowerBus, + PNPISABus, + PNPBus, + MaximumInterfaceType +}INTERFACE_TYPE, *PINTERFACE_TYPE; + +typedef enum _FILE_INFORMATION_CLASS +{ + FileDirectoryInformation = 1, + FileFullDirectoryInformation, + FileBothDirectoryInformation, + FileBasicInformation, + FileStandardInformation, + FileInternalInformation, + FileEaInformation, + FileAccessInformation, + FileNameInformation, + FileRenameInformation, + FileLinkInformation, + FileNamesInformation, + FileDispositionInformation, + FilePositionInformation, + FileFullEaInformation, + FileModeInformation, + FileAlignmentInformation, + FileAllInformation, + FileAllocationInformation, + FileEndOfFileInformation, + FileAlternateNameInformation, + FileStreamInformation, + FilePipeInformation, + FilePipeLocalInformation, + FilePipeRemoteInformation, + FileMailslotQueryInformation, + FileMailslotSetInformation, + FileCompressionInformation, + FileObjectIdInformation, + FileCompletionInformation, + FileMoveClusterInformation, + FileQuotaInformation, + FileReparsePointInformation, + FileNetworkOpenInformation, + FileAttributeTagInformation, + FileTrackingInformation, + FileIdBothDirectoryInformation, + FileIdFullDirectoryInformation, + FileValidDataLengthInformation, + FileShortNameInformation, + FileMaximumInformation +} FILE_INFORMATION_CLASS, *PFILE_INFORMATION_CLASS; + +typedef enum _FSINFOCLASS +{ + FileFsVolumeInformation = 1, + FileFsLabelInformation, + FileFsSizeInformation, + FileFsDeviceInformation, + FileFsAttributeInformation, + FileFsControlInformation, + FileFsFullSizeInformation, + FileFsObjectIdInformation, + FileFsDriverPathInformation, + FileFsMaximumInformation +} FS_INFORMATION_CLASS, *PFS_INFORMATION_CLASS; +#endif + typedef enum _PNP_DEVNODE_STATE { DeviceNodeUnspecified = 0x300, @@ -95,6 +244,279 @@ /* TYPES *********************************************************************/ +#ifdef NTOS_MODE_USER +typedef struct _FILE_BASIC_INFORMATION +{ + LARGE_INTEGER CreationTime; + LARGE_INTEGER LastAccessTime; + LARGE_INTEGER LastWriteTime; + LARGE_INTEGER ChangeTime; + ULONG FileAttributes; +} FILE_BASIC_INFORMATION, *PFILE_BASIC_INFORMATION; + +typedef struct _FILE_STANDARD_INFORMATION +{ + LARGE_INTEGER AllocationSize; + LARGE_INTEGER EndOfFile; + ULONG NumberOfLinks; + BOOLEAN DeletePending; + BOOLEAN Directory; +} FILE_STANDARD_INFORMATION, *PFILE_STANDARD_INFORMATION; + +typedef struct _FILE_NETWORK_OPEN_INFORMATION +{ + LARGE_INTEGER CreationTime; + LARGE_INTEGER LastAccessTime; + LARGE_INTEGER LastWriteTime; + LARGE_INTEGER ChangeTime; + LARGE_INTEGER AllocationSize; + LARGE_INTEGER EndOfFile; + ULONG FileAttributes; +} FILE_NETWORK_OPEN_INFORMATION, *PFILE_NETWORK_OPEN_INFORMATION; + +typedef struct _FILE_EA_INFORMATION +{ + ULONG EaSize; +} FILE_EA_INFORMATION, *PFILE_EA_INFORMATION; + +typedef struct _FILE_COMPRESSION_INFORMATION +{ + LARGE_INTEGER CompressedFileSize; + USHORT CompressionFormat; + UCHAR CompressionUnitShift; + UCHAR ChunkShift; + UCHAR ClusterShift; + UCHAR Reserved[3]; +} FILE_COMPRESSION_INFORMATION, *PFILE_COMPRESSION_INFORMATION; + +typedef struct _FILE_POSITION_INFORMATION +{ + LARGE_INTEGER CurrentByteOffset; +} FILE_POSITION_INFORMATION, *PFILE_POSITION_INFORMATION; + +typedef struct _FILE_DISPOSITION_INFORMATION +{ + BOOLEAN DeleteFile; +} FILE_DISPOSITION_INFORMATION, *PFILE_DISPOSITION_INFORMATION; + +typedef struct _FILE_FULL_EA_INFORMATION +{ + ULONG NextEntryOffset; + UCHAR Flags; + UCHAR EaNameLength; + USHORT EaValueLength; + CHAR EaName[1]; +} FILE_FULL_EA_INFORMATION, *PFILE_FULL_EA_INFORMATION; + +typedef struct _FILE_QUOTA_INFORMATION +{ + ULONG NextEntryOffset; + ULONG SidLength; + LARGE_INTEGER ChangeTime; + LARGE_INTEGER QuotaUsed; + LARGE_INTEGER QuotaThreshold; + LARGE_INTEGER QuotaLimit; + SID Sid; +} FILE_QUOTA_INFORMATION, *PFILE_QUOTA_INFORMATION; + +typedef struct _FILE_INTERNAL_INFORMATION +{ + LARGE_INTEGER IndexNumber; +} FILE_INTERNAL_INFORMATION, *PFILE_INTERNAL_INFORMATION; + +typedef struct _FILE_RENAME_INFORMATION +{ + BOOLEAN ReplaceIfExists; + HANDLE RootDirectory; + ULONG FileNameLength; + WCHAR FileName[1]; +} FILE_RENAME_INFORMATION, *PFILE_RENAME_INFORMATION; + +typedef struct _FILE_PIPE_INFORMATION +{ + ULONG ReadMode; + ULONG CompletionMode; +} FILE_PIPE_INFORMATION, *PFILE_PIPE_INFORMATION; + +typedef struct _FILE_PIPE_LOCAL_INFORMATION +{ + ULONG NamedPipeType; + ULONG NamedPipeConfiguration; + ULONG MaximumInstances; + ULONG CurrentInstances; + ULONG InboundQuota; + ULONG ReadDataAvailable; + ULONG OutboundQuota; + ULONG WriteQuotaAvailable; + ULONG NamedPipeState; + ULONG NamedPipeEnd; +} FILE_PIPE_LOCAL_INFORMATION, *PFILE_PIPE_LOCAL_INFORMATION; + +typedef struct _FILE_PIPE_REMOTE_INFORMATION +{ + LARGE_INTEGER CollectDataTime; + ULONG MaximumCollectionCount; +} FILE_PIPE_REMOTE_INFORMATION, *PFILE_PIPE_REMOTE_INFORMATION; + +typedef struct _FILE_MAILSLOT_QUERY_INFORMATION +{ + ULONG MaximumMessageSize; + ULONG MailslotQuota; + ULONG NextMessageSize; + ULONG MessagesAvailable; + LARGE_INTEGER ReadTimeout; +} FILE_MAILSLOT_QUERY_INFORMATION, *PFILE_MAILSLOT_QUERY_INFORMATION; + +typedef struct _FILE_MAILSLOT_SET_INFORMATION +{ + LARGE_INTEGER ReadTimeout; +} FILE_MAILSLOT_SET_INFORMATION, *PFILE_MAILSLOT_SET_INFORMATION; + +typedef struct _FILE_BOTH_DIR_INFORMATION +{ + ULONG NextEntryOffset; + ULONG FileIndex; + LARGE_INTEGER CreationTime; + LARGE_INTEGER LastAccessTime; + LARGE_INTEGER LastWriteTime; + LARGE_INTEGER ChangeTime; + LARGE_INTEGER EndOfFile; + LARGE_INTEGER AllocationSize; + ULONG FileAttributes; + ULONG FileNameLength; + ULONG EaSize; + CCHAR ShortNameLength; + WCHAR ShortName[12]; + WCHAR FileName[1]; +} FILE_BOTH_DIR_INFORMATION, *PFILE_BOTH_DIR_INFORMATION; + +typedef struct _FILE_COMPLETION_INFORMATION +{ + HANDLE Port; + PVOID Key; +} FILE_COMPLETION_INFORMATION, *PFILE_COMPLETION_INFORMATION; + +typedef struct _FILE_LINK_INFORMATION +{ + BOOLEAN ReplaceIfExists; + HANDLE RootDirectory; + ULONG FileNameLength; + WCHAR FileName[1]; +} FILE_LINK_INFORMATION, *PFILE_LINK_INFORMATION; + +typedef struct _FILE_NAME_INFORMATION +{ + ULONG FileNameLength; + WCHAR FileName[1]; +} FILE_NAME_INFORMATION, *PFILE_NAME_INFORMATION; + +typedef struct _FILE_ALLOCATION_INFORMATION +{ + LARGE_INTEGER AllocationSize; +} FILE_ALLOCATION_INFORMATION, *PFILE_ALLOCATION_INFORMATION; + +typedef struct _FILE_END_OF_FILE_INFORMATION +{ + LARGE_INTEGER EndOfFile; +} FILE_END_OF_FILE_INFORMATION, *PFILE_END_OF_FILE_INFORMATION; + +typedef struct _FILE_VALID_DATA_LENGTH_INFORMATION +{ + LARGE_INTEGER ValidDataLength; +} FILE_VALID_DATA_LENGTH_INFORMATION, *PFILE_VALID_DATA_LENGTH_INFORMATION; + +typedef struct _FILE_FS_DEVICE_INFORMATION +{ + DEVICE_TYPE DeviceType; + ULONG Characteristics; +} FILE_FS_DEVICE_INFORMATION, *PFILE_FS_DEVICE_INFORMATION; + +typedef struct _FILE_FS_ATTRIBUTE_INFORMATION +{ + ULONG FileSystemAttributes; + ULONG MaximumComponentNameLength; + ULONG FileSystemNameLength; + WCHAR FileSystemName[1]; +} FILE_FS_ATTRIBUTE_INFORMATION, *PFILE_FS_ATTRIBUTE_INFORMATION; + +typedef struct _FILE_FS_SIZE_INFORMATION +{ + LARGE_INTEGER TotalAllocationUnits; + LARGE_INTEGER AvailableAllocationUnits; + ULONG SectorsPerAllocationUnit; + ULONG BytesPerSector; +} FILE_FS_SIZE_INFORMATION, *PFILE_FS_SIZE_INFORMATION; + +typedef struct _FILE_FS_LABEL_INFORMATION +{ + ULONG VolumeLabelLength; + WCHAR VolumeLabel[1]; +} FILE_FS_LABEL_INFORMATION, *PFILE_FS_LABEL_INFORMATION; + +typedef struct _FILE_FS_VOLUME_INFORMATION +{ + LARGE_INTEGER VolumeCreationTime; + ULONG VolumeSerialNumber; + ULONG VolumeLabelLength; + BOOLEAN SupportsObjects; + WCHAR VolumeLabel[1]; +} FILE_FS_VOLUME_INFORMATION, *PFILE_FS_VOLUME_INFORMATION; + +typedef struct _FILE_PIPE_WAIT_FOR_BUFFER +{ + LARGE_INTEGER Timeout; + ULONG NameLength; + BOOLEAN TimeoutSpecified; + WCHAR Name[1]; +} FILE_PIPE_WAIT_FOR_BUFFER, *PFILE_PIPE_WAIT_FOR_BUFFER; + +typedef struct _FILE_PIPE_PEEK_BUFFER +{ + ULONG NamedPipeState; + ULONG ReadDataAvailable; + ULONG NumberOfMessages; + ULONG MessageLength; + CHAR Data[1]; +} FILE_PIPE_PEEK_BUFFER, *PFILE_PIPE_PEEK_BUFFER; + +typedef struct _IO_STATUS_BLOCK +{ + union + { + NTSTATUS Status; + PVOID Pointer; + }; + ULONG_PTR Information; +} IO_STATUS_BLOCK, *PIO_STATUS_BLOCK; + +typedef struct _IO_ERROR_LOG_PACKET +{ + UCHAR MajorFunctionCode; + UCHAR RetryCount; + USHORT DumpDataSize; + USHORT NumberOfStrings; + USHORT StringOffset; + USHORT EventCategory; + NTSTATUS ErrorCode; + ULONG UniqueErrorValue; + NTSTATUS FinalStatus; + ULONG SequenceNumber; + ULONG IoControlCode; + LARGE_INTEGER DeviceOffset; + ULONG DumpData[1]; +}IO_ERROR_LOG_PACKET, *PIO_ERROR_LOG_PACKET; + +typedef struct _IO_ERROR_LOG_MESSAGE +{ + USHORT Type; + USHORT Size; + USHORT DriverNameLength; + LARGE_INTEGER TimeStamp; + ULONG DriverNameOffset; + IO_ERROR_LOG_PACKET EntryData; +} IO_ERROR_LOG_MESSAGE, *PIO_ERROR_LOG_MESSAGE; +#endif + typedef struct _MAILSLOT_CREATE_PARAMETERS { ULONG MailslotQuota; @@ -115,6 +537,7 @@ BOOLEAN TimeoutSpecified; } NAMED_PIPE_CREATE_PARAMETERS, *PNAMED_PIPE_CREATE_PARAMETERS; +#ifndef NTOS_MODE_USER typedef struct _IO_TIMER { USHORT Type; @@ -127,52 +550,33 @@ typedef struct _DEVICE_NODE { - /* A tree structure. */ struct _DEVICE_NODE *Parent; struct _DEVICE_NODE *PrevSibling; struct _DEVICE_NODE *NextSibling; struct _DEVICE_NODE *Child; - /* The level of deepness in the tree. */ UINT Level; - PPO_DEVICE_NOTIFY Notify; - /* State machine. */ + struct _PO_DEVICE_NOTIFY *Notify; PNP_DEVNODE_STATE State; PNP_DEVNODE_STATE PreviousState; PNP_DEVNODE_STATE StateHistory[20]; UINT StateHistoryEntry; - /* ? */ INT CompletionStatus; - /* ? */ PIRP PendingIrp; - /* See DNF_* flags below (WinDBG documentation has WRONG values) */ ULONG Flags; - /* See DNUF_* flags below (and IRP_MN_QUERY_PNP_DEVICE_STATE) */ ULONG UserFlags; - /* See CM_PROB_* values are defined in cfg.h */ ULONG Problem; - /* Pointer to the PDO corresponding to the device node. */ PDEVICE_OBJECT PhysicalDeviceObject; - /* Resource list as assigned by the PnP arbiter. See IRP_MN_START_DEVICE - and ARBITER_INTERFACE (not documented in DDK, but present in headers). */ PCM_RESOURCE_LIST ResourceList; - /* Resource list as assigned by the PnP arbiter (translated version). */ PCM_RESOURCE_LIST ResourceListTranslated; - /* Instance path relative to the Enum key in registry. */ UNICODE_STRING InstancePath; - /* Name of the driver service. */ UNICODE_STRING ServiceName; - /* ? */ PDEVICE_OBJECT DuplicatePDO; - /* See IRP_MN_QUERY_RESOURCE_REQUIREMENTS. */ PIO_RESOURCE_REQUIREMENTS_LIST ResourceRequirements; - /* Information about bus for bus drivers. */ INTERFACE_TYPE InterfaceType; ULONG BusNumber; - /* Information about underlying bus for child devices. */ INTERFACE_TYPE ChildInterfaceType; ULONG ChildBusNumber; USHORT ChildBusTypeIndex; - /* ? */ UCHAR RemovalPolicy; UCHAR HardwareRemovalPolicy; LIST_ENTRY TargetDeviceNotify; @@ -191,9 +595,7 @@ { struct _DEVICE_NODE *NextResourceDeviceNode; } OverUsed2; - /* See IRP_MN_QUERY_RESOURCES/IRP_MN_FILTER_RESOURCES. */ PCM_RESOURCE_LIST BootResources; - /* See the bitfields in DEVICE_CAPABILITIES structure. */ ULONG CapabilityFlags; struct { @@ -245,6 +647,77 @@ PVOID ClientIdentificationAddress; CHAR Extension[1]; } PRIVATE_DRIVER_EXTENSIONS, *PPRIVATE_DRIVER_EXTENSIONS; +#endif +/* FUNCTION TYPES ************************************************************/ + +typedef VOID +(NTAPI *PIO_APC_ROUTINE)( + IN PVOID ApcContext, + IN PIO_STATUS_BLOCK IoStatusBlock, + IN ULONG Reserved); + +/* I/O CONTROL CODES *********************************************************/ + +#ifdef NTOS_MODE_USER +/* Mailslots */ +#define FSCTL_MAILSLOT_PEEK \ + CTL_CODE(FILE_DEVICE_MAILSLOT, 0, METHOD_NEITHER, FILE_READ_DATA) + +/* Pipes */ +#define FSCTL_PIPE_ASSIGN_EVENT \ + CTL_CODE(FILE_DEVICE_NAMED_PIPE, 0, METHOD_BUFFERED, FILE_ANY_ACCESS) [truncated at 1000 lines; 2891 more skipped]

19 years, 4 months

← Newer
1
...
15
16
17
18
19
20
21
...
67
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2005