Ros-diffs

ros-diffs@reactos.org

81390 discussions

[bfreisen] 75584: [PSDK][GDIPLUS] Further work on wrapper classes Pen, Graphics and Brush
by bfreisen＠svn.reactos.org 17 Aug '17

17 Aug '17

Author: bfreisen Date: Thu Aug 17 09:44:57 2017 New Revision: 75584 URL: http://svn.reactos.org/svn/reactos?rev=75584&view=rev Log: [PSDK][GDIPLUS] Further work on wrapper classes Pen, Graphics and Brush Modified: trunk/reactos/sdk/include/psdk/gdiplusbrush.h trunk/reactos/sdk/include/psdk/gdiplusgraphics.h trunk/reactos/sdk/include/psdk/gdipluspen.h Modified: trunk/reactos/sdk/include/psdk/gdiplusbrush.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/gdiplusbr… ============================================================================== --- trunk/reactos/sdk/include/psdk/gdiplusbrush.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/gdiplusbrush.h [iso-8859-1] Thu Aug 17 09:44:57 2017 @@ -24,6 +24,8 @@ class Brush : public GdiplusBase { public: + friend class Pen; + Brush *Clone(VOID) const { return NULL; @@ -31,12 +33,26 @@ Status GetLastStatus(VOID) { - return NotImplemented; + return status; } BrushType GetType(VOID) { - return BrushTypeSolidColor; + BrushType type; + SetStatus(DllExports::GdipGetBrushType(brush, &type)); + return type; + } + +private: + mutable Status status; + GpBrush *brush; + + Status SetStatus(Status status) const + { + if (status == Ok) + return status; + this->status = status; + return status; } }; Modified: trunk/reactos/sdk/include/psdk/gdiplusgraphics.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/gdiplusgr… ============================================================================== --- trunk/reactos/sdk/include/psdk/gdiplusgraphics.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/gdiplusgraphics.h [iso-8859-1] Thu Aug 17 09:44:57 2017 @@ -56,7 +56,7 @@ Status AddMetafileComment(const BYTE *data, UINT sizeData) { - return NotImplemented; + return SetStatus(DllExports::GdipComment(graphics, sizeData, data)); } GraphicsContainer BeginContainer(VOID) @@ -76,57 +76,57 @@ Status Clear(const Color &color) { - return NotImplemented; + return SetStatus(DllExports::GdipGraphicsClear(graphics, color.GetValue())); } Status DrawArc(const Pen *pen, const Rect &rect, REAL startAngle, REAL sweepAngle) { - return NotImplemented; + return SetStatus(DllExports::GdipDrawArcI(graphics, pen ? pen->pen : NULL, rect.X, rect.Y, rect.Width, rect.Height, startAngle, sweepAngle)); } Status DrawArc(const Pen *pen, const RectF &rect, REAL startAngle, REAL sweepAngle) { - return NotImplemented; + return SetStatus(DllExports::GdipDrawArcI(graphics, pen ? pen->pen : NULL, rect.X, rect.Y, rect.Width, rect.Height, startAngle, sweepAngle)); } Status DrawArc(const Pen *pen, REAL x, REAL y, REAL width, REAL height, REAL startAngle, REAL sweepAngle) { - return NotImplemented; + return SetStatus(DllExports::GdipDrawArc(graphics, pen ? pen->pen : NULL, x, y, width, height, startAngle, sweepAngle)); } Status DrawArc(const Pen *pen, INT x, INT y, INT width, INT height, REAL startAngle, REAL sweepAngle) { - return NotImplemented; + return SetStatus(DllExports::GdipDrawArcI(graphics, pen ? pen->pen : NULL, x, y, width, height, startAngle, sweepAngle)); } Status DrawBezier(const Pen *pen, const Point &pt1, const Point &pt2, const Point &pt3, const Point &pt4) { - return NotImplemented; + return SetStatus(DllExports::GdipDrawBezierI(graphics, pen ? pen->pen : NULL, pt1.X, pt1.Y, pt2.X, pt2.Y, pt3.X, pt3.Y, pt4.X, pt4.Y)); } Status DrawBezier(const Pen *pen, const PointF &pt1, const PointF &pt2, const PointF &pt3, const PointF &pt4) { - return NotImplemented; + return SetStatus(DllExports::GdipDrawBezier(graphics, pen ? pen->pen : NULL, pt1.X, pt1.Y, pt2.X, pt2.Y, pt3.X, pt3.Y, pt4.X, pt4.Y)); } Status DrawBezier(const Pen *pen, REAL x1, REAL y1, REAL x2, REAL y2, REAL x3, REAL y3, REAL x4, REAL y4) { - return NotImplemented; + return SetStatus(DllExports::GdipDrawBezier(graphics, pen ? pen->pen : NULL, x1, y1, x2, y2, x3, y3, x4, y4)); } Status DrawBezier(const Pen *pen, INT x1, INT y1, INT x2, INT y2, INT x3, INT y3, INT x4, INT y4) { - return NotImplemented; + return SetStatus(DllExports::GdipDrawBezierI(graphics, pen ? pen->pen : NULL, x1, y1, x2, y2, x3, y3, x4, y4)); } Status DrawBeziers(const Pen *pen, const Point *points, INT count) { - return NotImplemented; + return SetStatus(DllExports::GdipDrawBeziersI(graphics, pen ? pen->pen : NULL, points, count)); } Status DrawBeziers(const Pen *pen, const PointF *points, INT count) { - return NotImplemented; + return SetStatus(DllExports::GdipDrawBeziers(graphics, pen ? pen->pen : NULL, points, count)); } Status DrawCachedBitmap(CachedBitmap *cb, INT x, INT y) @@ -136,52 +136,52 @@ Status DrawClosedCurve(const Pen *pen, const Point *points, INT count) { - return NotImplemented; + return SetStatus(DllExports::GdipDrawClosedCurveI(graphics, pen ? pen->pen : NULL, points, count)); } Status DrawClosedCurve(const Pen *pen, const PointF *points, INT count) { - return NotImplemented; + return SetStatus(DllExports::GdipDrawClosedCurve(graphics, pen ? pen->pen : NULL, points, count)); } Status DrawClosedCurve(const Pen *pen, const PointF *points, INT count, REAL tension) { - return NotImplemented; + return SetStatus(DllExports::GdipDrawClosedCurve2(graphics, pen ? pen->pen : NULL, points, count, tension)); } Status DrawClosedCurve(const Pen *pen, const Point *points, INT count, REAL tension) { - return NotImplemented; + return SetStatus(DllExports::GdipDrawClosedCurve2I(graphics, pen ? pen->pen : NULL, points, count, tension)); } Status DrawCurve(const Pen *pen, const Point *points, INT count) { - return NotImplemented; + return SetStatus(DllExports::GdipDrawCurveI(graphics, pen ? pen->pen : NULL, points, count)); } Status DrawCurve(const Pen *pen, const PointF *points, INT count) { - return NotImplemented; + return SetStatus(DllExports::GdipDrawCurve(graphics, pen ? pen->pen : NULL, points, count)); } Status DrawCurve(const Pen *pen, const PointF *points, INT count, REAL tension) { - return NotImplemented; + return SetStatus(DllExports::GdipDrawCurve2(graphics, pen ? pen->pen : NULL, points, count, tension)); } Status DrawCurve(const Pen *pen, const Point *points, INT count, INT offset, INT numberOfSegments, REAL tension) { - return NotImplemented; + return SetStatus(DllExports::GdipDrawCurve3I(graphics, pen ? pen->pen : NULL, points, count, offset, numberOfSegments, tension)); } Status DrawCurve(const Pen *pen, const PointF *points, INT count, INT offset, INT numberOfSegments, REAL tension) { - return NotImplemented; + return SetStatus(DllExports::GdipDrawCurve3(graphics, pen ? pen->pen : NULL, points, count, offset, numberOfSegments, tension)); } Status DrawCurve(const Pen *pen, const Point *points, INT count, REAL tension) { - return NotImplemented; + return SetStatus(DllExports::GdipDrawCurve2I(graphics, pen ? pen->pen : NULL, points, count, tension)); } Status DrawDriverString(const UINT16 *text, INT length, const Font *font, const Brush *brush, const PointF *positions, INT flags, const Matrix *matrix) @@ -191,22 +191,22 @@ Status DrawEllipse(const Pen *pen, const Rect &rect) { - return NotImplemented; + return SetStatus(DllExports::GdipDrawEllipseI(graphics, pen ? pen->pen : NULL, rect.X, rect.Y, rect.Width, rect.Height)); } Status DrawEllipse(const Pen *pen, REAL x, REAL y, REAL width, REAL height) { - return NotImplemented; + return SetStatus(DllExports::GdipDrawEllipse(graphics, pen ? pen->pen : NULL, x, y, width, height)); } Status DrawEllipse(const Pen *pen, const RectF &rect) { - return NotImplemented; + return SetStatus(DllExports::GdipDrawEllipse(graphics, pen ? pen->pen : NULL, rect.X, rect.Y, rect.Width, rect.Height)); } Status DrawEllipse(const Pen *pen, INT x, INT y, INT width, INT height) { - return NotImplemented; + return SetStatus(DllExports::GdipDrawEllipseI(graphics, pen ? pen->pen : NULL, x, y, width, height)); } Status DrawImage(Image *image, const Point *destPoints, INT count) @@ -291,37 +291,32 @@ Status DrawLine(const Pen *pen, const Point &pt1, const Point &pt2) { - return NotImplemented; + return SetStatus(DllExports::GdipDrawLineI(graphics, pen ? pen->pen : NULL, pt1.X, pt1.Y, pt2.X, pt2.Y)); } Status DrawLine(const Pen *pen, const PointF &pt1, const Point &pt2) { - return NotImplemented; + return SetStatus(DllExports::GdipDrawLine(graphics, pen ? pen->pen : NULL, pt1.X, pt1.Y, pt2.X, pt2.Y)); } Status DrawLine(const Pen *pen, REAL x1, REAL y1, REAL x2, REAL y2) { - return NotImplemented; + return SetStatus(DllExports::GdipDrawLine(graphics, pen ? pen->pen : NULL, x1, y1, x2, y2)); } Status DrawLine(const Pen *pen, INT x1, INT y1, INT x2, INT y2) { - return SetStatus(DllExports::GdipDrawLine(graphics, - pen->pen, - x1, - y1, - x2, - y2)); + return SetStatus(DllExports::GdipDrawLine(graphics, pen ? pen->pen : NULL, x1, y1, x2, y2)); } Status DrawLines(const Pen *pen, const Point *points, INT count) { - return NotImplemented; + return SetStatus(DllExports::GdipDrawLinesI(graphics, pen ? pen->pen : NULL, points, count)); } Status DrawLines(const Pen *pen, const PointF *points, INT count) { - return NotImplemented; + return SetStatus(DllExports::GdipDrawLines(graphics, pen ? pen->pen : NULL, points, count)); } Status DrawPath(const Pen *pen, const GraphicsPath *path) @@ -331,62 +326,62 @@ Status DrawPie(const Pen *pen, const Rect &rect, REAL startAngle, REAL sweepAngle) { - return NotImplemented; + return SetStatus(DllExports::GdipDrawPieI(graphics, pen ? pen->pen : NULL, rect.X, rect.Y, rect.Width, rect.Height, startAngle, sweepAngle)); } Status DrawPie(const Pen *pen, INT x, INT y, INT width, INT height, REAL startAngle, REAL sweepAngle) { - return NotImplemented; + return SetStatus(DllExports::GdipDrawPieI(graphics, pen ? pen->pen : NULL, x, y, width, height, startAngle, sweepAngle)); } Status DrawPie(const Pen *pen, REAL x, REAL y, REAL width, REAL height, REAL startAngle, REAL sweepAngle) { - return NotImplemented; + return SetStatus(DllExports::GdipDrawPie(graphics, pen ? pen->pen : NULL, x, y, width, height, startAngle, sweepAngle)); } Status DrawPie(const Pen *pen, const RectF &rect, REAL startAngle, REAL sweepAngle) { - return NotImplemented; - } - - Status DrawPolygon(const Pen *pen, const Point *points, INT *count) - { - return NotImplemented; - } - - Status DrawPolygon(const Pen *pen, const PointF *points, INT *count) - { - return NotImplemented; + return SetStatus(DllExports::GdipDrawPie(graphics, pen ? pen->pen : NULL, rect.X, rect.Y, rect.Width, rect.Height, startAngle, sweepAngle)); + } + + Status DrawPolygon(const Pen *pen, const Point *points, INT count) + { + return SetStatus(DllExports::GdipDrawPolygonI(graphics, pen ? pen->pen : NULL, points, count)); + } + + Status DrawPolygon(const Pen *pen, const PointF *points, INT count) + { + return SetStatus(DllExports::GdipDrawPolygon(graphics, pen ? pen->pen : NULL, points, count)); } Status DrawRectangle(const Pen *pen, const Rect &rect) { - return NotImplemented; + return SetStatus(DllExports::GdipDrawRectangleI(graphics, pen ? pen->pen : NULL, rect.X, rect.Y, rect.Width, rect.Height)); } Status DrawRectangle(const Pen *pen, INT x, INT y, INT width, INT height) { - return NotImplemented; + return SetStatus(DllExports::GdipDrawRectangleI(graphics, pen ? pen->pen : NULL, x, y, width, height)); } Status DrawRectangle(const Pen *pen, REAL x, REAL y, REAL width, REAL height) { - return NotImplemented; + return SetStatus(DllExports::GdipDrawRectangle(graphics, pen ? pen->pen : NULL, x, y, width, height)); } Status DrawRectangle(const Pen *pen, const RectF &rect) { - return NotImplemented; + return SetStatus(DllExports::GdipDrawRectangleI(graphics, pen ? pen->pen : NULL, rect.X, rect.Y, rect.Width, rect.Height)); } Status DrawRectangles(const Pen *pen, const Rect *rects, INT count) { - return NotImplemented; + return SetStatus(DllExports::GdipDrawRectanglesI(graphics, pen ? pen->pen : NULL, rects, count)); } Status DrawRectangles(const Pen *pen, const RectF *rects, INT count) { - return NotImplemented; + return SetStatus(DllExports::GdipDrawRectangles(graphics, pen ? pen->pen : NULL, rects, count)); } Status DrawString(const WCHAR *string, INT length, const Font *font, const RectF &layoutRect, const StringFormat *stringFormat, const Brush *brush) @@ -406,7 +401,7 @@ Status EndContainer(GraphicsContainer state) { - return NotImplemented; + return SetStatus(DllExports::GdipEndContainer(graphics, state)); } Status EnumerateMetafile(const Metafile *metafile, const Metafile &destPoint, EnumerateMetafileProc callback, VOID *callbackData, ImageAttributes *imageAttributes) Modified: trunk/reactos/sdk/include/psdk/gdipluspen.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/gdipluspe… ============================================================================== --- trunk/reactos/sdk/include/psdk/gdipluspen.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/gdipluspen.h [iso-8859-1] Thu Aug 17 09:44:57 2017 @@ -200,7 +200,7 @@ Status SetBrush(const Brush *brush) { - return NotImplemented; // FIXME: Brush unimplemented SetStatus(DllExports::GdipSetPenBrushFill(pen, brush ? brush->brush : NULL)); + return SetStatus(DllExports::GdipSetPenBrushFill(pen, brush ? brush->brush : NULL)); } Status SetColor(const Color &color)

1 0

[tkreuzer] 75583: [WIN32K] Revert an accidental change from r75566 Fixes gdi32_winetest metafile regression
by tkreuzer＠svn.reactos.org 17 Aug '17

17 Aug '17

Author: tkreuzer Date: Thu Aug 17 09:39:43 2017 New Revision: 75583 URL: http://svn.reactos.org/svn/reactos?rev=75583&view=rev Log: [WIN32K] Revert an accidental change from r75566 Fixes gdi32_winetest metafile regression Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Thu Aug 17 09:39:43 2017 @@ -5143,7 +5143,7 @@ if (!dc->dclevel.pSurface) { /* Memory DC with no surface selected */ - bResult = FALSE; // TRUE? + bResult = TRUE; goto Cleanup; }

1 0

[tkreuzer] 75582: [WIN32K] Don't call IntIsFontRenderingEnabled() while holding an exclusive GDI object lock. Should fix GUI hangs.
by tkreuzer＠svn.reactos.org 17 Aug '17

17 Aug '17

Author: tkreuzer Date: Thu Aug 17 09:08:57 2017 New Revision: 75582 URL: http://svn.reactos.org/svn/reactos?rev=75582&view=rev Log: [WIN32K] Don't call IntIsFontRenderingEnabled() while holding an exclusive GDI object lock. Should fix GUI hangs. Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Thu Aug 17 09:08:57 2017 @@ -5111,6 +5111,10 @@ return FALSE; } + /* NOTE: This function locks the screen DC, so it must never be called + with a DC already locked */ + Render = IntIsFontRenderingEnabled(); + // TODO: Write test-cases to exactly match real Windows in different // bad parameters (e.g. does Windows check the DC or the RECT first?). dc = DC_LockDc(hDC); @@ -5238,7 +5242,6 @@ EmuBold = (plf->lfWeight >= FW_BOLD && FontGDI->OriginalWeight <= FW_NORMAL); EmuItalic = (plf->lfItalic && !FontGDI->OriginalItalic); - Render = IntIsFontRenderingEnabled(); if (Render) RenderMode = IntGetFontRenderMode(plf); else

1 0

[cfinck] 75581: [CDFS] Fix uninitialized variable usage (why did neither MSVC nor GCC catch this?)
by cfinck＠svn.reactos.org 16 Aug '17

16 Aug '17

Author: cfinck Date: Wed Aug 16 23:12:55 2017 New Revision: 75581 URL: http://svn.reactos.org/svn/reactos?rev=75581&view=rev Log: [CDFS] Fix uninitialized variable usage (why did neither MSVC nor GCC catch this?) Modified: trunk/reactos/drivers/filesystems/cdfs/fsctl.c Modified: trunk/reactos/drivers/filesystems/cdfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] Wed Aug 16 23:12:55 2017 @@ -237,14 +237,14 @@ /* FIXME: should be done only for real cdroms? */ Offset -= 150; } - CdInfo->VolumeOffset = Offset; } else { DPRINT1("Allowing mount of CDFS volume on non-CD device\n"); - CdInfo->VolumeOffset = 0; + Offset = 0; } + CdInfo->VolumeOffset = Offset; DPRINT("Offset of first track in last session %u\n", Offset); CdInfo->JolietLevel = 0;

1 0

[tkreuzer] 75580: [NTOS] Make the GET_HASH_ENTRY() macro return a pointer to the entry instead of the entry itself. Implicitly it was already returning a pointer, which was then referenced using a ...
by tkreuzer＠svn.reactos.org 16 Aug '17

16 Aug '17

Author: tkreuzer Date: Wed Aug 16 20:30:45 2017 New Revision: 75580 URL: http://svn.reactos.org/svn/reactos?rev=75580&view=rev Log: [NTOS] Make the GET_HASH_ENTRY() macro return a pointer to the entry instead of the entry itself. Implicitly it was already returning a pointer, which was then referenced using a "." instead of "->", giving the impression we were working on the returned object instead of the original data. - Convert some macros to inline functions Modified: trunk/reactos/ntoskrnl/config/cmkcbncb.c trunk/reactos/ntoskrnl/config/cmsysini.c trunk/reactos/ntoskrnl/include/internal/cm_x.h Modified: trunk/reactos/ntoskrnl/config/cmkcbncb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmkcbncb.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmkcbncb.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmkcbncb.c [iso-8859-1] Wed Aug 16 20:30:45 2017 @@ -82,7 +82,7 @@ ASSERT_VALID_HASH(KeyHash); /* Lookup all the keys in this index entry */ - Prev = &GET_HASH_ENTRY(CmpCacheTable, KeyHash->ConvKey).Entry; + Prev = &GET_HASH_ENTRY(CmpCacheTable, KeyHash->ConvKey)->Entry; while (TRUE) { /* Save the current one and make sure it's valid */ @@ -189,7 +189,7 @@ CmpAcquireNcbLockExclusiveByKey(ConvKey); /* Get the hash entry */ - HashEntry = GET_HASH_ENTRY(CmpNameCacheTable, ConvKey).Entry; + HashEntry = GET_HASH_ENTRY(CmpNameCacheTable, ConvKey)->Entry; while (HashEntry) { /* Get the current NCB */ @@ -290,8 +290,8 @@ /* Insert the name in the hash table */ HashEntry = &Ncb->NameHash; - HashEntry->NextHash = GET_HASH_ENTRY(CmpNameCacheTable, ConvKey).Entry; - GET_HASH_ENTRY(CmpNameCacheTable, ConvKey).Entry = HashEntry; + HashEntry->NextHash = GET_HASH_ENTRY(CmpNameCacheTable, ConvKey)->Entry; + GET_HASH_ENTRY(CmpNameCacheTable, ConvKey)->Entry = HashEntry; } /* Release NCB lock */ @@ -327,7 +327,7 @@ if (!(--Ncb->RefCount)) { /* Find the NCB in the table */ - Next = &GET_HASH_ENTRY(CmpNameCacheTable, Ncb->ConvKey).Entry; + Next = &GET_HASH_ENTRY(CmpNameCacheTable, Ncb->ConvKey)->Entry; while (TRUE) { /* Check the current entry */ Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] Wed Aug 16 20:30:45 2017 @@ -2081,14 +2081,14 @@ /* Get hash indexes */ Index1 = GET_HASH_INDEX(ConvKey1); Index2 = GET_HASH_INDEX(ConvKey2); - ASSERT((GET_HASH_ENTRY(CmpCacheTable, ConvKey2).Owner == KeGetCurrentThread()) || + ASSERT((GET_HASH_ENTRY(CmpCacheTable, ConvKey2)->Owner == KeGetCurrentThread()) || (CmpTestRegistryLockExclusive())); /* See which one is highest */ if (Index1 < Index2) { /* Grab them in the proper order */ - ASSERT((GET_HASH_ENTRY(CmpCacheTable, ConvKey1).Owner == KeGetCurrentThread()) || + ASSERT((GET_HASH_ENTRY(CmpCacheTable, ConvKey1)->Owner == KeGetCurrentThread()) || (CmpTestRegistryLockExclusive())); CmpReleaseKcbLockByKey(ConvKey2); CmpReleaseKcbLockByKey(ConvKey1); @@ -2098,7 +2098,7 @@ /* Release the first one first, then the second */ if (Index1 != Index2) { - ASSERT((GET_HASH_ENTRY(CmpCacheTable, ConvKey1).Owner == KeGetCurrentThread()) || + ASSERT((GET_HASH_ENTRY(CmpCacheTable, ConvKey1)->Owner == KeGetCurrentThread()) || (CmpTestRegistryLockExclusive())); CmpReleaseKcbLockByKey(ConvKey1); } Modified: trunk/reactos/ntoskrnl/include/internal/cm_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/cm_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/cm_x.h [iso-8859-1] Wed Aug 16 20:30:45 2017 @@ -18,7 +18,7 @@ #define GET_HASH_INDEX(ConvKey) \ GET_HASH_KEY(ConvKey) % CmpHashTableSize #define GET_HASH_ENTRY(Table, ConvKey) \ - (Table[GET_HASH_INDEX(ConvKey)]) + (&Table[GET_HASH_INDEX(ConvKey)]) #define ASSERT_VALID_HASH(h) \ ASSERT_KCB_VALID(CONTAINING_RECORD((h), CM_KEY_CONTROL_BLOCK, KeyHash)) @@ -81,37 +81,37 @@ // #define CmpIsKcbLockedExclusive(k) \ (GET_HASH_ENTRY(CmpCacheTable, \ - (k)->ConvKey).Owner == KeGetCurrentThread()) + (k)->ConvKey)->Owner == KeGetCurrentThread()) + +// +// Exclusively acquires a KCB by index +// +FORCEINLINE +VOID +CmpAcquireKcbLockExclusiveByIndex(ULONG Index) +{ + ExAcquirePushLockExclusive(&CmpCacheTable[Index].Lock); + CmpCacheTable[Index].Owner = KeGetCurrentThread(); +} // // Exclusively acquires a KCB // -#define CmpAcquireKcbLockExclusive(k) \ -{ \ - ExAcquirePushLockExclusive(&GET_HASH_ENTRY(CmpCacheTable, \ - (k)->ConvKey).Lock); \ - GET_HASH_ENTRY(CmpCacheTable, \ - (k)->ConvKey).Owner = KeGetCurrentThread(); \ -} - -// -// Exclusively acquires a KCB by index -// -#define CmpAcquireKcbLockExclusiveByIndex(i) \ -{ \ - ExAcquirePushLockExclusive(&CmpCacheTable[(i)].Lock); \ - CmpCacheTable[(i)].Owner = KeGetCurrentThread(); \ +FORCEINLINE +VOID +CmpAcquireKcbLockExclusive(PCM_KEY_CONTROL_BLOCK Kcb) +{ + CmpAcquireKcbLockExclusiveByIndex(GET_HASH_INDEX(Kcb->ConvKey)); } // // Exclusively acquires a KCB by key // -#define CmpAcquireKcbLockExclusiveByKey(k) \ -{ \ - ExAcquirePushLockExclusive(&GET_HASH_ENTRY(CmpCacheTable, \ - (k)).Lock); \ - GET_HASH_ENTRY(CmpCacheTable, \ - (k)).Owner = KeGetCurrentThread(); \ +FORCEINLINE +VOID +CmpAcquireKcbLockExclusiveByKey(IN ULONG ConvKey) +{ + CmpAcquireKcbLockExclusiveByIndex(GET_HASH_INDEX(ConvKey)); } @@ -121,7 +121,7 @@ #define CmpAcquireKcbLockShared(k) \ { \ ExAcquirePushLockShared(&GET_HASH_ENTRY(CmpCacheTable, \ - (k)->ConvKey).Lock); \ + (k)->ConvKey)->Lock); \ } // @@ -141,42 +141,44 @@ { ASSERT(CmpIsKcbLockedExclusive(k) == FALSE); if (ExConvertPushLockSharedToExclusive( - &GET_HASH_ENTRY(CmpCacheTable, k->ConvKey).Lock)) + &GET_HASH_ENTRY(CmpCacheTable, k->ConvKey)->Lock)) { GET_HASH_ENTRY(CmpCacheTable, - k->ConvKey).Owner = KeGetCurrentThread(); + k->ConvKey)->Owner = KeGetCurrentThread(); return TRUE; } return FALSE; } // +// Releases an exlusively or shared acquired KCB by index +// +FORCEINLINE +VOID +CmpReleaseKcbLockByIndex(ULONG Index) +{ + CmpCacheTable[Index].Owner = NULL; + ExReleasePushLock(&CmpCacheTable[Index].Lock); +} + +// // Releases an exlusively or shared acquired KCB // -#define CmpReleaseKcbLock(k) \ -{ \ - GET_HASH_ENTRY(CmpCacheTable, (k)->ConvKey).Owner = NULL; \ - ExReleasePushLock(&GET_HASH_ENTRY(CmpCacheTable, \ - (k)->ConvKey).Lock); \ -} - -// -// Releases an exlusively or shared acquired KCB by index -// -#define CmpReleaseKcbLockByIndex(i) \ -{ \ - CmpCacheTable[(i)].Owner = NULL; \ - ExReleasePushLock(&CmpCacheTable[(i)].Lock); \ +FORCEINLINE +VOID +CmpReleaseKcbLock(PCM_KEY_CONTROL_BLOCK Kcb) +{ + CmpReleaseKcbLockByIndex(GET_HASH_INDEX(Kcb->ConvKey)); } // // Releases an exlusively or shared acquired KCB by key // -#define CmpReleaseKcbLockByKey(k) \ -{ \ - GET_HASH_ENTRY(CmpCacheTable, (k)).Owner = NULL; \ - ExReleasePushLock(&GET_HASH_ENTRY(CmpCacheTable, \ - (k)).Lock); \ +FORCEINLINE +VOID +CmpReleaseKcbLockByKey(ULONG ConvKey) +{ + CmpReleaseKcbLockByIndex(GET_HASH_INDEX(ConvKey)); } // @@ -186,7 +188,7 @@ VOID CmpConvertKcbSharedToExclusive(IN PCM_KEY_CONTROL_BLOCK k) { - ASSERT(CmpIsKcbLockedExclusive(k) == FALSE); + ASSERT(CmpIsKcbLockedExclusive(k) == FALSE); CmpReleaseKcbLock(k); CmpAcquireKcbLockExclusive(k); } @@ -197,7 +199,7 @@ #define CmpAcquireNcbLockExclusive(n) \ { \ ExAcquirePushLockExclusive(&GET_HASH_ENTRY(CmpNameCacheTable, \ - (n)->ConvKey).Lock); \ + (n)->ConvKey)->Lock); \ } // @@ -206,7 +208,7 @@ #define CmpAcquireNcbLockExclusiveByKey(k) \ { \ ExAcquirePushLockExclusive(&GET_HASH_ENTRY(CmpNameCacheTable, \ - (k)).Lock); \ + (k))->Lock); \ } // @@ -215,7 +217,7 @@ #define CmpReleaseNcbLock(k) \ { \ ExReleasePushLock(&GET_HASH_ENTRY(CmpNameCacheTable, \ - (k)->ConvKey).Lock); \ + (k)->ConvKey)->Lock); \ } // @@ -224,15 +226,15 @@ #define CmpReleaseNcbLockByKey(k) \ { \ ExReleasePushLock(&GET_HASH_ENTRY(CmpNameCacheTable, \ - (k)).Lock); \ -} - -// -// Asserts that either the registry or the hash entry is locked + (k))->Lock); \ +} + +// +// Asserts that either the registry or the KCB is locked // #define CMP_ASSERT_HASH_ENTRY_LOCK(k) \ { \ - ASSERT(((GET_HASH_ENTRY(CmpCacheTable, k).Owner == \ + ASSERT(((GET_HASH_ENTRY(CmpCacheTable, k)->Owner == \ KeGetCurrentThread())) || \ (CmpTestRegistryLockExclusive() == TRUE)); \ }

1 0

[cfinck] 75579: [CDFS] Register CDFS as a disk filesystem too in order to flash our ISOs directly to USB drives and boot from them. Also fix some DPRINTs in the course of that. One step closer towa...
by cfinck＠svn.reactos.org 16 Aug '17

16 Aug '17

Author: cfinck Date: Wed Aug 16 20:04:55 2017 New Revision: 75579 URL: http://svn.reactos.org/svn/reactos?rev=75579&view=rev Log: [CDFS] Register CDFS as a disk filesystem too in order to flash our ISOs directly to USB drives and boot from them. Also fix some DPRINTs in the course of that. One step closer towards CORE-13184: This gets qemu -hda bootcd.iso to work. What still doesn't work is qemu -hda livecd.iso and booting from a flashed USB drive on real hardware. Further changes are also required in fs_rec, but this code isn't ready yet and doesn't seem to be the current blocker either. Credits go to the entire Hackfest Team for helping on this!! Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.c trunk/reactos/drivers/filesystems/cdfs/cdfs.h trunk/reactos/drivers/filesystems/cdfs/cleanup.c trunk/reactos/drivers/filesystems/cdfs/close.c trunk/reactos/drivers/filesystems/cdfs/create.c trunk/reactos/drivers/filesystems/cdfs/dispatch.c trunk/reactos/drivers/filesystems/cdfs/fcb.c trunk/reactos/drivers/filesystems/cdfs/fsctl.c Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/cdfs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/cdfs.c [iso-8859-1] Wed Aug 16 20:04:55 2017 @@ -55,9 +55,11 @@ * RETURNS: Success or failure */ { - PDEVICE_OBJECT DeviceObject; NTSTATUS Status; - UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Cdfs"); + PDEVICE_OBJECT CdFsDeviceObject; + PDEVICE_OBJECT HddFsDeviceObject; + UNICODE_STRING CdFsDeviceName = RTL_CONSTANT_STRING(L"\\Cdfs"); + UNICODE_STRING HddFsDeviceName = RTL_CONSTANT_STRING(L"\\CdfsHdd"); UNREFERENCED_PARAMETER(RegistryPath); @@ -65,25 +67,38 @@ Status = IoCreateDevice(DriverObject, sizeof(CDFS_GLOBAL_DATA), - &DeviceName, + &CdFsDeviceName, FILE_DEVICE_CD_ROM_FILE_SYSTEM, 0, FALSE, - &DeviceObject); + &CdFsDeviceObject); + if (!NT_SUCCESS(Status)) + { + return(Status); + } + + Status = IoCreateDevice(DriverObject, + 0, + &HddFsDeviceName, + FILE_DEVICE_DISK_FILE_SYSTEM, + 0, + FALSE, + &HddFsDeviceObject); if (!NT_SUCCESS(Status)) { return(Status); } /* Initialize global data */ - CdfsGlobalData = DeviceObject->DeviceExtension; + CdfsGlobalData = CdFsDeviceObject->DeviceExtension; RtlZeroMemory(CdfsGlobalData, sizeof(CDFS_GLOBAL_DATA)); CdfsGlobalData->DriverObject = DriverObject; - CdfsGlobalData->DeviceObject = DeviceObject; + CdfsGlobalData->CdFsDeviceObject = CdFsDeviceObject; + CdfsGlobalData->HddFsDeviceObject = HddFsDeviceObject; + HddFsDeviceObject->DeviceExtension = CdfsGlobalData; /* Initialize driver data */ - DeviceObject->Flags = DO_DIRECT_IO; DriverObject->MajorFunction[IRP_MJ_CLOSE] = CdfsFsdDispatch; DriverObject->MajorFunction[IRP_MJ_CLEANUP] = CdfsFsdDispatch; DriverObject->MajorFunction[IRP_MJ_CREATE] = CdfsFsdDispatch; @@ -116,12 +131,11 @@ CdfsGlobalData->CacheMgrCallbacks.AcquireForReadAhead = CdfsAcquireForLazyWrite; CdfsGlobalData->CacheMgrCallbacks.ReleaseFromReadAhead = CdfsReleaseFromLazyWrite; - DeviceObject->Flags |= DO_LOW_PRIORITY_FILESYSTEM; + CdFsDeviceObject->Flags |= DO_DIRECT_IO | DO_LOW_PRIORITY_FILESYSTEM; + HddFsDeviceObject->Flags |= DO_DIRECT_IO | DO_LOW_PRIORITY_FILESYSTEM; - IoRegisterFileSystem(DeviceObject); - DeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; + IoRegisterFileSystem(CdFsDeviceObject); + IoRegisterFileSystem(HddFsDeviceObject); return(STATUS_SUCCESS); } - - Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/cdfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/cdfs.h [iso-8859-1] Wed Aug 16 20:04:55 2017 @@ -248,7 +248,8 @@ typedef struct _CDFS_GLOBAL_DATA { PDRIVER_OBJECT DriverObject; - PDEVICE_OBJECT DeviceObject; + PDEVICE_OBJECT CdFsDeviceObject; + PDEVICE_OBJECT HddFsDeviceObject; ULONG Flags; CACHE_MANAGER_CALLBACKS CacheMgrCallbacks; FAST_IO_DISPATCH FastIoDispatch; Modified: trunk/reactos/drivers/filesystems/cdfs/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/cleanup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/cleanup.c [iso-8859-1] Wed Aug 16 20:04:55 2017 @@ -97,7 +97,7 @@ DeviceObject = IrpContext->DeviceObject; Stack = IrpContext->Stack; - if (DeviceObject == CdfsGlobalData->DeviceObject) + if (DeviceObject == CdfsGlobalData->CdFsDeviceObject || DeviceObject == CdfsGlobalData->HddFsDeviceObject) { DPRINT("Closing file system\n"); Status = STATUS_SUCCESS; Modified: trunk/reactos/drivers/filesystems/cdfs/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/close.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/close.c [iso-8859-1] Wed Aug 16 20:04:55 2017 @@ -94,7 +94,7 @@ DeviceObject = IrpContext->DeviceObject; Stack = IrpContext->Stack; - if (DeviceObject == CdfsGlobalData->DeviceObject) + if (DeviceObject == CdfsGlobalData->CdFsDeviceObject || DeviceObject == CdfsGlobalData->HddFsDeviceObject) { DPRINT("Closing file system\n"); Status = STATUS_SUCCESS; Modified: trunk/reactos/drivers/filesystems/cdfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/create.c [iso-8859-1] Wed Aug 16 20:04:55 2017 @@ -266,7 +266,7 @@ ASSERT(IrpContext); DeviceObject = IrpContext->DeviceObject; - if (DeviceObject == CdfsGlobalData->DeviceObject) + if (DeviceObject == CdfsGlobalData->CdFsDeviceObject || DeviceObject == CdfsGlobalData->HddFsDeviceObject) { /* DeviceObject represents FileSystem instead of logical volume */ DPRINT("Opening file system\n"); Modified: trunk/reactos/drivers/filesystems/cdfs/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/dispatch.c [iso-8859-1] Wed Aug 16 20:04:55 2017 @@ -63,7 +63,7 @@ DPRINT("CdfsLockControl(IrpContext %p)\n", IrpContext); - if (IrpContext->DeviceObject == CdfsGlobalData->DeviceObject) + if (IrpContext->DeviceObject == CdfsGlobalData->CdFsDeviceObject || IrpContext->DeviceObject == CdfsGlobalData->HddFsDeviceObject) { return STATUS_INVALID_DEVICE_REQUEST; } Modified: trunk/reactos/drivers/filesystems/cdfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/fcb.c [iso-8859-1] Wed Aug 16 20:04:55 2017 @@ -138,9 +138,9 @@ { KIRQL oldIrql; - DPRINT("grabbing FCB at %p: %S, refCount:%d\n", + DPRINT("grabbing FCB at %p: %wZ, refCount:%d\n", Fcb, - Fcb->PathName, + &Fcb->PathName, Fcb->RefCount); KeAcquireSpinLock(&Vcb->FcbListLock, &oldIrql); @@ -208,7 +208,8 @@ { Fcb = CONTAINING_RECORD(current_entry, FCB, FcbListEntry); - DPRINT("Comparing '%wZ' and '%wZ'\n", FileName, &Fcb->PathName); + // Disabled the DPRINT! Can't be called at DISPATCH_LEVEL! + //DPRINT("Comparing '%wZ' and '%wZ'\n", FileName, &Fcb->PathName); if (RtlCompareUnicodeString(FileName, &Fcb->PathName, TRUE) == 0) { Fcb->RefCount++; Modified: trunk/reactos/drivers/filesystems/cdfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] Wed Aug 16 20:04:55 2017 @@ -222,26 +222,29 @@ &Toc, &Size, TRUE); - if (!NT_SUCCESS(Status)) - { - ExFreePoolWithTag(Buffer, CDFS_TAG); - return Status; - } - - DPRINT("FirstTrack %u, LastTrack %u, TrackNumber %u\n", - Toc.FirstTrack, Toc.LastTrack, Toc.TrackData[0].TrackNumber); - - Offset = Toc.TrackData[0].Address[1] * 60 * 75; - Offset += Toc.TrackData[0].Address[2] * 75; - Offset += Toc.TrackData[0].Address[3]; - if (Offset >= 150) - { - /* Remove MSF numbering offset of first frame */ - /* FIXME: should be done only for real cdroms? */ - Offset -= 150; - } - CdInfo->VolumeOffset = Offset; - + if (NT_SUCCESS(Status)) + { + + DPRINT("FirstTrack %u, LastTrack %u, TrackNumber %u\n", + Toc.FirstTrack, Toc.LastTrack, Toc.TrackData[0].TrackNumber); + + Offset = Toc.TrackData[0].Address[1] * 60 * 75; + Offset += Toc.TrackData[0].Address[2] * 75; + Offset += Toc.TrackData[0].Address[3]; + if (Offset >= 150) + { + /* Remove MSF numbering offset of first frame */ + /* FIXME: should be done only for real cdroms? */ + Offset -= 150; + } + CdInfo->VolumeOffset = Offset; + } + else + { + DPRINT1("Allowing mount of CDFS volume on non-CD device\n"); + CdInfo->VolumeOffset = 0; + } + DPRINT("Offset of first track in last session %u\n", Offset); CdInfo->JolietLevel = 0; @@ -325,10 +328,19 @@ PVPB Vpb; NTSTATUS Status; CDINFO CdInfo; + DEVICE_TYPE FilesystemDeviceType; DPRINT("CdfsMountVolume() called\n"); - if (DeviceObject != CdfsGlobalData->DeviceObject) + if (DeviceObject == CdfsGlobalData->CdFsDeviceObject) + { + FilesystemDeviceType = FILE_DEVICE_CD_ROM_FILE_SYSTEM; + } + else if (DeviceObject == CdfsGlobalData->HddFsDeviceObject) + { + FilesystemDeviceType = FILE_DEVICE_DISK_FILE_SYSTEM; + } + else { Status = STATUS_INVALID_DEVICE_REQUEST; goto ByeBye; @@ -347,7 +359,7 @@ Status = IoCreateDevice(CdfsGlobalData->DriverObject, sizeof(DEVICE_EXTENSION), NULL, - FILE_DEVICE_CD_ROM_FILE_SYSTEM, + FilesystemDeviceType, DeviceToMount->Characteristics, FALSE, &NewDeviceObject);

1 0

[bfreisen] 75578: [PSDK][GDIPLUS] Further Pen work
by bfreisen＠svn.reactos.org 16 Aug '17

16 Aug '17

Author: bfreisen Date: Wed Aug 16 18:13:22 2017 New Revision: 75578 URL: http://svn.reactos.org/svn/reactos?rev=75578&view=rev Log: [PSDK][GDIPLUS] Further Pen work Modified: trunk/reactos/sdk/include/psdk/gdipluspen.h Modified: trunk/reactos/sdk/include/psdk/gdipluspen.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/gdipluspe… ============================================================================== --- trunk/reactos/sdk/include/psdk/gdipluspen.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/gdipluspen.h [iso-8859-1] Wed Aug 16 18:13:22 2017 @@ -47,7 +47,9 @@ PenAlignment GetAlignment(VOID) { - return PenAlignmentCenter; + PenAlignment penAlignment; + SetStatus(DllExports::GdipGetPenMode(pen, &penAlignment)); + return penAlignment; } Brush *GetBrush(VOID) @@ -88,7 +90,9 @@ DashCap GetDashCap(VOID) { - return DashCapFlat; + DashCap dashCap; + SetStatus(DllExports::GdipGetPenDashCap197819(pen, &dashCap)); + return dashCap; } REAL GetDashOffset(VOID) @@ -112,22 +116,28 @@ DashStyle GetDashStyle(VOID) { - return DashStyleSolid; + DashStyle dashStyle; + SetStatus(DllExports::GdipGetPenDashStyle(pen, &dashStyle)); + return dashStyle; } LineCap GetEndCap(VOID) { - return LineCapFlat; + LineCap endCap; + SetStatus(DllExports::GdipGetPenEndCap(pen, &endCap)); + return endCap; } Status GetLastStatus(VOID) { - return NotImplemented; + return status; } LineJoin GetLineJoin(VOID) { - return LineJoinMiter; + LineJoin lineJoin; + SetStatus(DllExports::GdipGetPenLineJoin(pen, &lineJoin)); + return lineJoin; } REAL GetMiterLimit(VOID) @@ -139,12 +149,16 @@ PenType GetPenType(VOID) { - return PenTypeSolidColor; + PenType type; + SetStatus(DllExports::GdipGetPenFillType(pen, &type)); + return type; } LineCap GetStartCap(VOID) { - return LineCapFlat; + LineCap startCap; + SetStatus(DllExports::GdipGetPenStartCap(pen, &startCap)); + return startCap; } Status GetTransform(Matrix *matrix) @@ -231,17 +245,17 @@ Status SetEndCap(LineCap endCap) { - return NotImplemented; + return SetStatus(DllExports::GdipSetPenEndCap(pen, endCap)); } Status SetLineCap(LineCap startCap, LineCap endCap, DashCap dashCap) { - return NotImplemented; + return SetStatus(DllExports::GdipSetPenLineCap197819(pen, startCap, endCap, dashCap)); } Status SetLineJoin(LineJoin lineJoin) { - return NotImplemented; + return SetStatus(DllExports::GdipSetPenLineJoin(pen, lineJoin)); } Status SetMiterLimit(REAL miterLimit) @@ -251,7 +265,7 @@ Status SetStartCap(LineCap startCap) { - return NotImplemented; + return SetStatus(DllExports::GdipSetPenStartCap(pen, startCap)); } Status SetTransform(const Matrix *matrix)

1 0

[tkreuzer] 75577: [PSDK] Add Win10 NTDDI version defines, improve version check
by tkreuzer＠svn.reactos.org 16 Aug '17

16 Aug '17

Author: tkreuzer Date: Wed Aug 16 17:10:06 2017 New Revision: 75577 URL: http://svn.reactos.org/svn/reactos?rev=75577&view=rev Log: [PSDK] Add Win10 NTDDI version defines, improve version check Modified: trunk/reactos/sdk/include/psdk/sdkddkver.h Modified: trunk/reactos/sdk/include/psdk/sdkddkver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/sdkddkver… ============================================================================== --- trunk/reactos/sdk/include/psdk/sdkddkver.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/sdkddkver.h [iso-8859-1] Wed Aug 16 17:10:06 2017 @@ -12,6 +12,7 @@ --*/ +#pragma once #ifndef _INC_SDKDDKVER #define _INC_SDKDDKVER @@ -113,6 +114,9 @@ #define NTDDI_WINBLUE 0x06030000 #define NTDDI_WINTHRESHOLD 0x0A000000 #define NTDDI_WIN10 0x0A000000 +#define NTDDI_WIN10_TH2 0x0A000001 +#define NTDDI_WIN10_RS1 0x0A000002 +#define NTDDI_WIN10_RS2 0x0A000003 /* Version Fields in NTDDI_VERSION */ #define OSVERSION_MASK 0xFFFF0000UL @@ -130,7 +134,7 @@ /* Select Default _WIN32_WINNT Value */ #if !defined(_WIN32_WINNT) && !defined(_CHICAGO_) -#define _WIN32_WINNT 0x0600 +#define _WIN32_WINNT 0x0600 /* 0x0502 */ #endif /* Choose NTDDI Version */ @@ -138,7 +142,7 @@ #ifdef _WIN32_WINNT #define NTDDI_VERSION NTDDI_VERSION_FROM_WIN32_WINNT(_WIN32_WINNT) #else -#define NTDDI_VERSION 0x06000000 +#define NTDDI_VERSION 0x06000000 /* NTDDI_WS03SP4 */ #endif #endif @@ -177,10 +181,7 @@ #endif /* Make Sure NTDDI_VERSION and _WIN32_WINNT Match */ -#if ((OSVER(NTDDI_VERSION) == NTDDI_WIN2K) && (_WIN32_WINNT != _WIN32_WINNT_WIN2K)) || \ - ((OSVER(NTDDI_VERSION) == NTDDI_WINXP) && (_WIN32_WINNT != _WIN32_WINNT_WINXP)) || \ - ((OSVER(NTDDI_VERSION) == NTDDI_WS03) && (_WIN32_WINNT != _WIN32_WINNT_WS03)) || \ - ((OSVER(NTDDI_VERSION) == NTDDI_WINXP) && (_WIN32_WINNT != _WIN32_WINNT_WINXP)) +#if ((NTDDI_VERSION >> 16) != _WIN32_WINNT) #error NTDDI_VERSION and _WIN32_WINNT mismatch! #endif

1 0

[bfreisen] 75576: [PSDK][GDIPLUS] Partly implement Pen
by bfreisen＠svn.reactos.org 16 Aug '17

16 Aug '17

Author: bfreisen Date: Wed Aug 16 16:19:17 2017 New Revision: 75576 URL: http://svn.reactos.org/svn/reactos?rev=75576&view=rev Log: [PSDK][GDIPLUS] Partly implement Pen Modified: trunk/reactos/sdk/include/psdk/gdiplusmatrix.h trunk/reactos/sdk/include/psdk/gdipluspen.h Modified: trunk/reactos/sdk/include/psdk/gdiplusmatrix.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/gdiplusma… ============================================================================== --- trunk/reactos/sdk/include/psdk/gdiplusmatrix.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/gdiplusmatrix.h [iso-8859-1] Wed Aug 16 16:19:17 2017 @@ -21,6 +21,7 @@ class Matrix : public GdiplusBase { + friend class Pen; friend class Region; public: Modified: trunk/reactos/sdk/include/psdk/gdipluspen.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/gdipluspe… ============================================================================== --- trunk/reactos/sdk/include/psdk/gdipluspen.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/gdipluspen.h [iso-8859-1] Wed Aug 16 16:19:17 2017 @@ -57,17 +57,23 @@ Status GetColor(Color *color) { - return NotImplemented; + ARGB argb; + Status status = SetStatus(DllExports::GdipGetPenColor(pen, &argb)); + if (color) + color->SetValue(argb); + return status; } Status GetCompoundArray(REAL *compoundArray, INT count) { - return NotImplemented; + return NotImplemented; // FIXME: not available: SetStatus(DllExports::GdipGetPenCompoundArray(pen, count)); } INT GetCompoundArrayCount(VOID) { - return 0; + INT count; + SetStatus(DllExports::GdipGetPenCompoundCount(pen, &count)); + return count; } Status GetCustomEndCap(CustomLineCap *customCap) @@ -87,17 +93,21 @@ REAL GetDashOffset(VOID) { - return 0; + REAL offset; + SetStatus(DllExports::GdipGetPenDashOffset(pen, &offset)); + return offset; } Status GetDashPattern(REAL *dashArray, INT count) { - return NotImplemented; + return SetStatus(DllExports::GdipGetPenDashArray(pen, dashArray, count)); } INT GetDashPatternCount(VOID) { - return 0; + INT count; + SetStatus(DllExports::GdipGetPenDashCount(pen, &count)); + return count; } DashStyle GetDashStyle(VOID) @@ -122,7 +132,9 @@ REAL GetMiterLimit(VOID) { - return 0; + REAL miterLimit; + SetStatus(DllExports::GdipGetPenMiterLimit(pen, &miterLimit)); + return miterLimit; } PenType GetPenType(VOID) @@ -142,47 +154,49 @@ REAL GetWidth(VOID) { - return 0; + REAL width; + SetStatus(DllExports::GdipGetPenWidth(pen, &width)); + return width; } Status MultiplyTransform(Matrix *matrix, MatrixOrder order) { - return NotImplemented; + return NotImplemented; // FIXME: not available: SetStatus(DllExports::GdipMultiplyPenTransform(pen, matrix ? matrix->matrix : NULL, order)); } Status ResetTransform(VOID) { - return NotImplemented; + return SetStatus(DllExports::GdipResetPenTransform(pen)); } Status RotateTransform(REAL angle, MatrixOrder order) { - return NotImplemented; + return NotImplemented; // FIXME: not available: SetStatus(DllExports::GdipRotatePenTransform(pen, angle, order)); } Status ScaleTransform(REAL sx, REAL sy, MatrixOrder order) { - return NotImplemented; + return SetStatus(DllExports::GdipScalePenTransform(pen, sx, sy, order)); } Status SetAlignment(PenAlignment penAlignment) { - return NotImplemented; + return SetStatus(DllExports::GdipSetPenMode(pen, penAlignment)); } Status SetBrush(const Brush *brush) { - return NotImplemented; + return NotImplemented; // FIXME: Brush unimplemented SetStatus(DllExports::GdipSetPenBrushFill(pen, brush ? brush->brush : NULL)); } Status SetColor(const Color &color) { - return NotImplemented; + return SetStatus(DllExports::GdipSetPenColor(pen, color.GetValue())); } Status SetCompoundArray(const REAL *compoundArray, INT count) { - return NotImplemented; + return SetStatus(DllExports::GdipSetPenCompoundArray(pen, compoundArray, count)); } Status SetCustomEndCap(const CustomLineCap *customCap) @@ -197,22 +211,22 @@ Status SetDashCap(DashCap dashCap) { - return NotImplemented; + return SetStatus(DllExports::GdipSetPenDashCap197819(pen, dashCap)); } Status SetDashOffset(REAL dashOffset) { - return NotImplemented; + return SetStatus(DllExports::GdipSetPenDashOffset(pen, dashOffset)); } Status SetDashPattern(const REAL *dashArray, INT count) { - return NotImplemented; + return SetStatus(DllExports::GdipSetPenDashArray(pen, dashArray, count)); } Status SetDashStyle(DashStyle dashStyle) { - return NotImplemented; + return SetStatus(DllExports::GdipSetPenDashStyle(pen, dashStyle)); } Status SetEndCap(LineCap endCap) @@ -232,7 +246,7 @@ Status SetMiterLimit(REAL miterLimit) { - return NotImplemented; + return SetStatus(DllExports::GdipSetPenMiterLimit(pen, miterLimit)); } Status SetStartCap(LineCap startCap) @@ -242,17 +256,27 @@ Status SetTransform(const Matrix *matrix) { - return NotImplemented; + return SetStatus(DllExports::GdipSetPenTransform(pen, matrix ? matrix->matrix : NULL)); } Status SetWidth(REAL width) { - return NotImplemented; + return SetStatus(DllExports::GdipSetPenWidth(pen, width)); } private: - Status status; GpPen *pen; + +private: + mutable Status status; + + Status SetStatus(Status status) const + { + if (status == Ok) + return status; + this->status = status; + return status; + } }; #endif /* _GDIPLUSPEN_H */

1 0

[tkreuzer] 75575: [FLTMC][NFSD] Fix version definition
by tkreuzer＠svn.reactos.org 16 Aug '17

16 Aug '17

Author: tkreuzer Date: Wed Aug 16 16:06:41 2017 New Revision: 75575 URL: http://svn.reactos.org/svn/reactos?rev=75575&view=rev Log: [FLTMC][NFSD] Fix version definition Modified: trunk/reactos/base/applications/fltmc/CMakeLists.txt trunk/reactos/base/applications/fltmc/fltmc.cpp trunk/reactos/base/services/nfsd/CMakeLists.txt trunk/reactos/base/services/nfsd/readwrite.c Modified: trunk/reactos/base/applications/fltmc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fltmc/CM… ============================================================================== --- trunk/reactos/base/applications/fltmc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/fltmc/CMakeLists.txt [iso-8859-1] Wed Aug 16 16:06:41 2017 @@ -1,3 +1,6 @@ + +remove_definitions(-D_WIN32_WINNT=0x502 -DWINVER=0x502) +add_definitions(-D_WIN32_WINNT=0x601) set_cpp(WITH_RUNTIME WITH_EXCEPTIONS) Modified: trunk/reactos/base/applications/fltmc/fltmc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fltmc/fl… ============================================================================== --- trunk/reactos/base/applications/fltmc/fltmc.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/fltmc/fltmc.cpp [iso-8859-1] Wed Aug 16 16:06:41 2017 @@ -5,9 +5,6 @@ * PURPOSE: Control utility for file system filter drivers * PROGRAMMERS: Copyright 2016 Ged Murphy (gedmurphy(a)gmail.com) */ - -//FIXME -#define NTDDI_VERSION NTDDI_WIN7 // Please leave this temporary hack in place // it's used to keep VS2015 happy for development. Modified: trunk/reactos/base/services/nfsd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/nfsd/CMakeLi… ============================================================================== --- trunk/reactos/base/services/nfsd/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/services/nfsd/CMakeLists.txt [iso-8859-1] Wed Aug 16 16:06:41 2017 @@ -1,5 +1,5 @@ -remove_definitions(-D_WIN32_WINNT=0x502) -add_definitions(-D_WIN32_WINNT=0x600) +remove_definitions(-D_WIN32_WINNT=0x502 -DWINVER=0x502) +add_definitions(-D_WIN32_WINNT=0x601) add_definitions(-DNTDDI_VERSION=0x06010000) include_directories( Modified: trunk/reactos/base/services/nfsd/readwrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/nfsd/readwri… ============================================================================== --- trunk/reactos/base/services/nfsd/readwrite.c [iso-8859-1] (original) +++ trunk/reactos/base/services/nfsd/readwrite.c [iso-8859-1] Wed Aug 16 16:06:41 2017 @@ -142,45 +142,27 @@ ULONG pnfs_bytes_read = 0; int status = NO_ERROR; -#ifdef __REACTOS__ - do - { + nfs41_open_stateid_arg(upcall->state_ref, &stateid); + +#ifdef PNFS_ENABLE_READ + status = read_from_pnfs(upcall, &stateid); + + if (status == NO_ERROR || status == ERROR_HANDLE_EOF) + goto out; + + if (args->out_len) { + pnfs_bytes_read = args->out_len; + args->out_len = 0; + + args->offset += pnfs_bytes_read; + args->buffer += pnfs_bytes_read; + args->len -= pnfs_bytes_read; + } #endif - nfs41_open_stateid_arg(upcall->state_ref, &stateid); - -#ifdef PNFS_ENABLE_READ - status = read_from_pnfs(upcall, &stateid); - - if (status == NO_ERROR || status == ERROR_HANDLE_EOF) - goto out; - - if (args->out_len) { - pnfs_bytes_read = args->out_len; - args->out_len = 0; - - args->offset += pnfs_bytes_read; - args->buffer += pnfs_bytes_read; - args->len -= pnfs_bytes_read; - } -#endif - - status = read_from_mds(upcall, &stateid); -#ifdef __REACTOS__ - /* Status returned by NFS server when session is to be renewed */ - if (status == 1006) - { - nfs41_session_renew(upcall->state_ref->session); - dprintf(1, "Session renewed (read)!\n"); - continue; - } -#endif - - args->out_len += pnfs_bytes_read; -#ifdef __REACTOS__ - break; - } - while (TRUE); -#endif + + status = read_from_mds(upcall, &stateid); + + args->out_len += pnfs_bytes_read; out: return status; } @@ -296,41 +278,24 @@ uint32_t pnfs_bytes_written = 0; int status; -#ifdef __REACTOS__ - do - { + nfs41_open_stateid_arg(upcall->state_ref, &stateid); + +#ifdef PNFS_ENABLE_WRITE + status = write_to_pnfs(upcall, &stateid); + if (args->out_len) { + pnfs_bytes_written = args->out_len; + args->out_len = 0; + + args->offset += pnfs_bytes_written; + args->buffer += pnfs_bytes_written; + args->len -= pnfs_bytes_written; + + if (args->len == 0) + goto out; + } #endif - nfs41_open_stateid_arg(upcall->state_ref, &stateid); - -#ifdef PNFS_ENABLE_WRITE - status = write_to_pnfs(upcall, &stateid); - if (args->out_len) { - pnfs_bytes_written = args->out_len; - args->out_len = 0; - - args->offset += pnfs_bytes_written; - args->buffer += pnfs_bytes_written; - args->len -= pnfs_bytes_written; - - if (args->len == 0) - goto out; - } -#endif - - status = write_to_mds(upcall, &stateid); -#ifdef __REACTOS__ - /* Status returned by NFS server when session is to be renewed */ - if (status == 1006) - { - nfs41_session_renew(upcall->state_ref->session); - dprintf(1, "Session renewed (write)!\n"); - continue; - } - - break; - } - while (TRUE); -#endif + + status = write_to_mds(upcall, &stateid); out: args->out_len += pnfs_bytes_written; return status;

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