Ros-diffs December 2008

ros-diffs@reactos.org

31 participants
710 discussions

[sginsberg] 38124: - Sync gdiplus Winetest too
by sginsberg＠svn.reactos.org 16 Dec '08

16 Dec '08

Author: sginsberg Date: Tue Dec 16 12:41:26 2008 New Revision: 38124 URL: http://svn.reactos.org/svn/reactos?rev=38124&view=rev Log: - Sync gdiplus Winetest too Modified: trunk/rostests/winetests/gdiplus/font.c trunk/rostests/winetests/gdiplus/graphics.c trunk/rostests/winetests/gdiplus/graphicspath.c trunk/rostests/winetests/gdiplus/region.c Modified: trunk/rostests/winetests/gdiplus/font.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/font.c?… ============================================================================== --- trunk/rostests/winetests/gdiplus/font.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/font.c [iso-8859-1] Tue Dec 16 12:41:26 2008 @@ -134,7 +134,7 @@ expect(0, lfw2.lfItalic); expect(0, lfw2.lfUnderline); expect(0, lfw2.lfStrikeOut); - expect(0, lfw2.lfCharSet); + expect(GetTextCharset(hdc), lfw2.lfCharSet); expect(0, lfw2.lfOutPrecision); expect(0, lfw2.lfClipPrecision); expect(0, lfw2.lfQuality); @@ -164,7 +164,7 @@ expect(TRUE, lfw2.lfItalic); expect(TRUE, lfw2.lfUnderline); expect(TRUE, lfw2.lfStrikeOut); - expect(0, lfw2.lfCharSet); + expect(GetTextCharset(hdc), lfw2.lfCharSet); expect(0, lfw2.lfOutPrecision); expect(0, lfw2.lfClipPrecision); expect(0, lfw2.lfQuality); Modified: trunk/rostests/winetests/gdiplus/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/graphic… ============================================================================== --- trunk/rostests/winetests/gdiplus/graphics.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/graphics.c [iso-8859-1] Tue Dec 16 12:41:26 2008 @@ -485,6 +485,7 @@ GpRegion *clip; INT i; BOOL res; + ARGB color = 0x00000000; pt[0].X = 10; pt[0].Y = 10; @@ -658,6 +659,8 @@ expect(ObjectBusy, status); status = Ok; status = GdipGetInterpolationMode(graphics, &intmode); expect(ObjectBusy, status); status = Ok; + status = GdipGetNearestColor(graphics, &color); + expect(ObjectBusy, status); status = Ok; status = GdipGetPageScale(graphics, &r); expect(ObjectBusy, status); status = Ok; status = GdipGetPageUnit(graphics, &unit); @@ -743,7 +746,6 @@ GdipDeleteBrush((GpBrush*)brush); GdipDeleteRegion(region); GdipDeleteMatrix(m); - GdipDeleteRegion(region); ReleaseDC(0, hdc); } Modified: trunk/rostests/winetests/gdiplus/graphicspath.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/graphic… ============================================================================== --- trunk/rostests/winetests/gdiplus/graphicspath.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/graphicspath.c [iso-8859-1] Tue Dec 16 12:41:26 2008 @@ -726,6 +726,15 @@ {23.3, 13.3, PathPointTypeBezier, 0, 0}, /*10*/ {30.0, 10.0, PathPointTypeBezier, 0, 0} /*11*/ }; +static path_test_t addcurve_path3[] = { + {10.0, 10.0, PathPointTypeStart, 0, 0}, /*0*/ + {13.3, 16.7, PathPointTypeBezier, 0, 1}, /*1*/ + {3.3, 20.0, PathPointTypeBezier, 0, 0}, /*2*/ + {10.0, 20.0, PathPointTypeBezier, 0, 0}, /*3*/ + {16.7, 20.0, PathPointTypeBezier, 0, 0}, /*4*/ + {23.3, 13.3, PathPointTypeBezier, 0, 0}, /*5*/ + {30.0, 10.0, PathPointTypeBezier, 0, 0} /*6*/ + }; static void test_addcurve(void) { GpStatus status; @@ -765,6 +774,37 @@ status = GdipAddPathCurve2(path, points, 4, 1.0); expect(Ok, status); ok_path(path, addcurve_path2, sizeof(addcurve_path2)/sizeof(path_test_t), FALSE); + + /* NULL args */ + GdipResetPath(path); + status = GdipAddPathCurve3(NULL, NULL, 0, 0, 0, 0.0); + expect(InvalidParameter, status); + status = GdipAddPathCurve3(path, NULL, 0, 0, 0, 0.0); + expect(InvalidParameter, status); + /* wrong count, offset.. */ + status = GdipAddPathCurve3(path, points, 0, 0, 0, 0.0); + expect(InvalidParameter, status); + status = GdipAddPathCurve3(path, points, 4, 0, 0, 0.0); + expect(InvalidParameter, status); + status = GdipAddPathCurve3(path, points, 4, 0, 4, 0.0); + expect(InvalidParameter, status); + status = GdipAddPathCurve3(path, points, 4, 1, 3, 0.0); + expect(InvalidParameter, status); + status = GdipAddPathCurve3(path, points, 4, 1, 0, 0.0); + expect(InvalidParameter, status); + status = GdipAddPathCurve3(path, points, 4, 3, 1, 0.0); + expect(InvalidParameter, status); + + /* use all points */ + status = GdipAddPathCurve3(path, points, 4, 0, 3, 1.0); + expect(Ok, status); + ok_path(path, addcurve_path, sizeof(addcurve_path)/sizeof(path_test_t), FALSE); + GdipResetPath(path); + + status = GdipAddPathCurve3(path, points, 4, 1, 2, 1.0); + expect(Ok, status); + ok_path(path, addcurve_path3, sizeof(addcurve_path3)/sizeof(path_test_t), FALSE); + GdipDeletePath(path); } Modified: trunk/rostests/winetests/gdiplus/region.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/region.… ============================================================================== --- trunk/rostests/winetests/gdiplus/region.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/region.c [iso-8859-1] Tue Dec 16 12:41:26 2008 @@ -670,7 +670,6 @@ expect_magic((DWORD*)(buf + 2)); expect_dword(buf + 3, 0); expect_dword(buf + 4, RGNDATA_INFINITE_RECT); - GdipDeletePath(path); GdipDeleteRegion(region2); /* more complex case : replace with a combined region */

