Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [SDK][INCLUDE] Improve gdipluspath.h (#2218)
by Katayama Hirofumi MZ 01 Jan '20

01 Jan '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b35558b46389d10e37a73… commit b35558b46389d10e37a738f34ba765b0ce109de1 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jan 1 15:40:05 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 1 15:40:05 2020 +0900 [SDK][INCLUDE] Improve gdipluspath.h (#2218) CORE-16585 --- sdk/include/psdk/gdipluspath.h | 324 +++++++++++++++++++++++++++++------------ 1 file changed, 234 insertions(+), 90 deletions(-) diff --git a/sdk/include/psdk/gdipluspath.h b/sdk/include/psdk/gdipluspath.h index 2d2b3f3f2af..2665bccbb0a 100644 --- a/sdk/include/psdk/gdipluspath.h +++ b/sdk/include/psdk/gdipluspath.h @@ -420,73 +420,89 @@ class GraphicsPath : public GdiplusBase } Status - GetPathPoints(Point *points, INT count) + GetPathPoints(Point *points, INT count) const { - return NotImplemented; + return SetStatus(DllExports::GdipGetPathPointsI(nativePath, points, count)); } Status - GetPathPoints(PointF *points, INT count) + GetPathPoints(PointF *points, INT count) const { - return NotImplemented; + return SetStatus(DllExports::GdipGetPathPoints(nativePath, points, count)); } Status - GetPathTypes(BYTE *types, INT count) + GetPathTypes(BYTE *types, INT count) const { - return NotImplemented; + return SetStatus(DllExports::GdipGetPathTypes(nativePath, types, count)); } INT - GetPointCount() + GetPointCount() const { - return 0; + INT count = 0; + SetStatus(DllExports::GdipGetPointCount(nativePath, &count)); + return count; } BOOL - IsOutlineVisible(const Point &point, const Pen *pen, const Graphics *g) + IsOutlineVisible(const Point &point, const Pen *pen, const Graphics *g) const { - return FALSE; + return IsOutlineVisible(point.X, point.Y, pen, g); } BOOL - IsOutlineVisible(REAL x, REAL y, const Pen *pen, const Graphics *g) + IsOutlineVisible(REAL x, REAL y, const Pen *pen, const Graphics *g) const { - return FALSE; + GpGraphics *nativeGraphics = g ? getNat(g) : NULL; + GpPen *nativePen = pen ? getNat(pen) : NULL; + BOOL flag = FALSE; + SetStatus(DllExports::GdipIsOutlineVisiblePathPoint(nativePath, x, y, nativePen, nativeGraphics, &flag)); + return flag; } BOOL - IsOutlineVisible(INT x, INT y, const Pen *pen, const Graphics *g) + IsOutlineVisible(INT x, INT y, const Pen *pen, const Graphics *g) const { - return FALSE; + GpGraphics *nativeGraphics = g ? getNat(g) : NULL; + GpPen *nativePen = pen ? getNat(pen) : NULL; + BOOL flag = FALSE; + SetStatus(DllExports::GdipIsOutlineVisiblePathPointI(nativePath, x, y, nativePen, nativeGraphics, &flag)); + return flag; } BOOL - IsOutlineVisible(const PointF &point, const Pen *pen, const Graphics *g) + IsOutlineVisible(const PointF &point, const Pen *pen, const Graphics *g) const { - return FALSE; + return IsOutlineVisible(point.X, point.Y, pen, g); } BOOL - IsVisible(REAL x, REAL y, const Graphics *g) + IsVisible(REAL x, REAL y, const Graphics *g) const { - return FALSE; + GpGraphics *nativeGraphics = g ? getNat(g) : NULL; + BOOL flag = FALSE; + SetStatus(DllExports::GdipIsVisiblePathPoint(nativePath, x, y, nativeGraphics, &flag)); + return flag; } BOOL - IsVisible(const PointF &point, const Graphics *g) + IsVisible(const PointF &point, const Graphics *g) const { return IsVisible(point.X, point.Y, g); } BOOL - IsVisible(INT x, INT y, const Graphics *g) + IsVisible(INT x, INT y, const Graphics *g) const { - return FALSE; + GpGraphics *nativeGraphics = g ? getNat(g) : NULL; + BOOL flag = FALSE; + SetStatus(DllExports::GdipIsVisiblePathPointI(nativePath, x, y, nativeGraphics, &flag)); + return flag; } BOOL - IsVisible(const Point &point, const Graphics *g) + IsVisible(const Point &point, const Graphics *g) const { return IsVisible(point.X, point.Y, g); } @@ -494,7 +510,12 @@ class GraphicsPath : public GdiplusBase Status Outline(const Matrix *matrix, REAL flatness) { - return NotImplemented; +#if 1 + return SetStatus(NotImplemented); // FIXME +#else + GpMatrix *nativeMatrix = matrix ? getNat(matrix) : NULL; + return SetStatus(DllExports::GdipWindingModeOutline(nativePath, nativeMatrix, flatness)); +#endif } Status @@ -601,273 +622,377 @@ class GraphicsPathIterator : public GdiplusBase public: GraphicsPathIterator(GraphicsPath *path) { + GpPathIterator *it = NULL; + GpPath *nativePath = path ? getNat(path) : NULL; + lastStatus = DllExports::GdipCreatePathIter(&it, nativePath); + nativeIterator = it; + } + + ~GraphicsPathIterator() + { + DllExports::GdipDeletePathIter(nativeIterator); } INT CopyData(PointF *points, BYTE *types, INT startIndex, INT endIndex) { - return 0; + INT resultCount; + SetStatus(DllExports::GdipPathIterCopyData(nativeIterator, &resultCount, points, types, startIndex, endIndex)); + return resultCount; } INT Enumerate(PointF *points, BYTE *types, INT count) { - return 0; + INT resultCount; + SetStatus(DllExports::GdipPathIterEnumerate(nativeIterator, &resultCount, points, types, count)); + return resultCount; } INT - GetCount() + GetCount() const { - return 0; + INT resultCount; + SetStatus(DllExports::GdipPathIterGetCount(nativeIterator, &resultCount)); + return resultCount; } Status GetLastStatus() const { - return NotImplemented; + return lastStatus; } INT GetSubpathCount() const { - return 0; + INT resultCount; + SetStatus(DllExports::GdipPathIterGetSubpathCount(nativeIterator, &resultCount)); + return resultCount; } BOOL HasCurve() const { - return FALSE; + BOOL hasCurve; + SetStatus(DllExports::GdipPathIterHasCurve(nativeIterator, &hasCurve)); + return hasCurve; } INT NextMarker(GraphicsPath *path) { - return 0; + INT resultCount; + GpPath *nativePath = path ? getNat(path) : NULL; + SetStatus(DllExports::GdipPathIterNextMarkerPath(nativeIterator, &resultCount, nativePath)); + return resultCount; } INT NextMarker(INT *startIndex, INT *endIndex) { - return 0; + INT resultCount; + SetStatus(DllExports::GdipPathIterNextMarker(nativeIterator, &resultCount, startIndex, endIndex)); + return resultCount; } INT NextPathType(BYTE *pathType, INT *startIndex, INT *endIndex) { - return 0; + INT resultCount; + SetStatus(DllExports::GdipPathIterNextPathType(nativeIterator, &resultCount, pathType, startIndex, endIndex)); + return resultCount; } INT NextSubpath(GraphicsPath *path, BOOL *isClosed) { - return 0; + GpPath *nativePath = path ? getNat(path) : NULL; + INT resultCount; + SetStatus(DllExports::GdipPathIterNextSubpathPath(nativeIterator, &resultCount, nativePath, isClosed)); + return resultCount; } INT NextSubpath(INT *startIndex, INT *endIndex, BOOL *isClosed) { - return 0; + INT resultCount; + SetStatus(DllExports::GdipPathIterNextSubpath(nativeIterator, &resultCount, startIndex, endIndex, isClosed)); + return resultCount; } VOID Rewind() { + SetStatus(DllExports::GdipPathIterRewind(nativeIterator)); + } + + protected: + GpPathIterator *nativeIterator; + mutable Status lastStatus; + + Status + SetStatus(Status status) const + { + if (status != Ok) + lastStatus = status; + return status; } }; class PathGradientBrush : public Brush { public: - PathGradientBrush(const Point *points, INT count, WrapMode wrapMode) + friend class Pen; + + PathGradientBrush(const Point *points, INT count, WrapMode wrapMode = WrapModeClamp) { + GpPathGradient *brush = NULL; + lastStatus = DllExports::GdipCreatePathGradientI(points, count, wrapMode, &brush); + SetNativeBrush(brush); } - PathGradientBrush(const PointF *points, INT count, WrapMode wrapMode) + PathGradientBrush(const PointF *points, INT count, WrapMode wrapMode = WrapModeClamp) { + GpPathGradient *brush = NULL; + lastStatus = DllExports::GdipCreatePathGradient(points, count, wrapMode, &brush); + SetNativeBrush(brush); } PathGradientBrush(const GraphicsPath *path) { + GpPathGradient *brush = NULL; + lastStatus = DllExports::GdipCreatePathGradientFromPath(getNat(path), &brush); + SetNativeBrush(brush); } INT - GetBlendCount() + GetBlendCount() const { - return 0; + INT count = 0; + SetStatus(DllExports::GdipGetPathGradientBlendCount(GetNativeGradient(), &count)); + return count; } Status - GetBlend(REAL *blendFactors, REAL *blendPositions, INT count) + GetBlend(REAL *blendFactors, REAL *blendPositions, INT count) const { - return NotImplemented; + return SetStatus( + DllExports::GdipGetPathGradientBlend(GetNativeGradient(), blendFactors, blendPositions, count)); } Status - GetCenterColor(Color *color) + GetCenterColor(Color *color) const { - return NotImplemented; + if (color != NULL) + return SetStatus(InvalidParameter); + + ARGB argb; + SetStatus(DllExports::GdipGetPathGradientCenterColor(GetNativeGradient(), &argb)); + color->SetValue(argb); + return GetLastStatus(); } Status - GetCenterPoint(Point *point) + GetCenterPoint(Point *point) const { - return NotImplemented; + return SetStatus(DllExports::GdipGetPathGradientCenterPointI(GetNativeGradient(), point)); } Status - GetCenterPoint(PointF *point) + GetCenterPoint(PointF *point) const { - return NotImplemented; + return SetStatus(DllExports::GdipGetPathGradientCenterPoint(GetNativeGradient(), point)); } Status - GetFocusScales(REAL *xScale, REAL *yScale) + GetFocusScales(REAL *xScale, REAL *yScale) const { - return NotImplemented; + return SetStatus(DllExports::GdipGetPathGradientFocusScales(GetNativeGradient(), xScale, yScale)); } BOOL - GetGammaCorrection() + GetGammaCorrection() const { - return FALSE; + BOOL useGammaCorrection; + SetStatus(DllExports::GdipGetPathGradientGammaCorrection(GetNativeGradient(), &useGammaCorrection)); + return useGammaCorrection; } Status - GetGraphicsPath(GraphicsPath *path) + GetGraphicsPath(GraphicsPath *path) const { - return NotImplemented; + if (!path) + return SetStatus(InvalidParameter); + + return SetStatus(DllExports::GdipGetPathGradientPath(GetNativeGradient(), getNat(path))); } INT - GetInterpolationColorCount() + GetInterpolationColorCount() const { - return 0; + INT count = 0; + SetStatus(DllExports::GdipGetPathGradientPresetBlendCount(GetNativeGradient(), &count)); + return count; } Status - GetInterpolationColors(Color *presetColors, REAL *blendPositions, INT count) + GetInterpolationColors(Color *presetColors, REAL *blendPositions, INT count) const { return NotImplemented; } INT - GetPointCount() + GetPointCount() const { - return 0; + INT count; + SetStatus(DllExports::GdipGetPathGradientPointCount(GetNativeGradient(), &count)); + return count; } Status - GetRectangle(RectF *rect) + GetRectangle(RectF *rect) const { - return NotImplemented; + return SetStatus(DllExports::GdipGetPathGradientRect(GetNativeGradient(), rect)); } Status - GetRectangle(Rect *rect) + GetRectangle(Rect *rect) const { - return NotImplemented; + return SetStatus(DllExports::GdipGetPathGradientRectI(GetNativeGradient(), rect)); } INT - GetSurroundColorCount() + GetSurroundColorCount() const { - return 0; + INT count; + SetStatus(DllExports::GdipGetPathGradientSurroundColorCount(GetNativeGradient(), &count)); + return count; } Status - GetSurroundColors(Color *colors, INT *count) + GetSurroundColors(Color *colors, INT *count) const { return NotImplemented; } Status - GetTransform(Matrix *matrix) + GetTransform(Matrix *matrix) const { - return NotImplemented; +#if 1 + return SetStatus(NotImplemented); +#else + return SetStatus(DllExports::GdipGetPathGradientTransform(GetNativeGradient(), getNat(matrix))); +#endif } WrapMode - GetWrapMode() + GetWrapMode() const { - return WrapModeTile; + WrapMode wrapMode; + SetStatus(DllExports::GdipGetPathGradientWrapMode(GetNativeGradient(), &wrapMode)); + return wrapMode; } Status - MultiplyTransform(Matrix *matrix, MatrixOrder order) + MultiplyTransform(Matrix *matrix, MatrixOrder order = MatrixOrderPrepend) { - return NotImplemented; +#if 1 + return SetStatus(NotImplemented); +#else + return SetStatus(DllExports::GdipMultiplyPathGradientTransform(GetNativeGradient(), getNat(matrix), order)); +#endif } Status ResetTransform() { - return NotImplemented; +#if 1 + return SetStatus(NotImplemented); +#else + return SetStatus(DllExports::GdipResetPathGradientTransform(GetNativeGradient())); +#endif } Status - RotateTransform(REAL angle, MatrixOrder order) + RotateTransform(REAL angle, MatrixOrder order = MatrixOrderPrepend) { - return NotImplemented; +#if 1 + return SetStatus(NotImplemented); +#else + return SetStatus(DllExports::GdipRotatePathGradientTransform(GetNativeGradient(), angle, order)); +#endif } Status - ScaleTransform(REAL sx, REAL sy, MatrixOrder order) + ScaleTransform(REAL sx, REAL sy, MatrixOrder order = MatrixOrderPrepend) { - return NotImplemented; +#if 1 + return SetStatus(NotImplemented); +#else + return SetStatus(DllExports::GdipScalePathGradientTransform(GetNativeGradient(), sx, sy, order)); +#endif } Status SetBlend(REAL *blendFactors, REAL *blendPositions, INT count) { - return NotImplemented; + return SetStatus( + DllExports::GdipSetPathGradientBlend(GetNativeGradient(), blendFactors, blendPositions, count)); } Status SetBlendBellShape(REAL focus, REAL scale) { - return NotImplemented; + return SetStatus(DllExports::GdipSetPathGradientSigmaBlend(GetNativeGradient(), focus, scale)); } Status - SetBlendTriangularShape(REAL focus, REAL scale) + SetBlendTriangularShape(REAL focus, REAL scale = 1.0f) { - return NotImplemented; +#if 1 + return SetStatus(NotImplemented); +#else + return SetStatus(DllExports::GdipSetPathGradientLinearBlend(GetNativeGradient(), focus, scale)); +#endif } Status SetCenterColor(const Color &color) { - return NotImplemented; + return SetStatus(DllExports::GdipSetPathGradientCenterColor(GetNativeGradient(), color.GetValue())); } Status SetCenterPoint(const Point &point) { - return NotImplemented; + return SetStatus(DllExports::GdipSetPathGradientCenterPointI(GetNativeGradient(), const_cast<Point *>(&point))); } Status SetCenterPoint(const PointF &point) { - return NotImplemented; + return SetStatus(DllExports::GdipSetPathGradientCenterPoint(GetNativeGradient(), const_cast<PointF *>(&point))); } Status SetFocusScales(REAL xScale, REAL yScale) { - return NotImplemented; + return SetStatus(DllExports::GdipSetPathGradientFocusScales(GetNativeGradient(), xScale, yScale)); } Status SetGammaCorrection(BOOL useGammaCorrection) { - return NotImplemented; + return SetStatus(DllExports::GdipSetPathGradientGammaCorrection(GetNativeGradient(), useGammaCorrection)); } Status SetGraphicsPath(const GraphicsPath *path) { - return NotImplemented; + if (!path) + return SetStatus(InvalidParameter); + return SetStatus(DllExports::GdipSetPathGradientPath(GetNativeGradient(), getNat(path))); } Status @@ -885,19 +1010,38 @@ class PathGradientBrush : public Brush Status SetTransform(const Matrix *matrix) { - return NotImplemented; +#if 1 + return SetStatus(NotImplemented); +#else + return SetStatus(DllExports::GdipSetPathGradientTransform(GetNativeGradient(), getNat(matrix))); +#endif } Status SetWrapMode(WrapMode wrapMode) { - return NotImplemented; + return SetStatus(DllExports::GdipSetPathGradientWrapMode(GetNativeGradient(), wrapMode)); } Status - TranslateTransform(REAL dx, REAL dy, MatrixOrder order) + TranslateTransform(REAL dx, REAL dy, MatrixOrder order = MatrixOrderPrepend) + { +#if 1 + return SetStatus(NotImplemented); +#else + return SetStatus(DllExports::GdipTranslatePathGradientTransform(GetNativeGradient(), dx, dy, order)); +#endif + } + + protected: + GpPathGradient * + GetNativeGradient() const + { + return static_cast<GpPathGradient *>(nativeBrush); + } + + PathGradientBrush() { - return NotImplemented; } };

1 0

[reactos] 01/01: [SDK][INCLUDE] Refinement of Gdiplus headers (#2217)
by Katayama Hirofumi MZ 01 Jan '20

01 Jan '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=84de8c3f2563a3fb7f433… commit 84de8c3f2563a3fb7f433d7a06ebc27d5fb6a7df Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jan 1 13:53:30 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 1 13:53:30 2020 +0900 [SDK][INCLUDE] Refinement of Gdiplus headers (#2217) Define getNat helper functions in gdiplusbase.h and use them. CORE-16585 --- sdk/include/psdk/gdiplusbase.h | 49 +++++++++++++++++++++++++++++++++++ sdk/include/psdk/gdiplusbrush.h | 22 ++++++---------- sdk/include/psdk/gdiplusgraphics.h | 39 +++------------------------- sdk/include/psdk/gdiplusheaders.h | 53 ++++++++++++++++++++++++-------------- sdk/include/psdk/gdipluslinecaps.h | 4 +-- sdk/include/psdk/gdiplusmatrix.h | 4 +-- sdk/include/psdk/gdipluspath.h | 18 +++---------- sdk/include/psdk/gdipluspen.h | 16 ++++-------- 8 files changed, 105 insertions(+), 100 deletions(-) diff --git a/sdk/include/psdk/gdiplusbase.h b/sdk/include/psdk/gdiplusbase.h index 274195c243f..92e3aafc7c5 100644 --- a/sdk/include/psdk/gdiplusbase.h +++ b/sdk/include/psdk/gdiplusbase.h @@ -47,4 +47,53 @@ class GdiplusBase } }; +class Brush; +class CachedBitmap; +class CustomLineCap; +class Font; +class FontCollection; +class FontFamily; +class Graphics; +class GraphicsPath; +class Image; +class ImageAttributes; +class Matrix; +class Metafile; +class Pen; +class Region; + +// get native +GpBrush *& +getNat(const Brush *brush); + +GpCachedBitmap *& +getNat(const CachedBitmap *cb); + +GpCustomLineCap *& +getNat(const CustomLineCap *cap); + +GpFontCollection *& +getNat(const FontCollection *fc); + +GpGraphics *& +getNat(const Graphics *graphics); + +GpPath *& +getNat(const GraphicsPath *path); + +GpImage *& +getNat(const Image *image); + +GpImageAttributes *& +getNat(const ImageAttributes *ia); + +GpMatrix *& +getNat(const Matrix *matrix); + +GpPen *& +getNat(const Pen *pen); + +GpRegion *& +getNat(const Region *region); + #endif /* _GDIPLUSBASE_H */ diff --git a/sdk/include/psdk/gdiplusbrush.h b/sdk/include/psdk/gdiplusbrush.h index 2416135294e..cb98a7a3e22 100644 --- a/sdk/include/psdk/gdiplusbrush.h +++ b/sdk/include/psdk/gdiplusbrush.h @@ -19,8 +19,6 @@ #ifndef _GDIPLUSBRUSH_H #define _GDIPLUSBRUSH_H -class Image; - class Brush : public GdiplusBase { public: @@ -302,7 +300,7 @@ class LinearGradientBrush : public Brush GetTransform(Matrix *matrix) const { GpLineGradient *gradient = GetNativeGradient(); - return SetStatus(DllExports::GdipGetLineTransform(gradient, matrix->nativeMatrix)); + return SetStatus(DllExports::GdipGetLineTransform(gradient, getNat(matrix))); } WrapMode @@ -319,7 +317,7 @@ class LinearGradientBrush : public Brush MultiplyTransform(const Matrix *matrix, MatrixOrder order) { GpLineGradient *gradient = GetNativeGradient(); - return SetStatus(DllExports::GdipMultiplyLineTransform(gradient, matrix->nativeMatrix, order)); + return SetStatus(DllExports::GdipMultiplyLineTransform(gradient, getNat(matrix), order)); } Status @@ -388,7 +386,7 @@ class LinearGradientBrush : public Brush SetTransform(const Matrix *matrix) { GpLineGradient *gradient = GetNativeGradient(); - return SetStatus(DllExports::GdipSetLineTransform(gradient, matrix->nativeMatrix)); + return SetStatus(DllExports::GdipSetLineTransform(gradient, getNat(matrix))); } Status @@ -502,10 +500,6 @@ class SolidBrush : Brush } }; -// get native -GpImage *& -getNat(const Image *image); - class TextureBrush : Brush { public: @@ -520,7 +514,7 @@ class TextureBrush : Brush TextureBrush(Image *image, Rect &dstRect, ImageAttributes *imageAttributes) { GpTexture *texture = NULL; - GpImageAttributes *attrs = imageAttributes ? imageAttributes->nativeImageAttr : NULL; + GpImageAttributes *attrs = imageAttributes ? getNat(imageAttributes) : NULL; lastStatus = DllExports::GdipCreateTextureIA( getNat(image), attrs, dstRect.X, dstRect.Y, dstRect.Width, dstRect.Height, &texture); SetNativeBrush(texture); @@ -544,7 +538,7 @@ class TextureBrush : Brush TextureBrush(Image *image, RectF &dstRect, ImageAttributes *imageAttributes) { GpTexture *texture = NULL; - GpImageAttributes *attrs = imageAttributes ? imageAttributes->nativeImageAttr : NULL; + GpImageAttributes *attrs = imageAttributes ? getNat(imageAttributes) : NULL; lastStatus = DllExports::GdipCreateTextureIA( getNat(image), attrs, dstRect.X, dstRect.Y, dstRect.Width, dstRect.Height, &texture); SetNativeBrush(texture); @@ -573,7 +567,7 @@ class TextureBrush : Brush GetTransform(Matrix *matrix) const { GpTexture *texture = GetNativeTexture(); - return SetStatus(DllExports::GdipGetTextureTransform(texture, matrix->nativeMatrix)); + return SetStatus(DllExports::GdipGetTextureTransform(texture, getNat(matrix))); } WrapMode @@ -589,7 +583,7 @@ class TextureBrush : Brush MultiplyTransform(Matrix *matrix, MatrixOrder order = MatrixOrderPrepend) { GpTexture *texture = GetNativeTexture(); - return SetStatus(DllExports::GdipMultiplyTextureTransform(texture, matrix->nativeMatrix, order)); + return SetStatus(DllExports::GdipMultiplyTextureTransform(texture, getNat(matrix), order)); } Status @@ -617,7 +611,7 @@ class TextureBrush : Brush SetTransform(const Matrix *matrix) { GpTexture *texture = GetNativeTexture(); - return SetStatus(DllExports::GdipSetTextureTransform(texture, matrix->nativeMatrix)); + return SetStatus(DllExports::GdipSetTextureTransform(texture, getNat(matrix))); } Status diff --git a/sdk/include/psdk/gdiplusgraphics.h b/sdk/include/psdk/gdiplusgraphics.h index f34c1093cc5..d93dd542694 100644 --- a/sdk/include/psdk/gdiplusgraphics.h +++ b/sdk/include/psdk/gdiplusgraphics.h @@ -19,39 +19,6 @@ #ifndef _GDIPLUSGRAPHICS_H #define _GDIPLUSGRAPHICS_H -class Image; -class ImageAttributes; -class CachedBitmap; -class Region; -class Font; -class GraphicsPath; -class Metafile; - -// get native -GpImage *& -getNat(const Image *image); - -GpPen *& -getNat(const Pen *pen); - -GpBrush *& -getNat(const Brush *brush); - -GpCachedBitmap *& -getNat(const CachedBitmap *cb); - -GpImageAttributes *& -getNat(const ImageAttributes *ia); - -GpRegion *& -getNat(const Region *region); - -GpMatrix *& -getNat(const Matrix *matrix); - -GpPath *& -getNat(const GraphicsPath *path); - class Graphics : public GdiplusBase { friend class Region; @@ -1401,7 +1368,7 @@ class Graphics : public GdiplusBase Status SetClip(const Graphics *g, CombineMode combineMode = CombineModeReplace) { - return SetStatus(DllExports::GdipSetClipGraphics(nativeGraphics, g ? g->nativeGraphics : NULL, combineMode)); + return SetStatus(DllExports::GdipSetClipGraphics(nativeGraphics, g ? getNat(g) : NULL, combineMode)); } Status @@ -1553,9 +1520,9 @@ class Graphics : public GdiplusBase // get native friend inline GpGraphics *& - getNat(const Graphics *graph) + getNat(const Graphics *graphics) { - return const_cast<Graphics *>(graph)->nativeGraphics; + return const_cast<Graphics *>(graphics)->nativeGraphics; } }; diff --git a/sdk/include/psdk/gdiplusheaders.h b/sdk/include/psdk/gdiplusheaders.h index 2cd2a35657f..d839ce324ff 100644 --- a/sdk/include/psdk/gdiplusheaders.h +++ b/sdk/include/psdk/gdiplusheaders.h @@ -310,7 +310,7 @@ class Image : public GdiplusBase if (!newImage) return SetStatus(InvalidParameter); - return SetStatus(DllExports::GdipSaveAddImage(nativeImage, newImage->nativeImage, encoderParams)); + return SetStatus(DllExports::GdipSaveAddImage(nativeImage, getNat(newImage), encoderParams)); #endif } @@ -386,10 +386,6 @@ class Image : public GdiplusBase } }; -// get native -GpGraphics *& -getNat(const Graphics *graph); - class Bitmap : public Image { friend class CachedBitmap; @@ -714,6 +710,13 @@ class FontCollection : public GdiplusBase FontCollection(const FontCollection &); FontCollection & operator=(const FontCollection &); + + // get native + friend inline GpFontCollection *& + getNat(const FontCollection *fc) + { + return const_cast<FontCollection *>(fc)->nativeFontCollection; + } }; class FontFamily : public GdiplusBase @@ -727,7 +730,7 @@ class FontFamily : public GdiplusBase FontFamily(const WCHAR *name, const FontCollection *fontCollection) { - GpFontCollection *theCollection = fontCollection ? fontCollection->nativeFontCollection : NULL; + GpFontCollection *theCollection = fontCollection ? getNat(fontCollection) : NULL; status = DllExports::GdipCreateFontFamilyFromName(name, theCollection, &fontFamily); } @@ -834,6 +837,13 @@ class FontFamily : public GdiplusBase this->status = status; return status; } + + // get native + friend inline GpFontFamily *& + getNat(const FontFamily *ff) + { + return const_cast<FontFamily *>(ff)->fontFamily; + } }; class InstalledFontFamily : public FontFamily @@ -1001,6 +1011,13 @@ class Font : public GdiplusBase this->status = status; return status; } + + // get native + friend inline GpFont *& + getNat(const Font *font) + { + return const_cast<Font *>(font)->font; + } }; class Region : public GdiplusBase @@ -1027,7 +1044,7 @@ class Region : public GdiplusBase Region(const GraphicsPath *path) { - lastStatus = DllExports::GdipCreateRegionPath(path->nativePath, &nativeRegion); + lastStatus = DllExports::GdipCreateRegionPath(getNat(path), &nativeRegion); } Region(HRGN hRgn) @@ -1052,7 +1069,7 @@ class Region : public GdiplusBase Status Complement(const GraphicsPath *path) { - GpPath *thePath = path ? path->nativePath : NULL; + GpPath *thePath = path ? getNat(path) : NULL; return SetStatus(DllExports::GdipCombineRegionPath(nativeRegion, thePath, CombineModeComplement)); } @@ -1088,7 +1105,7 @@ class Region : public GdiplusBase Exclude(const GraphicsPath *path) { return SetStatus( - DllExports::GdipCombineRegionPath(nativeRegion, path ? path->nativePath : NULL, CombineModeExclude)); + DllExports::GdipCombineRegionPath(nativeRegion, path ? getNat(path) : NULL, CombineModeExclude)); } Status @@ -1159,22 +1176,20 @@ class Region : public GdiplusBase Status GetRegionScans(const Matrix *matrix, Rect *rects, INT *count) const { - return SetStatus( - DllExports::GdipGetRegionScansI(nativeRegion, rects, count, matrix ? matrix->nativeMatrix : NULL)); + return SetStatus(DllExports::GdipGetRegionScansI(nativeRegion, rects, count, matrix ? getNat(matrix) : NULL)); } Status GetRegionScans(const Matrix *matrix, RectF *rects, INT *count) const { - return SetStatus( - DllExports::GdipGetRegionScans(nativeRegion, rects, count, matrix ? matrix->nativeMatrix : NULL)); + return SetStatus(DllExports::GdipGetRegionScans(nativeRegion, rects, count, matrix ? getNat(matrix) : NULL)); } UINT GetRegionScansCount(const Matrix *matrix) const { UINT count; - SetStatus(DllExports::GdipGetRegionScansCount(nativeRegion, &count, matrix ? matrix->nativeMatrix : NULL)); + SetStatus(DllExports::GdipGetRegionScansCount(nativeRegion, &count, matrix ? getNat(matrix) : NULL)); return count; } @@ -1187,7 +1202,7 @@ class Region : public GdiplusBase Status Intersect(const GraphicsPath *path) { - GpPath *thePath = path ? path->nativePath : NULL; + GpPath *thePath = path ? getNat(path) : NULL; return SetStatus(DllExports::GdipCombineRegionPath(nativeRegion, thePath, CombineModeIntersect)); } @@ -1303,7 +1318,7 @@ class Region : public GdiplusBase Status Transform(const Matrix *matrix) { - return SetStatus(DllExports::GdipTransformRegion(nativeRegion, matrix ? matrix->nativeMatrix : NULL)); + return SetStatus(DllExports::GdipTransformRegion(nativeRegion, matrix ? getNat(matrix) : NULL)); } Status @@ -1340,15 +1355,13 @@ class Region : public GdiplusBase Status Union(const GraphicsPath *path) { - return SetStatus( - DllExports::GdipCombineRegionPath(nativeRegion, path ? path->nativePath : NULL, CombineModeUnion)); + return SetStatus(DllExports::GdipCombineRegionPath(nativeRegion, path ? getNat(path) : NULL, CombineModeUnion)); } Status Xor(const GraphicsPath *path) { - return SetStatus( - DllExports::GdipCombineRegionPath(nativeRegion, path ? path->nativePath : NULL, CombineModeXor)); + return SetStatus(DllExports::GdipCombineRegionPath(nativeRegion, path ? getNat(path) : NULL, CombineModeXor)); } Status diff --git a/sdk/include/psdk/gdipluslinecaps.h b/sdk/include/psdk/gdipluslinecaps.h index 0a0d26bada7..d449874b5e7 100644 --- a/sdk/include/psdk/gdipluslinecaps.h +++ b/sdk/include/psdk/gdipluslinecaps.h @@ -27,8 +27,8 @@ inline CustomLineCap::CustomLineCap( : nativeCap(NULL) { nativeCap = NULL; - GpPath *nativeFillPath = fillPath ? fillPath->nativePath : NULL; - GpPath *nativeStrokePath = strokePath ? strokePath->nativePath : NULL; + GpPath *nativeFillPath = fillPath ? getNat(fillPath) : NULL; + GpPath *nativeStrokePath = strokePath ? getNat(strokePath) : NULL; lastStatus = DllExports::GdipCreateCustomLineCap(nativeFillPath, nativeStrokePath, baseCap, baseInset, &nativeCap); } diff --git a/sdk/include/psdk/gdiplusmatrix.h b/sdk/include/psdk/gdiplusmatrix.h index c822be2cd4d..124b070a9e4 100644 --- a/sdk/include/psdk/gdiplusmatrix.h +++ b/sdk/include/psdk/gdiplusmatrix.h @@ -70,7 +70,7 @@ class Matrix : public GdiplusBase Equals(const Matrix *matrix) { BOOL result; - SetStatus(DllExports::GdipIsMatrixEqual(nativeMatrix, matrix ? matrix->nativeMatrix : NULL, &result)); + SetStatus(DllExports::GdipIsMatrixEqual(nativeMatrix, matrix ? getNat(matrix) : NULL, &result)); return result; } @@ -111,7 +111,7 @@ class Matrix : public GdiplusBase Status Multiply(const Matrix *matrix, MatrixOrder order) { - return SetStatus(DllExports::GdipMultiplyMatrix(nativeMatrix, matrix ? matrix->nativeMatrix : NULL, order)); + return SetStatus(DllExports::GdipMultiplyMatrix(nativeMatrix, matrix ? getNat(matrix) : NULL, order)); } REAL OffsetX(VOID) diff --git a/sdk/include/psdk/gdipluspath.h b/sdk/include/psdk/gdipluspath.h index a937784628c..2d2b3f3f2af 100644 --- a/sdk/include/psdk/gdipluspath.h +++ b/sdk/include/psdk/gdipluspath.h @@ -19,9 +19,6 @@ #ifndef _GDIPLUSPATH_H #define _GDIPLUSPATH_H -class FontFamily; -class Graphics; - class GraphicsPath : public GdiplusBase { friend class Region; @@ -233,10 +230,7 @@ class GraphicsPath : public GdiplusBase Status AddPath(const GraphicsPath *addingPath, BOOL connect) { - GpPath *nativePath2 = NULL; - if (addingPath) - nativePath2 = addingPath->nativePath; - + GpPath *nativePath2 = addingPath ? getNat(addingPath) : NULL; return SetStatus(DllExports::GdipAddPathPath(nativePath, nativePath2, connect)); } @@ -383,10 +377,7 @@ class GraphicsPath : public GdiplusBase Status Flatten(const Matrix *matrix, REAL flatness) { - GpMatrix *nativeMatrix = NULL; - if (matrix) - nativeMatrix = matrix->nativeMatrix; - + GpMatrix *nativeMatrix = matrix ? getNat(matrix) : NULL; return SetStatus(DllExports::GdipFlattenPath(nativePath, nativeMatrix, flatness)); } @@ -553,10 +544,7 @@ class GraphicsPath : public GdiplusBase WarpMode warpMode, REAL flatness) { - GpMatrix *nativeMatrix = NULL; - if (matrix) - nativeMatrix = matrix->nativeMatrix; - + GpMatrix *nativeMatrix = matrix ? getNat(matrix) : NULL; return SetStatus(DllExports::GdipWarpPath( nativePath, nativeMatrix, destPoints, count, srcRect.X, srcRect.Y, srcRect.Width, srcRect.Height, warpMode, flatness)); diff --git a/sdk/include/psdk/gdipluspen.h b/sdk/include/psdk/gdipluspen.h index 76291aea017..58c08a4ed98 100644 --- a/sdk/include/psdk/gdipluspen.h +++ b/sdk/include/psdk/gdipluspen.h @@ -19,12 +19,6 @@ #ifndef _GDIPLUSPEN_H #define _GDIPLUSPEN_H -class CustomLineCap; - -// get native -GpCustomLineCap *& -getNat(const CustomLineCap *cap); - class Pen : public GdiplusBase { public: @@ -33,7 +27,7 @@ class Pen : public GdiplusBase Pen(const Brush *brush, REAL width = 1.0f) : nativePen(NULL) { - lastStatus = DllExports::GdipCreatePen2(brush->nativeBrush, width, UnitWorld, &nativePen); + lastStatus = DllExports::GdipCreatePen2(getNat(brush), width, UnitWorld, &nativePen); } Pen(const Color &color, REAL width = 1.0f) : nativePen(NULL) @@ -218,7 +212,7 @@ class Pen : public GdiplusBase Status GetTransform(Matrix *matrix) { - return SetStatus(DllExports::GdipGetPenTransform(nativePen, matrix->nativeMatrix)); + return SetStatus(DllExports::GdipGetPenTransform(nativePen, getNat(matrix))); } REAL @@ -235,7 +229,7 @@ class Pen : public GdiplusBase #if 1 return SetStatus(NotImplemented); #else - return SetStatus(DllExports::GdipMultiplyPenTransform(nativePen, matrix->nativeMatrix, order)); + return SetStatus(DllExports::GdipMultiplyPenTransform(nativePen, getNat(matrix), order)); #endif } @@ -266,7 +260,7 @@ class Pen : public GdiplusBase Status SetBrush(const Brush *brush) { - GpBrush *theBrush = brush ? brush->nativeBrush : NULL; + GpBrush *theBrush = brush ? getNat(brush) : NULL; return SetStatus(DllExports::GdipSetPenBrushFill(nativePen, theBrush)); } @@ -353,7 +347,7 @@ class Pen : public GdiplusBase Status SetTransform(const Matrix *matrix) { - GpMatrix *mat = matrix ? matrix->nativeMatrix : NULL; + GpMatrix *mat = matrix ? getNat(matrix) : NULL; return SetStatus(DllExports::GdipSetPenTransform(nativePen, mat)); }

1 0

[reactos] 01/01: Happy New Year 2020 to everyone!!
by Hermès Bélusca-Maïto 31 Dec '19

31 Dec '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9ba5594599e3f39f279f0… commit 9ba5594599e3f39f279f046ba7a1f13b8989c95c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Jan 1 00:00:00 2020 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Jan 1 00:00:00 2020 +0100 Happy New Year 2020 to everyone!! 🎊 🎆 🍾 🥳 .:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:. __, ,__) __, ,__) __, ,__) ░░▄████▄░▄███▄░▄████▄░▄███▄░░ (--|__| _ ,_ ,_ (--|\ | _ (--\ | _ _ ,_ ░░▀▀░▄██░██░██░▀▀░▄██░██░██░░ _| |(_||_)|_)(_| _| \|(/_(_|_) \|(/_(_|| ░░░▄██▀░░██░██░░▄██▀░░██░██░░ ( | | ,_| ( (__| ░░██████░▀███▀░██████░▀███▀░░ .:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:. ███████████████████████████████████████████████████████████████████████████████ ██████████████████▓▒▒▒▒▒▒▓▓█████████████████████████▓▓▒▒▒▒▒▒▓██████████████████ ███████████████▒▒▒▒▓▓███▓▓▓▒▒░▒▓▓█████████████▓▒▒░▒▒▓▓████▓▓▒▒▒▓███████████████ █████████████▓░░░░░░░░░▒▒▓██████▓▒▒▒▓█████▓▒▒▒▓██████▓▒▒░░░░░░░░░▓█████████████ ███████████▒▓░▒█████████▓▓▒░▒▓███▓▓▓▓▓▓▓▓▓▓▓▓████▒▒▒▒▓▓████████▓▒░▓▓███████████ ██████████▒▒▓░▓██████████████▓▓▓▓▓█████▓▓▓▓▓▓▓▓▒▒███████████████▓░▓░▒██████████ █████████▓░▓█░▓██████████▓▒▒▒▒▓▓▓▓███████▓▓▓▓▓▓▓▓▓▒▒▓███████████▓░█▒░▓█████████ █████████▓▒██▒▒████████▒▒░░░░▒▒▓▓▓███████▓▓▓▓▓▓▓▓▓▓▓▒▒░█████████▒▒█▓▒▒█████████ █████████▓░██▓░▓█████▓▓▒▒░░░░▒▒▓▓▓▓████▓▓▓▓▓▓▓▓▒▒▓▓▓▓▓▒░░▓█████▓░▓█▓░▓█████████ ██████████░▓██▒▒▓██▓▓▓▓▓▒▒▒▒▒▒▓▓▓▓██████▓▓▓▓▓▓▒▒▒▒▒▓▓▓▓▒▒░░███▓░▒██▒░██████████ ██████████▒▒▓██▒▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓█████████▓▓▓▒▒▒▒▒▒▒▒▒▓▒▒▒▒░░▓█▒▒██▓░▓██████████ ███████████▒▒███▒░▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓████▓▓▓▓▓▓▒▒░▒▒▒▒▒▒▒▒▒░░░▒███▒▓███████████ ████████████▒▒█▓▓▒░▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▒░░░░▒▒░░░▒▒▒░░░▓██▒▒████████████ █████████████▒▒▒▒▒▒░▒▓▓▓▓▓▒▒▒▒▒▒▒▒▒▒▒▓▓▓▓▓▓▓▓▒▒░░░░░░░░░░░░░▒▒▒▓▒▒█████████████ ██████████████░░▒▒▒▒░░▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▓▓▓▓▒▒▒▒▒░░░░░░░░░▒░░▒░▒██████████████ ██████████████▓▒░▒▒▒▒▒░░▒▒░░░░░░░░░▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒░░░░░░░░░░░░░▓███████████████ ██████████████▓▒▓░░▒▒▒▒░░░░░░░░░░░░░░░░░▒▒▒▒▒▒░░░░░░░░░░▒░░░░░▓▒▓▓█████████████ ███████████▓▒▓▓▓▒▒░░░░░▒▒░░░░░░░░░░░░░░░░░░░░░░░░░░░░░▒░░░░░░▒▒▒█▒▒▓███████████ ██████████▓▒▒█▓▓▒▒░▒░░░░░▒░░░░░░░░░░░░░░░░░░░░░░░░░░░▒░░░░░▓▒▒▒▒██▒▒▓██████████ █████████▓▒▓██▓▒▒▒▒░░▒░░░░░▒░░░░░░░░░░░░░░░░░░░░░░░▒░░░░░▒▒▒▒▒▒▓███▓▒▓█████████ ████████▓▒▓███▓▒▒▒▒░░░▒░░░░░░▒░░░░░░░░░░░░░░░░░░░▓▒▒▒▒░▒▓▒▒▓▓▒▒▓▒▓██▓▒▓████████ ███████▓▒▓███▒▓▓▒▒▒░░░░░▒░░░░░░▒░░░░░░░░░░░░░░░▓▒▒▒▒░▒▓▒▓▓▓▓▒▒██▓▒▓██▓▒████████ ███████▒▒██▓▒▓█▓▓▒▒░░░░░░░▒░░░░░░▒░░░░░░░░░░░▓▒▒▒▒░▒▓▒▒▒▓▓▓▒▒▓███▓▒███▒▓███████ ██████▓▒▓██▒▒███▓▒▒▒░░░░░░░░▒▒░░░░░▒▒░░░░░░░░▒▒░░▒▓▓▓▓▒▒▒▒▒▒▓█████▒▒██▓░▓██████ ██████▒▒██▒▒█████▓▒▒▒░░░░░░░░░▒░░░░░░░▒░░░░▒▒░░▒▓▒▒▒▒▒▒▒▒▒▒████████▒▒██▒▒██████ ██████▒▓██░▓██████▓▓▒▒▒░░░░░░░░░░▒░░░░░░░▒░░░░▒▒▒▒▒▒▒▓▓▒▒██████████▒░██▒▒██████ ██████▒▒▓▓▒█████████▓▓▒▒▒░░░░░░░░░░▒▒░░░░▒▒▒▓░░░▒▒▒▒▒▓▓████████████▓▒▓▓░▒██████ ██████▓░▒▒▒███████████▓▓▒▒░░░░▒▒▒░▒░▒▒▒▒░░▒▒▒▒▒▓▒░░▒▒██████████████▓░▒▒▒███████ ███████▓▒░░▒█████████▓▒▒░░▒▓▓▒▒▒░░░░▒▒▒▓▒▓▒░░▒▒▓▓██▓▓▒░▒▒▓█████████▒░░▒████████ ██████████▒░░░░░░░▒▒▓▓█████▓▓▒░░▒▓██▓▓████████▒░▒▒▓██████▓▓▒▒░░░░░░░▒██████████ ███████████▓▒▒▒▓▓████▓▓▒▒▒░▒▒█████████████████████▒▒░▒▒▓▓▓███▓▓▒▒▒▒████████████ ████████████████▓▓▓▓▓▓███████████████████████████████████▓▓▓▓▓▓████████████████ ███████████████████████████████████████████████████████████████████████████████ ███████████████████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████▓░░▓████████░░░▓█████ ███▒░░░░▒▓███████████████████████████████████████▒█████▓▒▒▓██▓▒▒▓████▓░█▓░▓████ ███▒█████░▒███▓▒▒▒▒▒▓████▓▒▒▒▒▒▓█▓███▓▒▒▒▒▒▒▓██▓▒░▒▒▓▒▓█████████▓▒██▓▒█████████ ███▒█████░▒█▓▒▒█████▒▒██▒▒▓████▓░▒██▒▒▓████▓▒▓██▓░▓██▓███████████▓▓██▓░░░▒█████ ███▒█▓░░▒▓█▓▒▒▓▒░░▒▓▒░▒▓▒███████▒▒██▒████████████░███▓███████████▓▓██████░▒████ ███▒██░▓███▓▒▓█████████▓▒███████▒▒██▒████████████░███▒▓██████████▓████████░▓███ ███▒███░▒▓██▓▒▒████▓▒▓██▓▒▒▓██▓▒░▒██▓▒▒▓███▓▒▓███░████▓▒▒█████▒▒▓███▓▒▓██░▓████ ███▒████▓░▓████▒▒▒▒▒██████▓▒▒▒▒▓█▓████▓▒▒▒▒▓█████▒███████▓▒▒▒▒▓███████▒▒▒▓█████ ███████████████████████████████████████████████████████████████████████████████ --- dll/win32/msgina/resources/reactos.bmp | Bin 89334 -> 89334 bytes dll/win32/msgina/resources/reactos.svg | 2 +- dll/win32/shell32/res/bitmaps/reactos.bmp | Bin 89334 -> 89334 bytes ntoskrnl/inbv/resources/copyright.bmp | Bin 1712 -> 1852 bytes sdk/include/reactos/version.cmake | 2 +- 5 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/msgina/resources/reactos.bmp b/dll/win32/msgina/resources/reactos.bmp index b069af6c876..bfee4ff308f 100644 Binary files a/dll/win32/msgina/resources/reactos.bmp and b/dll/win32/msgina/resources/reactos.bmp differ diff --git a/dll/win32/msgina/resources/reactos.svg b/dll/win32/msgina/resources/reactos.svg index 61aa38640d1..5edfb2604e4 100644 --- a/dll/win32/msgina/resources/reactos.svg +++ b/dll/win32/msgina/resources/reactos.svg @@ -1930,7 +1930,7 @@ x="5.59375" y="1047.7255" style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#1e2122;fill-opacity:1;font-family:Lucida Sans Unicode;-inkscape-font-specification:Lucida Sans Unicode" - id="tspan3618">Copyright © 1996-2019 ReactOS Team & Contributors</tspan></text> + id="tspan3618">Copyright © 1996-2020 ReactOS Team & Contributors</tspan></text> <g transform="matrix(0.16958533,0,0,0.16958533,89.849943,981.79073)" id="g15501"> diff --git a/dll/win32/shell32/res/bitmaps/reactos.bmp b/dll/win32/shell32/res/bitmaps/reactos.bmp index b069af6c876..bfee4ff308f 100644 Binary files a/dll/win32/shell32/res/bitmaps/reactos.bmp and b/dll/win32/shell32/res/bitmaps/reactos.bmp differ diff --git a/ntoskrnl/inbv/resources/copyright.bmp b/ntoskrnl/inbv/resources/copyright.bmp index 080e462c659..1226788f7f7 100644 Binary files a/ntoskrnl/inbv/resources/copyright.bmp and b/ntoskrnl/inbv/resources/copyright.bmp differ diff --git a/sdk/include/reactos/version.cmake b/sdk/include/reactos/version.cmake index 4ccb3e79e65..af97b8fb45c 100644 --- a/sdk/include/reactos/version.cmake +++ b/sdk/include/reactos/version.cmake @@ -3,7 +3,7 @@ string(TIMESTAMP KERNEL_VERSION_BUILD %Y%m%d UTC) set(KERNEL_VERSION_MAJOR "0") set(KERNEL_VERSION_MINOR "4") set(KERNEL_VERSION_PATCH_LEVEL "14") -set(COPYRIGHT_YEAR "2019") +set(COPYRIGHT_YEAR "2020") # KERNEL_VERSION_BUILD_TYPE is "dev" for Git builds # or "RC1", "RC2", "" for releases.

1 0

[reactos] 01/01: [ADVAPI32] OpenSCManagerA/W: Set the last error even in case of success
by Eric Kohl 31 Dec '19

31 Dec '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5d3fe05505781e3d5add6… commit 5d3fe05505781e3d5add6afc1b64aa062fa7c0db Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue Dec 31 23:23:23 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue Dec 31 23:23:23 2019 +0100 [ADVAPI32] OpenSCManagerA/W: Set the last error even in case of success This fixes a failure in the QueryServiceConfig2 api test. --- dll/win32/advapi32/service/scm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/advapi32/service/scm.c b/dll/win32/advapi32/service/scm.c index 0588caef19e..f373f311add 100644 --- a/dll/win32/advapi32/service/scm.c +++ b/dll/win32/advapi32/service/scm.c @@ -1989,10 +1989,10 @@ OpenSCManagerA(LPCSTR lpMachineName, } RpcEndExcept; + SetLastError(dwError); if (dwError != ERROR_SUCCESS) { TRACE("ROpenSCManagerA() failed (Error %lu)\n", dwError); - SetLastError(dwError); return NULL; } @@ -2033,10 +2033,10 @@ OpenSCManagerW(LPCWSTR lpMachineName, } RpcEndExcept; + SetLastError(dwError); if (dwError != ERROR_SUCCESS) { TRACE("ROpenSCManagerW() failed (Error %lu)\n", dwError); - SetLastError(dwError); return NULL; }

1 0

[reactos] 01/01: [LSASRV] LsarLookupSids: Return proper domain information for nameless domains
by Eric Kohl 31 Dec '19

31 Dec '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=17864b49e33d5da8f067a… commit 17864b49e33d5da8f067aa043d4dcb3a19e33cde Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue Dec 31 17:59:10 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue Dec 31 17:59:10 2019 +0100 [LSASRV] LsarLookupSids: Return proper domain information for nameless domains --- dll/win32/lsasrv/lookup.c | 76 +++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 70 insertions(+), 6 deletions(-) diff --git a/dll/win32/lsasrv/lookup.c b/dll/win32/lsasrv/lookup.c index 79cbffca57c..f593f2b86ae 100644 --- a/dll/win32/lsasrv/lookup.c +++ b/dll/win32/lsasrv/lookup.c @@ -940,6 +940,57 @@ LsapAddDomainToDomainsList(PLSAPR_REFERENCED_DOMAIN_LIST ReferencedDomains, } +static NTSTATUS +LsapAddAuthorityToDomainsList( + PLSAPR_REFERENCED_DOMAIN_LIST ReferencedDomains, + PSID Sid, + PULONG Index) +{ + SID AuthoritySid; + ULONG i; + + RtlInitializeSid(&AuthoritySid, + RtlIdentifierAuthoritySid(Sid), + 0); + + i = 0; + while (i < ReferencedDomains->Entries && + ReferencedDomains->Domains[i].Sid != NULL) + { + if (RtlEqualSid(&AuthoritySid, ReferencedDomains->Domains[i].Sid)) + { + *Index = i; + return STATUS_SUCCESS; + } + + i++; + } + + ReferencedDomains->Domains[i].Sid = MIDL_user_allocate(RtlLengthSid(&AuthoritySid)); + if (ReferencedDomains->Domains[i].Sid == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + RtlCopySid(RtlLengthSid(&AuthoritySid), ReferencedDomains->Domains[i].Sid, &AuthoritySid); + + ReferencedDomains->Domains[i].Name.Length = 0; + ReferencedDomains->Domains[i].Name.MaximumLength = sizeof(WCHAR); + ReferencedDomains->Domains[i].Name.Buffer = MIDL_user_allocate(sizeof(WCHAR)); + if (ReferencedDomains->Domains[i].Name.Buffer == NULL) + { + MIDL_user_free(ReferencedDomains->Domains[i].Sid); + ReferencedDomains->Domains[i].Sid = NULL; + return STATUS_INSUFFICIENT_RESOURCES; + } + + ReferencedDomains->Domains[i].Name.Buffer[0] = UNICODE_NULL; + + ReferencedDomains->Entries++; + *Index = i; + + return STATUS_SUCCESS; +} + + static BOOLEAN LsapIsPrefixSid(IN PSID PrefixSid, IN PSID Sid) @@ -2033,18 +2084,31 @@ LsapLookupWellKnownSids(PLSAPR_SID_ENUM_BUFFER SidEnumBuffer, RtlCopyMemory(NamesBuffer[i].Name.Buffer, ptr->AccountName.Buffer, ptr->AccountName.MaximumLength); - ptr2= LsapLookupIsolatedWellKnownName(&ptr->DomainName); - if (ptr2 != NULL) + if (ptr->DomainName.Length == 0) { - Status = LsapAddDomainToDomainsList(DomainsBuffer, - &ptr2->AccountName, - ptr2->Sid, - &DomainIndex); + Status = LsapAddAuthorityToDomainsList(DomainsBuffer, + SidEnumBuffer->SidInfo[i].Sid, + &DomainIndex); if (!NT_SUCCESS(Status)) goto done; NamesBuffer[i].DomainIndex = DomainIndex; } + else + { + ptr2= LsapLookupIsolatedWellKnownName(&ptr->DomainName); + if (ptr2 != NULL) + { + Status = LsapAddDomainToDomainsList(DomainsBuffer, + &ptr2->AccountName, + ptr2->Sid, + &DomainIndex); + if (!NT_SUCCESS(Status)) + goto done; + + NamesBuffer[i].DomainIndex = DomainIndex; + } + } TRACE("Mapped to: %wZ\n", &NamesBuffer[i].Name);

1 0

[reactos] 01/01: [FREELDR] Obtain Xbox memory map via multiboot spec (#1971)
by Stanislav Motylkov 31 Dec '19

31 Dec '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=96692636e461b5cc4d0f5… commit 96692636e461b5cc4d0f5e9fe4e937eb3fcb8d84 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Tue Dec 31 18:10:34 2019 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Dec 31 16:10:34 2019 +0100 [FREELDR] Obtain Xbox memory map via multiboot spec (#1971) - Also obtain framebuffer memory size the same way. References: https://wiki.osdev.org/Detecting_Memory_(x86)#Memory_Map_Via_GRUB https://www.gnu.org/software/grub/manual/multiboot/multiboot.html#Boot-info… CORE-16216 CORE-16300 --- boot/freeldr/freeldr/arch/i386/multiboot.S | 43 ++++++++++++ boot/freeldr/freeldr/arch/i386/xboxmem.c | 106 +++++++++++++++++++++++++---- boot/freeldr/freeldr/arch/i386/xboxvideo.c | 50 +++++++++++++- boot/freeldr/freeldr/include/multiboot.h | 21 ++++++ 4 files changed, 204 insertions(+), 16 deletions(-) diff --git a/boot/freeldr/freeldr/arch/i386/multiboot.S b/boot/freeldr/freeldr/arch/i386/multiboot.S index 6094000a0e0..296ce0de73f 100644 --- a/boot/freeldr/freeldr/arch/i386/multiboot.S +++ b/boot/freeldr/freeldr/arch/i386/multiboot.S @@ -29,9 +29,13 @@ * the header signature and uses the header to load it. */ +#define MB_INFO_SIZE 60 /* sizeof(multiboot_info_t) */ #define MB_INFO_FLAGS_OFFSET 0 #define MB_INFO_BOOT_DEVICE_OFFSET 12 #define MB_INFO_COMMAND_LINE_OFFSET 16 +#define MB_INFO_MMAP_LEN_OFFSET 44 +#define MB_INFO_MMAP_ADDR_OFFSET 48 +#define MB_MMAP_SIZE 480 /* 20 * sizeof(memory_map_t) - up to 20 entries */ #define CMDLINE_SIZE 256 /* @@ -91,6 +95,35 @@ MultibootEntry: cmp eax, MULTIBOOT_BOOTLOADER_MAGIC jne mbfail + /* Save multiboot info structure */ + mov esi, ebx + mov edi, offset MultibootInfo + INITIAL_BASE - FREELDR_BASE + mov ecx, (MB_INFO_SIZE / 4) + rep movsd + mov dword ptr ds:[MultibootInfo + INITIAL_BASE - FREELDR_BASE + MB_INFO_MMAP_ADDR_OFFSET], 0 + mov dword ptr ds:[_MultibootInfoPtr + INITIAL_BASE - FREELDR_BASE], offset MultibootInfo + + /* See if the memory map was passed in */ + test dword ptr ds:[ebx + MB_INFO_FLAGS_OFFSET], MB_INFO_FLAG_MEMORY_MAP + jz mbchk_command_line + /* Check memory map length */ + mov ecx, dword ptr ds:[ebx + MB_INFO_MMAP_LEN_OFFSET] + test ecx, ecx + jz mbchk_command_line + cmp ecx, MB_MMAP_SIZE + jg mbchk_command_line + /* Check memory map address */ + mov esi, dword ptr ds:[ebx + MB_INFO_MMAP_ADDR_OFFSET] + test esi, esi + jz mbchk_command_line + /* Save memory map structure */ + mov edi, offset MultibootMemoryMap + INITIAL_BASE - FREELDR_BASE + shr ecx, 2 + rep movsd + /* Relocate memory map address */ + mov dword ptr ds:[MultibootInfo + INITIAL_BASE - FREELDR_BASE + MB_INFO_MMAP_ADDR_OFFSET], offset MultibootMemoryMap + +mbchk_command_line: /* Save command line */ test dword ptr ds:[ebx + MB_INFO_FLAGS_OFFSET], MB_INFO_FLAG_COMMAND_LINE jz mb2 @@ -171,6 +204,16 @@ gdtptr: .word HEX(17) /* Limit */ .long gdt /* Base Address */ +PUBLIC _MultibootInfoPtr +_MultibootInfoPtr: + .long 0 + +MultibootInfo: + .space MB_INFO_SIZE + +MultibootMemoryMap: + .space MB_MMAP_SIZE + PUBLIC cmdline cmdline: .space CMDLINE_SIZE diff --git a/boot/freeldr/freeldr/arch/i386/xboxmem.c b/boot/freeldr/freeldr/arch/i386/xboxmem.c index bf7721dc32c..e8ea7b016ea 100644 --- a/boot/freeldr/freeldr/arch/i386/xboxmem.c +++ b/boot/freeldr/freeldr/arch/i386/xboxmem.c @@ -26,6 +26,7 @@ DBG_DEFAULT_CHANNEL(MEMORY); static ULONG InstalledMemoryMb = 0; static ULONG AvailableMemoryMb = 0; +extern multiboot_info_t * MultibootInfoPtr; extern PVOID FrameBuffer; extern ULONG FrameBufferSize; @@ -98,30 +99,107 @@ XboxMemInit(VOID) AvailableMemoryMb = InstalledMemoryMb; } +memory_map_t * +XboxGetMultibootMemoryMap(INT * Count) +{ + memory_map_t * MemoryMap; + + if (!MultibootInfoPtr) + { + ERR("Multiboot info structure not found!\n"); + return NULL; + } + + if (!(MultibootInfoPtr->flags & MB_INFO_FLAG_MEMORY_MAP)) + { + ERR("Multiboot memory map is not passed!\n"); + return NULL; + } + + MemoryMap = (memory_map_t *)MultibootInfoPtr->mmap_addr; + + if (!MemoryMap || + MultibootInfoPtr->mmap_length == 0 || + MultibootInfoPtr->mmap_length % sizeof(memory_map_t) != 0) + { + ERR("Multiboot memory map structure is malformed!\n"); + return NULL; + } + + *Count = MultibootInfoPtr->mmap_length / sizeof(memory_map_t); + return MemoryMap; +} + +TYPE_OF_MEMORY +XboxMultibootMemoryType(ULONG Type) +{ + switch (Type) + { + case 0: // Video RAM + return LoaderFirmwarePermanent; + case 1: // Available RAM + return LoaderFree; + case 3: // ACPI area + return LoaderFirmwareTemporary; + case 4: // Hibernation area + return LoaderSpecialMemory; + case 5: // Reserved or invalid memory + return LoaderSpecialMemory; + default: + return LoaderFirmwarePermanent; + } +} + FREELDR_MEMORY_DESCRIPTOR XboxMemoryMap[MAX_BIOS_DESCRIPTORS + 1]; PFREELDR_MEMORY_DESCRIPTOR XboxMemGetMemoryMap(ULONG *MemoryMapSize) { + memory_map_t * MbMap; + INT Count, i; + TRACE("XboxMemGetMemoryMap()\n"); - /* FIXME: Obtain memory map via multiboot spec */ - /* Synthesize memory map */ + MbMap = XboxGetMultibootMemoryMap(&Count); + if (MbMap) + { + /* Obtain memory map via multiboot spec */ - /* Available RAM block */ - SetMemory(XboxMemoryMap, - 0, - AvailableMemoryMb * 1024 * 1024, - LoaderFree); + for (i = 0; i < Count; i++, MbMap++) + { + TRACE("i = %d, base_addr_low = 0x%p, length_low = 0x%p\n", i, MbMap->base_addr_low, MbMap->length_low); - if (FrameBufferSize != 0) + if (MbMap->base_addr_high > 0 || MbMap->length_high > 0) + { + ERR("Memory descriptor base or size is greater than 4 GB, should not happen on Xbox!\n"); + ASSERT(FALSE); + } + + SetMemory(XboxMemoryMap, + MbMap->base_addr_low, + MbMap->length_low, + XboxMultibootMemoryType(MbMap->type)); + } + } + else { - /* Video memory */ - ReserveMemory(XboxMemoryMap, - (ULONG_PTR)FrameBuffer, - FrameBufferSize, - LoaderFirmwarePermanent, - "Video memory"); + /* Synthesize memory map */ + + /* Available RAM block */ + SetMemory(XboxMemoryMap, + 0, + AvailableMemoryMb * 1024 * 1024, + LoaderFree); + + if (FrameBufferSize != 0) + { + /* Video memory */ + ReserveMemory(XboxMemoryMap, + (ULONG_PTR)FrameBuffer, + FrameBufferSize, + LoaderFirmwarePermanent, + "Video memory"); + } } *MemoryMapSize = PcMemFinalizeMemoryMap(XboxMemoryMap); diff --git a/boot/freeldr/freeldr/arch/i386/xboxvideo.c b/boot/freeldr/freeldr/arch/i386/xboxvideo.c index d5839024d43..ffc2144d408 100644 --- a/boot/freeldr/freeldr/arch/i386/xboxvideo.c +++ b/boot/freeldr/freeldr/arch/i386/xboxvideo.c @@ -30,6 +30,7 @@ static ULONG ScreenWidth; static ULONG ScreenHeight; static ULONG BytesPerPixel; static ULONG Delta; +extern multiboot_info_t * MultibootInfoPtr; #define CHAR_WIDTH 8 #define CHAR_HEIGHT 16 @@ -127,6 +128,46 @@ NvGetCrtc(UCHAR Index) return *((PUCHAR) NV2A_CRTC_REGISTER_VALUE); } +ULONG +XboxGetFramebufferSize(PVOID Offset) +{ + memory_map_t * MemoryMap; + INT Count, i; + + if (!MultibootInfoPtr) + { + return 0; + } + + if (!(MultibootInfoPtr->flags & MB_INFO_FLAG_MEMORY_MAP)) + { + return 0; + } + + MemoryMap = (memory_map_t *)MultibootInfoPtr->mmap_addr; + + if (!MemoryMap || + MultibootInfoPtr->mmap_length == 0 || + MultibootInfoPtr->mmap_length % sizeof(memory_map_t) != 0) + { + return 0; + } + + Count = MultibootInfoPtr->mmap_length / sizeof(memory_map_t); + for (i = 0; i < Count; i++, MemoryMap++) + { + TRACE("i = %d, base_addr_low = 0x%p, MemoryMap->length_low = 0x%p\n", i, MemoryMap->base_addr_low, MemoryMap->length_low); + + if (MemoryMap->base_addr_low == (ULONG)Offset && MemoryMap->base_addr_high == 0) + { + TRACE("Video memory found\n"); + return MemoryMap->length_low; + } + } + ERR("Video memory not found!\n"); + return 0; +} + VOID XboxVideoInit(VOID) { @@ -135,8 +176,13 @@ XboxVideoInit(VOID) /* Verify that framebuffer address is page-aligned */ ASSERT((ULONG_PTR)FrameBuffer % PAGE_SIZE == 0); - /* FIXME: obtain fb size from firmware somehow (Cromwell reserves high 4 MB of RAM) */ - FrameBufferSize = 4 * 1024 * 1024; + /* Obtain framebuffer memory size from multiboot memory map */ + if ((FrameBufferSize = XboxGetFramebufferSize(FrameBuffer)) == 0) + { + /* Fallback to Cromwell standard which reserves high 4 MB of RAM */ + FrameBufferSize = 4 * 1024 * 1024; + WARN("Could not detect framebuffer memory size, fallback to 4 MB\n"); + } ScreenWidth = *((PULONG) NV2A_RAMDAC_FP_HVALID_END) + 1; ScreenHeight = *((PULONG) NV2A_RAMDAC_FP_VVALID_END) + 1; diff --git a/boot/freeldr/freeldr/include/multiboot.h b/boot/freeldr/freeldr/include/multiboot.h index 732e5c89b53..b5627d6db89 100644 --- a/boot/freeldr/freeldr/include/multiboot.h +++ b/boot/freeldr/freeldr/include/multiboot.h @@ -90,6 +90,27 @@ typedef struct elf_section_header_table unsigned long shndx; } elf_section_header_table_t; +/* The Multiboot information. */ +typedef struct multiboot_info +{ + unsigned long flags; + unsigned long mem_lower; + unsigned long mem_upper; + unsigned long boot_device; + unsigned long cmdline; + unsigned long mods_count; + unsigned long mods_addr; + union + { + aout_symbol_table_t aout_sym; + elf_section_header_table_t elf_sec; + } u; + unsigned long mmap_length; + unsigned long mmap_addr; + unsigned long drives_length; + unsigned long drives_addr; +} multiboot_info_t; + /* The memory map. Be careful that the offset 0 is base_addr_low but no size. */ typedef struct memory_map

1 0

[reactos] 01/01: [NTOS:KE] Rename some locking functions to reflect the IRQL level changes
by Timo Kreuzer 31 Dec '19

31 Dec '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7523a7b13880b47d21f2e… commit 7523a7b13880b47d21f2ef17761450e5893e6f49 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Dec 30 15:34:38 2019 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Dec 31 15:30:27 2019 +0100 [NTOS:KE] Rename some locking functions to reflect the IRQL level changes * KiAcquireApcLock -> KiAcquireApcLockRaiseToSynch * KiAcquireApcLockAtDpcLevel -> KiAcquireApcLockAtSynchLevel * KiReleaseApcLockFromDpcLevel -> KiReleaseApcLockFromSynchLevel * KiAcquireApcLockAtApcLevel -> KiAcquireApcLockRaiseToDpc * KiAcquireProcessLock -> KiAcquireProcessLockRaiseToSynch * KiReleaseProcessLockFromDpcLevel -> KiReleaseProcessLockFromSynchLevel * KiAcquireDispatcherLockAtDpcLevel -> KiAcquireDispatcherLockAtSynchLevel * KiReleaseDispatcherLockFromDpcLevel -> KiReleaseDispatcherLockFromSynchLevel * Add some ASSERTs --- ntoskrnl/include/internal/ke_x.h | 34 +++++++++-------- ntoskrnl/ke/apc.c | 22 +++++------ ntoskrnl/ke/gate.c | 14 +++---- ntoskrnl/ke/procobj.c | 48 +++++++++++------------ ntoskrnl/ke/queue.c | 12 +++--- ntoskrnl/ke/thrdobj.c | 82 ++++++++++++++++++++-------------------- ntoskrnl/ke/timerobj.c | 6 +-- ntoskrnl/ke/wait.c | 16 ++++---- ntoskrnl/mm/ARM3/pagfault.c | 2 +- 9 files changed, 120 insertions(+), 116 deletions(-) diff --git a/ntoskrnl/include/internal/ke_x.h b/ntoskrnl/include/internal/ke_x.h index 3aa3e7ab74c..84cb68e2c76 100644 --- a/ntoskrnl/include/internal/ke_x.h +++ b/ntoskrnl/include/internal/ke_x.h @@ -157,17 +157,18 @@ KiReleaseDispatcherLock(IN KIRQL OldIrql) FORCEINLINE VOID -KiAcquireDispatcherLockAtDpcLevel(VOID) +KiAcquireDispatcherLockAtSynchLevel(VOID) { - /* This is a no-op at DPC Level for UP systems */ + /* This is a no-op at SYNCH_LEVEL for UP systems */ + ASSERT(KeGetCurrentIrql() >= SYNCH_LEVEL); return; } FORCEINLINE VOID -KiReleaseDispatcherLockFromDpcLevel(VOID) +KiReleaseDispatcherLockFromSynchLevel(VOID) { - /* This is a no-op at DPC Level for UP systems */ + /* This is a no-op at SYNCH_LEVEL for UP systems */ return; } @@ -360,16 +361,17 @@ KiReleaseDispatcherLock(IN KIRQL OldIrql) FORCEINLINE VOID -KiAcquireDispatcherLockAtDpcLevel(VOID) +KiAcquireDispatcherLockAtSynchLevel(VOID) { /* Acquire the dispatcher lock */ + ASSERT(KeGetCurrentIrql() >= SYNCH_LEVEL); KeAcquireQueuedSpinLockAtDpcLevel(&KeGetCurrentPrcb()-> LockQueue[LockQueueDispatcherLock]); } FORCEINLINE VOID -KiReleaseDispatcherLockFromDpcLevel(VOID) +KiReleaseDispatcherLockFromSynchLevel(VOID) { /* Release the dispatcher lock */ KeReleaseQueuedSpinLockFromDpcLevel(&KeGetCurrentPrcb()-> @@ -597,7 +599,7 @@ KiReleaseTimerLock(IN PKSPIN_LOCK_QUEUE LockQueue) FORCEINLINE VOID -KiAcquireApcLock(IN PKTHREAD Thread, +KiAcquireApcLockRaiseToSynch(IN PKTHREAD Thread, IN PKLOCK_QUEUE_HANDLE Handle) { /* Acquire the lock and raise to synchronization level */ @@ -606,16 +608,17 @@ KiAcquireApcLock(IN PKTHREAD Thread, FORCEINLINE VOID -KiAcquireApcLockAtDpcLevel(IN PKTHREAD Thread, +KiAcquireApcLockAtSynchLevel(IN PKTHREAD Thread, IN PKLOCK_QUEUE_HANDLE Handle) { /* Acquire the lock */ + ASSERT(KeGetCurrentIrql() >= SYNCH_LEVEL); KeAcquireInStackQueuedSpinLockAtDpcLevel(&Thread->ApcQueueLock, Handle); } FORCEINLINE VOID -KiAcquireApcLockAtApcLevel(IN PKTHREAD Thread, +KiAcquireApcLockRaiseToDpc(IN PKTHREAD Thread, IN PKLOCK_QUEUE_HANDLE Handle) { /* Acquire the lock */ @@ -632,7 +635,7 @@ KiReleaseApcLock(IN PKLOCK_QUEUE_HANDLE Handle) FORCEINLINE VOID -KiReleaseApcLockFromDpcLevel(IN PKLOCK_QUEUE_HANDLE Handle) +KiReleaseApcLockFromSynchLevel(IN PKLOCK_QUEUE_HANDLE Handle) { /* Release the lock */ KeReleaseInStackQueuedSpinLockFromDpcLevel(Handle); @@ -640,7 +643,7 @@ KiReleaseApcLockFromDpcLevel(IN PKLOCK_QUEUE_HANDLE Handle) FORCEINLINE VOID -KiAcquireProcessLock(IN PKPROCESS Process, +KiAcquireProcessLockRaiseToSynch(IN PKPROCESS Process, IN PKLOCK_QUEUE_HANDLE Handle) { /* Acquire the lock and raise to synchronization level */ @@ -651,15 +654,15 @@ FORCEINLINE VOID KiReleaseProcessLock(IN PKLOCK_QUEUE_HANDLE Handle) { - /* Release the lock */ + /* Release the lock and restore previous IRQL */ KeReleaseInStackQueuedSpinLock(Handle); } FORCEINLINE VOID -KiReleaseProcessLockFromDpcLevel(IN PKLOCK_QUEUE_HANDLE Handle) +KiReleaseProcessLockFromSynchLevel(IN PKLOCK_QUEUE_HANDLE Handle) { - /* Release the lock */ + /* Release the lock without lowering IRQL */ KeReleaseInStackQueuedSpinLockFromDpcLevel(Handle); } @@ -916,10 +919,11 @@ KxInsertTimer(IN PKTIMER Timer, IN ULONG Hand) { PKSPIN_LOCK_QUEUE LockQueue; + ASSERT(KeGetCurrentIrql() >= SYNCH_LEVEL); /* Acquire the lock and release the dispatcher lock */ LockQueue = KiAcquireTimerLock(Hand); - KiReleaseDispatcherLockFromDpcLevel(); + KiReleaseDispatcherLockFromSynchLevel(); /* Try to insert the timer */ if (KiInsertTimerTable(Timer, Hand)) diff --git a/ntoskrnl/ke/apc.c b/ntoskrnl/ke/apc.c index c4bab2a4c02..65169ca3c56 100644 --- a/ntoskrnl/ke/apc.c +++ b/ntoskrnl/ke/apc.c @@ -264,7 +264,7 @@ KiInsertQueueApc(IN PKAPC Apc, } /* Release dispatcher lock */ - KiReleaseDispatcherLockFromDpcLevel(); + KiReleaseDispatcherLockFromSynchLevel(); /* Check if an interrupt was requested */ KiRequestApcInterrupt(RequestInterrupt, Thread->NextProcessor); @@ -330,7 +330,7 @@ KiDeliverApc(IN KPROCESSOR_MODE DeliveryMode, while (!IsListEmpty(&Thread->ApcState.ApcListHead[KernelMode])) { /* Lock the APC Queue */ - KiAcquireApcLockAtApcLevel(Thread, &ApcLock); + KiAcquireApcLockRaiseToDpc(Thread, &ApcLock); /* Check if the list became empty now */ if (IsListEmpty(&Thread->ApcState.ApcListHead[KernelMode])) @@ -441,7 +441,7 @@ KiDeliverApc(IN KPROCESSOR_MODE DeliveryMode, (Thread->ApcState.UserApcPending)) { /* Lock the APC Queue */ - KiAcquireApcLockAtApcLevel(Thread, &ApcLock); + KiAcquireApcLockRaiseToDpc(Thread, &ApcLock); /* It's not pending anymore */ Thread->ApcState.UserApcPending = FALSE; @@ -744,7 +744,7 @@ KeInsertQueueApc(IN PKAPC Apc, ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); /* Get the APC lock */ - KiAcquireApcLock(Thread, &ApcLock); + KiAcquireApcLockRaiseToSynch(Thread, &ApcLock); /* Make sure we can Queue APCs and that this one isn't already inserted */ if (!(Thread->ApcQueueable) || (Apc->Inserted)) @@ -764,7 +764,7 @@ KeInsertQueueApc(IN PKAPC Apc, } /* Release the APC lock and return success */ - KiReleaseApcLockFromDpcLevel(&ApcLock); + KiReleaseApcLockFromSynchLevel(&ApcLock); KiExitDispatcher(ApcLock.OldIrql); return State; } @@ -802,7 +802,7 @@ KeFlushQueueApc(IN PKTHREAD Thread, if (PreviousMode == UserMode) { /* Get the APC lock */ - KiAcquireApcLock(Thread, &ApcLock); + KiAcquireApcLockRaiseToSynch(Thread, &ApcLock); /* Select user list and check if it's empty */ if (IsListEmpty(&Thread->ApcState.ApcListHead[UserMode])) @@ -822,7 +822,7 @@ KeFlushQueueApc(IN PKTHREAD Thread, } /* Otherwise, acquire the APC lock */ - KiAcquireApcLock(Thread, &ApcLock); + KiAcquireApcLockRaiseToSynch(Thread, &ApcLock); } /* Get the first entry and check if the list is empty now */ @@ -892,8 +892,8 @@ KeRemoveQueueApc(IN PKAPC Apc) ASSERT_APC(Apc); ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); - /* Get the APC lock */ - KiAcquireApcLock(Thread, &ApcLock); + /* Get the APC lock (this raises IRQL to SYNCH_LEVEL) */ + KiAcquireApcLockRaiseToSynch(Thread, &ApcLock); /* Check if it's inserted */ Inserted = Apc->Inserted; @@ -904,7 +904,7 @@ KeRemoveQueueApc(IN PKAPC Apc) ApcState = Thread->ApcStatePointer[(UCHAR)Apc->ApcStateIndex]; /* Acquire the dispatcher lock and remove it from the list */ - KiAcquireDispatcherLockAtDpcLevel(); + KiAcquireDispatcherLockAtSynchLevel(); if (RemoveEntryList(&Apc->ApcListEntry)) { /* Set the correct state based on the APC Mode */ @@ -921,7 +921,7 @@ KeRemoveQueueApc(IN PKAPC Apc) } /* Release dispatcher lock */ - KiReleaseDispatcherLockFromDpcLevel(); + KiReleaseDispatcherLockFromSynchLevel(); } /* Release the lock and return */ diff --git a/ntoskrnl/ke/gate.c b/ntoskrnl/ke/gate.c index 12f8a02e096..f078f929001 100644 --- a/ntoskrnl/ke/gate.c +++ b/ntoskrnl/ke/gate.c @@ -44,7 +44,7 @@ KeWaitForGate(IN PKGATE Gate, do { /* Acquire the APC lock */ - KiAcquireApcLock(Thread, &ApcLock); + KiAcquireApcLockRaiseToSynch(Thread, &ApcLock); /* Check if a kernel APC is pending and we're below APC_LEVEL */ if ((Thread->ApcState.KernelApcPending) && @@ -58,7 +58,7 @@ KeWaitForGate(IN PKGATE Gate, { /* Check if we have a queue and lock the dispatcher if so */ Queue = Thread->Queue; - if (Queue) KiAcquireDispatcherLockAtDpcLevel(); + if (Queue) KiAcquireDispatcherLockAtSynchLevel(); /* Lock the thread */ KiAcquireThreadLock(Thread); @@ -77,7 +77,7 @@ KeWaitForGate(IN PKGATE Gate, KiReleaseThreadLock(Thread); /* Release the gate lock */ - if (Queue) KiReleaseDispatcherLockFromDpcLevel(); + if (Queue) KiReleaseDispatcherLockFromSynchLevel(); /* Release the APC lock and return */ KiReleaseApcLock(&ApcLock); @@ -116,11 +116,11 @@ KeWaitForGate(IN PKGATE Gate, KiActivateWaiterQueue(Queue); /* Release the dispatcher lock */ - KiReleaseDispatcherLockFromDpcLevel(); + KiReleaseDispatcherLockFromSynchLevel(); } /* Release the APC lock but stay at DPC level */ - KiReleaseApcLockFromDpcLevel(&ApcLock); + KiReleaseApcLockFromSynchLevel(&ApcLock); /* Find a new thread to run */ Status = KiSwapThread(Thread, KeGetCurrentPrcb()); @@ -203,7 +203,7 @@ KeSignalGateBoostPriority(IN PKGATE Gate) if (WaitThread->Queue) { /* Acquire the dispatcher lock */ - KiAcquireDispatcherLockAtDpcLevel(); + KiAcquireDispatcherLockAtSynchLevel(); /* Check if we still have one */ if (WaitThread->Queue) @@ -213,7 +213,7 @@ KeSignalGateBoostPriority(IN PKGATE Gate) } /* Release lock */ - KiReleaseDispatcherLockFromDpcLevel(); + KiReleaseDispatcherLockFromSynchLevel(); } /* Make the thread ready */ diff --git a/ntoskrnl/ke/procobj.c b/ntoskrnl/ke/procobj.c index 865d7881f81..abf5a4f3fc4 100644 --- a/ntoskrnl/ke/procobj.c +++ b/ntoskrnl/ke/procobj.c @@ -92,10 +92,10 @@ KiAttachProcess(IN PKTHREAD Thread, #endif /* Release dispatcher lock */ - KiReleaseDispatcherLockFromDpcLevel(); + KiReleaseDispatcherLockFromSynchLevel(); /* Release lock */ - KiReleaseApcLockFromDpcLevel(ApcLock); + KiReleaseApcLockFromSynchLevel(ApcLock); /* Swap Processes */ KiSwapProcess(Process, SavedApcState->Process); @@ -236,7 +236,7 @@ KeSetQuantumProcess(IN PKPROCESS Process, ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); /* Lock the process */ - KiAcquireProcessLock(Process, &ProcessLock); + KiAcquireProcessLockRaiseToSynch(Process, &ProcessLock); /* Set new quantum */ Process->QuantumReset = Quantum; @@ -275,10 +275,10 @@ KeSetAffinityProcess(IN PKPROCESS Process, ASSERT((Affinity & KeActiveProcessors) != 0); /* Lock the process */ - KiAcquireProcessLock(Process, &ProcessLock); + KiAcquireProcessLockRaiseToSynch(Process, &ProcessLock); /* Acquire the dispatcher lock */ - KiAcquireDispatcherLockAtDpcLevel(); + KiAcquireDispatcherLockAtSynchLevel(); /* Capture old affinity and update it */ OldAffinity = Process->Affinity; @@ -298,10 +298,10 @@ KeSetAffinityProcess(IN PKPROCESS Process, } /* Release Dispatcher Database */ - KiReleaseDispatcherLockFromDpcLevel(); + KiReleaseDispatcherLockFromSynchLevel(); /* Release the process lock */ - KiReleaseProcessLockFromDpcLevel(&ProcessLock); + KiReleaseProcessLockFromSynchLevel(&ProcessLock); KiExitDispatcher(ProcessLock.OldIrql); /* Return previous affinity */ @@ -365,7 +365,7 @@ KeSetPriorityAndQuantumProcess(IN PKPROCESS Process, if (!Priority) Priority = LOW_PRIORITY + 1; /* Lock the process */ - KiAcquireProcessLock(Process, &ProcessLock); + KiAcquireProcessLockRaiseToSynch(Process, &ProcessLock); /* Check if we are modifying the quantum too */ if (Quantum) Process->QuantumReset = Quantum; @@ -507,10 +507,10 @@ KeSetPriorityAndQuantumProcess(IN PKPROCESS Process, } /* Release Dispatcher Database */ - KiReleaseDispatcherLockFromDpcLevel(); + KiReleaseDispatcherLockFromSynchLevel(); /* Release the process lock */ - KiReleaseProcessLockFromDpcLevel(&ProcessLock); + KiReleaseProcessLockFromSynchLevel(&ProcessLock); KiExitDispatcher(ProcessLock.OldIrql); /* Return previous priority */ @@ -531,7 +531,7 @@ KeQueryValuesProcess(IN PKPROCESS Process, ASSERT(KeGetCurrentIrql() <= DISPATCH_LEVEL); /* Lock the process */ - KiAcquireProcessLock(Process, &ProcessLock); + KiAcquireProcessLockRaiseToSynch(Process, &ProcessLock); /* Initialize user and kernel times */ TotalKernel = Process->KernelTime; @@ -600,10 +600,10 @@ KeAttachProcess(IN PKPROCESS Process) else { /* Acquire APC Lock */ - KiAcquireApcLock(Thread, &ApcLock); + KiAcquireApcLockRaiseToSynch(Thread, &ApcLock); /* Acquire the dispatcher lock */ - KiAcquireDispatcherLockAtDpcLevel(); + KiAcquireDispatcherLockAtSynchLevel(); /* Legit attach attempt: do it! */ KiAttachProcess(Thread, Process, &ApcLock, &Thread->SavedApcState); @@ -626,7 +626,7 @@ KeDetachProcess(VOID) if (Thread->ApcStateIndex == OriginalApcEnvironment) return; /* Acquire APC Lock */ - KiAcquireApcLock(Thread, &ApcLock); + KiAcquireApcLockRaiseToSynch(Thread, &ApcLock); /* Check for invalid attach attempts */ if ((Thread->ApcState.KernelApcInProgress) || @@ -641,7 +641,7 @@ KeDetachProcess(VOID) Process = Thread->ApcState.Process; /* Acquire dispatcher lock */ - KiAcquireDispatcherLockAtDpcLevel(); + KiAcquireDispatcherLockAtSynchLevel(); /* Decrease the stack count */ ASSERT(Process->StackCount != 0); @@ -655,7 +655,7 @@ KeDetachProcess(VOID) } /* Release dispatcher lock */ - KiReleaseDispatcherLockFromDpcLevel(); + KiReleaseDispatcherLockFromSynchLevel(); /* Restore the APC State */ KiMoveApcState(&Thread->SavedApcState, &Thread->ApcState); @@ -665,7 +665,7 @@ KeDetachProcess(VOID) Thread->ApcStateIndex = OriginalApcEnvironment; /* Release lock */ - KiReleaseApcLockFromDpcLevel(&ApcLock); + KiReleaseApcLockFromSynchLevel(&ApcLock); /* Swap Processes */ KiSwapProcess(Thread->ApcState.Process, Process); @@ -726,10 +726,10 @@ KeStackAttachProcess(IN PKPROCESS Process, } /* Acquire APC Lock */ - KiAcquireApcLock(Thread, &ApcLock); + KiAcquireApcLockRaiseToSynch(Thread, &ApcLock); /* Acquire dispatcher lock */ - KiAcquireDispatcherLockAtDpcLevel(); + KiAcquireDispatcherLockAtSynchLevel(); /* Check if the Current Thread is already attached */ if (Thread->ApcStateIndex != OriginalApcEnvironment) @@ -764,7 +764,7 @@ KeUnstackDetachProcess(IN PRKAPC_STATE ApcState) for (;;) { /* Acquire APC Lock */ - KiAcquireApcLock(Thread, &ApcLock); + KiAcquireApcLockRaiseToSynch(Thread, &ApcLock); /* Check if a kernel APC is pending */ if (Thread->ApcState.KernelApcPending) @@ -799,7 +799,7 @@ KeUnstackDetachProcess(IN PRKAPC_STATE ApcState) Process = Thread->ApcState.Process; /* Acquire dispatcher lock */ - KiAcquireDispatcherLockAtDpcLevel(); + KiAcquireDispatcherLockAtSynchLevel(); /* Decrease the stack count */ ASSERT(Process->StackCount != 0); @@ -813,7 +813,7 @@ KeUnstackDetachProcess(IN PRKAPC_STATE ApcState) } /* Release dispatcher lock */ - KiReleaseDispatcherLockFromDpcLevel(); + KiReleaseDispatcherLockFromSynchLevel(); /* Check if there's an APC state to restore */ if (ApcState->Process) @@ -832,7 +832,7 @@ KeUnstackDetachProcess(IN PRKAPC_STATE ApcState) } /* Release lock */ - KiReleaseApcLockFromDpcLevel(&ApcLock); + KiReleaseApcLockFromSynchLevel(&ApcLock); /* Swap Processes */ KiSwapProcess(Thread->ApcState.Process, Process); @@ -869,7 +869,7 @@ KeQueryRuntimeProcess(IN PKPROCESS Process, TotalKernel = Process->KernelTime; /* Lock the process */ - KiAcquireProcessLock(Process, &ProcessLock); + KiAcquireProcessLockRaiseToSynch(Process, &ProcessLock); /* Loop all child threads and sum up their times */ ListHead = &Process->ThreadListHead; diff --git a/ntoskrnl/ke/queue.c b/ntoskrnl/ke/queue.c index 0ddbfa6a88a..1b02a88aeed 100644 --- a/ntoskrnl/ke/queue.c +++ b/ntoskrnl/ke/queue.c @@ -265,7 +265,7 @@ KeRemoveQueue(IN PKQUEUE Queue, /* Raise IRQL to synch, prepare the wait, then lock the database */ Thread->WaitIrql = KeRaiseIrqlToSynchLevel(); KxQueueThreadWait(); - KiAcquireDispatcherLockAtDpcLevel(); + KiAcquireDispatcherLockAtSynchLevel(); } /* @@ -339,7 +339,7 @@ KeRemoveQueue(IN PKQUEUE Queue, { /* Increment the count and unlock the dispatcher */ Queue->CurrentCount++; - KiReleaseDispatcherLockFromDpcLevel(); + KiReleaseDispatcherLockFromSynchLevel(); KiExitDispatcher(Thread->WaitIrql); } else @@ -394,7 +394,7 @@ KeRemoveQueue(IN PKQUEUE Queue, else { /* Otherwise, unlock the dispatcher */ - KiReleaseDispatcherLockFromDpcLevel(); + KiReleaseDispatcherLockFromSynchLevel(); } /* Do the actual swap */ @@ -419,13 +419,13 @@ KeRemoveQueue(IN PKQUEUE Queue, /* Start another wait */ Thread->WaitIrql = KeRaiseIrqlToSynchLevel(); KxQueueThreadWait(); - KiAcquireDispatcherLockAtDpcLevel(); + KiAcquireDispatcherLockAtSynchLevel(); Queue->CurrentCount--; } } /* Unlock Database and return */ - KiReleaseDispatcherLockFromDpcLevel(); + KiReleaseDispatcherLockFromSynchLevel(); KiExitDispatcher(Thread->WaitIrql); return QueueEntry; } @@ -477,7 +477,7 @@ KeRundownQueue(IN PKQUEUE Queue) } /* Release the dispatcher lock */ - KiReleaseDispatcherLockFromDpcLevel(); + KiReleaseDispatcherLockFromSynchLevel(); /* Exit the dispatcher and return the first entry (if any) */ KiExitDispatcher(OldIrql); diff --git a/ntoskrnl/ke/thrdobj.c b/ntoskrnl/ke/thrdobj.c index 142ff18291a..627f42c7395 100644 --- a/ntoskrnl/ke/thrdobj.c +++ b/ntoskrnl/ke/thrdobj.c @@ -138,8 +138,8 @@ KeAlertResumeThread(IN PKTHREAD Thread) ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); /* Lock the Dispatcher Database and the APC Queue */ - KiAcquireApcLock(Thread, &ApcLock); - KiAcquireDispatcherLockAtDpcLevel(); + KiAcquireApcLockRaiseToSynch(Thread, &ApcLock); + KiAcquireDispatcherLockAtSynchLevel(); /* Return if Thread is already alerted. */ if (!Thread->Alerted[KernelMode]) @@ -174,8 +174,8 @@ KeAlertResumeThread(IN PKTHREAD Thread) } /* Release Locks and return the Old State */ - KiReleaseDispatcherLockFromDpcLevel(); - KiReleaseApcLockFromDpcLevel(&ApcLock); + KiReleaseDispatcherLockFromSynchLevel(); + KiReleaseApcLockFromSynchLevel(&ApcLock); KiExitDispatcher(ApcLock.OldIrql); return PreviousCount; } @@ -191,8 +191,8 @@ KeAlertThread(IN PKTHREAD Thread, ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); /* Lock the Dispatcher Database and the APC Queue */ - KiAcquireApcLock(Thread, &ApcLock); - KiAcquireDispatcherLockAtDpcLevel(); + KiAcquireApcLockRaiseToSynch(Thread, &ApcLock); + KiAcquireDispatcherLockAtSynchLevel(); /* Save the Previous State */ PreviousState = Thread->Alerted[AlertMode]; @@ -216,8 +216,8 @@ KeAlertThread(IN PKTHREAD Thread, } /* Release the Dispatcher Lock */ - KiReleaseDispatcherLockFromDpcLevel(); - KiReleaseApcLockFromDpcLevel(&ApcLock); + KiReleaseDispatcherLockFromSynchLevel(); + KiReleaseApcLockFromSynchLevel(&ApcLock); KiExitDispatcher(ApcLock.OldIrql); /* Return the old state */ @@ -281,7 +281,7 @@ KeForceResumeThread(IN PKTHREAD Thread) ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); /* Lock the APC Queue */ - KiAcquireApcLock(Thread, &ApcLock); + KiAcquireApcLockRaiseToSynch(Thread, &ApcLock); /* Save the old Suspend Count */ PreviousCount = Thread->SuspendCount + Thread->FreezeCount; @@ -294,18 +294,18 @@ KeForceResumeThread(IN PKTHREAD Thread) Thread->FreezeCount = 0; /* Lock the dispatcher */ - KiAcquireDispatcherLockAtDpcLevel(); + KiAcquireDispatcherLockAtSynchLevel(); /* Signal and satisfy */ Thread->SuspendSemaphore.Header.SignalState++; KiWaitTest(&Thread->SuspendSemaphore.Header, IO_NO_INCREMENT); /* Release the dispatcher */ - KiReleaseDispatcherLockFromDpcLevel(); + KiReleaseDispatcherLockFromSynchLevel(); } /* Release Lock and return the Old State */ - KiReleaseApcLockFromDpcLevel(&ApcLock); + KiReleaseApcLockFromSynchLevel(&ApcLock); KiExitDispatcher(ApcLock.OldIrql); return PreviousCount; } @@ -322,14 +322,14 @@ KeFreezeAllThreads(VOID) ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); /* Lock the process */ - KiAcquireProcessLock(Process, &LockHandle); + KiAcquireProcessLockRaiseToSynch(Process, &LockHandle); /* If someone is already trying to free us, try again */ while (CurrentThread->FreezeCount) { /* Release and re-acquire the process lock so the APC will go through */ KiReleaseProcessLock(&LockHandle); - KiAcquireProcessLock(Process, &LockHandle); + KiAcquireProcessLockRaiseToSynch(Process, &LockHandle); } /* Enter a critical region */ @@ -344,7 +344,7 @@ KeFreezeAllThreads(VOID) Current = CONTAINING_RECORD(NextEntry, KTHREAD, ThreadListEntry); /* Lock it */ - KiAcquireApcLockAtDpcLevel(Current, &ApcLock); + KiAcquireApcLockAtSynchLevel(Current, &ApcLock); /* Make sure it's not ours, and check if APCs are enabled */ if ((Current != CurrentThread) && (Current->ApcQueueable)) @@ -369,26 +369,26 @@ KeFreezeAllThreads(VOID) else { /* Lock the dispatcher */ - KiAcquireDispatcherLockAtDpcLevel(); + KiAcquireDispatcherLockAtSynchLevel(); /* Unsignal the semaphore, the APC was already inserted */ Current->SuspendSemaphore.Header.SignalState--; /* Release the dispatcher */ - KiReleaseDispatcherLockFromDpcLevel(); + KiReleaseDispatcherLockFromSynchLevel(); } } } /* Release the APC lock */ - KiReleaseApcLockFromDpcLevel(&ApcLock); + KiReleaseApcLockFromSynchLevel(&ApcLock); /* Move to the next thread */ NextEntry = NextEntry->Flink; } while (NextEntry != ListHead); /* Release the process lock and exit the dispatcher */ - KiReleaseProcessLockFromDpcLevel(&LockHandle); + KiReleaseProcessLockFromSynchLevel(&LockHandle); KiExitDispatcher(LockHandle.OldIrql); } @@ -402,7 +402,7 @@ KeResumeThread(IN PKTHREAD Thread) ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); /* Lock the APC Queue */ - KiAcquireApcLock(Thread, &ApcLock); + KiAcquireApcLockRaiseToSynch(Thread, &ApcLock); /* Save the Old Count */ PreviousCount = Thread->SuspendCount; @@ -417,19 +417,19 @@ KeResumeThread(IN PKTHREAD Thread) if ((!Thread->SuspendCount) && (!Thread->FreezeCount)) { /* Acquire the dispatcher lock */ - KiAcquireDispatcherLockAtDpcLevel(); + KiAcquireDispatcherLockAtSynchLevel(); /* Signal the Suspend Semaphore */ Thread->SuspendSemaphore.Header.SignalState++; KiWaitTest(&Thread->SuspendSemaphore.Header, IO_NO_INCREMENT); /* Release the dispatcher lock */ - KiReleaseDispatcherLockFromDpcLevel(); + KiReleaseDispatcherLockFromSynchLevel(); } } /* Release APC Queue lock and return the Old State */ - KiReleaseApcLockFromDpcLevel(&ApcLock); + KiReleaseApcLockFromSynchLevel(&ApcLock); KiExitDispatcher(ApcLock.OldIrql); return PreviousCount; } @@ -516,7 +516,7 @@ KeStartThread(IN OUT PKTHREAD Thread) Thread->SystemAffinityActive = FALSE; /* Lock the process */ - KiAcquireProcessLock(Process, &LockHandle); + KiAcquireProcessLockRaiseToSynch(Process, &LockHandle); /* Setup volatile data */ Thread->Priority = Process->BasePriority; @@ -553,7 +553,7 @@ KeStartThread(IN OUT PKTHREAD Thread) Thread->UserIdealProcessor = IdealProcessor; /* Lock the Dispatcher Database */ - KiAcquireDispatcherLockAtDpcLevel(); + KiAcquireDispatcherLockAtSynchLevel(); /* Insert the thread into the process list */ InsertTailList(&Process->ThreadListHead, &Thread->ThreadListEntry); @@ -563,7 +563,7 @@ KeStartThread(IN OUT PKTHREAD Thread) Process->StackCount++; /* Release locks and return */ - KiReleaseDispatcherLockFromDpcLevel(); + KiReleaseDispatcherLockFromSynchLevel(); KiReleaseProcessLock(&LockHandle); } @@ -615,7 +615,7 @@ KeSuspendThread(PKTHREAD Thread) ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); /* Lock the APC Queue */ - KiAcquireApcLock(Thread, &ApcLock); + KiAcquireApcLockRaiseToSynch(Thread, &ApcLock); /* Save the Old Count */ PreviousCount = Thread->SuspendCount; @@ -647,19 +647,19 @@ KeSuspendThread(PKTHREAD Thread) else { /* Lock the dispatcher */ - KiAcquireDispatcherLockAtDpcLevel(); + KiAcquireDispatcherLockAtSynchLevel(); /* Unsignal the semaphore, the APC was already inserted */ Thread->SuspendSemaphore.Header.SignalState--; /* Release the dispatcher */ - KiReleaseDispatcherLockFromDpcLevel(); + KiReleaseDispatcherLockFromSynchLevel(); } } } /* Release Lock and return the Old State */ - KiReleaseApcLockFromDpcLevel(&ApcLock); + KiReleaseApcLockFromSynchLevel(&ApcLock); KiExitDispatcher(ApcLock.OldIrql); return PreviousCount; } @@ -676,7 +676,7 @@ KeThawAllThreads(VOID) ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); /* Lock the process */ - KiAcquireProcessLock(Process, &LockHandle); + KiAcquireProcessLockRaiseToSynch(Process, &LockHandle); /* Loop the Process's Threads */ ListHead = &Process->ThreadListHead; @@ -687,7 +687,7 @@ KeThawAllThreads(VOID) Current = CONTAINING_RECORD(NextEntry, KTHREAD, ThreadListEntry); /* Lock it */ - KiAcquireApcLockAtDpcLevel(Current, &ApcLock); + KiAcquireApcLockAtSynchLevel(Current, &ApcLock); /* Make sure we are frozen */ OldCount = Current->FreezeCount; @@ -700,26 +700,26 @@ KeThawAllThreads(VOID) if (!(Current->SuspendCount) && (!Current->FreezeCount)) { /* Lock the dispatcher */ - KiAcquireDispatcherLockAtDpcLevel(); + KiAcquireDispatcherLockAtSynchLevel(); /* Signal the suspend semaphore and wake it */ Current->SuspendSemaphore.Header.SignalState++; KiWaitTest(&Current->SuspendSemaphore, 0); /* Unlock the dispatcher */ - KiReleaseDispatcherLockFromDpcLevel(); + KiReleaseDispatcherLockFromSynchLevel(); } } /* Release the APC lock */ - KiReleaseApcLockFromDpcLevel(&ApcLock); + KiReleaseApcLockFromSynchLevel(&ApcLock); /* Go to the next one */ NextEntry = NextEntry->Flink; } while (NextEntry != ListHead); /* Release the process lock and exit the dispatcher */ - KiReleaseProcessLockFromDpcLevel(&LockHandle); + KiReleaseProcessLockFromSynchLevel(&LockHandle); KiExitDispatcher(LockHandle.OldIrql); /* Leave the critical region */ @@ -737,7 +737,7 @@ KeTestAlertThread(IN KPROCESSOR_MODE AlertMode) ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); /* Lock the Dispatcher Database and the APC Queue */ - KiAcquireApcLock(Thread, &ApcLock); + KiAcquireApcLockRaiseToSynch(Thread, &ApcLock); /* Save the old State */ OldState = Thread->Alerted[AlertMode]; @@ -1383,7 +1383,7 @@ KeTerminateThread(IN KPRIORITY Increment) ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); /* Lock the process */ - KiAcquireProcessLock(Process, &LockHandle); + KiAcquireProcessLockRaiseToSynch(Process, &LockHandle); /* Make sure we won't get Swapped */ KiSetThreadSwapBusy(Thread); @@ -1415,7 +1415,7 @@ KeTerminateThread(IN KPRIORITY Increment) } while (Entry != SavedEntry); /* Acquire the dispatcher lock */ - KiAcquireDispatcherLockAtDpcLevel(); + KiAcquireDispatcherLockAtSynchLevel(); /* Check if the reaper wasn't active */ if (!Entry) @@ -1446,7 +1446,7 @@ KeTerminateThread(IN KPRIORITY Increment) RemoveEntryList(&Thread->ThreadListEntry); /* Release the process lock */ - KiReleaseProcessLockFromDpcLevel(&LockHandle); + KiReleaseProcessLockFromSynchLevel(&LockHandle); /* Set us as terminated, decrease the Process's stack count */ Thread->State = Terminated; @@ -1464,6 +1464,6 @@ KeTerminateThread(IN KPRIORITY Increment) KiRundownThread(Thread); /* Swap to a new thread */ - KiReleaseDispatcherLockFromDpcLevel(); + KiReleaseDispatcherLockFromSynchLevel(); KiSwapThread(Thread, KeGetCurrentPrcb()); } diff --git a/ntoskrnl/ke/timerobj.c b/ntoskrnl/ke/timerobj.c index 43a348ec008..26f12720dda 100644 --- a/ntoskrnl/ke/timerobj.c +++ b/ntoskrnl/ke/timerobj.c @@ -184,13 +184,13 @@ KiCompleteTimer(IN PKTIMER Timer, KiReleaseTimerLock(LockQueue); /* Acquire dispatcher lock */ - KiAcquireDispatcherLockAtDpcLevel(); + KiAcquireDispatcherLockAtSynchLevel(); /* Signal the timer if it's still on our list */ if (!IsListEmpty(&ListHead)) RequestInterrupt = KiSignalTimer(Timer); /* Release the dispatcher lock */ - KiReleaseDispatcherLockFromDpcLevel(); + KiReleaseDispatcherLockFromSynchLevel(); /* Request a DPC if needed */ if (RequestInterrupt) HalRequestSoftwareInterrupt(DISPATCH_LEVEL); @@ -321,7 +321,7 @@ KeSetTimerEx(IN OUT PKTIMER Timer, RequestInterrupt = KiSignalTimer(Timer); /* Release the dispatcher lock */ - KiReleaseDispatcherLockFromDpcLevel(); + KiReleaseDispatcherLockFromSynchLevel(); /* Check if we need to do an interrupt */ if (RequestInterrupt) HalRequestSoftwareInterrupt(DISPATCH_LEVEL); diff --git a/ntoskrnl/ke/wait.c b/ntoskrnl/ke/wait.c index bae1e8fcd60..3863b8e4779 100644 --- a/ntoskrnl/ke/wait.c +++ b/ntoskrnl/ke/wait.c @@ -386,7 +386,7 @@ WaitStart: /* Setup a new wait */ Thread->WaitIrql = KeRaiseIrqlToSynchLevel(); KxDelayThreadWait(); - KiAcquireDispatcherLockAtDpcLevel(); + KiAcquireDispatcherLockAtSynchLevel(); } /* We're done! */ @@ -403,7 +403,7 @@ NoWait: } /* Unlock the dispatcher and adjust the quantum for a no-wait */ - KiReleaseDispatcherLockFromDpcLevel(); + KiReleaseDispatcherLockFromSynchLevel(); KiAdjustQuantumThread(Thread); return STATUS_SUCCESS; } @@ -540,7 +540,7 @@ KeWaitForSingleObject(IN PVOID Object, else { /* Otherwise, unlock the dispatcher */ - KiReleaseDispatcherLockFromDpcLevel(); + KiReleaseDispatcherLockFromSynchLevel(); } /* Do the actual swap */ @@ -562,7 +562,7 @@ WaitStart: /* Setup a new wait */ Thread->WaitIrql = KeRaiseIrqlToSynchLevel(); KxSingleThreadWait(); - KiAcquireDispatcherLockAtDpcLevel(); + KiAcquireDispatcherLockAtSynchLevel(); } /* Wait complete */ @@ -571,7 +571,7 @@ WaitStart: DontWait: /* Release dispatcher lock but maintain high IRQL */ - KiReleaseDispatcherLockFromDpcLevel(); + KiReleaseDispatcherLockFromSynchLevel(); /* Adjust the Quantum and return the wait status */ KiAdjustQuantumThread(Thread); @@ -835,7 +835,7 @@ KeWaitForMultipleObjects(IN ULONG Count, else { /* Otherwise, unlock the dispatcher */ - KiReleaseDispatcherLockFromDpcLevel(); + KiReleaseDispatcherLockFromSynchLevel(); } /* Swap the thread */ @@ -858,7 +858,7 @@ WaitStart: /* Setup a new wait */ Thread->WaitIrql = KeRaiseIrqlToSynchLevel(); KxMultiThreadWait(); - KiAcquireDispatcherLockAtDpcLevel(); + KiAcquireDispatcherLockAtSynchLevel(); } /* We are done */ @@ -867,7 +867,7 @@ WaitStart: DontWait: /* Release dispatcher lock but maintain high IRQL */ - KiReleaseDispatcherLockFromDpcLevel(); + KiReleaseDispatcherLockFromSynchLevel(); /* Adjust the Quantum and return the wait status */ KiAdjustQuantumThread(Thread); diff --git a/ntoskrnl/mm/ARM3/pagfault.c b/ntoskrnl/mm/ARM3/pagfault.c index de642510df0..1ab109e9f65 100644 --- a/ntoskrnl/mm/ARM3/pagfault.c +++ b/ntoskrnl/mm/ARM3/pagfault.c @@ -2576,7 +2576,7 @@ MmSetExecuteOptions(IN ULONG ExecuteOptions) } /* Change the NX state in the process lock */ - KiAcquireProcessLock(CurrentProcess, &ProcessLock); + KiAcquireProcessLockRaiseToSynch(CurrentProcess, &ProcessLock); /* Don't change anything if the permanent flag was set */ if (!CurrentProcess->Flags.Permanent)

1 0

[reactos] 05/05: [NTDLL_APITEST] Add a test for NtUnloadDriver.
by Thomas Faber 31 Dec '19

31 Dec '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3b430eefddf79bd524f04… commit 3b430eefddf79bd524f040cb79ad8b63a591b422 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Dec 29 13:49:18 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Tue Dec 31 15:18:59 2019 +0100 [NTDLL_APITEST] Add a test for NtUnloadDriver. --- modules/rostests/apitests/ntdll/CMakeLists.txt | 1 + modules/rostests/apitests/ntdll/NtUnloadDriver.c | 108 +++++++++++++++++++++++ modules/rostests/apitests/ntdll/testlist.c | 2 + 3 files changed, 111 insertions(+) diff --git a/modules/rostests/apitests/ntdll/CMakeLists.txt b/modules/rostests/apitests/ntdll/CMakeLists.txt index cf0bbb4e284..0cce35587ed 100644 --- a/modules/rostests/apitests/ntdll/CMakeLists.txt +++ b/modules/rostests/apitests/ntdll/CMakeLists.txt @@ -35,6 +35,7 @@ list(APPEND SOURCE NtSetInformationFile.c NtSetValueKey.c NtSetVolumeInformationFile.c + NtUnloadDriver.c NtWriteFile.c RtlAllocateHeap.c RtlBitmap.c diff --git a/modules/rostests/apitests/ntdll/NtUnloadDriver.c b/modules/rostests/apitests/ntdll/NtUnloadDriver.c new file mode 100644 index 00000000000..5b827053f4a --- /dev/null +++ b/modules/rostests/apitests/ntdll/NtUnloadDriver.c @@ -0,0 +1,108 @@ +/* + * PROJECT: ReactOS API Tests + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Test for NtUnloadDriver + * COPYRIGHT: Copyright 2019 Thomas Faber (thomas.faber(a)reactos.org) + */ + +#include "precomp.h" + +START_TEST(NtUnloadDriver) +{ + NTSTATUS Status; + BOOLEAN OldPrivilege, OldPrivilege2; + UNICODE_STRING ServiceName; + PWCHAR Buffer = NULL; + + Status = RtlAdjustPrivilege(SE_LOAD_DRIVER_PRIVILEGE, FALSE, FALSE, &OldPrivilege); + if (!NT_SUCCESS(Status)) + { + skip("Failed to drop driver load privilege\n"); + return; + } + + Status = NtUnloadDriver(NULL); + ok_hex(Status, STATUS_PRIVILEGE_NOT_HELD); + + Status = RtlAdjustPrivilege(SE_LOAD_DRIVER_PRIVILEGE, TRUE, FALSE, &OldPrivilege2); + if (!NT_SUCCESS(Status)) + { + skip("Failed to acquire driver load privilege\n"); + goto Exit; + } + + Status = NtUnloadDriver(NULL); + ok_hex(Status, STATUS_ACCESS_VIOLATION); + + RtlInitEmptyUnicodeString(&ServiceName, NULL, 0); + Status = NtUnloadDriver(&ServiceName); + ok_hex(Status, STATUS_INVALID_PARAMETER); + + Buffer = AllocateGuarded(0x10000); + if (!Buffer) + { + skip("Failed to allocate memory\n"); + goto Exit; + } + + RtlFillMemoryUlong(Buffer, 0x10000, 'A' << 16 | 'A'); + + ServiceName.Buffer = Buffer; + ServiceName.Length = 0xFFFF; + ServiceName.MaximumLength = MAXUSHORT; + Status = NtUnloadDriver(&ServiceName); + ok_hex(Status, STATUS_OBJECT_NAME_INVALID); + + ServiceName.Buffer = Buffer; + ServiceName.Length = 0xFFFE; + ServiceName.MaximumLength = MAXUSHORT; + Status = NtUnloadDriver(&ServiceName); + ok_hex(Status, STATUS_OBJECT_NAME_INVALID); + + ServiceName.Buffer = Buffer; + ServiceName.Length = 0xFFFD; + ServiceName.MaximumLength = MAXUSHORT; + Status = NtUnloadDriver(&ServiceName); + ok_hex(Status, STATUS_OBJECT_NAME_INVALID); + + ServiceName.Buffer = Buffer; + ServiceName.Length = 0xFFFC; + ServiceName.MaximumLength = MAXUSHORT; + Status = NtUnloadDriver(&ServiceName); + ok_hex(Status, STATUS_OBJECT_PATH_SYNTAX_BAD); + + ServiceName.Buffer = Buffer; + ServiceName.Length = 0x1000; + ServiceName.MaximumLength = MAXUSHORT; + Status = NtUnloadDriver(&ServiceName); + ok_hex(Status, STATUS_OBJECT_PATH_SYNTAX_BAD); + + ServiceName.Buffer = Buffer; + ServiceName.Length = 1; + ServiceName.MaximumLength = MAXUSHORT; + Status = NtUnloadDriver(&ServiceName); + ok_hex(Status, STATUS_OBJECT_NAME_INVALID); + + Buffer[0xFFFC / sizeof(WCHAR)] = L'\\'; + ServiceName.Buffer = Buffer; + ServiceName.Length = 0xFFFC; + ServiceName.MaximumLength = MAXUSHORT; + Status = NtUnloadDriver(&ServiceName); + ok_hex(Status, STATUS_OBJECT_PATH_SYNTAX_BAD); + + Buffer[0xFFFC / sizeof(WCHAR) - 1] = L'\\'; + ServiceName.Buffer = Buffer; + ServiceName.Length = 0xFFFC; + ServiceName.MaximumLength = MAXUSHORT; + Status = NtUnloadDriver(&ServiceName); + ok_hex(Status, STATUS_OBJECT_PATH_SYNTAX_BAD); + +Exit: + if (Buffer != NULL) + { + FreeGuarded(Buffer); + } + + Status = RtlAdjustPrivilege(SE_LOAD_DRIVER_PRIVILEGE, OldPrivilege, FALSE, &OldPrivilege2); + ok_hex(Status, STATUS_SUCCESS); +} diff --git a/modules/rostests/apitests/ntdll/testlist.c b/modules/rostests/apitests/ntdll/testlist.c index cfcf8cefe04..9359f36808b 100644 --- a/modules/rostests/apitests/ntdll/testlist.c +++ b/modules/rostests/apitests/ntdll/testlist.c @@ -34,6 +34,7 @@ extern void func_NtSetInformationFile(void); extern void func_NtSetValueKey(void); extern void func_NtSetVolumeInformationFile(void); extern void func_NtSystemInformation(void); +extern void func_NtUnloadDriver(void); extern void func_NtWriteFile(void); extern void func_RtlAllocateHeap(void); extern void func_RtlBitmap(void); @@ -99,6 +100,7 @@ const struct test winetest_testlist[] = { "NtSetValueKey", func_NtSetValueKey}, { "NtSetVolumeInformationFile", func_NtSetVolumeInformationFile }, { "NtSystemInformation", func_NtSystemInformation }, + { "NtUnloadDriver", func_NtUnloadDriver }, { "NtWriteFile", func_NtWriteFile }, { "RtlAllocateHeap", func_RtlAllocateHeap }, { "RtlBitmapApi", func_RtlBitmap },

1 0

[reactos] 04/05: [APITESTS] Centrally define AllocateGuarded/FreeGuarded instead of duplicating them.
by Thomas Faber 31 Dec '19

31 Dec '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=787b2c76604a96444c5ff… commit 787b2c76604a96444c5fffe206b3c3fb5dcdedee Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Wed Jul 10 12:25:36 2019 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Tue Dec 31 15:18:41 2019 +0100 [APITESTS] Centrally define AllocateGuarded/FreeGuarded instead of duplicating them. --- modules/rostests/apitests/crt/sprintf.c | 48 +------------ modules/rostests/apitests/include/apitest_guard.h | 79 ++++++++++++++++++++++ modules/rostests/apitests/ntdll/RtlBitmap.c | 47 ------------- modules/rostests/apitests/ntdll/RtlDeleteAce.c | 47 ------------- .../apitests/ntdll/RtlDetermineDosPathNameType.c | 69 ------------------- modules/rostests/apitests/ntdll/RtlFirstFreeAce.c | 47 ------------- modules/rostests/apitests/ntdll/RtlImageRvaToVa.c | 47 ------------- modules/rostests/apitests/ntdll/precomp.h | 1 + .../apitests/user32/GetUserObjectInformation.c | 48 +------------ modules/rostests/apitests/ws2_32/WSAStartup.c | 48 +------------ 10 files changed, 83 insertions(+), 398 deletions(-) diff --git a/modules/rostests/apitests/crt/sprintf.c b/modules/rostests/apitests/crt/sprintf.c index b612d6d993f..8d42148142c 100644 --- a/modules/rostests/apitests/crt/sprintf.c +++ b/modules/rostests/apitests/crt/sprintf.c @@ -6,6 +6,7 @@ */ #include <apitest.h> +#include <apitest_guard.h> #define WIN32_NO_STATUS #include <stdio.h> @@ -25,53 +26,6 @@ #endif #endif -static -PVOID -AllocateGuarded( - SIZE_T SizeRequested) -{ - NTSTATUS Status; - SIZE_T Size = PAGE_ROUND_UP(SizeRequested + PAGE_SIZE); - PVOID VirtualMemory = NULL; - PCHAR StartOfBuffer; - - Status = NtAllocateVirtualMemory(NtCurrentProcess(), &VirtualMemory, 0, &Size, MEM_RESERVE, PAGE_NOACCESS); - - if (!NT_SUCCESS(Status)) - return NULL; - - Size -= PAGE_SIZE; - if (Size) - { - Status = NtAllocateVirtualMemory(NtCurrentProcess(), &VirtualMemory, 0, &Size, MEM_COMMIT, PAGE_READWRITE); - if (!NT_SUCCESS(Status)) - { - Size = 0; - Status = NtFreeVirtualMemory(NtCurrentProcess(), &VirtualMemory, &Size, MEM_RELEASE); - ok(Status == STATUS_SUCCESS, "Status = %lx\n", Status); - return NULL; - } - } - - StartOfBuffer = VirtualMemory; - StartOfBuffer += Size - SizeRequested; - - return StartOfBuffer; -} - -static -VOID -FreeGuarded( - PVOID Pointer) -{ - NTSTATUS Status; - PVOID VirtualMemory = (PVOID)PAGE_ROUND_DOWN((SIZE_T)Pointer); - SIZE_T Size = 0; - - Status = NtFreeVirtualMemory(NtCurrentProcess(), &VirtualMemory, &Size, MEM_RELEASE); - ok(Status == STATUS_SUCCESS, "Status = %lx\n", Status); -} - /* NOTE: This test is not only used for all the CRT apitests, but also for * user32's wsprintf. Make sure to test them all */ START_TEST(sprintf) diff --git a/modules/rostests/apitests/include/apitest_guard.h b/modules/rostests/apitests/include/apitest_guard.h new file mode 100644 index 00000000000..26b8ea0adf1 --- /dev/null +++ b/modules/rostests/apitests/include/apitest_guard.h @@ -0,0 +1,79 @@ +#ifndef _APITEST_GUARD_H +#define _APITEST_GUARD_H + +#include <ndk/mmfuncs.h> +#include <ndk/psfuncs.h> + +static +inline +PVOID +AllocateGuarded( + _In_ SIZE_T SizeRequested) +{ + NTSTATUS Status; + SIZE_T Size = PAGE_ROUND_UP(SizeRequested + PAGE_SIZE); + PVOID VirtualMemory = NULL; + PCHAR StartOfBuffer; + + Status = NtAllocateVirtualMemory(NtCurrentProcess(), &VirtualMemory, 0, &Size, MEM_RESERVE, PAGE_NOACCESS); + + if (!NT_SUCCESS(Status)) + return NULL; + + Size -= PAGE_SIZE; + if (Size) + { + Status = NtAllocateVirtualMemory(NtCurrentProcess(), &VirtualMemory, 0, &Size, MEM_COMMIT, PAGE_READWRITE); + if (!NT_SUCCESS(Status)) + { + Size = 0; + Status = NtFreeVirtualMemory(NtCurrentProcess(), &VirtualMemory, &Size, MEM_RELEASE); + ok(Status == STATUS_SUCCESS, "Status = %lx\n", Status); + return NULL; + } + } + + StartOfBuffer = VirtualMemory; + StartOfBuffer += Size - SizeRequested; + + return StartOfBuffer; +} + +static +inline +VOID +FreeGuarded( + _In_ PVOID Pointer) +{ + NTSTATUS Status; + PVOID VirtualMemory = (PVOID)PAGE_ROUND_DOWN((SIZE_T)Pointer); + SIZE_T Size = 0; + + Status = NtFreeVirtualMemory(NtCurrentProcess(), &VirtualMemory, &Size, MEM_RELEASE); + ok(Status == STATUS_SUCCESS, "Status = %lx\n", Status); +} + +static +inline +VOID +MakeReadOnly( + PVOID Pointer, + SIZE_T SizeRequested) +{ + NTSTATUS Status; + SIZE_T Size = PAGE_ROUND_UP(SizeRequested); + PVOID VirtualMemory = (PVOID)PAGE_ROUND_DOWN((SIZE_T)Pointer); + + if (Size) + { + Status = NtAllocateVirtualMemory(NtCurrentProcess(), &VirtualMemory, 0, &Size, MEM_COMMIT, PAGE_READWRITE); + if (!NT_SUCCESS(Status)) + { + Size = 0; + Status = NtFreeVirtualMemory(NtCurrentProcess(), &VirtualMemory, &Size, MEM_RELEASE); + ok(Status == STATUS_SUCCESS, "Status = %lx\n", Status); + } + } +} + +#endif /* _APITEST_GUARD_H */ diff --git a/modules/rostests/apitests/ntdll/RtlBitmap.c b/modules/rostests/apitests/ntdll/RtlBitmap.c index e524872b64c..355ccee0aff 100644 --- a/modules/rostests/apitests/ntdll/RtlBitmap.c +++ b/modules/rostests/apitests/ntdll/RtlBitmap.c @@ -4,53 +4,6 @@ static BOOL IsBroken = FALSE; -static -PVOID -AllocateGuarded( - _In_ SIZE_T SizeRequested) -{ - NTSTATUS Status; - SIZE_T Size = PAGE_ROUND_UP(SizeRequested + PAGE_SIZE); - PVOID VirtualMemory = NULL; - PCHAR StartOfBuffer; - - Status = NtAllocateVirtualMemory(NtCurrentProcess(), &VirtualMemory, 0, &Size, MEM_RESERVE, PAGE_NOACCESS); - - if (!NT_SUCCESS(Status)) - return NULL; - - Size -= PAGE_SIZE; - if (Size) - { - Status = NtAllocateVirtualMemory(NtCurrentProcess(), &VirtualMemory, 0, &Size, MEM_COMMIT, PAGE_READWRITE); - if (!NT_SUCCESS(Status)) - { - Size = 0; - Status = NtFreeVirtualMemory(NtCurrentProcess(), &VirtualMemory, &Size, MEM_RELEASE); - ok(Status == STATUS_SUCCESS, "Status = %lx\n", Status); - return NULL; - } - } - - StartOfBuffer = VirtualMemory; - StartOfBuffer += Size - SizeRequested; - - return StartOfBuffer; -} - -static -VOID -FreeGuarded( - _In_ PVOID Pointer) -{ - NTSTATUS Status; - PVOID VirtualMemory = (PVOID)PAGE_ROUND_DOWN((SIZE_T)Pointer); - SIZE_T Size = 0; - - Status = NtFreeVirtualMemory(NtCurrentProcess(), &VirtualMemory, &Size, MEM_RELEASE); - ok(Status == STATUS_SUCCESS, "Status = %lx\n", Status); -} - void Test_RtlFindMostSignificantBit(void) { diff --git a/modules/rostests/apitests/ntdll/RtlDeleteAce.c b/modules/rostests/apitests/ntdll/RtlDeleteAce.c index 4c4aaf58cdb..327247c728c 100644 --- a/modules/rostests/apitests/ntdll/RtlDeleteAce.c +++ b/modules/rostests/apitests/ntdll/RtlDeleteAce.c @@ -7,53 +7,6 @@ #include "precomp.h" -static -PVOID -AllocateGuarded( - _In_ SIZE_T SizeRequested) -{ - NTSTATUS Status; - SIZE_T Size = PAGE_ROUND_UP(SizeRequested + PAGE_SIZE); - PVOID VirtualMemory = NULL; - PCHAR StartOfBuffer; - - Status = NtAllocateVirtualMemory(NtCurrentProcess(), &VirtualMemory, 0, &Size, MEM_RESERVE, PAGE_NOACCESS); - - if (!NT_SUCCESS(Status)) - return NULL; - - Size -= PAGE_SIZE; - if (Size) - { - Status = NtAllocateVirtualMemory(NtCurrentProcess(), &VirtualMemory, 0, &Size, MEM_COMMIT, PAGE_READWRITE); - if (!NT_SUCCESS(Status)) - { - Size = 0; - Status = NtFreeVirtualMemory(NtCurrentProcess(), &VirtualMemory, &Size, MEM_RELEASE); - ok(Status == STATUS_SUCCESS, "Status = %lx\n", Status); - return NULL; - } - } - - StartOfBuffer = VirtualMemory; - StartOfBuffer += Size - SizeRequested; - - return StartOfBuffer; -} - -static -VOID -FreeGuarded( - _In_ PVOID Pointer) -{ - NTSTATUS Status; - PVOID VirtualMemory = (PVOID)PAGE_ROUND_DOWN((SIZE_T)Pointer); - SIZE_T Size = 0; - - Status = NtFreeVirtualMemory(NtCurrentProcess(), &VirtualMemory, &Size, MEM_RELEASE); - ok(Status == STATUS_SUCCESS, "Status = %lx\n", Status); -} - static PACL MakeAcl( diff --git a/modules/rostests/apitests/ntdll/RtlDetermineDosPathNameType.c b/modules/rostests/apitests/ntdll/RtlDetermineDosPathNameType.c index 3f99a38a9bd..ed197720302 100644 --- a/modules/rostests/apitests/ntdll/RtlDetermineDosPathNameType.c +++ b/modules/rostests/apitests/ntdll/RtlDetermineDosPathNameType.c @@ -30,75 +30,6 @@ ULONG //= (PVOID)0x7c830669; ; -static -PVOID -AllocateGuarded( - SIZE_T SizeRequested) -{ - NTSTATUS Status; - SIZE_T Size = PAGE_ROUND_UP(SizeRequested + PAGE_SIZE); - PVOID VirtualMemory = NULL; - PCHAR StartOfBuffer; - - Status = NtAllocateVirtualMemory(NtCurrentProcess(), &VirtualMemory, 0, &Size, MEM_RESERVE, PAGE_NOACCESS); - - if (!NT_SUCCESS(Status)) - return NULL; - - Size -= PAGE_SIZE; - if (Size) - { - Status = NtAllocateVirtualMemory(NtCurrentProcess(), &VirtualMemory, 0, &Size, MEM_COMMIT, PAGE_READWRITE); - if (!NT_SUCCESS(Status)) - { - Size = 0; - Status = NtFreeVirtualMemory(NtCurrentProcess(), &VirtualMemory, &Size, MEM_RELEASE); - ok(Status == STATUS_SUCCESS, "Status = %lx\n", Status); - return NULL; - } - } - - StartOfBuffer = VirtualMemory; - StartOfBuffer += Size - SizeRequested; - - return StartOfBuffer; -} - -static -VOID -MakeReadOnly( - PVOID Pointer, - SIZE_T SizeRequested) -{ - NTSTATUS Status; - SIZE_T Size = PAGE_ROUND_UP(SizeRequested); - PVOID VirtualMemory = (PVOID)PAGE_ROUND_DOWN((SIZE_T)Pointer); - - if (Size) - { - Status = NtAllocateVirtualMemory(NtCurrentProcess(), &VirtualMemory, 0, &Size, MEM_COMMIT, PAGE_READWRITE); - if (!NT_SUCCESS(Status)) - { - Size = 0; - Status = NtFreeVirtualMemory(NtCurrentProcess(), &VirtualMemory, &Size, MEM_RELEASE); - ok(Status == STATUS_SUCCESS, "Status = %lx\n", Status); - } - } -} - -static -VOID -FreeGuarded( - PVOID Pointer) -{ - NTSTATUS Status; - PVOID VirtualMemory = (PVOID)PAGE_ROUND_DOWN((SIZE_T)Pointer); - SIZE_T Size = 0; - - Status = NtFreeVirtualMemory(NtCurrentProcess(), &VirtualMemory, &Size, MEM_RELEASE); - ok(Status == STATUS_SUCCESS, "Status = %lx\n", Status); -} - START_TEST(RtlDetermineDosPathNameType) { RTL_PATH_TYPE PathType; diff --git a/modules/rostests/apitests/ntdll/RtlFirstFreeAce.c b/modules/rostests/apitests/ntdll/RtlFirstFreeAce.c index 0022945e416..654fdb09363 100644 --- a/modules/rostests/apitests/ntdll/RtlFirstFreeAce.c +++ b/modules/rostests/apitests/ntdll/RtlFirstFreeAce.c @@ -7,53 +7,6 @@ #include "precomp.h" -static -PVOID -AllocateGuarded( - _In_ SIZE_T SizeRequested) -{ - NTSTATUS Status; - SIZE_T Size = PAGE_ROUND_UP(SizeRequested + PAGE_SIZE); - PVOID VirtualMemory = NULL; - PCHAR StartOfBuffer; - - Status = NtAllocateVirtualMemory(NtCurrentProcess(), &VirtualMemory, 0, &Size, MEM_RESERVE, PAGE_NOACCESS); - - if (!NT_SUCCESS(Status)) - return NULL; - - Size -= PAGE_SIZE; - if (Size) - { - Status = NtAllocateVirtualMemory(NtCurrentProcess(), &VirtualMemory, 0, &Size, MEM_COMMIT, PAGE_READWRITE); - if (!NT_SUCCESS(Status)) - { - Size = 0; - Status = NtFreeVirtualMemory(NtCurrentProcess(), &VirtualMemory, &Size, MEM_RELEASE); - ok(Status == STATUS_SUCCESS, "Status = %lx\n", Status); - return NULL; - } - } - - StartOfBuffer = VirtualMemory; - StartOfBuffer += Size - SizeRequested; - - return StartOfBuffer; -} - -static -VOID -FreeGuarded( - _In_ PVOID Pointer) -{ - NTSTATUS Status; - PVOID VirtualMemory = (PVOID)PAGE_ROUND_DOWN((SIZE_T)Pointer); - SIZE_T Size = 0; - - Status = NtFreeVirtualMemory(NtCurrentProcess(), &VirtualMemory, &Size, MEM_RELEASE); - ok(Status == STATUS_SUCCESS, "Status = %lx\n", Status); -} - static PACL MakeAcl( diff --git a/modules/rostests/apitests/ntdll/RtlImageRvaToVa.c b/modules/rostests/apitests/ntdll/RtlImageRvaToVa.c index 9d15c58e717..ba9f75d7d7a 100644 --- a/modules/rostests/apitests/ntdll/RtlImageRvaToVa.c +++ b/modules/rostests/apitests/ntdll/RtlImageRvaToVa.c @@ -7,53 +7,6 @@ #include "precomp.h" -static -PVOID -AllocateGuarded( - _In_ SIZE_T SizeRequested) -{ - NTSTATUS Status; - SIZE_T Size = PAGE_ROUND_UP(SizeRequested + PAGE_SIZE); - PVOID VirtualMemory = NULL; - PCHAR StartOfBuffer; - - Status = NtAllocateVirtualMemory(NtCurrentProcess(), &VirtualMemory, 0, &Size, MEM_RESERVE, PAGE_NOACCESS); - - if (!NT_SUCCESS(Status)) - return NULL; - - Size -= PAGE_SIZE; - if (Size) - { - Status = NtAllocateVirtualMemory(NtCurrentProcess(), &VirtualMemory, 0, &Size, MEM_COMMIT, PAGE_READWRITE); - if (!NT_SUCCESS(Status)) - { - Size = 0; - Status = NtFreeVirtualMemory(NtCurrentProcess(), &VirtualMemory, &Size, MEM_RELEASE); - ok(Status == STATUS_SUCCESS, "Status = %lx\n", Status); - return NULL; - } - } - - StartOfBuffer = VirtualMemory; - StartOfBuffer += Size - SizeRequested; - - return StartOfBuffer; -} - -static -VOID -FreeGuarded( - _In_ PVOID Pointer) -{ - NTSTATUS Status; - PVOID VirtualMemory = (PVOID)PAGE_ROUND_DOWN((SIZE_T)Pointer); - SIZE_T Size = 0; - - Status = NtFreeVirtualMemory(NtCurrentProcess(), &VirtualMemory, &Size, MEM_RELEASE); - ok(Status == STATUS_SUCCESS, "Status = %lx\n", Status); -} - START_TEST(RtlImageRvaToVa) { PIMAGE_NT_HEADERS NtHeader; diff --git a/modules/rostests/apitests/ntdll/precomp.h b/modules/rostests/apitests/ntdll/precomp.h index 39ff188224d..82d3e0733b0 100644 --- a/modules/rostests/apitests/ntdll/precomp.h +++ b/modules/rostests/apitests/ntdll/precomp.h @@ -8,6 +8,7 @@ #define COM_NO_WINDOWS_H #include <apitest.h> +#include <apitest_guard.h> #include <ndk/ntndk.h> #include <strsafe.h> diff --git a/modules/rostests/apitests/user32/GetUserObjectInformation.c b/modules/rostests/apitests/user32/GetUserObjectInformation.c index 71c441fc852..423e3e649bf 100644 --- a/modules/rostests/apitests/user32/GetUserObjectInformation.c +++ b/modules/rostests/apitests/user32/GetUserObjectInformation.c @@ -6,6 +6,7 @@ */ #include "precomp.h" +#include <apitest_guard.h> #include <ndk/mmfuncs.h> #include <ndk/pstypes.h> @@ -30,53 +31,6 @@ CheckBuffer( return TRUE; } -static -PVOID -AllocateGuarded( - SIZE_T SizeRequested) -{ - NTSTATUS Status; - SIZE_T Size = PAGE_ROUND_UP(SizeRequested + PAGE_SIZE); - PVOID VirtualMemory = NULL; - PCHAR StartOfBuffer; - - Status = NtAllocateVirtualMemory(NtCurrentProcess(), &VirtualMemory, 0, &Size, MEM_RESERVE, PAGE_NOACCESS); - - if (!NT_SUCCESS(Status)) - return NULL; - - Size -= PAGE_SIZE; - if (Size) - { - Status = NtAllocateVirtualMemory(NtCurrentProcess(), &VirtualMemory, 0, &Size, MEM_COMMIT, PAGE_READWRITE); - if (!NT_SUCCESS(Status)) - { - Size = 0; - Status = NtFreeVirtualMemory(NtCurrentProcess(), &VirtualMemory, &Size, MEM_RELEASE); - ok(Status == STATUS_SUCCESS, "Status = %lx\n", Status); - return NULL; - } - } - - StartOfBuffer = VirtualMemory; - StartOfBuffer += Size - SizeRequested; - - return StartOfBuffer; -} - -static -VOID -FreeGuarded( - PVOID Pointer) -{ - NTSTATUS Status; - PVOID VirtualMemory = (PVOID)PAGE_ROUND_DOWN((SIZE_T)Pointer); - SIZE_T Size = 0; - - Status = NtFreeVirtualMemory(NtCurrentProcess(), &VirtualMemory, &Size, MEM_RELEASE); - ok(Status == STATUS_SUCCESS, "Status = %lx\n", Status); -} - #define xok ok // Make the test succeed on Win2003 //#define xok(...) // This should make the test succeed on all Windows versions #define NOTSET 1234 diff --git a/modules/rostests/apitests/ws2_32/WSAStartup.c b/modules/rostests/apitests/ws2_32/WSAStartup.c index 11e731a805e..d3b203f2393 100644 --- a/modules/rostests/apitests/ws2_32/WSAStartup.c +++ b/modules/rostests/apitests/ws2_32/WSAStartup.c @@ -6,53 +6,7 @@ */ #include "ws2_32.h" - -static -PVOID -AllocateGuarded( - SIZE_T SizeRequested) -{ - NTSTATUS Status; - SIZE_T Size = PAGE_ROUND_UP(SizeRequested + PAGE_SIZE); - PVOID VirtualMemory = NULL; - PCHAR StartOfBuffer; - - Status = NtAllocateVirtualMemory(NtCurrentProcess(), &VirtualMemory, 0, &Size, MEM_RESERVE, PAGE_NOACCESS); - - if (!NT_SUCCESS(Status)) - return NULL; - - Size -= PAGE_SIZE; - if (Size) - { - Status = NtAllocateVirtualMemory(NtCurrentProcess(), &VirtualMemory, 0, &Size, MEM_COMMIT, PAGE_READWRITE); - if (!NT_SUCCESS(Status)) - { - Size = 0; - Status = NtFreeVirtualMemory(NtCurrentProcess(), &VirtualMemory, &Size, MEM_RELEASE); - ok(Status == STATUS_SUCCESS, "Status = %lx\n", Status); - return NULL; - } - } - - StartOfBuffer = VirtualMemory; - StartOfBuffer += Size - SizeRequested; - - return StartOfBuffer; -} - -static -VOID -FreeGuarded( - PVOID Pointer) -{ - NTSTATUS Status; - PVOID VirtualMemory = (PVOID)PAGE_ROUND_DOWN((SIZE_T)Pointer); - SIZE_T Size = 0; - - Status = NtFreeVirtualMemory(NtCurrentProcess(), &VirtualMemory, &Size, MEM_RELEASE); - ok(Status == STATUS_SUCCESS, "Status = %lx\n", Status); -} +#include <apitest_guard.h> static BOOLEAN

1 0

[reactos] 03/05: [NTOS:IO] Use UNICODE_STRING operations in IopUnloadDriver.
by Thomas Faber 31 Dec '19

31 Dec '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c904983b49ee7b755f5c9… commit c904983b49ee7b755f5c926c17b3b99e4042f72f Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Dec 29 13:47:40 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Tue Dec 31 15:18:17 2019 +0100 [NTOS:IO] Use UNICODE_STRING operations in IopUnloadDriver. Fixes several overflow vulnerabilities. --- ntoskrnl/io/iomgr/driver.c | 39 +++++++++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/ntoskrnl/io/iomgr/driver.c b/ntoskrnl/io/iomgr/driver.c index f636dc35627..8e0bea4092f 100644 --- a/ntoskrnl/io/iomgr/driver.c +++ b/ntoskrnl/io/iomgr/driver.c @@ -1186,6 +1186,7 @@ IopInitializeSystemDrivers(VOID) NTSTATUS NTAPI IopUnloadDriver(PUNICODE_STRING DriverServiceName, BOOLEAN UnloadPnpDrivers) { + UNICODE_STRING Backslash = RTL_CONSTANT_STRING(L"\\"); RTL_QUERY_REGISTRY_TABLE QueryTable[2]; UNICODE_STRING ImagePath; UNICODE_STRING ServiceName; @@ -1194,7 +1195,7 @@ IopUnloadDriver(PUNICODE_STRING DriverServiceName, BOOLEAN UnloadPnpDrivers) PDEVICE_OBJECT DeviceObject; PEXTENDED_DEVOBJ_EXTENSION DeviceExtension; NTSTATUS Status; - PWSTR Start; + USHORT LastBackslash; BOOLEAN SafeToUnload = TRUE; KPROCESSOR_MODE PreviousMode; UNICODE_STRING CapturedServiceName; @@ -1230,19 +1231,34 @@ IopUnloadDriver(PUNICODE_STRING DriverServiceName, BOOLEAN UnloadPnpDrivers) /* * Get the service name from the registry key name */ - Start = wcsrchr(CapturedServiceName.Buffer, L'\\'); - if (Start == NULL) - Start = CapturedServiceName.Buffer; + Status = RtlFindCharInUnicodeString(RTL_FIND_CHAR_IN_UNICODE_STRING_START_AT_END, + &CapturedServiceName, + &Backslash, + &LastBackslash); + if (NT_SUCCESS(Status)) + { + NT_ASSERT(CapturedServiceName.Length >= LastBackslash + sizeof(WCHAR)); + ServiceName.Buffer = &CapturedServiceName.Buffer[LastBackslash / sizeof(WCHAR) + 1]; + ServiceName.Length = CapturedServiceName.Length - LastBackslash - sizeof(WCHAR); + ServiceName.MaximumLength = CapturedServiceName.MaximumLength - LastBackslash - sizeof(WCHAR); + } else - Start++; - - RtlInitUnicodeString(&ServiceName, Start); + { + ServiceName = CapturedServiceName; + } /* * Construct the driver object name */ - ObjectName.Length = ((USHORT)wcslen(Start) + 8) * sizeof(WCHAR); - ObjectName.MaximumLength = ObjectName.Length + sizeof(WCHAR); + Status = RtlUShortAdd(sizeof(DRIVER_ROOT_NAME), + ServiceName.Length, + &ObjectName.MaximumLength); + if (!NT_SUCCESS(Status)) + { + ReleaseCapturedUnicodeString(&CapturedServiceName, PreviousMode); + return Status; + } + ObjectName.Length = 0; ObjectName.Buffer = ExAllocatePoolWithTag(PagedPool, ObjectName.MaximumLength, TAG_IO); @@ -1251,9 +1267,8 @@ IopUnloadDriver(PUNICODE_STRING DriverServiceName, BOOLEAN UnloadPnpDrivers) ReleaseCapturedUnicodeString(&CapturedServiceName, PreviousMode); return STATUS_INSUFFICIENT_RESOURCES; } - wcscpy(ObjectName.Buffer, DRIVER_ROOT_NAME); - memcpy(ObjectName.Buffer + 8, Start, ObjectName.Length - 8 * sizeof(WCHAR)); - ObjectName.Buffer[ObjectName.Length/sizeof(WCHAR)] = UNICODE_NULL; + NT_VERIFY(NT_SUCCESS(RtlAppendUnicodeToString(&ObjectName, DRIVER_ROOT_NAME))); + NT_VERIFY(NT_SUCCESS(RtlAppendUnicodeStringToString(&ObjectName, &ServiceName))); /* * Find the driver object

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs