Ros-diffs December 2009

ros-diffs@reactos.org

22 participants
501 discussions

[tkreuzer] 44782: reduce diff to trunk
by tkreuzer＠svn.reactos.org 28 Dec '09

28 Dec '09

Author: tkreuzer Date: Mon Dec 28 01:51:53 2009 New Revision: 44782 URL: http://svn.reactos.org/svn/reactos?rev=44782&view=rev Log: reduce diff to trunk Modified: branches/ros-amd64-bringup/reactos/dll/cpl/console/console.spec Modified: branches/ros-amd64-bringup/reactos/dll/cpl/console/console.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/cpl/console/console.spec [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/cpl/console/console.spec [iso-8859-1] Mon Dec 28 01:51:53 2009 @@ -1,1 +1,1 @@ -@ stdcall CPlApplet(ptr long ptr ptr) +@ stdcall CPlApplet(ptr long ptr ptr)

1 0

[tkreuzer] 44781: [KE] Make trap handling cleaner / simplify stack layout by using the P1Home ... P5 members of KTRAP_FRAME and KEXCEPTION_FRAME as save area for function parameters.
by tkreuzer＠svn.reactos.org 28 Dec '09

28 Dec '09

Author: tkreuzer Date: Mon Dec 28 01:37:29 2009 New Revision: 44781 URL: http://svn.reactos.org/svn/reactos?rev=44781&view=rev Log: [KE] Make trap handling cleaner / simplify stack layout by using the P1Home ... P5 members of KTRAP_FRAME and KEXCEPTION_FRAME as save area for function parameters. Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] Mon Dec 28 01:37:29 2009 @@ -67,13 +67,9 @@ * |-------------------| * | KTRAP_FRAME | * |-------------------| <- rbp - * | 0x20 bytes params | + * | EXCEPTION_RECORD | * |-------------------| * | KEXCEPTION_FRAME | - * |-------------------| - * | EXCEPTION_RECORD | - * |-------------------| - * | 0x28 bytes params | * |-------------------| <- rsp * */ @@ -84,7 +80,7 @@ .macro ENTER_TRAP_FRAME AllocSize Flags .set SIZE_INITIAL_FRAME, 7 * 8 //.set SIZE_LOCAL_DATA, SIZE_EXCEPTION_RECORD + 0x28 -.set SIZE_TRAP_FRAME_ALLOC, SIZE_KTRAP_FRAME - SIZE_INITIAL_FRAME + \AllocSize +.set SIZE_TRAP_FRAME_ALLOC, SIZE_KTRAP_FRAME - SIZE_INITIAL_FRAME .set TRAPFLAGS, \Flags /* Save rbp */ @@ -96,13 +92,7 @@ .allocstack SIZE_TRAP_FRAME_ALLOC /* Point rbp to the KTRAP_FRAME */ - lea rbp, [rsp + \AllocSize] - -// KTRAP_FRAME_P1Home -// KTRAP_FRAME_P2Home -// KTRAP_FRAME_P3Home -// KTRAP_FRAME_P4Home -// KTRAP_FRAME_P5 + lea rbp, [rsp] .if (TRAPFLAGS & TRAPFLAG_NONVOLATILES) /* Save non-volatile registers */ @@ -249,42 +239,43 @@ _InternalDispatchException: /* Allocate stack space for EXCEPTION_RECORD and KEXCEPTION_FRAME */ - sub rsp, SIZE_EXCEPTION_RECORD + SIZE_KEXCEPTION_FRAME + 0x28 + sub rsp, SIZE_EXCEPTION_RECORD + SIZE_KEXCEPTION_FRAME /* Set up EXCEPTION_RECORD */ - mov [rsp + 0x28 + EXCEPTION_RECORD_ExceptionCode], ecx + mov eax, ecx + lea rcx, [rsp + SIZE_KEXCEPTION_FRAME] + mov [rcx + EXCEPTION_RECORD_ExceptionCode], eax xor rax, rax - mov [rsp + 0x28 + EXCEPTION_RECORD_ExceptionFlags], eax - mov [rsp + 0x28 + EXCEPTION_RECORD_ExceptionRecord], rax + mov [rcx + EXCEPTION_RECORD_ExceptionFlags], eax + mov [rcx + EXCEPTION_RECORD_ExceptionRecord], rax mov rax, [rbp + KTRAP_FRAME_Rip] - mov [rsp + 0x28 + EXCEPTION_RECORD_ExceptionAddress], rax - mov [rsp + 0x28 + EXCEPTION_RECORD_NumberParameters], edx - mov [rsp + 0x28 + EXCEPTION_RECORD_ExceptionInformation + 0x00], r9 - mov [rsp + 0x28 + EXCEPTION_RECORD_ExceptionInformation + 0x08], r10 - mov [rsp + 0x28 + EXCEPTION_RECORD_ExceptionInformation + 0x10], r11 + mov [rcx + EXCEPTION_RECORD_ExceptionAddress], rax + mov [rcx + EXCEPTION_RECORD_NumberParameters], edx + mov [rcx + EXCEPTION_RECORD_ExceptionInformation + 0x00], r9 + mov [rcx + EXCEPTION_RECORD_ExceptionInformation + 0x08], r10 + mov [rcx + EXCEPTION_RECORD_ExceptionInformation + 0x10], r11 /* Set up KEXCEPTION_FRAME */ - lea rdx, [rsp + 0x28 + SIZE_EXCEPTION_RECORD] mov rax, [rbp + KTRAP_FRAME_Rbp] - mov [rdx + KEXCEPTION_FRAME_Rbp], rax - mov [rdx + KEXCEPTION_FRAME_Rbx], rbx - mov [rdx + KEXCEPTION_FRAME_Rdi], rdi - mov [rdx + KEXCEPTION_FRAME_Rsi], rsi - mov [rdx + KEXCEPTION_FRAME_R12], r12 - mov [rdx + KEXCEPTION_FRAME_R13], r13 - mov [rdx + KEXCEPTION_FRAME_R14], r14 - mov [rdx + KEXCEPTION_FRAME_R15], r15 - mov qword ptr [rdx + KEXCEPTION_FRAME_Return], 0 + mov [rsp + KEXCEPTION_FRAME_Rbp], rax + mov [rsp + KEXCEPTION_FRAME_Rbx], rbx + mov [rsp + KEXCEPTION_FRAME_Rdi], rdi + mov [rsp + KEXCEPTION_FRAME_Rsi], rsi + mov [rsp + KEXCEPTION_FRAME_R12], r12 + mov [rsp + KEXCEPTION_FRAME_R13], r13 + mov [rsp + KEXCEPTION_FRAME_R14], r14 + mov [rsp + KEXCEPTION_FRAME_R15], r15 + mov qword ptr [rsp + KEXCEPTION_FRAME_Return], 0 /* Call KiDispatchException */ - lea rcx, [rsp + 0x28] // ExceptionRecord - // rdx already points to ExceptionFrame - mov r8, rbp // TrapFrame - mov r9b, [r8 + KTRAP_FRAME_PreviousMode] // PreviousMode - mov byte ptr [rsp + 0x20], 1 // FirstChance + // rcx already points to ExceptionRecord + mov rdx, rsp // ExceptionFrame + mov r8, rbp // TrapFrame + mov r9b, [r8 + KTRAP_FRAME_PreviousMode] // PreviousMode + mov byte ptr [rsp + KEXCEPTION_FRAME_P5], 1 // FirstChance call _KiDispatchException - add rsp, SIZE_EXCEPTION_RECORD + SIZE_KEXCEPTION_FRAME + 0x28 + add rsp, SIZE_EXCEPTION_RECORD + SIZE_KEXCEPTION_FRAME ret /* SOFTWARE INTERRUPT SERVICES ***********************************************/

1 0

[tkreuzer] 44780: spaces -> tabs in rbuild file
by tkreuzer＠svn.reactos.org 27 Dec '09

27 Dec '09

Author: tkreuzer Date: Mon Dec 28 00:54:01 2009 New Revision: 44780 URL: http://svn.reactos.org/svn/reactos?rev=44780&view=rev Log: spaces -> tabs in rbuild file Modified: trunk/reactos/base/services/services.rbuild Modified: trunk/reactos/base/services/services.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/services.rbu… ============================================================================== --- trunk/reactos/base/services/services.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/services/services.rbuild [iso-8859-1] Mon Dec 28 00:54:01 2009 @@ -25,9 +25,9 @@ <directory name="telnetd"> <xi:include href="telnetd/telnetd.rbuild" /> </directory> - <directory name="tftpd"> - <xi:include href="tftpd/tftpd.rbuild" /> - </directory> + <directory name="tftpd"> + <xi:include href="tftpd/tftpd.rbuild" /> + </directory> <directory name="umpnpmgr"> <xi:include href="umpnpmgr/umpnpmgr.rbuild" /> </directory>

1 0

[tkreuzer] 44779: reduce differences to trunk
by tkreuzer＠svn.reactos.org 27 Dec '09

27 Dec '09

Author: tkreuzer Date: Sun Dec 27 23:06:48 2009 New Revision: 44779 URL: http://svn.reactos.org/svn/reactos?rev=44779&view=rev Log: reduce differences to trunk Modified: branches/ros-amd64-bringup/reactos/dll/win32/beepmidi/beepmidi.c branches/ros-amd64-bringup/reactos/dll/win32/comctl32/commctrl.c branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/brush.c branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/gdiplus.c branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/graphics.c branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/image.c branches/ros-amd64-bringup/reactos/dll/win32/glu32/glu32.spec branches/ros-amd64-bringup/reactos/dll/win32/mmdrv/wave.c branches/ros-amd64-bringup/reactos/dll/win32/ole32/ole32.spec branches/ros-amd64-bringup/reactos/dll/win32/setupapi/parser.c branches/ros-amd64-bringup/reactos/dll/win32/shell32/shell32.rbuild branches/ros-amd64-bringup/reactos/dll/win32/wdmaud.drv/wdmaud.rbuild branches/ros-amd64-bringup/reactos/dll/win32/ws2_32_new/ws2_32.rbuild Modified: branches/ros-amd64-bringup/reactos/dll/win32/beepmidi/beepmidi.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/beepmidi/beepmidi.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/beepmidi/beepmidi.c [iso-8859-1] Sun Dec 27 23:06:48 2009 @@ -749,7 +749,7 @@ header->dwFlags |= MHDR_DONE; header->dwFlags &= ~ MHDR_INQUEUE; - DPRINT("Success? %d\n", CallClient(the_device, MOM_DONE, (DWORD_PTR)header, 0)); + DPRINT("Success? %d\n", CallClient(the_device, MOM_DONE, (DWORD_PTR) header, 0)); return MMSYSERR_NOERROR; } Modified: branches/ros-amd64-bringup/reactos/dll/win32/comctl32/commctrl.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/comctl32/commctrl.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/comctl32/commctrl.c [iso-8859-1] Sun Dec 27 23:06:48 2009 @@ -707,7 +707,6 @@ VOID WINAPI InitCommonControls (void) { - return; } Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/brush.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/brush.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/brush.c [iso-8859-1] Sun Dec 27 23:06:48 2009 @@ -303,20 +303,20 @@ } else { - FIXME("Unimplemented hatch style %d\n", hatchstyle); - - (*brush)->brush.lb.lbStyle = BS_SOLID; - (*brush)->brush.lb.lbColor = fgcol; - (*brush)->brush.lb.lbHatch = 0; + FIXME("Unimplemented hatch style %d\n", hatchstyle); + + (*brush)->brush.lb.lbStyle = BS_SOLID; + (*brush)->brush.lb.lbColor = fgcol; + (*brush)->brush.lb.lbHatch = 0; (*brush)->brush.gdibrush = CreateBrushIndirect(&(*brush)->brush.lb); } if (stat == Ok) { - (*brush)->brush.bt = BrushTypeHatchFill; - (*brush)->forecol = forecol; - (*brush)->backcol = backcol; - (*brush)->hatchstyle = hatchstyle; + (*brush)->brush.bt = BrushTypeHatchFill; + (*brush)->forecol = forecol; + (*brush)->backcol = backcol; + (*brush)->hatchstyle = hatchstyle; } else { Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/gdiplus.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/gdiplus.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/gdiplus.c [iso-8859-1] Sun Dec 27 23:06:48 2009 @@ -235,7 +235,7 @@ } if (points) - add_arc_part(&points[i], x1, y1, x2, y2, start_angle, end_angle, i == 0); + add_arc_part(&points[i], x1, y1, x2, y2, start_angle, end_angle, i == 0); start_angle += M_PI_2 * (sweepAngle < 0.0 ? -1.0 : 1.0); } Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/graphics.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/graphics.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/graphics.c [iso-8859-1] Sun Dec 27 23:06:48 2009 @@ -222,7 +222,7 @@ } if (brush->pblendcount == 0) - return blend_colors(brush->startcolor, brush->endcolor, blendfac); + return blend_colors(brush->startcolor, brush->endcolor, blendfac); else { int i=1; @@ -240,7 +240,7 @@ right_blendcolor = brush->pblendcolor[i]; blendfac = (blendfac - left_blendpos) / (right_blendpos - left_blendpos); return blend_colors(left_blendcolor, right_blendcolor, blendfac); -} + } } static void brush_fill_path(GpGraphics *graphics, GpBrush* brush) Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/image.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/image.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/image.c [iso-8859-1] Sun Dec 27 23:06:48 2009 @@ -257,8 +257,8 @@ break; default: FIXME("not implemented for format 0x%x\n", bitmap->format); - return NotImplemented; -} + return NotImplemented; + } *color = a<<24|r<<16|g<<8|b; @@ -405,8 +405,8 @@ break; default: FIXME("not implemented for format 0x%x\n", bitmap->format); - return NotImplemented; -} + return NotImplemented; + } return Ok; } @@ -1789,23 +1789,23 @@ bitmap = (GpBitmap*)*image; if (status == Ok && bitmap->format == PixelFormat32bppARGB) -{ + { /* WIC supports bmp files with alpha, but gdiplus does not */ bitmap->format = PixelFormat32bppRGB; } return status; - } +} static GpStatus decode_image_jpeg(IStream* stream, REFCLSID clsid, GpImage **image) { return decode_image_wic(stream, &CLSID_WICJpegDecoder, image); - } +} static GpStatus decode_image_png(IStream* stream, REFCLSID clsid, GpImage **image) - { +{ return decode_image_wic(stream, &CLSID_WICPngDecoder, image); - } +} static GpStatus decode_image_gif(IStream* stream, REFCLSID clsid, GpImage **image) { @@ -1925,7 +1925,7 @@ if (stat == Ok) { memcpy(&(*image)->format, &codec->info.FormatID, sizeof(GUID)); -} + } return stat; } Modified: branches/ros-amd64-bringup/reactos/dll/win32/glu32/glu32.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/glu32/glu32.spec [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/glu32/glu32.spec [iso-8859-1] Sun Dec 27 23:06:48 2009 @@ -1,53 +1,59 @@ -@ stdcall gluBeginCurve(ptr) -@ stdcall gluBeginPolygon(ptr) -@ stdcall gluBeginSurface(ptr) -@ stdcall gluBeginTrim(ptr) -@ stdcall gluBuild1DMipmaps(long long long long long ptr) -@ stdcall gluBuild2DMipmaps(long long long long long long ptr) -@ stdcall gluCheckExtension(str ptr) -@ stdcall gluCylinder(ptr double double double long long) -@ stdcall gluDeleteNurbsRenderer(ptr) -@ stdcall gluDeleteQuadric(ptr) -@ stdcall gluDeleteTess(ptr) -@ stdcall gluDisk(ptr double double long long) -@ stdcall gluEndCurve(ptr) -@ stdcall gluEndPolygon(ptr) -@ stdcall gluEndSurface(ptr) -@ stdcall gluEndTrim(ptr) -@ stdcall gluErrorString(long) -@ stub gluErrorUnicodeStringEXT -@ stdcall gluGetNurbsProperty(ptr long ptr) -@ stdcall gluGetString(long) -@ stdcall gluGetTessProperty(ptr ptr ptr) -@ stdcall gluLoadSamplingMatrices(ptr ptr ptr ptr) -@ stdcall gluLookAt(double double double double double double double double double) -@ stdcall gluNewNurbsRenderer() -@ stdcall gluNewQuadric() -@ stdcall gluNewTess() -@ stdcall gluNextContour(ptr long) -@ stdcall gluNurbsCallback(ptr long ptr) -@ stdcall gluNurbsCurve(ptr long ptr long ptr long long) -@ stdcall gluNurbsProperty(ptr long long) -@ stdcall gluNurbsSurface(ptr long ptr long ptr long long ptr long long long) -@ stdcall gluOrtho2D(double double double double) -@ stdcall gluPartialDisk(ptr double double long long double double) -@ stdcall gluPerspective(double double double double) -@ stdcall gluPickMatrix(double double double double ptr) -@ stdcall gluProject(double double double ptr ptr ptr ptr ptr ptr) -@ stdcall gluPwlCurve(ptr long ptr long long) -@ stdcall gluQuadricCallback(ptr long ptr) -@ stdcall gluQuadricDrawStyle(ptr long) -@ stdcall gluQuadricNormals(ptr long) -@ stdcall gluQuadricOrientation(ptr long) -@ stdcall gluQuadricTexture(ptr long) -@ stdcall gluScaleImage(long long long long ptr long long long ptr) -@ stdcall gluSphere(ptr double long long) -@ stdcall gluTessBeginContour(ptr) -@ stdcall gluTessBeginPolygon(ptr ptr) -@ stdcall gluTessCallback(ptr long ptr) -@ stdcall gluTessEndContour(ptr) -@ stdcall gluTessEndPolygon(ptr) -@ stdcall gluTessNormal(ptr double double double) -@ stdcall gluTessProperty(ptr long double) -@ stdcall gluTessVertex(ptr ptr ptr) -@ stdcall gluUnProject(double double double ptr ptr ptr ptr ptr ptr) +@ stdcall gluBeginCurve(ptr) +@ stdcall gluBeginPolygon(ptr) +@ stdcall gluBeginSurface(ptr) +@ stdcall gluBeginTrim(ptr) +@ stdcall gluBuild1DMipmapLevels(long long long long long long long long ptr) +@ stdcall gluBuild1DMipmaps(long long long long long ptr) +@ stdcall gluBuild2DMipmapLevels(long long long long long long long long long ptr) +@ stdcall gluBuild2DMipmaps(long long long long long long ptr) +@ stdcall gluBuild3DMipmapLevels(long long long long long long long long long long ptr) +@ stdcall gluBuild3DMipmaps(long long long long long long long ptr) +@ stdcall gluCheckExtension(str ptr) +@ stdcall gluCylinder(ptr double double double long long) +@ stdcall gluDeleteNurbsRenderer(ptr) +@ stdcall gluDeleteQuadric(ptr) +@ stdcall gluDeleteTess(ptr) +@ stdcall gluDisk(ptr double double long long) +@ stdcall gluEndCurve(ptr) +@ stdcall gluEndPolygon(ptr) +@ stdcall gluEndSurface(ptr) +@ stdcall gluEndTrim(ptr) +@ stdcall gluErrorString(long) +@ stdcall gluGetNurbsProperty(ptr long ptr) +@ stdcall gluGetString(long) +@ stdcall gluGetTessProperty(ptr long ptr) +@ stdcall gluLoadSamplingMatrices(ptr ptr ptr ptr) +@ stdcall gluLookAt(double double double double double double double double double) +@ stdcall gluNewNurbsRenderer() +@ stdcall gluNewQuadric() +@ stdcall gluNewTess() +@ stdcall gluNextContour(ptr long) +@ stdcall gluNurbsCallback(ptr long ptr) +@ stdcall gluNurbsCallbackData(ptr ptr) +@ stdcall gluNurbsCallbackDataEXT(ptr ptr) +@ stdcall gluNurbsCurve(ptr long ptr long ptr long long) +@ stdcall gluNurbsProperty(ptr long long) +@ stdcall gluNurbsSurface(ptr long ptr long ptr long long ptr long long long) +@ stdcall gluOrtho2D(double double double double) +@ stdcall gluPartialDisk(ptr double double long long double double) +@ stdcall gluPerspective(double double double double) +@ stdcall gluPickMatrix(double double double double ptr) +@ stdcall gluProject(double double double ptr ptr ptr ptr ptr ptr) +@ stdcall gluPwlCurve(ptr long ptr long long) +@ stdcall gluQuadricCallback(ptr long ptr) +@ stdcall gluQuadricDrawStyle(ptr long) +@ stdcall gluQuadricNormals(ptr long) +@ stdcall gluQuadricOrientation(ptr long) +@ stdcall gluQuadricTexture(ptr long) +@ stdcall gluScaleImage(long long long long ptr long long long ptr) +@ stdcall gluSphere(ptr double long long) +@ stdcall gluTessBeginContour(ptr) +@ stdcall gluTessBeginPolygon(ptr ptr) +@ stdcall gluTessCallback(ptr long ptr) +@ stdcall gluTessEndContour(ptr) +@ stdcall gluTessEndPolygon(ptr) +@ stdcall gluTessNormal(ptr double double double) +@ stdcall gluTessProperty(ptr long double) +@ stdcall gluTessVertex(ptr ptr ptr) +@ stdcall gluUnProject(double double double ptr ptr ptr ptr ptr ptr) +@ stdcall gluUnProject4(double double double double ptr ptr ptr double double ptr ptr ptr ptr) Modified: branches/ros-amd64-bringup/reactos/dll/win32/mmdrv/wave.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/mmdrv/wave.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/mmdrv/wave.c [iso-8859-1] Sun Dec 27 23:06:48 2009 @@ -112,7 +112,7 @@ message = (session_info->device_type == WaveOutDevice) ? WOM_DONE : WIM_DATA; - DPRINT("Notifying client that buffer 0x%x is done\n", header); + DPRINT("Notifying client that buffer 0x%p is done\n", header); /* Notify the client */ NotifyClient(session_info, message, (DWORD_PTR) header, 0); Modified: branches/ros-amd64-bringup/reactos/dll/win32/ole32/ole32.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/ole32/ole32.spec [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/ole32/ole32.spec [iso-8859-1] Sun Dec 27 23:06:48 2009 @@ -282,4 +282,4 @@ @ stdcall WriteClassStm(ptr ptr) @ stdcall WriteFmtUserTypeStg(ptr long ptr) @ stub WriteOleStg -@ stub WriteStringStream +@ stub WriteStringStream Modified: branches/ros-amd64-bringup/reactos/dll/win32/setupapi/parser.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/setupapi/parser.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/setupapi/parser.c [iso-8859-1] Sun Dec 27 23:06:48 2009 @@ -1906,13 +1906,13 @@ if (!*buffer) *result = 0; else { - res = strtol( buffer, &end, 0 ); + res = strtol( buffer, &end, 0 ); if (end != buffer && !*end) *result = res; else - { + { SetLastError( ERROR_INVALID_DATA ); ret = FALSE; - } + } } done: Modified: branches/ros-amd64-bringup/reactos/dll/win32/shell32/shell32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/shell32/shell32.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/shell32/shell32.rbuild [iso-8859-1] Sun Dec 27 23:06:48 2009 @@ -1,5 +1,5 @@ <group> -<module name="shell32" type="win32dll" baseaddress="${BASEADDRESS_SHELL32}" installbase="system32" installname="shell32.dll" crt="msvcrt" allowwarnings="true"> +<module name="shell32" type="win32dll" baseaddress="${BASEADDRESS_SHELL32}" installbase="system32" installname="shell32.dll" crt="msvcrt"> <autoregister infsection="OleControlDlls" type="Both" /> <importlibrary definition="shell32.spec" /> <include base="shell32">.</include> Modified: branches/ros-amd64-bringup/reactos/dll/win32/wdmaud.drv/wdmaud.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/wdmaud.drv/wdmaud.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/wdmaud.drv/wdmaud.rbuild [iso-8859-1] Sun Dec 27 23:06:48 2009 @@ -22,4 +22,4 @@ <file>mmixer.c</file> <file>legacy.c</file> <file>wdmaud.rc</file> -</module> +</module> Modified: branches/ros-amd64-bringup/reactos/dll/win32/ws2_32_new/ws2_32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/ws2_32_new/ws2_32.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/ws2_32_new/ws2_32.rbuild [iso-8859-1] Sun Dec 27 23:06:48 2009 @@ -1,4 +1,4 @@ -<module name="ws2_32_new" type="win32dll" baseaddress="${BASEADDRESS_WS2_32}" installbase="system32" installname="ws2_32_new.dll" allowwarnings="true"> +<module name="ws2_32_new" type="win32dll" baseaddress="${BASEADDRESS_WS2_32}" installbase="system32" installname="ws2_32_new.dll"> <importlibrary definition="ws2_32.spec" /> <include base="ws2_32_new">inc</include> <include base="ReactOS">include/reactos/winsock</include>

1 0

[tkreuzer] 44778: fix USERMODE=0 compilation
by tkreuzer＠svn.reactos.org 27 Dec '09

27 Dec '09

Author: tkreuzer Date: Sun Dec 27 22:30:36 2009 New Revision: 44778 URL: http://svn.reactos.org/svn/reactos?rev=44778&view=rev Log: fix USERMODE=0 compilation Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/3rdparty.rbuild branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild branches/ros-amd64-bringup/reactos/subsystems/win32/win32.rbuild Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/3rdparty.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/3rdparty.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/3rdparty.rbuild [iso-8859-1] Sun Dec 27 22:30:36 2009 @@ -7,9 +7,11 @@ <directory name="bzip2"> <xi:include href="bzip2/bzip2.rbuild" /> </directory> - <directory name="cardlib"> - <xi:include href="cardlib/cardlib.rbuild" /> - </directory> + <if property="USERMODE" value="1"> + <directory name="cardlib"> + <xi:include href="cardlib/cardlib.rbuild" /> + </directory> + </if> <directory name="expat"> <xi:include href="expat/expat.rbuild" /> </directory> 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] Sun Dec 27 22:30:36 2009 @@ -5,7 +5,9 @@ <define name="_CRTBLD" /> <importlibrary definition="moldname-msvcrt.def" dllname="msvcrt.dll" /> <include base="ReactOS">include/reactos/mingw-w64</include> - <library>kernel32</library> + <if property="USERMODE" value="1"> + <library>kernel32</library> + </if> <file>_newmode.c</file> <file>atonexit.c</file> <file>binmode.c</file> Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/win32/win32.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/win32/win32.rbuild [iso-8859-1] Sun Dec 27 22:30:36 2009 @@ -1,9 +1,11 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> -<directory name="csrss"> - <xi:include href="csrss/csrss.rbuild" /> -</directory> +<if property="USERMODE" value="1"> + <directory name="csrss"> + <xi:include href="csrss/csrss.rbuild" /> + </directory> +</if> <directory name="win32k"> <xi:include href="win32k/win32k.rbuild" /> </directory>

1 0

[bfreisen] 44777: Tool box, color palette and status bar can be hidden and shown using menu entry and/or shortcut.
by bfreisen＠svn.reactos.org 27 Dec '09

27 Dec '09

Author: bfreisen Date: Sun Dec 27 22:15:08 2009 New Revision: 44777 URL: http://svn.reactos.org/svn/reactos?rev=44777&view=rev Log: Tool box, color palette and status bar can be hidden and shown using menu entry and/or shortcut. Modified: trunk/reactos/base/applications/paint/globalvar.h trunk/reactos/base/applications/paint/main.c trunk/reactos/base/applications/paint/winproc.c Modified: trunk/reactos/base/applications/paint/globalvar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/gl… ============================================================================== --- trunk/reactos/base/applications/paint/globalvar.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/globalvar.h [iso-8859-1] Sun Dec 27 22:15:08 2009 @@ -53,6 +53,7 @@ extern HWND hScrollbox; extern HWND hMainWnd; extern HWND hPalWin; +extern HWND hToolBoxContainer; extern HWND hToolSettings; extern HWND hTrackbarZoom; extern CHOOSECOLOR choosecolor; Modified: trunk/reactos/base/applications/paint/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/ma… ============================================================================== --- trunk/reactos/base/applications/paint/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/main.c [iso-8859-1] Sun Dec 27 22:15:08 2009 @@ -76,6 +76,7 @@ HWND hScrollbox; HWND hMainWnd; HWND hPalWin; +HWND hToolBoxContainer; HWND hToolSettings; HWND hTrackbarZoom; CHOOSECOLOR choosecolor; @@ -285,6 +286,9 @@ CreateWindowEx(0, _T("STATIC"), _T(""), WS_CHILD | WS_VISIBLE | SS_ETCHEDHORZ, 0, 0, 5000, 2, hwnd, NULL, hThisInstance, NULL); + hToolBoxContainer = + CreateWindowEx(0, _T("WindowsApp"), _T(""), WS_CHILD | WS_VISIBLE, 2, 2, 52, 350, hwnd, NULL, + hThisInstance, NULL); /* creating the 16 bitmap radio buttons and setting the bitmap */ @@ -295,7 +299,7 @@ hToolbar = CreateWindowEx(0, TOOLBARCLASSNAME, NULL, WS_CHILD | WS_VISIBLE | CCS_NOPARENTALIGN | CCS_VERT | CCS_NORESIZE | TBSTYLE_TOOLTIPS, - 3, 3, 50, 205, hwnd, NULL, hThisInstance, NULL); + 1, 1, 50, 205, hToolBoxContainer, NULL, hThisInstance, NULL); hImageList = ImageList_Create(16, 16, ILC_COLOR24 | ILC_MASK, 16, 0); SendMessage(hToolbar, TB_SETIMAGELIST, 0, (LPARAM) hImageList); tempBm = LoadImage(hThisInstance, MAKEINTRESOURCE(IDB_TOOLBARICONS), IMAGE_BITMAP, 256, 16, 0); @@ -327,8 +331,8 @@ /* creating the tool settings child window */ hToolSettings = - CreateWindowEx(0, _T("ToolSettings"), _T(""), WS_CHILD | WS_VISIBLE, 7, 210, 42, 140, hwnd, NULL, - hThisInstance, NULL); + CreateWindowEx(0, _T("ToolSettings"), _T(""), WS_CHILD | WS_VISIBLE, 5, 208, 42, 140, + hToolBoxContainer, NULL, hThisInstance, NULL); hTrackbarZoom = CreateWindowEx(0, TRACKBAR_CLASS, _T(""), WS_CHILD | TBS_VERT | TBS_AUTOTICKS, 1, 1, 40, 64, hToolSettings, NULL, hThisInstance, NULL); Modified: trunk/reactos/base/applications/paint/winproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/wi… ============================================================================== --- trunk/reactos/base/applications/paint/winproc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/winproc.c [iso-8859-1] Sun Dec 27 22:15:08 2009 @@ -112,6 +112,38 @@ ReleaseDC(hImageArea, hdc); } +void +alignChildrenToMainWindow() +{ + int x, y, w, h; + RECT clientRect; + GetClientRect(hMainWnd, &clientRect); + + if (IsWindowVisible(hToolBoxContainer)) + { + x = 56; + w = clientRect.right - 56; + } + else + { + x = 0; + w = clientRect.right; + } + if (IsWindowVisible(hPalWin)) + { + y = 49; + h = clientRect.bottom - 49; + } + else + { + y = 3; + h = clientRect.bottom - 3; + } + + MoveWindow(hScrollbox, x, y, w, IsWindowVisible(hStatusBar) ? h - 23 : h, TRUE); + MoveWindow(hPalWin, x, 9, 255, 32, TRUE); +} + BOOL drawing; LRESULT CALLBACK @@ -179,14 +211,10 @@ } break; case 1: - if (undoSteps > 0) - EnableMenuItem(GetMenu(hMainWnd), IDM_EDITUNDO, MF_ENABLED | MF_BYCOMMAND); - else - EnableMenuItem(GetMenu(hMainWnd), IDM_EDITUNDO, MF_GRAYED | MF_BYCOMMAND); - if (redoSteps > 0) - EnableMenuItem(GetMenu(hMainWnd), IDM_EDITREDO, MF_ENABLED | MF_BYCOMMAND); - else - EnableMenuItem(GetMenu(hMainWnd), IDM_EDITREDO, MF_GRAYED | MF_BYCOMMAND); + EnableMenuItem(GetMenu(hMainWnd), IDM_EDITUNDO, + (undoSteps > 0) ? (MF_ENABLED | MF_BYCOMMAND) : (MF_GRAYED | MF_BYCOMMAND)); + EnableMenuItem(GetMenu(hMainWnd), IDM_EDITREDO, + (redoSteps > 0) ? (MF_ENABLED | MF_BYCOMMAND) : (MF_GRAYED | MF_BYCOMMAND)); if (IsWindowVisible(hSelection)) { EnableMenuItem(GetMenu(hMainWnd), IDM_EDITCUT, MF_ENABLED | MF_BYCOMMAND); @@ -219,10 +247,15 @@ (MF_CHECKED | MF_BYCOMMAND) : (MF_UNCHECKED | MF_BYCOMMAND)); break; } - if (IsWindowVisible(hStatusBar)) - CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWSTATUSBAR, MF_CHECKED | MF_BYCOMMAND); - else - CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWSTATUSBAR, MF_UNCHECKED | MF_BYCOMMAND); + CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWTOOLBOX, + IsWindowVisible(hToolBoxContainer) ? + (MF_CHECKED | MF_BYCOMMAND) : (MF_UNCHECKED | MF_BYCOMMAND)); + CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWCOLORPALETTE, + IsWindowVisible(hPalWin) ? + (MF_CHECKED | MF_BYCOMMAND) : (MF_UNCHECKED | MF_BYCOMMAND)); + CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWSTATUSBAR, + IsWindowVisible(hStatusBar) ? + (MF_CHECKED | MF_BYCOMMAND) : (MF_UNCHECKED | MF_BYCOMMAND)); CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWSHOWGRID, showGrid ? (MF_CHECKED | MF_BYCOMMAND) : (MF_UNCHECKED | MF_BYCOMMAND)); @@ -252,8 +285,7 @@ int test[] = { LOWORD(lParam) - 260, LOWORD(lParam) - 140, LOWORD(lParam) - 20 }; SendMessage(hStatusBar, WM_SIZE, wParam, lParam); SendMessage(hStatusBar, SB_SETPARTS, 3, (LPARAM)&test); - MoveWindow(hScrollbox, 56, 49, LOWORD(lParam) - 56, HIWORD(lParam) - 72, TRUE); - //InvalidateRect(hwnd, NULL, TRUE); + alignChildrenToMainWindow(); } if (hwnd == hImageArea) { @@ -813,8 +845,17 @@ updateCanvasAndScrollbars(); break; + case IDM_VIEWTOOLBOX: + ShowWindow(hToolBoxContainer, IsWindowVisible(hToolBoxContainer) ? SW_HIDE : SW_SHOW); + alignChildrenToMainWindow(); + break; + case IDM_VIEWCOLORPALETTE: + ShowWindow(hPalWin, IsWindowVisible(hPalWin) ? SW_HIDE : SW_SHOW); + alignChildrenToMainWindow(); + break; case IDM_VIEWSTATUSBAR: ShowWindow(hStatusBar, IsWindowVisible(hStatusBar) ? SW_HIDE : SW_SHOW); + alignChildrenToMainWindow(); break; case IDM_VIEWSHOWGRID:

1 0

[ekohl] 44776: [lsalib] Fix indentation. No code changes.
by ekohl＠svn.reactos.org 27 Dec '09

27 Dec '09

Author: ekohl Date: Sun Dec 27 20:46:13 2009 New Revision: 44776 URL: http://svn.reactos.org/svn/reactos?rev=44776&view=rev Log: [lsalib] Fix indentation. No code changes. Modified: trunk/reactos/lib/lsalib/lsa.c Modified: trunk/reactos/lib/lsalib/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/lsalib/lsa.c?rev=44776… ============================================================================== --- trunk/reactos/lib/lsalib/lsa.c [iso-8859-1] (original) +++ trunk/reactos/lib/lsalib/lsa.c [iso-8859-1] Sun Dec 27 20:46:13 2009 @@ -28,28 +28,29 @@ NTSTATUS WINAPI LsaDeregisterLogonProcess(HANDLE LsaHandle) { - LSASS_REQUEST Request; - LSASS_REPLY Reply; - NTSTATUS Status; - - Request.Header.u1.s1.DataLength = 0; - Request.Header.u1.s1.TotalLength = sizeof(LSASS_REQUEST); - Request.Type = LSASS_REQUEST_DEREGISTER_LOGON_PROCESS; - Status = NtRequestWaitReplyPort(LsaHandle, - &Request.Header, - &Reply.Header); - if (!NT_SUCCESS(Status)) - { - return(Status); - } - - if (!NT_SUCCESS(Reply.Status)) - { - return(Reply.Status); - } - - return(Status); -} + LSASS_REQUEST Request; + LSASS_REPLY Reply; + NTSTATUS Status; + + Request.Header.u1.s1.DataLength = 0; + Request.Header.u1.s1.TotalLength = sizeof(LSASS_REQUEST); + Request.Type = LSASS_REQUEST_DEREGISTER_LOGON_PROCESS; + Status = NtRequestWaitReplyPort(LsaHandle, + &Request.Header, + &Reply.Header); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + if (!NT_SUCCESS(Reply.Status)) + { + return Reply.Status; + } + + return Status; +} + /* * @unimplemented @@ -57,68 +58,69 @@ NTSTATUS WINAPI LsaConnectUntrusted(PHANDLE LsaHandle) { - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + /* * @implemented */ NTSTATUS WINAPI LsaCallAuthenticationPackage(HANDLE LsaHandle, - ULONG AuthenticationPackage, - PVOID ProtocolSubmitBuffer, - ULONG SubmitBufferLength, - PVOID* ProtocolReturnBuffer, - PULONG ReturnBufferLength, - PNTSTATUS ProtocolStatus) -{ - PLSASS_REQUEST Request; - PLSASS_REPLY Reply; - LSASS_REQUEST RawRequest; - LSASS_REPLY RawReply; - NTSTATUS Status; - ULONG OutBufferSize; - - Request = (PLSASS_REQUEST)&RawRequest; - Reply = (PLSASS_REPLY)&RawReply; - - Request->Header.u1.s1.DataLength = sizeof(LSASS_REQUEST) + SubmitBufferLength - - sizeof(PORT_MESSAGE); - Request->Header.u1.s1.TotalLength = - Request->Header.u1.s1.DataLength + sizeof(PORT_MESSAGE); - Request->Type = LSASS_REQUEST_CALL_AUTHENTICATION_PACKAGE; - Request->d.CallAuthenticationPackageRequest.AuthenticationPackage = - AuthenticationPackage; - Request->d.CallAuthenticationPackageRequest.InBufferLength = - SubmitBufferLength; - memcpy(Request->d.CallAuthenticationPackageRequest.InBuffer, - ProtocolSubmitBuffer, - SubmitBufferLength); - - Status = NtRequestWaitReplyPort(LsaHandle, - &Request->Header, - &Reply->Header); - if (!NT_SUCCESS(Status)) - { - return(Status); - } - - if (!NT_SUCCESS(Reply->Status)) - { - return(Reply->Status); - } - - OutBufferSize = Reply->d.CallAuthenticationPackageReply.OutBufferLength; - *ProtocolReturnBuffer = RtlAllocateHeap(Secur32Heap, - 0, - OutBufferSize); - *ReturnBufferLength = OutBufferSize; - memcpy(*ProtocolReturnBuffer, - Reply->d.CallAuthenticationPackageReply.OutBuffer, - *ReturnBufferLength); - - return(Status); + ULONG AuthenticationPackage, + PVOID ProtocolSubmitBuffer, + ULONG SubmitBufferLength, + PVOID *ProtocolReturnBuffer, + PULONG ReturnBufferLength, + PNTSTATUS ProtocolStatus) +{ + PLSASS_REQUEST Request; + PLSASS_REPLY Reply; + LSASS_REQUEST RawRequest; + LSASS_REPLY RawReply; + NTSTATUS Status; + ULONG OutBufferSize; + + Request = (PLSASS_REQUEST)&RawRequest; + Reply = (PLSASS_REPLY)&RawReply; + + Request->Header.u1.s1.DataLength = sizeof(LSASS_REQUEST) + SubmitBufferLength - + sizeof(PORT_MESSAGE); + Request->Header.u1.s1.TotalLength = + Request->Header.u1.s1.DataLength + sizeof(PORT_MESSAGE); + Request->Type = LSASS_REQUEST_CALL_AUTHENTICATION_PACKAGE; + Request->d.CallAuthenticationPackageRequest.AuthenticationPackage = + AuthenticationPackage; + Request->d.CallAuthenticationPackageRequest.InBufferLength = + SubmitBufferLength; + memcpy(Request->d.CallAuthenticationPackageRequest.InBuffer, + ProtocolSubmitBuffer, + SubmitBufferLength); + + Status = NtRequestWaitReplyPort(LsaHandle, + &Request->Header, + &Reply->Header); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + if (!NT_SUCCESS(Reply->Status)) + { + return Reply->Status; + } + + OutBufferSize = Reply->d.CallAuthenticationPackageReply.OutBufferLength; + *ProtocolReturnBuffer = RtlAllocateHeap(Secur32Heap, + 0, + OutBufferSize); + *ReturnBufferLength = OutBufferSize; + memcpy(*ProtocolReturnBuffer, + Reply->d.CallAuthenticationPackageReply.OutBuffer, + *ReturnBufferLength); + + return Status; } @@ -128,7 +130,7 @@ NTSTATUS WINAPI LsaFreeReturnBuffer(PVOID Buffer) { - return(RtlFreeHeap(Secur32Heap, 0, Buffer)); + return RtlFreeHeap(Secur32Heap, 0, Buffer); } @@ -137,36 +139,37 @@ */ NTSTATUS WINAPI LsaLookupAuthenticationPackage(HANDLE LsaHandle, - PLSA_STRING PackageName, - PULONG AuthenticationPackage) -{ - NTSTATUS Status; - PLSASS_REQUEST Request; - LSASS_REQUEST RawRequest; - LSASS_REPLY Reply; - - Request = (PLSASS_REQUEST)&RawRequest; - Request->Header.u1.s1.DataLength = sizeof(LSASS_REQUEST) + PackageName->Length - - sizeof(PORT_MESSAGE); - Request->Header.u1.s1.TotalLength = Request->Header.u1.s1.DataLength + - sizeof(PORT_MESSAGE); - Request->Type = LSASS_REQUEST_LOOKUP_AUTHENTICATION_PACKAGE; - - Status = NtRequestWaitReplyPort(LsaHandle, - &Request->Header, - &Reply.Header); - if (!NT_SUCCESS(Status)) - { - return(Status); - } - if (!NT_SUCCESS(Reply.Status)) - { - return(Reply.Status); - } - - *AuthenticationPackage = Reply.d.LookupAuthenticationPackageReply.Package; - - return(Reply.Status); + PLSA_STRING PackageName, + PULONG AuthenticationPackage) +{ + NTSTATUS Status; + PLSASS_REQUEST Request; + LSASS_REQUEST RawRequest; + LSASS_REPLY Reply; + + Request = (PLSASS_REQUEST)&RawRequest; + Request->Header.u1.s1.DataLength = sizeof(LSASS_REQUEST) + PackageName->Length - + sizeof(PORT_MESSAGE); + Request->Header.u1.s1.TotalLength = Request->Header.u1.s1.DataLength + + sizeof(PORT_MESSAGE); + Request->Type = LSASS_REQUEST_LOOKUP_AUTHENTICATION_PACKAGE; + + Status = NtRequestWaitReplyPort(LsaHandle, + &Request->Header, + &Reply.Header); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + if (!NT_SUCCESS(Reply.Status)) + { + return Reply.Status; + } + + *AuthenticationPackage = Reply.d.LookupAuthenticationPackageReply.Package; + + return Reply.Status; } @@ -175,102 +178,102 @@ */ NTSTATUS WINAPI LsaLogonUser(HANDLE LsaHandle, - PLSA_STRING OriginName, - SECURITY_LOGON_TYPE LogonType, - ULONG AuthenticationPackage, - PVOID AuthenticationInformation, - ULONG AuthenticationInformationLength, - PTOKEN_GROUPS LocalGroups, - PTOKEN_SOURCE SourceContext, - PVOID* ProfileBuffer, - PULONG ProfileBufferLength, - PLUID LogonId, - PHANDLE Token, - PQUOTA_LIMITS Quotas, - PNTSTATUS SubStatus) -{ - ULONG RequestLength; - ULONG CurrentLength; - PLSASS_REQUEST Request; - LSASS_REQUEST RawMessage; - PLSASS_REPLY Reply; - LSASS_REPLY RawReply; - NTSTATUS Status; - - RequestLength = sizeof(LSASS_REQUEST) - sizeof(PORT_MESSAGE); - RequestLength = RequestLength + (OriginName->Length * sizeof(WCHAR)); - RequestLength = RequestLength + AuthenticationInformationLength; - RequestLength = RequestLength + - (LocalGroups->GroupCount * sizeof(SID_AND_ATTRIBUTES)); - - CurrentLength = 0; - Request = (PLSASS_REQUEST)&RawMessage; - - Request->d.LogonUserRequest.OriginNameLength = OriginName->Length; - Request->d.LogonUserRequest.OriginName = (PWSTR)&RawMessage + CurrentLength; - memcpy((PWSTR)&RawMessage + CurrentLength, - OriginName->Buffer, - OriginName->Length * sizeof(WCHAR)); - CurrentLength = CurrentLength + (OriginName->Length * sizeof(WCHAR)); - - Request->d.LogonUserRequest.LogonType = LogonType; - - Request->d.LogonUserRequest.AuthenticationPackage = - AuthenticationPackage; - - Request->d.LogonUserRequest.AuthenticationInformation = - (PVOID)((ULONG_PTR)&RawMessage + CurrentLength); - Request->d.LogonUserRequest.AuthenticationInformationLength = - AuthenticationInformationLength; - memcpy((PVOID)((ULONG_PTR)&RawMessage + CurrentLength), - AuthenticationInformation, - AuthenticationInformationLength); - CurrentLength = CurrentLength + AuthenticationInformationLength; - - Request->d.LogonUserRequest.LocalGroupsCount = LocalGroups->GroupCount; - Request->d.LogonUserRequest.LocalGroups = - (PSID_AND_ATTRIBUTES)&RawMessage + CurrentLength; - memcpy((PSID_AND_ATTRIBUTES)&RawMessage + CurrentLength, - LocalGroups->Groups, - LocalGroups->GroupCount * sizeof(SID_AND_ATTRIBUTES)); - - Request->d.LogonUserRequest.SourceContext = *SourceContext; - - Request->Type = LSASS_REQUEST_LOGON_USER; - Request->Header.u1.s1.DataLength = RequestLength - sizeof(PORT_MESSAGE); - Request->Header.u1.s1.TotalLength = RequestLength + sizeof(PORT_MESSAGE); - - Reply = (PLSASS_REPLY)&RawReply; - - Status = NtRequestWaitReplyPort(LsaHandle, - &Request->Header, - &Reply->Header); - if (!NT_SUCCESS(Status)) - { - return(Status); - } - - *SubStatus = Reply->d.LogonUserReply.SubStatus; - - if (!NT_SUCCESS(Reply->Status)) - { - return(Status); - } - - *ProfileBuffer = RtlAllocateHeap(Secur32Heap, - 0, - Reply->d.LogonUserReply.ProfileBufferLength); - memcpy(*ProfileBuffer, - (PVOID)((ULONG)Reply->d.LogonUserReply.Data + - (ULONG)Reply->d.LogonUserReply.ProfileBuffer), - Reply->d.LogonUserReply.ProfileBufferLength); - *LogonId = Reply->d.LogonUserReply.LogonId; - *Token = Reply->d.LogonUserReply.Token; - memcpy(Quotas, - &Reply->d.LogonUserReply.Quotas, - sizeof(Reply->d.LogonUserReply.Quotas)); - - return(Status); + PLSA_STRING OriginName, + SECURITY_LOGON_TYPE LogonType, + ULONG AuthenticationPackage, + PVOID AuthenticationInformation, + ULONG AuthenticationInformationLength, + PTOKEN_GROUPS LocalGroups, + PTOKEN_SOURCE SourceContext, + PVOID *ProfileBuffer, + PULONG ProfileBufferLength, + PLUID LogonId, + PHANDLE Token, + PQUOTA_LIMITS Quotas, + PNTSTATUS SubStatus) +{ + ULONG RequestLength; + ULONG CurrentLength; + PLSASS_REQUEST Request; + LSASS_REQUEST RawMessage; + PLSASS_REPLY Reply; + LSASS_REPLY RawReply; + NTSTATUS Status; + + RequestLength = sizeof(LSASS_REQUEST) - sizeof(PORT_MESSAGE); + RequestLength = RequestLength + (OriginName->Length * sizeof(WCHAR)); + RequestLength = RequestLength + AuthenticationInformationLength; + RequestLength = RequestLength + + (LocalGroups->GroupCount * sizeof(SID_AND_ATTRIBUTES)); + + CurrentLength = 0; + Request = (PLSASS_REQUEST)&RawMessage; + + Request->d.LogonUserRequest.OriginNameLength = OriginName->Length; + Request->d.LogonUserRequest.OriginName = (PWSTR)&RawMessage + CurrentLength; + memcpy((PWSTR)&RawMessage + CurrentLength, + OriginName->Buffer, + OriginName->Length * sizeof(WCHAR)); + CurrentLength = CurrentLength + (OriginName->Length * sizeof(WCHAR)); + + Request->d.LogonUserRequest.LogonType = LogonType; + + Request->d.LogonUserRequest.AuthenticationPackage = + AuthenticationPackage; + + Request->d.LogonUserRequest.AuthenticationInformation = + (PVOID)((ULONG_PTR)&RawMessage + CurrentLength); + Request->d.LogonUserRequest.AuthenticationInformationLength = + AuthenticationInformationLength; + memcpy((PVOID)((ULONG_PTR)&RawMessage + CurrentLength), + AuthenticationInformation, + AuthenticationInformationLength); + CurrentLength = CurrentLength + AuthenticationInformationLength; + + Request->d.LogonUserRequest.LocalGroupsCount = LocalGroups->GroupCount; + Request->d.LogonUserRequest.LocalGroups = + (PSID_AND_ATTRIBUTES)&RawMessage + CurrentLength; + memcpy((PSID_AND_ATTRIBUTES)&RawMessage + CurrentLength, + LocalGroups->Groups, + LocalGroups->GroupCount * sizeof(SID_AND_ATTRIBUTES)); + + Request->d.LogonUserRequest.SourceContext = *SourceContext; + + Request->Type = LSASS_REQUEST_LOGON_USER; + Request->Header.u1.s1.DataLength = RequestLength - sizeof(PORT_MESSAGE); + Request->Header.u1.s1.TotalLength = RequestLength + sizeof(PORT_MESSAGE); + + Reply = (PLSASS_REPLY)&RawReply; + + Status = NtRequestWaitReplyPort(LsaHandle, + &Request->Header, + &Reply->Header); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + *SubStatus = Reply->d.LogonUserReply.SubStatus; + + if (!NT_SUCCESS(Reply->Status)) + { + return Status; + } + + *ProfileBuffer = RtlAllocateHeap(Secur32Heap, + 0, + Reply->d.LogonUserReply.ProfileBufferLength); + memcpy(*ProfileBuffer, + (PVOID)((ULONG)Reply->d.LogonUserReply.Data + + (ULONG)Reply->d.LogonUserReply.ProfileBuffer), + Reply->d.LogonUserReply.ProfileBufferLength); + *LogonId = Reply->d.LogonUserReply.LogonId; + *Token = Reply->d.LogonUserReply.Token; + memcpy(Quotas, + &Reply->d.LogonUserReply.Quotas, + sizeof(Reply->d.LogonUserReply.Quotas)); + + return Status; } @@ -279,113 +282,109 @@ */ NTSTATUS WINAPI LsaRegisterLogonProcess(PLSA_STRING LsaLogonProcessName, - PHANDLE Handle, - PLSA_OPERATIONAL_MODE OperationalMode) -{ - UNICODE_STRING Portname = RTL_CONSTANT_STRING(L"\\SeLsaCommandPort"); - ULONG ConnectInfoLength; - NTSTATUS Status; - LSASS_REQUEST Request; - LSASS_REPLY Reply; - - ConnectInfoLength = 0; - Status = NtConnectPort(Handle, - &Portname, - NULL, - NULL, - NULL, - NULL, - NULL, - &ConnectInfoLength); - if (!NT_SUCCESS(Status)) - { - return(Status); - } - - Request.Type = LSASS_REQUEST_REGISTER_LOGON_PROCESS; - Request.Header.u1.s1.DataLength = sizeof(LSASS_REQUEST) - - sizeof(PORT_MESSAGE); - Request.Header.u1.s1.TotalLength = sizeof(LSASS_REQUEST); - - Request.d.RegisterLogonProcessRequest.Length = LsaLogonProcessName->Length; - memcpy(Request.d.RegisterLogonProcessRequest.LogonProcessNameBuffer, - LsaLogonProcessName->Buffer, - Request.d.RegisterLogonProcessRequest.Length); - - Status = NtRequestWaitReplyPort(*Handle, - &Request.Header, - &Reply.Header); - if (!NT_SUCCESS(Status)) - { - NtClose(*Handle); - *Handle = NULL; - return(Status); - } - - if (!NT_SUCCESS(Reply.Status)) - { - NtClose(*Handle); - *Handle = NULL; - return(Status); - } - - *OperationalMode = Reply.d.RegisterLogonProcessReply.OperationalMode; - - return(Reply.Status); -} + PHANDLE Handle, + PLSA_OPERATIONAL_MODE OperationalMode) +{ + UNICODE_STRING Portname = RTL_CONSTANT_STRING(L"\\SeLsaCommandPort"); + ULONG ConnectInfoLength; + NTSTATUS Status; + LSASS_REQUEST Request; + LSASS_REPLY Reply; + + ConnectInfoLength = 0; + Status = NtConnectPort(Handle, + &Portname, + NULL, + NULL, + NULL, + NULL, + NULL, + &ConnectInfoLength); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + Request.Type = LSASS_REQUEST_REGISTER_LOGON_PROCESS; + Request.Header.u1.s1.DataLength = sizeof(LSASS_REQUEST) - + sizeof(PORT_MESSAGE); + Request.Header.u1.s1.TotalLength = sizeof(LSASS_REQUEST); + + Request.d.RegisterLogonProcessRequest.Length = LsaLogonProcessName->Length; + memcpy(Request.d.RegisterLogonProcessRequest.LogonProcessNameBuffer, + LsaLogonProcessName->Buffer, + Request.d.RegisterLogonProcessRequest.Length); + + Status = NtRequestWaitReplyPort(*Handle, + &Request.Header, + &Reply.Header); + if (!NT_SUCCESS(Status)) + { + NtClose(*Handle); + *Handle = NULL; + return Status; + } + + if (!NT_SUCCESS(Reply.Status)) + { + NtClose(*Handle); + *Handle = NULL; + return Status; + } + + *OperationalMode = Reply.d.RegisterLogonProcessReply.OperationalMode; + + return Reply.Status; +} + /* * @unimplemented */ NTSTATUS WINAPI -LsaEnumerateLogonSessions( -PULONG LogonSessionCount, -PLUID * LogonSessionList -) -{ - UNIMPLEMENTED; - return FALSE; -} +LsaEnumerateLogonSessions(PULONG LogonSessionCount, + PLUID *LogonSessionList) +{ + UNIMPLEMENTED; + return FALSE; +} + /* * @unimplemented */ NTSTATUS WINAPI -LsaGetLogonSessionData( -PLUID LogonId, -PSECURITY_LOGON_SESSION_DATA * ppLogonSessionData -) -{ - UNIMPLEMENTED; - return FALSE; -} +LsaGetLogonSessionData(PLUID LogonId, + PSECURITY_LOGON_SESSION_DATA *ppLogonSessionData) +{ + UNIMPLEMENTED; + return FALSE; +} + /* * @unimplemented */ NTSTATUS WINAPI -LsaRegisterPolicyChangeNotification( -POLICY_NOTIFICATION_INFORMATION_CLASS InformationClass, -HANDLE NotificationEventHandle -) -{ - UNIMPLEMENTED; - return FALSE; -} +LsaRegisterPolicyChangeNotification(POLICY_NOTIFICATION_INFORMATION_CLASS InformationClass, + HANDLE NotificationEventHandle) +{ + UNIMPLEMENTED; + return FALSE; +} + /* * @unimplemented */ NTSTATUS WINAPI -LsaUnregisterPolicyChangeNotification( -POLICY_NOTIFICATION_INFORMATION_CLASS InformationClass, -HANDLE NotificationEventHandle -) -{ - UNIMPLEMENTED; - return FALSE; -} +LsaUnregisterPolicyChangeNotification(POLICY_NOTIFICATION_INFORMATION_CLASS InformationClass, + HANDLE NotificationEventHandle) +{ + UNIMPLEMENTED; + return FALSE; +}

1 0

[jimtabor] 44775: [gdi32] - Add notes, fix CombineRgn and cleanup.
by jimtabor＠svn.reactos.org 27 Dec '09

27 Dec '09

Author: jimtabor Date: Sun Dec 27 20:43:46 2009 New Revision: 44775 URL: http://svn.reactos.org/svn/reactos?rev=44775&view=rev Log: [gdi32] - Add notes, fix CombineRgn and cleanup. Modified: trunk/reactos/dll/win32/gdi32/objects/region.c Modified: trunk/reactos/dll/win32/gdi32/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/re… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/region.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/region.c [iso-8859-1] Sun Dec 27 20:43:46 2009 @@ -1,4 +1,7 @@ #include "precomp.h" + +#define NDEBUG +#include <debug.h> #define INRECT(r, x, y) \ ( ( ((r).right > x)) && \ @@ -6,17 +9,30 @@ ( ((r).bottom > y)) && \ ( ((r).top <= y)) ) +#define OVERLAPPING_RGN 0 +#define INVERTED_RGN 1 +#define SAME_RGN 2 +#define DIFF_RGN 3 +/* + From tests, there are four results based on normalized coordinates. + If the rects are overlapping and normalized, it's OVERLAPPING_RGN. + If the rects are overlapping in anyway or same in dimension and one is inverted, + it's INVERTED_RGN. + If the rects are same in dimension or NULL, it's SAME_RGN. + If the rects are overlapping and not normalized or displace in different areas, + it's DIFF_RGN. + */ static INT FASTCALL -ComplexityFromRects( PRECT prc1, PRECT prc2) +ComplexityFromRects( PRECTL prc1, PRECTL prc2) { if ( prc2->left >= prc1->left ) { if ( ( prc1->right >= prc2->right) && ( prc1->top <= prc2->top ) && - ( prc1->bottom <= prc2->bottom ) ) - return SIMPLEREGION; + ( prc1->bottom >= prc2->bottom ) ) + return SAME_RGN; if ( prc2->left > prc1->left ) { @@ -24,7 +40,7 @@ ( prc1->right <= prc2->left ) || ( prc1->top >= prc2->bottom ) || ( prc1->bottom <= prc2->top ) ) - return COMPLEXREGION; + return DIFF_RGN; } } @@ -36,14 +52,13 @@ ( prc1->right <= prc2->left ) || ( prc1->top >= prc2->bottom ) || ( prc1->bottom <= prc2->top ) ) - return COMPLEXREGION; + return DIFF_RGN; } else { - return NULLREGION; - } - - return ERROR; + return INVERTED_RGN; + } + return OVERLAPPING_RGN; } static @@ -181,7 +196,7 @@ /* FUNCTIONS *****************************************************************/ /* - * @unimplemented + * @implemented */ INT WINAPI @@ -190,8 +205,203 @@ HRGN hSrc2, INT CombineMode) { - /* FIXME some part should be done in user mode */ - return NtGdiCombineRgn(hDest, hSrc1, hSrc2, CombineMode); + PRGN_ATTR pRgn_Attr_Dest = NULL; + PRGN_ATTR pRgn_Attr_Src1 = NULL; + PRGN_ATTR pRgn_Attr_Src2 = NULL; + INT Complexity; + BOOL Ret; + + Ret = GdiGetHandleUserData((HGDIOBJ) hDest, GDI_OBJECT_TYPE_REGION, (PVOID) &pRgn_Attr_Dest); + Ret = GdiGetHandleUserData((HGDIOBJ) hSrc1, GDI_OBJECT_TYPE_REGION, (PVOID) &pRgn_Attr_Src1); + + if ( !Ret || + !pRgn_Attr_Dest || + !pRgn_Attr_Src1 || + pRgn_Attr_Src1->Flags > SIMPLEREGION ) + return NtGdiCombineRgn(hDest, hSrc1, hSrc2, CombineMode); + + /* Handle COPY and use only src1. */ + if ( CombineMode == RGN_COPY ) + { + switch (pRgn_Attr_Src1->Flags) + { + case NULLREGION: + Ret = SetRectRgn( hDest, 0, 0, 0, 0); + if (Ret) + return NULLREGION; + goto ERROR_Exit; + + case SIMPLEREGION: + Ret = SetRectRgn( hDest, + pRgn_Attr_Src1->Rect.left, + pRgn_Attr_Src1->Rect.top, + pRgn_Attr_Src1->Rect.right, + pRgn_Attr_Src1->Rect.bottom ); + if (Ret) + return SIMPLEREGION; + goto ERROR_Exit; + + case COMPLEXREGION: + default: + return NtGdiCombineRgn(hDest, hSrc1, hSrc2, CombineMode); + } + } + + Ret = GdiGetHandleUserData((HGDIOBJ) hSrc2, GDI_OBJECT_TYPE_REGION, (PVOID) &pRgn_Attr_Src2); + if ( !Ret || + !pRgn_Attr_Src2 || + pRgn_Attr_Src2->Flags > SIMPLEREGION ) + return NtGdiCombineRgn(hDest, hSrc1, hSrc2, CombineMode); + + /* All but AND. */ + if ( CombineMode != RGN_AND) + { + if ( CombineMode <= RGN_AND) + { + /* + There might be some type of junk in the call, so go K. + If this becomes a problem, need to setup parameter check at the top. + */ + DPRINT1("Might be junk! CombineMode %d\n",CombineMode); + return NtGdiCombineRgn(hDest, hSrc1, hSrc2, CombineMode); + } + + if ( CombineMode > RGN_XOR) /* Handle DIFF. */ + { + if ( CombineMode != RGN_DIFF) + { /* Filter check! Well, must be junk?, so go K. */ + DPRINT1("RGN_COPY was handled! CombineMode %d\n",CombineMode); + return NtGdiCombineRgn(hDest, hSrc1, hSrc2, CombineMode); + } + + if ( pRgn_Attr_Src1->Flags != NULLREGION && + pRgn_Attr_Src2->Flags != NULLREGION ) + { + Complexity = ComplexityFromRects( &pRgn_Attr_Src1->Rect, &pRgn_Attr_Src2->Rect); + /* If same or overlapping and norm just go K. */ + if (Complexity == SAME_RGN || Complexity == OVERLAPPING_RGN) + return NtGdiCombineRgn(hDest, hSrc1, hSrc2, CombineMode); + } + /* Just NULL rgn. */ + if (SetRectRgn( hDest, 0, 0, 0, 0)) + return NULLREGION; + goto ERROR_Exit; + } + else /* Handle OR or XOR. */ + { + if ( pRgn_Attr_Src1->Flags == NULLREGION ) + { + if ( pRgn_Attr_Src2->Flags != NULLREGION ) + { /* Src1 null and not NULL, set from src2. */ + Ret = SetRectRgn( hDest, + pRgn_Attr_Src2->Rect.left, + pRgn_Attr_Src2->Rect.top, + pRgn_Attr_Src2->Rect.right, + pRgn_Attr_Src2->Rect.bottom ); + if (Ret) + return SIMPLEREGION; + goto ERROR_Exit; + } + /* Both are NULL. */ + if (SetRectRgn( hDest, 0, 0, 0, 0)) + return NULLREGION; + goto ERROR_Exit; + } + /* Src1 is not NULL. */ + if ( pRgn_Attr_Src2->Flags != NULLREGION ) + { + if ( CombineMode != RGN_OR ) /* Filter XOR, so go K. */ + return NtGdiCombineRgn(hDest, hSrc1, hSrc2, CombineMode); + + Complexity = ComplexityFromRects( &pRgn_Attr_Src1->Rect, &pRgn_Attr_Src2->Rect); + /* If inverted use Src2. */ + if ( Complexity == INVERTED_RGN) + { + Ret = SetRectRgn( hDest, + pRgn_Attr_Src2->Rect.left, + pRgn_Attr_Src2->Rect.top, + pRgn_Attr_Src2->Rect.right, + pRgn_Attr_Src2->Rect.bottom ); + if (Ret) + return SIMPLEREGION; + goto ERROR_Exit; + } + /* Not NULL or overlapping or differentiated, go to K. */ + if ( Complexity != SAME_RGN) + return NtGdiCombineRgn(hDest, hSrc1, hSrc2, CombineMode); + /* If same, just fall through. */ + } + } + Ret = SetRectRgn( hDest, + pRgn_Attr_Src1->Rect.left, + pRgn_Attr_Src1->Rect.top, + pRgn_Attr_Src1->Rect.right, + pRgn_Attr_Src1->Rect.bottom ); + if (Ret) + return SIMPLEREGION; + goto ERROR_Exit; + } + + /* Handle AND. */ + if ( pRgn_Attr_Src1->Flags != NULLREGION && + pRgn_Attr_Src2->Flags != NULLREGION ) + { + Complexity = ComplexityFromRects( &pRgn_Attr_Src1->Rect, &pRgn_Attr_Src2->Rect); + + if ( Complexity == DIFF_RGN ) /* Differentiated in anyway just NULL rgn. */ + { + if (SetRectRgn( hDest, 0, 0, 0, 0)) + return NULLREGION; + goto ERROR_Exit; + } + + if ( Complexity != INVERTED_RGN) /* Not inverted and overlapping. */ + { + if ( Complexity != SAME_RGN) /* Must be norm and overlapping. */ + return NtGdiCombineRgn(hDest, hSrc1, hSrc2, CombineMode); + /* Merge from src2. */ + Ret = SetRectRgn( hDest, + pRgn_Attr_Src2->Rect.left, + pRgn_Attr_Src2->Rect.top, + pRgn_Attr_Src2->Rect.right, + pRgn_Attr_Src2->Rect.bottom ); + if (Ret) + return SIMPLEREGION; + goto ERROR_Exit; + } + /* Inverted so merge from src1. */ + Ret = SetRectRgn( hDest, + pRgn_Attr_Src1->Rect.left, + pRgn_Attr_Src1->Rect.top, + pRgn_Attr_Src1->Rect.right, + pRgn_Attr_Src1->Rect.bottom ); + if (Ret) + return SIMPLEREGION; + goto ERROR_Exit; + } + + /* It's all NULL! */ + if (SetRectRgn( hDest, 0, 0, 0, 0)) + return NULLREGION; + +ERROR_Exit: + /* Even on error the flag is set dirty and force server side to redraw. */ + pRgn_Attr_Dest->AttrFlags |= ATTR_RGN_DIRTY; + return ERROR; +} + +/* + * @implemented + */ +HRGN +WINAPI +CreateEllipticRgnIndirect( + const RECT *prc +) +{ + /* Notes if prc is NULL it will crash on All Windows NT I checked 2000/XP/VISTA */ + return NtGdiCreateEllipticRgn(prc->left, prc->top, prc->right, prc->bottom); + } /* @@ -215,20 +425,6 @@ int fnPolyFillMode) { return (HRGN) NtGdiPolyPolyDraw( (HDC) fnPolyFillMode, (PPOINT) lppt, (PULONG) lpPolyCounts, (ULONG) nCount, GdiPolyPolyRgn ); -} - -/* - * @implemented - */ -HRGN -WINAPI -CreateEllipticRgnIndirect( - const RECT *prc -) -{ - /* Notes if prc is NULL it will crash on All Windows NT I checked 2000/XP/VISTA */ - return NtGdiCreateEllipticRgn(prc->left, prc->top, prc->right, prc->bottom); - } /* @@ -585,14 +781,12 @@ { return ERROR; } - else - { - pRgn_Attr->Rect.top = nTopRect; - pRgn_Attr->Rect.left = nLeftRect; - pRgn_Attr->Rect.right = nRightRect; - pRgn_Attr->Rect.bottom = nBottomRect; - pRgn_Attr->AttrFlags |= ATTR_RGN_DIRTY; - } + + pRgn_Attr->Rect.top = nTopRect; + pRgn_Attr->Rect.left = nLeftRect; + pRgn_Attr->Rect.right = nRightRect; + pRgn_Attr->Rect.bottom = nBottomRect; + pRgn_Attr->AttrFlags |= ATTR_RGN_DIRTY; } } return pRgn_Attr->Flags; @@ -630,7 +824,7 @@ LPCRECT prcl) { PRGN_ATTR pRgn_Attr; - RECT rc; + RECTL rc; if (!GdiGetHandleUserData((HGDIOBJ) hrgn, GDI_OBJECT_TYPE_REGION, (PVOID) &pRgn_Attr)) return NtGdiRectInRegion(hrgn, (LPRECT) prcl); @@ -643,31 +837,31 @@ /* swap the coordinates to make right >= left and bottom >= top */ /* (region building rectangles are normalized the same way) */ - if ( prcl->top > prcl->bottom) - { - rc.top = prcl->bottom; - rc.bottom = prcl->top; - } - else - { - rc.top = prcl->top; - rc.bottom = prcl->bottom; - } - if ( prcl->right < prcl->left) - { - rc.right = prcl->left; - rc.left = prcl->right; - } - else - { - rc.right = prcl->right; - rc.left = prcl->left; - } - - if ( ComplexityFromRects( (PRECT)&pRgn_Attr->Rect, &rc) != COMPLEXREGION ) - return TRUE; - - return FALSE; + if ( prcl->top > prcl->bottom) + { + rc.top = prcl->bottom; + rc.bottom = prcl->top; + } + else + { + rc.top = prcl->top; + rc.bottom = prcl->bottom; + } + if ( prcl->right < prcl->left) + { + rc.right = prcl->left; + rc.left = prcl->right; + } + else + { + rc.right = prcl->right; + rc.left = prcl->left; + } + + if ( ComplexityFromRects( &pRgn_Attr->Rect, &rc) != DIFF_RGN ) + return TRUE; + + return FALSE; } /* @@ -752,4 +946,3 @@ return ERROR; } -

1 0

[ekohl] 44774: Move the client-side LSA functions from secur32.dll to the new static library lsalib because these functions will be shared between ntoskrnl.exe, advapi32.dll and secur32.dll.
by ekohl＠svn.reactos.org 27 Dec '09

27 Dec '09

Author: ekohl Date: Sun Dec 27 20:10:30 2009 New Revision: 44774 URL: http://svn.reactos.org/svn/reactos?rev=44774&view=rev Log: Move the client-side LSA functions from secur32.dll to the new static library lsalib because these functions will be shared between ntoskrnl.exe, advapi32.dll and secur32.dll. Added: trunk/reactos/lib/lsalib/ (with props) trunk/reactos/lib/lsalib/lsa.c - copied, changed from r44761, trunk/reactos/dll/win32/secur32/lsa.c trunk/reactos/lib/lsalib/lsalib.rbuild (with props) Removed: trunk/reactos/dll/win32/secur32/lsa.c Modified: trunk/reactos/dll/win32/secur32/secur32.rbuild trunk/reactos/lib/lib.rbuild Removed: trunk/reactos/dll/win32/secur32/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/lsa.c?re… ============================================================================== --- trunk/reactos/dll/win32/secur32/lsa.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/secur32/lsa.c (removed) @@ -1,390 +1,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * FILE: lib/secur32/lsa.c - * PURPOSE: Client-side LSA functions - * UPDATE HISTORY: - * Created 05/08/00 - */ - -/* INCLUDES ******************************************************************/ - -#include <precomp.h> - -#define NDEBUG -#include <debug.h> - -/* GLOBALS *******************************************************************/ - -extern HANDLE Secur32Heap; - -/* FUNCTIONS *****************************************************************/ - -/* - * @implemented - */ -NTSTATUS WINAPI -LsaDeregisterLogonProcess(HANDLE LsaHandle) -{ - LSASS_REQUEST Request; - LSASS_REPLY Reply; - NTSTATUS Status; - - Request.Header.u1.s1.DataLength = 0; - Request.Header.u1.s1.TotalLength = sizeof(LSASS_REQUEST); - Request.Type = LSASS_REQUEST_DEREGISTER_LOGON_PROCESS; - Status = NtRequestWaitReplyPort(LsaHandle, - &Request.Header, - &Reply.Header); - if (!NT_SUCCESS(Status)) - { - return(Status); - } - - if (!NT_SUCCESS(Reply.Status)) - { - return(Reply.Status); - } - - return(Status); -} - -/* - * @unimplemented - */ -NTSTATUS WINAPI -LsaConnectUntrusted(PHANDLE LsaHandle) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - -/* - * @implemented - */ -NTSTATUS WINAPI -LsaCallAuthenticationPackage(HANDLE LsaHandle, - ULONG AuthenticationPackage, - PVOID ProtocolSubmitBuffer, - ULONG SubmitBufferLength, - PVOID* ProtocolReturnBuffer, - PULONG ReturnBufferLength, - PNTSTATUS ProtocolStatus) -{ - PLSASS_REQUEST Request; - PLSASS_REPLY Reply; - LSASS_REQUEST RawRequest; - LSASS_REPLY RawReply; - NTSTATUS Status; - ULONG OutBufferSize; - - Request = (PLSASS_REQUEST)&RawRequest; - Reply = (PLSASS_REPLY)&RawReply; - - Request->Header.u1.s1.DataLength = sizeof(LSASS_REQUEST) + SubmitBufferLength - - sizeof(PORT_MESSAGE); - Request->Header.u1.s1.TotalLength = - Request->Header.u1.s1.DataLength + sizeof(PORT_MESSAGE); - Request->Type = LSASS_REQUEST_CALL_AUTHENTICATION_PACKAGE; - Request->d.CallAuthenticationPackageRequest.AuthenticationPackage = - AuthenticationPackage; - Request->d.CallAuthenticationPackageRequest.InBufferLength = - SubmitBufferLength; - memcpy(Request->d.CallAuthenticationPackageRequest.InBuffer, - ProtocolSubmitBuffer, - SubmitBufferLength); - - Status = NtRequestWaitReplyPort(LsaHandle, - &Request->Header, - &Reply->Header); - if (!NT_SUCCESS(Status)) - { - return(Status); - } - - if (!NT_SUCCESS(Reply->Status)) - { - return(Reply->Status); - } - - OutBufferSize = Reply->d.CallAuthenticationPackageReply.OutBufferLength; - *ProtocolReturnBuffer = RtlAllocateHeap(Secur32Heap, - 0, - OutBufferSize); - *ReturnBufferLength = OutBufferSize; - memcpy(*ProtocolReturnBuffer, - Reply->d.CallAuthenticationPackageReply.OutBuffer, - *ReturnBufferLength); - - return(Status); -} - - -/* - * @implemented - */ -NTSTATUS WINAPI -LsaFreeReturnBuffer(PVOID Buffer) -{ - return(RtlFreeHeap(Secur32Heap, 0, Buffer)); -} - - -/* - * @implemented - */ -NTSTATUS WINAPI -LsaLookupAuthenticationPackage(HANDLE LsaHandle, - PLSA_STRING PackageName, - PULONG AuthenticationPackage) -{ - NTSTATUS Status; - PLSASS_REQUEST Request; - LSASS_REQUEST RawRequest; - LSASS_REPLY Reply; - - Request = (PLSASS_REQUEST)&RawRequest; - Request->Header.u1.s1.DataLength = sizeof(LSASS_REQUEST) + PackageName->Length - - sizeof(PORT_MESSAGE); - Request->Header.u1.s1.TotalLength = Request->Header.u1.s1.DataLength + - sizeof(PORT_MESSAGE); - Request->Type = LSASS_REQUEST_LOOKUP_AUTHENTICATION_PACKAGE; - - Status = NtRequestWaitReplyPort(LsaHandle, - &Request->Header, - &Reply.Header); - if (!NT_SUCCESS(Status)) - { - return(Status); - } - if (!NT_SUCCESS(Reply.Status)) - { - return(Reply.Status); - } - - *AuthenticationPackage = Reply.d.LookupAuthenticationPackageReply.Package; - - return(Reply.Status); -} - - -/* - * @implemented - */ -NTSTATUS WINAPI -LsaLogonUser(HANDLE LsaHandle, - PLSA_STRING OriginName, - SECURITY_LOGON_TYPE LogonType, - ULONG AuthenticationPackage, - PVOID AuthenticationInformation, - ULONG AuthenticationInformationLength, - PTOKEN_GROUPS LocalGroups, - PTOKEN_SOURCE SourceContext, - PVOID* ProfileBuffer, - PULONG ProfileBufferLength, - PLUID LogonId, - PHANDLE Token, - PQUOTA_LIMITS Quotas, - PNTSTATUS SubStatus) -{ - ULONG RequestLength; - ULONG CurrentLength; - PLSASS_REQUEST Request; - LSASS_REQUEST RawMessage; - PLSASS_REPLY Reply; - LSASS_REPLY RawReply; - NTSTATUS Status; - - RequestLength = sizeof(LSASS_REQUEST) - sizeof(PORT_MESSAGE); - RequestLength = RequestLength + (OriginName->Length * sizeof(WCHAR)); - RequestLength = RequestLength + AuthenticationInformationLength; - RequestLength = RequestLength + - (LocalGroups->GroupCount * sizeof(SID_AND_ATTRIBUTES)); - - CurrentLength = 0; - Request = (PLSASS_REQUEST)&RawMessage; - - Request->d.LogonUserRequest.OriginNameLength = OriginName->Length; - Request->d.LogonUserRequest.OriginName = (PWSTR)&RawMessage + CurrentLength; - memcpy((PWSTR)&RawMessage + CurrentLength, - OriginName->Buffer, - OriginName->Length * sizeof(WCHAR)); - CurrentLength = CurrentLength + (OriginName->Length * sizeof(WCHAR)); - - Request->d.LogonUserRequest.LogonType = LogonType; - - Request->d.LogonUserRequest.AuthenticationPackage = - AuthenticationPackage; - - Request->d.LogonUserRequest.AuthenticationInformation = - (PVOID)((ULONG_PTR)&RawMessage + CurrentLength); - Request->d.LogonUserRequest.AuthenticationInformationLength = - AuthenticationInformationLength; - memcpy((PVOID)((ULONG_PTR)&RawMessage + CurrentLength), - AuthenticationInformation, - AuthenticationInformationLength); - CurrentLength = CurrentLength + AuthenticationInformationLength; - - Request->d.LogonUserRequest.LocalGroupsCount = LocalGroups->GroupCount; - Request->d.LogonUserRequest.LocalGroups = - (PSID_AND_ATTRIBUTES)&RawMessage + CurrentLength; - memcpy((PSID_AND_ATTRIBUTES)&RawMessage + CurrentLength, - LocalGroups->Groups, - LocalGroups->GroupCount * sizeof(SID_AND_ATTRIBUTES)); - - Request->d.LogonUserRequest.SourceContext = *SourceContext; - - Request->Type = LSASS_REQUEST_LOGON_USER; - Request->Header.u1.s1.DataLength = RequestLength - sizeof(PORT_MESSAGE); - Request->Header.u1.s1.TotalLength = RequestLength + sizeof(PORT_MESSAGE); - - Reply = (PLSASS_REPLY)&RawReply; - - Status = NtRequestWaitReplyPort(LsaHandle, - &Request->Header, - &Reply->Header); - if (!NT_SUCCESS(Status)) - { - return(Status); - } - - *SubStatus = Reply->d.LogonUserReply.SubStatus; - - if (!NT_SUCCESS(Reply->Status)) - { - return(Status); - } - - *ProfileBuffer = RtlAllocateHeap(Secur32Heap, - 0, - Reply->d.LogonUserReply.ProfileBufferLength); - memcpy(*ProfileBuffer, - (PVOID)((ULONG)Reply->d.LogonUserReply.Data + - (ULONG)Reply->d.LogonUserReply.ProfileBuffer), - Reply->d.LogonUserReply.ProfileBufferLength); - *LogonId = Reply->d.LogonUserReply.LogonId; - *Token = Reply->d.LogonUserReply.Token; - memcpy(Quotas, - &Reply->d.LogonUserReply.Quotas, - sizeof(Reply->d.LogonUserReply.Quotas)); - - return(Status); -} - - -/* - * @implemented - */ -NTSTATUS WINAPI -LsaRegisterLogonProcess(PLSA_STRING LsaLogonProcessName, - PHANDLE Handle, - PLSA_OPERATIONAL_MODE OperationalMode) -{ - UNICODE_STRING Portname = RTL_CONSTANT_STRING(L"\\SeLsaCommandPort"); - ULONG ConnectInfoLength; - NTSTATUS Status; - LSASS_REQUEST Request; - LSASS_REPLY Reply; - - ConnectInfoLength = 0; - Status = NtConnectPort(Handle, - &Portname, - NULL, - NULL, - NULL, - NULL, - NULL, - &ConnectInfoLength); - if (!NT_SUCCESS(Status)) - { - return(Status); - } - - Request.Type = LSASS_REQUEST_REGISTER_LOGON_PROCESS; - Request.Header.u1.s1.DataLength = sizeof(LSASS_REQUEST) - - sizeof(PORT_MESSAGE); - Request.Header.u1.s1.TotalLength = sizeof(LSASS_REQUEST); - - Request.d.RegisterLogonProcessRequest.Length = LsaLogonProcessName->Length; - memcpy(Request.d.RegisterLogonProcessRequest.LogonProcessNameBuffer, - LsaLogonProcessName->Buffer, - Request.d.RegisterLogonProcessRequest.Length); - - Status = NtRequestWaitReplyPort(*Handle, - &Request.Header, - &Reply.Header); - if (!NT_SUCCESS(Status)) - { - NtClose(*Handle); - *Handle = INVALID_HANDLE_VALUE; - return(Status); - } - - if (!NT_SUCCESS(Reply.Status)) - { - NtClose(*Handle); - *Handle = INVALID_HANDLE_VALUE; - return(Status); - } - - *OperationalMode = Reply.d.RegisterLogonProcessReply.OperationalMode; - - return(Reply.Status); -} - -/* - * @unimplemented - */ -NTSTATUS -WINAPI -LsaEnumerateLogonSessions( -PULONG LogonSessionCount, -PLUID * LogonSessionList -) -{ - UNIMPLEMENTED; - return FALSE; -} - -/* - * @unimplemented - */ -NTSTATUS -WINAPI -LsaGetLogonSessionData( -PLUID LogonId, -PSECURITY_LOGON_SESSION_DATA * ppLogonSessionData -) -{ - UNIMPLEMENTED; - return FALSE; -} - -/* - * @unimplemented - */ -NTSTATUS -WINAPI -LsaRegisterPolicyChangeNotification( -POLICY_NOTIFICATION_INFORMATION_CLASS InformationClass, -HANDLE NotificationEventHandle -) -{ - UNIMPLEMENTED; - return FALSE; -} - -/* - * @unimplemented - */ -NTSTATUS -WINAPI -LsaUnregisterPolicyChangeNotification( -POLICY_NOTIFICATION_INFORMATION_CLASS InformationClass, -HANDLE NotificationEventHandle -) -{ - UNIMPLEMENTED; - return FALSE; -} Modified: trunk/reactos/dll/win32/secur32/secur32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/secur32.… ============================================================================== --- trunk/reactos/dll/win32/secur32/secur32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/secur32/secur32.rbuild [iso-8859-1] Sun Dec 27 20:10:30 2009 @@ -3,10 +3,10 @@ <include base="secur32">.</include> <include base="ReactOS">include/reactos/subsys</include> <define name="__SECUR32__" /> + <library>lsalib</library> <library>ntdll</library> <library>advapi32</library> <file>dllmain.c</file> - <file>lsa.c</file> <file>secext.c</file> <file>sspi.c</file> <file>secur32.rc</file> Modified: trunk/reactos/lib/lib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/lib.rbuild?rev=44774&r… ============================================================================== --- trunk/reactos/lib/lib.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/lib.rbuild [iso-8859-1] Sun Dec 27 20:10:30 2009 @@ -34,6 +34,9 @@ <directory name="inflib"> <xi:include href="inflib/inflib.rbuild" /> </directory> + <directory name="lsalib"> + <xi:include href="lsalib/lsalib.rbuild" /> + </directory> <directory name="nls"> <xi:include href="nls/nls.rbuild" /> </directory> Propchange: trunk/reactos/lib/lsalib/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Dec 27 20:10:30 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/lib/lsalib/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/lib/lsalib/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/lib/lsalib/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Copied: trunk/reactos/lib/lsalib/lsa.c (from r44761, trunk/reactos/dll/win32/secur32/lsa.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/lsalib/lsa.c?p2=trunk/… ============================================================================== --- trunk/reactos/dll/win32/secur32/lsa.c [iso-8859-1] (original) +++ trunk/reactos/lib/lsalib/lsa.c [iso-8859-1] Sun Dec 27 20:10:30 2009 @@ -1,8 +1,7 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries - * FILE: lib/secur32/lsa.c + * FILE: lib/lsalib/lsa.c * PURPOSE: Client-side LSA functions * UPDATE HISTORY: * Created 05/08/00 @@ -10,7 +9,9 @@ /* INCLUDES ******************************************************************/ -#include <precomp.h> +#include <ndk/ntndk.h> +#include <psdk/ntsecapi.h> +#include <lsass/lsass.h> #define NDEBUG #include <debug.h> @@ -317,14 +318,14 @@ if (!NT_SUCCESS(Status)) { NtClose(*Handle); - *Handle = INVALID_HANDLE_VALUE; + *Handle = NULL; return(Status); } if (!NT_SUCCESS(Reply.Status)) { NtClose(*Handle); - *Handle = INVALID_HANDLE_VALUE; + *Handle = NULL; return(Status); } Added: trunk/reactos/lib/lsalib/lsalib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/lsalib/lsalib.rbuild?r… ============================================================================== --- trunk/reactos/lib/lsalib/lsalib.rbuild (added) +++ trunk/reactos/lib/lsalib/lsalib.rbuild [iso-8859-1] Sun Dec 27 20:10:30 2009 @@ -1,0 +1,7 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> +<module name="lsalib" type="staticlibrary"> + <include base="lsalib">.</include> + <include base="ReactOS">include/reactos/subsys</include> + <file>lsa.c</file> +</module> Propchange: trunk/reactos/lib/lsalib/lsalib.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[sserapion] 44773: Implement KeGetTrapFrame and KeGetExceptionFrame macros.
by sserapion＠svn.reactos.org 27 Dec '09

27 Dec '09

Author: sserapion Date: Sun Dec 27 19:19:20 2009 New Revision: 44773 URL: http://svn.reactos.org/svn/reactos?rev=44773&view=rev Log: Implement KeGetTrapFrame and KeGetExceptionFrame macros. Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h [iso-8859-1] Sun Dec 27 19:19:20 2009 @@ -101,6 +101,17 @@ #define KeSetContextReturnRegister(Context, ReturnValue) \ ((Context)->Rax = (ReturnValue)) + +// +// Macro to get trap and exception frame from a thread stack +// +#define KeGetTrapFrame(Thread) \ + (PKTRAP_FRAME)((ULONG_PTR)((Thread)->InitialStack) - \ + sizeof(KTRAP_FRAME)) + +#define KeGetExceptionFrame(Thread) \ + (PKEXCEPTION_FRAME)((ULONG_PTR)KeGetTrapFrame(Thread) - \ + sizeof(KEXCEPTION_FRAME)) // // Returns the Interrupt State from a Trap Frame.

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
51
Older →

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 December 2009