1 0

[sginsberg] 38123: - Sync gdiplus with Wine head
by sginsberg＠svn.reactos.org 16 Dec '08

16 Dec '08

Author: sginsberg Date: Tue Dec 16 12:41:07 2008 New Revision: 38123 URL: http://svn.reactos.org/svn/reactos?rev=38123&view=rev Log: - Sync gdiplus with Wine head Modified: trunk/reactos/dll/win32/gdiplus/font.c trunk/reactos/dll/win32/gdiplus/gdiplus.spec trunk/reactos/dll/win32/gdiplus/graphics.c trunk/reactos/dll/win32/gdiplus/graphicspath.c trunk/reactos/dll/win32/gdiplus/pen.c trunk/reactos/dll/win32/gdiplus/region.c trunk/reactos/include/psdk/gdiplusflat.h Modified: trunk/reactos/dll/win32/gdiplus/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/font.c?r… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/font.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/font.c [iso-8859-1] Tue Dec 16 12:41:07 2008 @@ -195,6 +195,7 @@ (*font)->lfw.lfHeight = -textmet.tmHeight; (*font)->lfw.lfWeight = textmet.tmWeight; + (*font)->lfw.lfCharSet = textmet.tmCharSet; (*font)->height = 1; /* FIXME: need NEWTEXTMETRIC.ntmSizeEM here */ (*font)->line_spacing = textmet.tmAscent + textmet.tmDescent + textmet.tmExternalLeading; Modified: trunk/reactos/dll/win32/gdiplus/gdiplus.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus.… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/gdiplus.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/gdiplus.spec [iso-8859-1] Tue Dec 16 12:41:07 2008 @@ -10,8 +10,8 @@ @ stdcall GdipAddPathClosedCurveI(ptr ptr long) @ stdcall GdipAddPathCurve2(ptr ptr long long) @ stdcall GdipAddPathCurve2I(ptr ptr long long) -@ stub GdipAddPathCurve3 -@ stub GdipAddPathCurve3I +@ stdcall GdipAddPathCurve3(ptr ptr long long long long) +@ stdcall GdipAddPathCurve3I(ptr ptr long long long long) @ stdcall GdipAddPathCurve(ptr ptr long) @ stdcall GdipAddPathCurveI(ptr ptr long) @ stdcall GdipAddPathEllipse(ptr long long long long) @@ -320,7 +320,7 @@ @ stdcall GdipGetMetafileHeaderFromMetafile(ptr ptr) @ stub GdipGetMetafileHeaderFromStream @ stub GdipGetMetafileHeaderFromWmf -@ stub GdipGetNearestColor +@ stdcall GdipGetNearestColor(ptr ptr) @ stdcall GdipGetPageScale(ptr ptr) @ stdcall GdipGetPageUnit(ptr ptr) @ stdcall GdipGetPathData(ptr ptr) Modified: trunk/reactos/dll/win32/gdiplus/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/graphics… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/graphics.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/graphics.c [iso-8859-1] Tue Dec 16 12:41:07 2008 @@ -2456,6 +2456,19 @@ return Ok; } +GpStatus WINGDIPAPI GdipGetNearestColor(GpGraphics *graphics, ARGB* argb) +{ + if(!graphics || !argb) + return InvalidParameter; + + if(graphics->busy) + return ObjectBusy; + + FIXME("(%p, %p): stub\n", graphics, argb); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipGetPageScale(GpGraphics *graphics, REAL *scale) { TRACE("(%p, %p)\n", graphics, scale); Modified: trunk/reactos/dll/win32/gdiplus/graphicspath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/graphics… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/graphicspath.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/graphicspath.c [iso-8859-1] Tue Dec 16 12:41:07 2008 @@ -524,6 +524,28 @@ return stat; } +GpStatus WINGDIPAPI GdipAddPathCurve3(GpPath *path, GDIPCONST GpPointF *points, + INT count, INT offset, INT nseg, REAL tension) +{ + TRACE("(%p, %p, %d, %d, %d, %.2f)\n", path, points, count, offset, nseg, tension); + + if(!path || !points || offset + 1 >= count || count - offset < nseg + 1) + return InvalidParameter; + + return GdipAddPathCurve2(path, &points[offset], nseg + 1, tension); +} + +GpStatus WINGDIPAPI GdipAddPathCurve3I(GpPath *path, GDIPCONST GpPoint *points, + INT count, INT offset, INT nseg, REAL tension) +{ + TRACE("(%p, %p, %d, %d, %d, %.2f)\n", path, points, count, offset, nseg, tension); + + if(!path || !points || offset + 1 >= count || count - offset < nseg + 1) + return InvalidParameter; + + return GdipAddPathCurve2I(path, &points[offset], nseg + 1, tension); +} + GpStatus WINGDIPAPI GdipAddPathEllipse(GpPath *path, REAL x, REAL y, REAL width, REAL height) { Modified: trunk/reactos/dll/win32/gdiplus/pen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/pen.c?re… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/pen.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/pen.c [iso-8859-1] Tue Dec 16 12:41:07 2008 @@ -412,7 +412,7 @@ GpStatus WINGDIPAPI GdipSetPenCompoundArray(GpPen *pen, GDIPCONST REAL *dash, INT count) { - FIXME("(%p, %p, %i): stub", pen, dash, count); + FIXME("(%p, %p, %i): stub\n", pen, dash, count); if (!pen || !dash || count < 2 || count%2 == 1) return InvalidParameter; Modified: trunk/reactos/dll/win32/gdiplus/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/region.c… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/region.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/region.c [iso-8859-1] Tue Dec 16 12:41:07 2008 @@ -360,6 +360,7 @@ delete_element(&region1->node); memcpy(region1, reg2copy, sizeof(GpRegion)); + GdipFree(reg2copy); return Ok; } Modified: trunk/reactos/include/psdk/gdiplusflat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/gdiplusflat.h… ============================================================================== --- trunk/reactos/include/psdk/gdiplusflat.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/gdiplusflat.h [iso-8859-1] Tue Dec 16 12:41:07 2008 @@ -196,6 +196,7 @@ GpStatus WINGDIPAPI GdipGetDpiY(GpGraphics*,REAL*); GpStatus WINGDIPAPI GdipGetImageGraphicsContext(GpImage*,GpGraphics**); GpStatus WINGDIPAPI GdipGetInterpolationMode(GpGraphics*,InterpolationMode*); +GpStatus WINGDIPAPI GdipGetNearestColor(GpGraphics*,ARGB*); GpStatus WINGDIPAPI GdipGetPageScale(GpGraphics*,REAL*); GpStatus WINGDIPAPI GdipGetPageUnit(GpGraphics*,GpUnit*); GpStatus WINGDIPAPI GdipGetPixelOffsetMode(GpGraphics*,PixelOffsetMode*); @@ -255,6 +256,8 @@ GpStatus WINGDIPAPI GdipAddPathCurveI(GpPath*,GDIPCONST GpPoint*,INT); GpStatus WINGDIPAPI GdipAddPathCurve2(GpPath*,GDIPCONST GpPointF*,INT,REAL); GpStatus WINGDIPAPI GdipAddPathCurve2I(GpPath*,GDIPCONST GpPoint*,INT,REAL); +GpStatus WINGDIPAPI GdipAddPathCurve3(GpPath*,GDIPCONST GpPointF*,INT,INT,INT,REAL); +GpStatus WINGDIPAPI GdipAddPathCurve3I(GpPath*,GDIPCONST GpPoint*,INT,INT,INT,REAL); GpStatus WINGDIPAPI GdipAddPathEllipse(GpPath*,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipAddPathEllipseI(GpPath*,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipAddPathLine(GpPath*,REAL,REAL,REAL,REAL);

1 0

[tkreuzer] 38122: comment out RtlWalkFrameChain for x64, we currently implement it in lib/rtl (we probably need a seperate um implementation later though)
by tkreuzer＠svn.reactos.org 16 Dec '08

16 Dec '08

Author: tkreuzer Date: Tue Dec 16 12:28:48 2008 New Revision: 38122 URL: http://svn.reactos.org/svn/reactos?rev=38122&view=rev Log: comment out RtlWalkFrameChain for x64, we currently implement it in lib/rtl (we probably need a seperate um implementation later though) Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/rtl/libsupp.c Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/n… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/ntdll/rtl/libsupp.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/ntdll/rtl/libsupp.c [iso-8859-1] Tue Dec 16 12:28:48 2008 @@ -19,6 +19,8 @@ /* FUNCTIONS ***************************************************************/ +#ifndef _M_AMD64 +// FIXME: Why "Not implemented"??? /* * @implemented */ @@ -31,6 +33,7 @@ /* Not implemented for user-mode */ return 0; } +#endif BOOLEAN NTAPI

1 0

[tkreuzer] 38121: Fix usage of PNTSTATUS instead of NTSTATUS in NT_SUCCESS, which could result in IopCheckVpbMounted returning a wrong status code
by tkreuzer＠svn.reactos.org 16 Dec '08

16 Dec '08

Author: tkreuzer Date: Tue Dec 16 12:12:13 2008 New Revision: 38121 URL: http://svn.reactos.org/svn/reactos?rev=38121&view=rev Log: Fix usage of PNTSTATUS instead of NTSTATUS in NT_SUCCESS, which could result in IopCheckVpbMounted returning a wrong status code Modified: trunk/reactos/ntoskrnl/io/iomgr/volume.c Modified: trunk/reactos/ntoskrnl/io/iomgr/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/volume.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/volume.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/volume.c [iso-8859-1] Tue Dec 16 12:12:13 2008 @@ -70,7 +70,7 @@ IopDereferenceDeviceObject(DeviceObject, FALSE); /* Check if it was a total failure */ - if (!NT_SUCCESS(Status)) return NULL; + if (!NT_SUCCESS(*Status)) return NULL; /* Otherwise we were alerted */ *Status = STATUS_WRONG_VOLUME;

1 0

[sginsberg] 38120: - Add missing break (<3 kjk <3)
by sginsberg＠svn.reactos.org 16 Dec '08

16 Dec '08

Author: sginsberg Date: Tue Dec 16 11:51:57 2008 New Revision: 38120 URL: http://svn.reactos.org/svn/reactos?rev=38120&view=rev Log: - Add missing break (<3 kjk <3) Modified: trunk/reactos/ntoskrnl/kd/kdmain.c Modified: trunk/reactos/ntoskrnl/kd/kdmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdmain.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] Tue Dec 16 11:51:57 2008 @@ -89,6 +89,7 @@ default: break; } + break; } /* Special case for stack frame dumps */

1 0

[tkreuzer] 38119: remove kernel32 dependency from mingw lib
by tkreuzer＠svn.reactos.org 16 Dec '08

16 Dec '08

Author: tkreuzer Date: Tue Dec 16 11:37:45 2008 New Revision: 38119 URL: http://svn.reactos.org/svn/reactos?rev=38119&view=rev Log: remove kernel32 dependency from mingw lib Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] Tue Dec 16 11:37:45 2008 @@ -4,7 +4,6 @@ <module name="mingw_common" type="staticlibrary" isstartuplib="true" underscoresymbols="true" crt="dll"> <importlibrary definition="moldname-msvcrt.def" dllname="msvcrt.dll" /> <include base="mingw_common">include</include> - <library>kernel32</library> <file>_newmode.c</file> <file>_wgetopt.c</file> <file>argv.c</file>

1 0

[tkreuzer] 38118: Let rbuild throw an exception when an implicit module dependency (like mingw lib) cannot be resolved instead of silently failing.
by tkreuzer＠svn.reactos.org 16 Dec '08

16 Dec '08

Author: tkreuzer Date: Tue Dec 16 09:51:55 2008 New Revision: 38118 URL: http://svn.reactos.org/svn/reactos?rev=38118&view=rev Log: Let rbuild throw an exception when an implicit module dependency (like mingw lib) cannot be resolved instead of silently failing. Modified: trunk/reactos/tools/rbuild/module.cpp Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/module.cpp [iso-8859-1] Tue Dec 16 09:51:55 2008 @@ -1454,6 +1454,14 @@ name(_name), importedModule(_module.project.LocateModule(_name)) { + if ( !importedModule ) + { + throw XMLInvalidBuildFileException ( + "<internal>", + "module '%s' trying to import non-existant module '%s'", + module.name.c_str(), + name.c_str() ); + } } void

1 0

[sginsberg] 38117: - Remove KeRosDumpStackFrames export and make the call go through KdSystemDebugControl instead
by sginsberg＠svn.reactos.org 16 Dec '08

16 Dec '08

Author: sginsberg Date: Tue Dec 16 09:25:51 2008 New Revision: 38117 URL: http://svn.reactos.org/svn/reactos?rev=38117&view=rev Log: - Remove KeRosDumpStackFrames export and make the call go through KdSystemDebugControl instead Modified: trunk/reactos/ntoskrnl/kd/kdmain.c trunk/reactos/ntoskrnl/ntoskrnl.pspec trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c Modified: trunk/reactos/ntoskrnl/kd/kdmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdmain.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] Tue Dec 16 09:25:51 2008 @@ -89,6 +89,13 @@ default: break; } + } + + /* Special case for stack frame dumps */ + case TAG('R', 'o', 's', 'D'): + { + KeRosDumpStackFrames((PULONG)Buffer1, Buffer1Length); + break; } #endif default: Modified: trunk/reactos/ntoskrnl/ntoskrnl.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.pspec?re… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.pspec [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.pspec [iso-8859-1] Tue Dec 16 09:25:51 2008 @@ -1030,7 +1030,6 @@ @ stdcall READ_REGISTER_UCHAR(ptr) @ stdcall READ_REGISTER_ULONG(ptr) @ stdcall READ_REGISTER_USHORT(ptr) -@ stdcall KeRosDumpStackFrames(ptr long) @ stdcall RtlAbsoluteToSelfRelativeSD(ptr ptr ptr) @ stdcall RtlAddAccessAllowedAce(ptr long long ptr) @ stdcall RtlAddAccessAllowedAceEx(ptr long long long ptr) Modified: trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c [iso-8859-1] Tue Dec 16 09:25:51 2008 @@ -1,6 +1,6 @@ #ifdef GDI_DEBUG -NTSYSAPI VOID APIENTRY KeRosDumpStackFrames(PULONG, ULONG); +#define KeRosDumpStackFrames(Frames, Count) KdSystemDebugControl(TAG('R', 'o', 's', 'D'), (PVOID)Frames, Count, NULL, 0, NULL, KernelMode) NTSYSAPI ULONG APIENTRY RtlWalkFrameChain(OUT PVOID *Callers, IN ULONG Count, IN ULONG Flags); static int leak_reported = 0;

1 0

[sginsberg] 38116: - Temporarily revert part of 38078 to make build server builds bootable again
by sginsberg＠svn.reactos.org 16 Dec '08

16 Dec '08

Author: sginsberg Date: Tue Dec 16 08:50:57 2008 New Revision: 38116 URL: http://svn.reactos.org/svn/reactos?rev=38116&view=rev Log: - Temporarily revert part of 38078 to make build server builds bootable again Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/lsa… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] Tue Dec 16 08:50:57 2008 @@ -78,10 +78,11 @@ NTSTATUS WINAPI LsaClose(LSA_HANDLE ObjectHandle) { - NTSTATUS Status; + //NTSTATUS Status; TRACE("LsaClose(0x%p) called\n", ObjectHandle); +#if 0 _SEH2_TRY { Status = LsarClose((PLSAPR_HANDLE)&ObjectHandle); @@ -93,6 +94,15 @@ _SEH2_END; return Status; +#else + + /* This is our fake handle, don't go too much long way */ + if (ObjectHandle == (LSA_HANDLE)0xcafe) + return STATUS_SUCCESS; + + return LsarClose((PLSAPR_HANDLE)&ObjectHandle); + +#endif } @@ -385,12 +395,13 @@ IN ACCESS_MASK DesiredAccess, IN OUT PLSA_HANDLE PolicyHandle) { - NTSTATUS Status; + //NTSTATUS Status; TRACE("LsaOpenPolicy (%s,%p,0x%08x,%p)\n", SystemName?debugstr_w(SystemName->Buffer):"(null)", ObjectAttributes, DesiredAccess, PolicyHandle); +#if 0 _SEH2_TRY { *PolicyHandle = NULL; @@ -409,6 +420,12 @@ TRACE("LsaOpenPolicy() done (Status: 0x%08lx)\n", Status); return Status; +#else + + if(PolicyHandle) *PolicyHandle = (LSA_HANDLE)0xcafe; + return STATUS_SUCCESS; + +#endif }

1 0

[janderwald] 38115: - Implement KsCreateAllocator, KsRegisterWorker, KsUnregisterWorker, KsRegisterCountedWorker, KsDecrementCountedWorker, KsIncrementCountedWorker, KsQueueWorkItem
by janderwald＠svn.reactos.org 16 Dec '08

16 Dec '08

Author: janderwald Date: Tue Dec 16 07:19:53 2008 New Revision: 38115 URL: http://svn.reactos.org/svn/reactos?rev=38115&view=rev Log: - Implement KsCreateAllocator, KsRegisterWorker, KsUnregisterWorker, KsRegisterCountedWorker, KsDecrementCountedWorker, KsIncrementCountedWorker, KsQueueWorkItem Modified: trunk/reactos/drivers/ksfilter/ks/allocators.c trunk/reactos/drivers/ksfilter/ks/ks.rbuild trunk/reactos/drivers/ksfilter/ks/worker.c Modified: trunk/reactos/drivers/ksfilter/ks/allocators.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/alloca… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/allocators.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/allocators.c [iso-8859-1] Tue Dec 16 07:19:53 2008 @@ -20,14 +20,13 @@ } /* - @unimplemented + @implemented */ KSDDKAPI NTSTATUS NTAPI KsCreateDefaultAllocator( IN PIRP Irp) { - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; + return KsCreateDefaultAllocatorEx(Irp, NULL, NULL, NULL, NULL, NULL); } /* @@ -54,7 +53,14 @@ IN PFNKSINITIALIZEALLOCATOR InitializeAllocator OPTIONAL, IN PFNKSDELETEALLOCATOR DeleteAllocator OPTIONAL) { - UNIMPLEMENTED; + NTSTATUS Status; + PKSALLOCATOR_FRAMING AllocatorFraming; + + Status = KsValidateAllocatorCreateRequest(Irp, &AllocatorFraming); + if (!NT_SUCCESS(Status)) + return STATUS_INVALID_PARAMETER; + + return STATUS_UNSUCCESSFUL; } Modified: trunk/reactos/drivers/ksfilter/ks/ks.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/ks.rbu… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/ks.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/ks.rbuild [iso-8859-1] Tue Dec 16 07:19:53 2008 @@ -6,6 +6,7 @@ <include base="ks">../include</include> <importlibrary definition="ks.spec" /> <library>ntoskrnl</library> + <library>hal</library> <define name="BUILDING_KS" /> <define name="_NTDDK_" /> <define name="_COMDDK_" /> Modified: trunk/reactos/drivers/ksfilter/ks/worker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/worker… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/worker.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/worker.c [iso-8859-1] Tue Dec 16 07:19:53 2008 @@ -6,30 +6,87 @@ #include <debug.h> #include <ks.h> + +typedef struct +{ + KEVENT Event; + KSPIN_LOCK Lock; + WORK_QUEUE_TYPE Type; + LONG Counter; + PWORK_QUEUE_ITEM WorkItem; + ULONG WorkItemActive; + ULONG DeleteInProgress; +}KS_WORKER; + /* - @unimplemented + @implemented */ -KSDDKAPI NTSTATUS NTAPI +KSDDKAPI +NTSTATUS +NTAPI KsRegisterWorker( IN WORK_QUEUE_TYPE WorkQueueType, OUT PKSWORKER* Worker) { + KS_WORKER * KsWorker; UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; + + if (WorkQueueType != CriticalWorkQueue && + WorkQueueType != DelayedWorkQueue && + WorkQueueType != HyperCriticalWorkQueue) + { + return STATUS_INVALID_PARAMETER; + } + + KsWorker = ExAllocatePoolWithTag(NonPagedPool, sizeof(KS_WORKER), 0); + if (!KsWorker) + return STATUS_INSUFFICIENT_RESOURCES; + + KsWorker->Type = WorkQueueType; + KsWorker->Counter = 0; + KsWorker->WorkItemActive = 0; + KsWorker->WorkItem = NULL; + KsWorker->DeleteInProgress = TRUE; + KeInitializeSpinLock(&KsWorker->Lock); + KeInitializeEvent(&KsWorker->Event, NotificationEvent, FALSE); + + *Worker = KsWorker; + return STATUS_SUCCESS; } /* - @unimplemented + @implemented */ KSDDKAPI VOID NTAPI KsUnregisterWorker( IN PKSWORKER Worker) { - UNIMPLEMENTED; + KS_WORKER * KsWorker; + KIRQL OldIrql; + ULONG bWait = FALSE; + + if (!Worker) + return; + + KsWorker = (KS_WORKER *)Worker; + + KsWorker->DeleteInProgress = TRUE; + + if (KsWorker->WorkItemActive) + { + KeReleaseSpinLock(&KsWorker->Lock, OldIrql); + KeWaitForSingleObject(&KsWorker->Event, Executive, KernelMode, FALSE, NULL); + } + else + { + KeReleaseSpinLock(&KsWorker->Lock, OldIrql); + } + + ExFreePoolWithTag(KsWorker, 0); } /* - @unimplemented + @implemented */ KSDDKAPI NTSTATUS NTAPI KsRegisterCountedWorker( @@ -37,40 +94,98 @@ IN PWORK_QUEUE_ITEM CountedWorkItem, OUT PKSWORKER* Worker) { - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; + NTSTATUS Status; + KS_WORKER * KsWorker; + + Status = KsRegisterWorker(WorkQueueType, Worker); + + if (NT_SUCCESS(Status)) + { + KsWorker = (KS_WORKER *)Worker; + KsWorker->WorkItem = CountedWorkItem; + } + + return Status; } /* - @unimplemented + @implemented */ -KSDDKAPI ULONG NTAPI +KSDDKAPI +ULONG +NTAPI KsDecrementCountedWorker( IN PKSWORKER Worker) { - UNIMPLEMENTED; - return 0; + KS_WORKER * KsWorker; + LONG Counter; + + if (!Worker) + return STATUS_INVALID_PARAMETER; + + KsWorker = (KS_WORKER *)Worker; + Counter = InterlockedDecrement(&KsWorker->Counter); + + if (KsWorker->DeleteInProgress) + { + /* signal that we are done */ + KeSetEvent(&KsWorker->Event, 0, 0); + } + + return Counter; } /* - @unimplemented + @implemented */ -KSDDKAPI ULONG NTAPI +KSDDKAPI +ULONG +NTAPI KsIncrementCountedWorker( IN PKSWORKER Worker) { - UNIMPLEMENTED; - return 0; + KS_WORKER * KsWorker; + LONG Counter; + + if (!Worker) + return STATUS_INVALID_PARAMETER; + + KsWorker = (KS_WORKER *)Worker; + + Counter = InterlockedIncrement(&KsWorker->Counter); + if (Counter == 1) + { + KsQueueWorkItem(Worker, KsWorker->WorkItem); + } + return Counter; } /* - @unimplemented + @implemented */ -KSDDKAPI NTSTATUS NTAPI +KSDDKAPI +NTSTATUS +NTAPI KsQueueWorkItem( IN PKSWORKER Worker, IN PWORK_QUEUE_ITEM WorkItem) { - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; + KS_WORKER * KsWorker; + KIRQL OldIrql; + NTSTATUS Status = STATUS_SUCCESS; + + if (!Worker || !WorkItem) + return STATUS_INVALID_PARAMETER; + + KsWorker = (KS_WORKER *)Worker; + KeAcquireSpinLock(&KsWorker->Lock, &OldIrql); + + if (!KsWorker->DeleteInProgress) + { + ExQueueWorkItem(WorkItem, KsWorker->Type); + Status = STATUS_UNSUCCESSFUL; + } + + KeReleaseSpinLock(&KsWorker->Lock, OldIrql); + return Status; }

1 0

← Newer
1
...
35
36
37
38
39
40
41
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2008