Ros-diffs January 2011

ros-diffs@reactos.org

20 participants
336 discussions

[rmessiant] 50284: [KERNEL32] - ReadDirectoryChangesW: Treat the OVERLAPPED structure as an IO_STATUS_BLOCK, not one of its fields.
by rmessiant＠svn.reactos.org 04 Jan '11

04 Jan '11

Author: rmessiant Date: Tue Jan 4 17:26:25 2011 New Revision: 50284 URL: http://svn.reactos.org/svn/reactos?rev=50284&view=rev Log: [KERNEL32] - ReadDirectoryChangesW: Treat the OVERLAPPED structure as an IO_STATUS_BLOCK, not one of its fields. Modified: trunk/reactos/dll/win32/kernel32/file/cnotify.c Modified: trunk/reactos/dll/win32/kernel32/file/cnotify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/cn… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/cnotify.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/cnotify.c [iso-8859-1] Tue Jan 4 17:26:25 2011 @@ -219,7 +219,7 @@ EventHandle, IoApcRoutine, CompletionRoutine, /* ApcContext */ - lpOverlapped ? (PIO_STATUS_BLOCK)lpOverlapped->Internal : &IoStatus, + lpOverlapped ? (PIO_STATUS_BLOCK) lpOverlapped : &IoStatus, lpBuffer, nBufferLength, dwNotifyFilter,

1 0

[tkreuzer] 50283: [WIN32K] - Simplify error checks, by reordering code in NtGdiScaleViewportExtEx - Simplify exception handling, use _SEH2_YIELD - Change function order - Minor code improvements
by tkreuzer＠svn.reactos.org 04 Jan '11

04 Jan '11

Author: tkreuzer Date: Tue Jan 4 16:53:23 2011 New Revision: 50283 URL: http://svn.reactos.org/svn/reactos?rev=50283&view=rev Log: [WIN32K] - Simplify error checks, by reordering code in NtGdiScaleViewportExtEx - Simplify exception handling, use _SEH2_YIELD - Change function order - Minor code improvements Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] Tue Jan 4 16:53:23 2011 @@ -1,24 +1,5 @@ /* - * ReactOS W32 Subsystem - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ -/* - * - * COPYRIGHT: See COPYING in the top level directory + * COPYRIGHT: GNU GPL, See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: Coordinate systems * FILE: subsys/win32k/objects/coord.c @@ -35,13 +16,13 @@ /* FUNCTIONS *****************************************************************/ void FASTCALL -IntFixIsotropicMapping(PDC dc) +IntFixIsotropicMapping(PDC pdc) { PDC_ATTR pdcattr; LONG fx, fy, s; /* Get a pointer to the DC_ATTR */ - pdcattr = dc->pdcattr; + pdcattr = pdc->pdcattr; /* Check if all values are valid */ if (pdcattr->szlWindowExt.cx == 0 || pdcattr->szlWindowExt.cy == 0 || @@ -63,6 +44,76 @@ { s = pdcattr->szlWindowExt.cx * pdcattr->szlViewportExt.cy > 0 ? 1 : -1; pdcattr->szlViewportExt.cy = s * fy / pdcattr->szlWindowExt.cx; + } +} + +// FIXME: Don't use floating point in the kernel! +void IntWindowToViewPort(PDC_ATTR pdcattr, LPXFORM xformWnd2Vport) +{ + FLOAT scaleX, scaleY; + + scaleX = (pdcattr->szlWindowExt.cx ? (FLOAT)pdcattr->szlViewportExt.cx / (FLOAT)pdcattr->szlWindowExt.cx : 0.0f); + scaleY = (pdcattr->szlWindowExt.cy ? (FLOAT)pdcattr->szlViewportExt.cy / (FLOAT)pdcattr->szlWindowExt.cy : 0.0f); + xformWnd2Vport->eM11 = scaleX; + xformWnd2Vport->eM12 = 0.0; + xformWnd2Vport->eM21 = 0.0; + xformWnd2Vport->eM22 = scaleY; + xformWnd2Vport->eDx = (FLOAT)pdcattr->ptlViewportOrg.x - scaleX * (FLOAT)pdcattr->ptlWindowOrg.x; + xformWnd2Vport->eDy = (FLOAT)pdcattr->ptlViewportOrg.y - scaleY * (FLOAT)pdcattr->ptlWindowOrg.y; +} + +// FIXME: Use XFORMOBJECT! +VOID FASTCALL +DC_UpdateXforms(PDC dc) +{ + XFORM xformWnd2Vport; + PDC_ATTR pdcattr = dc->pdcattr; + XFORM xformWorld2Vport, xformWorld2Wnd, xformVport2World; + + /* Construct a transformation to do the window-to-viewport conversion */ + IntWindowToViewPort(pdcattr, &xformWnd2Vport); + + /* Combine with the world transformation */ + MatrixS2XForm(&xformWorld2Vport, &dc->dclevel.mxWorldToDevice); + MatrixS2XForm(&xformWorld2Wnd, &dc->dclevel.mxWorldToPage); + IntGdiCombineTransform(&xformWorld2Vport, &xformWorld2Wnd, &xformWnd2Vport); + + /* Create inverse of world-to-viewport transformation */ + MatrixS2XForm(&xformVport2World, &dc->dclevel.mxDeviceToWorld); + if (DC_InvertXform(&xformWorld2Vport, &xformVport2World)) + { + pdcattr->flXform &= ~DEVICE_TO_WORLD_INVALID; + } + else + { + pdcattr->flXform |= DEVICE_TO_WORLD_INVALID; + } + + /* Update transformation matrices */ + XForm2MatrixS(&dc->dclevel.mxWorldToDevice, &xformWorld2Vport); + XForm2MatrixS(&dc->dclevel.mxDeviceToWorld, &xformVport2World); +} + +VOID +FASTCALL +DC_vUpdateViewportExt(PDC pdc) +{ + PDC_ATTR pdcattr; + + /* Get a pointer to the dc attribute */ + pdcattr = pdc->pdcattr; + + /* Check if we need to recalculate */ + if (pdcattr->flXform & PAGE_EXTENTS_CHANGED) + { + /* Check if we need to do isotropic fixup */ + if (pdcattr->iMapMode == MM_ISOTROPIC) + { + IntFixIsotropicMapping(pdc); + } + + /* Update xforms, CHECKME: really done here? */ + DC_UpdateXforms(pdc); } } @@ -74,6 +125,7 @@ LPXFORM xform2) { XFORM xformTemp; + /* Check for illegal parameters */ if (!XFormResult || !xform1 || !xform2) { @@ -94,10 +146,12 @@ } // FIXME: should be XFORML and use XFORMOBJ functions -BOOL APIENTRY NtGdiCombineTransform( - LPXFORM UnsafeXFormResult, - LPXFORM Unsafexform1, - LPXFORM Unsafexform2) +BOOL +APIENTRY +NtGdiCombineTransform( + LPXFORM UnsafeXFormResult, + LPXFORM Unsafexform1, + LPXFORM Unsafexform2) { BOOL Ret; @@ -117,6 +171,170 @@ _SEH2_END; return Ret; +} + +// FIXME: Should be XFORML and use XFORMOBJ functions directly +BOOL +APIENTRY +NtGdiGetTransform( + HDC hDC, + DWORD iXform, + LPXFORM XForm) +{ + PDC pdc; + NTSTATUS Status = STATUS_SUCCESS; + + if (!XForm) + { + EngSetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + pdc = DC_LockDc(hDC); + if (!pdc) + { + EngSetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + _SEH2_TRY + { + ProbeForWrite(XForm, sizeof(XFORM), 1); + switch (iXform) + { + case GdiWorldSpaceToPageSpace: + MatrixS2XForm(XForm, &pdc->dclevel.mxWorldToPage); + break; + + case GdiWorldSpaceToDeviceSpace: + MatrixS2XForm(XForm, &pdc->dclevel.mxWorldToDevice); + break; + + case GdiPageSpaceToDeviceSpace: + IntWindowToViewPort(pdc->pdcattr, XForm); + break; + + case GdiDeviceSpaceToWorldSpace: + MatrixS2XForm(XForm, &pdc->dclevel.mxDeviceToWorld); + break; + + default: + DPRINT1("Unknown transform %lu\n", iXform); + Status = STATUS_INVALID_PARAMETER; + break; + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + DC_UnlockDc(pdc); + return NT_SUCCESS(Status); +} + + +/*! + * Converts points from logical coordinates into device coordinates. + * Conversion depends on the mapping mode, + * world transfrom, viewport origin settings for the given device context. + * \param hDC device context. + * \param Points an array of POINT structures (in/out). + * \param Count number of elements in the array of POINT structures. + * \return TRUE if success, FALSE otherwise. +*/ +BOOL +APIENTRY +NtGdiTransformPoints( + HDC hDC, + PPOINT UnsafePtsIn, + PPOINT UnsafePtOut, + INT Count, + INT iMode) +{ + PDC pdc; + LPPOINT Points; + ULONG Size; + BOOL ret; + + pdc = DC_LockDc(hDC); + if (!pdc) + { + EngSetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + if (!UnsafePtsIn || !UnsafePtOut || Count <= 0) + { + DC_UnlockDc(pdc); + EngSetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + Size = Count * sizeof(POINT); + + // FIXME: It would be wise to have a small stack buffer as optimization + Points = ExAllocatePoolWithTag(PagedPool, Size, TAG_COORD); + if (!Points) + { + DC_UnlockDc(pdc); + EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + _SEH2_TRY + { + ProbeForWrite(UnsafePtOut, Size, 1); + ProbeForRead(UnsafePtsIn, Size, 1); + RtlCopyMemory(Points, UnsafePtsIn, Size); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastNtError(_SEH2_GetExceptionCode()); + ret = FALSE; + _SEH2_YIELD(goto leave;) + } + _SEH2_END; + + switch (iMode) + { + case GdiDpToLp: + IntDPtoLP(pdc, Points, Count); + break; + + case GdiLpToDp: + IntLPtoDP(pdc, Points, Count); + break; + + case 2: // Not supported yet. Need testing. + default: + { + EngSetLastError(ERROR_INVALID_PARAMETER); + ret = FALSE; + goto leave; + } + } + + _SEH2_TRY + { + /* pointer was already probed! */ + RtlCopyMemory(UnsafePtOut, Points, Size); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastNtError(_SEH2_GetExceptionCode()); + ret = FALSE; + } + _SEH2_END; + +// +// If we are getting called that means User XForms is a mess! +// +leave: + DC_UnlockDc(pdc); + ExFreePoolWithTag(Points, TAG_COORD); + return ret; } // FIXME: Don't use floating point in the kernel @@ -165,196 +383,6 @@ return TRUE; } -// FIXME: Don't use floating point in the kernel! -void IntWindowToViewPort(PDC_ATTR pdcattr, LPXFORM xformWnd2Vport) -{ - FLOAT scaleX, scaleY; - - scaleX = (pdcattr->szlWindowExt.cx ? (FLOAT)pdcattr->szlViewportExt.cx / (FLOAT)pdcattr->szlWindowExt.cx : 0.0f); - scaleY = (pdcattr->szlWindowExt.cy ? (FLOAT)pdcattr->szlViewportExt.cy / (FLOAT)pdcattr->szlWindowExt.cy : 0.0f); - xformWnd2Vport->eM11 = scaleX; - xformWnd2Vport->eM12 = 0.0; - xformWnd2Vport->eM21 = 0.0; - xformWnd2Vport->eM22 = scaleY; - xformWnd2Vport->eDx = (FLOAT)pdcattr->ptlViewportOrg.x - scaleX * (FLOAT)pdcattr->ptlWindowOrg.x; - xformWnd2Vport->eDy = (FLOAT)pdcattr->ptlViewportOrg.y - scaleY * (FLOAT)pdcattr->ptlWindowOrg.y; -} - -// FIXME: Should be XFORML and use XFORMOBJ functions directly -BOOL -APIENTRY -NtGdiGetTransform( - HDC hDC, - DWORD iXform, - LPXFORM XForm) -{ - PDC dc; - NTSTATUS Status = STATUS_SUCCESS; - - dc = DC_LockDc(hDC); - if (!dc) - { - EngSetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (!XForm) - { - DC_UnlockDc(dc); - EngSetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - _SEH2_TRY - { - ProbeForWrite(XForm, sizeof(XFORM), 1); - switch (iXform) - { - case GdiWorldSpaceToPageSpace: - MatrixS2XForm(XForm, &dc->dclevel.mxWorldToPage); - break; - - case GdiWorldSpaceToDeviceSpace: - MatrixS2XForm(XForm, &dc->dclevel.mxWorldToDevice); - break; - - case GdiPageSpaceToDeviceSpace: - IntWindowToViewPort(dc->pdcattr, XForm); - break; - - case GdiDeviceSpaceToWorldSpace: - MatrixS2XForm(XForm, &dc->dclevel.mxDeviceToWorld); - break; - - default: - DPRINT1("Unknown transform %lu\n", iXform); - Status = STATUS_INVALID_PARAMETER; - break; - } - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - DC_UnlockDc(dc); - return NT_SUCCESS(Status); -} - - -/*! - * Converts points from logical coordinates into device coordinates. Conversion depends on the mapping mode, - * world transfrom, viewport origin settings for the given device context. - * \param hDC device context. - * \param Points an array of POINT structures (in/out). - * \param Count number of elements in the array of POINT structures. - * \return TRUE if success. -*/ -BOOL -APIENTRY -NtGdiTransformPoints( - HDC hDC, - PPOINT UnsafePtsIn, - PPOINT UnsafePtOut, - INT Count, - INT iMode) -{ - PDC dc; - NTSTATUS Status = STATUS_SUCCESS; - LPPOINT Points; - ULONG Size; - - dc = DC_LockDc(hDC); - if (!dc) - { - EngSetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - - if (!UnsafePtsIn || !UnsafePtOut || Count <= 0) - { - DC_UnlockDc(dc); - EngSetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - Size = Count * sizeof(POINT); - - // FIXME: It would be wise to have a small stack buffer as optimization - Points = ExAllocatePoolWithTag(PagedPool, Size, TAG_COORD); - if (!Points) - { - DC_UnlockDc(dc); - EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - _SEH2_TRY - { - ProbeForWrite(UnsafePtOut, Size, 1); - ProbeForRead(UnsafePtsIn, Size, 1); - RtlCopyMemory(Points, UnsafePtsIn, Size); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - if (!NT_SUCCESS(Status)) - { - DC_UnlockDc(dc); - ExFreePoolWithTag(Points, TAG_COORD); - SetLastNtError(Status); - return FALSE; - } - - switch (iMode) - { - case GdiDpToLp: - IntDPtoLP(dc, Points, Count); - break; - - case GdiLpToDp: - IntLPtoDP(dc, Points, Count); - break; - - case 2: // Not supported yet. Need testing. - default: - { - DC_UnlockDc(dc); - ExFreePoolWithTag(Points, TAG_COORD); - EngSetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - } - - _SEH2_TRY - { - /* pointer was already probed! */ - RtlCopyMemory(UnsafePtOut, Points, Size); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - if (!NT_SUCCESS(Status)) - { - DC_UnlockDc(dc); - ExFreePoolWithTag(Points, TAG_COORD); - SetLastNtError(Status); - return FALSE; - } -// -// If we are getting called that means User XForms is a mess! -// - DC_UnlockDc(dc); - ExFreePoolWithTag(Points, TAG_COORD); - return TRUE; -} - BOOL APIENTRY NtGdiModifyWorldTransform( @@ -363,7 +391,7 @@ DWORD Mode) { PDC dc; - XFORM SafeXForm; + XFORM SafeXForm; //FIXME: use XFORML BOOL Ret = TRUE; dc = DC_LockDc(hDC); @@ -527,31 +555,6 @@ return FALSE; } pdcattr = pDC->pdcattr; - - if (pSize) - { - NTSTATUS Status = STATUS_SUCCESS; - - _SEH2_TRY - { - ProbeForWrite(pSize, sizeof(LPSIZE), 1); - - pSize->cx = pdcattr->szlViewportExt.cx; - pSize->cy = pdcattr->szlViewportExt.cy; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - if (!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - DC_UnlockDc(pDC); - return FALSE; - } - } if (pdcattr->iMapMode > MM_TWIPS) { @@ -585,6 +588,23 @@ } else Ret = TRUE; + + if (pSize) + { + _SEH2_TRY + { + ProbeForWrite(pSize, sizeof(LPSIZE), 1); + + pSize->cx = pdcattr->szlViewportExt.cx; + pSize->cy = pdcattr->szlViewportExt.cy; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastNtError(_SEH2_GetExceptionCode()); + Ret = FALSE; + } + _SEH2_END; + } DC_UnlockDc(pDC); return Ret; @@ -1102,37 +1122,6 @@ return TRUE; } -VOID FASTCALL -DC_UpdateXforms(PDC dc) -{ - XFORM xformWnd2Vport; - PDC_ATTR pdcattr = dc->pdcattr; - XFORM xformWorld2Vport, xformWorld2Wnd, xformVport2World; - - /* Construct a transformation to do the window-to-viewport conversion */ - IntWindowToViewPort(pdcattr, &xformWnd2Vport); - - /* Combine with the world transformation */ - MatrixS2XForm(&xformWorld2Vport, &dc->dclevel.mxWorldToDevice); - MatrixS2XForm(&xformWorld2Wnd, &dc->dclevel.mxWorldToPage); - IntGdiCombineTransform(&xformWorld2Vport, &xformWorld2Wnd, &xformWnd2Vport); - - /* Create inverse of world-to-viewport transformation */ - MatrixS2XForm(&xformVport2World, &dc->dclevel.mxDeviceToWorld); - if (DC_InvertXform(&xformWorld2Vport, &xformVport2World)) - { - pdcattr->flXform &= ~DEVICE_TO_WORLD_INVALID; - } - else - { - pdcattr->flXform |= DEVICE_TO_WORLD_INVALID; - } - - /* Update transformation matrices */ - XForm2MatrixS(&dc->dclevel.mxWorldToDevice, &xformWorld2Vport); - XForm2MatrixS(&dc->dclevel.mxDeviceToWorld, &xformVport2World); -} - LONG FASTCALL IntCalcFillOrigin(PDC pdc) { @@ -1167,29 +1156,6 @@ { AspectRatio->cx = 0; AspectRatio->cy = 0; - } -} - -VOID -FASTCALL -DC_vUpdateViewportExt(PDC pdc) -{ - PDC_ATTR pdcattr; - - /* Get a pointer to the dc attribute */ - pdcattr = pdc->pdcattr; - - /* Check if we need to recalculate */ - if (pdcattr->flXform & PAGE_EXTENTS_CHANGED) - { - /* Check if we need to do isotropic fixup */ - if (pdcattr->iMapMode == MM_ISOTROPIC) - { - IntFixIsotropicMapping(pdc); - } - - /* Update xforms, CHECKME: really done here? */ - DC_UpdateXforms(pdc); } }

1 0

[janderwald] 50282: [MSVCRT_WINETEST] - Comment out test which fails in WinXP SP3
by janderwald＠svn.reactos.org 04 Jan '11

04 Jan '11

Author: janderwald Date: Tue Jan 4 16:45:03 2011 New Revision: 50282 URL: http://svn.reactos.org/svn/reactos?rev=50282&view=rev Log: [MSVCRT_WINETEST] - Comment out test which fails in WinXP SP3 Modified: trunk/rostests/winetests/msvcrt/cpp.c Modified: trunk/rostests/winetests/msvcrt/cpp.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/cpp.c?re… ============================================================================== --- trunk/rostests/winetests/msvcrt/cpp.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrt/cpp.c [iso-8859-1] Tue Jan 4 16:45:03 2011 @@ -844,7 +844,7 @@ { "?AV?$CDB_GEN_BIG_ENUM_FLAG@W4CDB_WYSIWYG_BITS_ENUM@@$0HO@@@", "class CDB_GEN_BIG_ENUM_FLAG<enum CDB_WYSIWYG_BITS_ENUM,126>",TRUE}, { "?AV?$CDB_GEN_BIG_ENUM_FLAG@W4CDB_WYSIWYG_BITS_ENUM@@$0HOA@@@", "class CDB_GEN_BIG_ENUM_FLAG<enum CDB_WYSIWYG_BITS_ENUM,2016>",TRUE}, { "?AV?$CDB_GEN_BIG_ENUM_FLAG@W4CDB_WYSIWYG_BITS_ENUM@@$0HOAA@@@", "class CDB_GEN_BIG_ENUM_FLAG<enum CDB_WYSIWYG_BITS_ENUM,32256>",TRUE}, - { "?AV?$CDB_GEN_BIG_ENUM_FLAG@W4CDB_WYSIWYG_BITS_ENUM@@$01@@@", "?AV?$CDB_GEN_BIG_ENUM_FLAG@W4CDB_WYSIWYG_BITS_ENUM@@$01@@@", FALSE}, +/* { "?AV?$CDB_GEN_BIG_ENUM_FLAG@W4CDB_WYSIWYG_BITS_ENUM@@$01@@@", "?AV?$CDB_GEN_BIG_ENUM_FLAG@W4CDB_WYSIWYG_BITS_ENUM@@$01@@@", FALSE},*/ /*FAILS in WINXP SP3 */ /* { "?AV?$CDB_GEN_BIG_ENUM_FLAG@W4CDB_WYSIWYG_BITS_ENUM@@$011@@@", "?AV?$CDB_GEN_BIG_ENUM_FLAG@W4CDB_WYSIWYG_BITS_ENUM@@$011@@@",FALSE}, */ }; int i, num_test = (sizeof(demangle)/sizeof(struct _demangle));

1 0

[tkreuzer] 50281: [WIN32K] - Access the DC member directly instead of using IntGdiGetDCOrg - Remove unused IntGdiGetDCOrg, GdiSetDCOrg, GdiGetDCOrgEx
by tkreuzer＠svn.reactos.org 04 Jan '11

04 Jan '11

Author: tkreuzer Date: Tue Jan 4 15:52:59 2011 New Revision: 50281 URL: http://svn.reactos.org/svn/reactos?rev=50281&view=rev Log: [WIN32K] - Access the DC member directly instead of using IntGdiGetDCOrg - Remove unused IntGdiGetDCOrg, GdiSetDCOrg, GdiGetDCOrgEx Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c trunk/reactos/subsystems/win32/win32k/objects/path.c trunk/reactos/subsystems/win32/win32k/objects/region.c Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] Tue Jan 4 15:52:59 2011 @@ -1152,49 +1152,6 @@ return &pdc->dclevel.ptlBrushOrigin; } -VOID -APIENTRY -GdiSetDCOrg(HDC hDC, LONG Left, LONG Top, PRECTL prc) -{ - PDC pdc; - - pdc = DC_LockDc(hDC); - if (!pdc) return; - - pdc->ptlDCOrig.x = Left; - pdc->ptlDCOrig.y = Top; - - IntCalcFillOrigin(pdc); - - if (prc) pdc->erclWindow = *prc; - - DC_UnlockDc(pdc); -} - -// FIXME: remove me -BOOL FASTCALL -IntGdiGetDCOrg(PDC pDc, PPOINTL ppt) -{ - *ppt = pDc->ptlDCOrig; - return TRUE; -} - -// FIXME: remove me -BOOL APIENTRY -GdiGetDCOrgEx(HDC hDC, PPOINTL ppt, PRECTL prc) -{ - PDC pdc; - - pdc = DC_LockDc(hDC); - if (!pdc) return FALSE; - - *prc = pdc->erclWindow; - *ppt = pdc->ptlDCOrig; - - DC_UnlockDc(pdc); - return TRUE; -} - static VOID FASTCALL DC_vGetAspectRatioFilter(PDC pDC, LPSIZE AspectRatio) Modified: trunk/reactos/subsystems/win32/win32k/objects/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/path.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/path.c [iso-8859-1] Tue Jan 4 15:52:59 2011 @@ -2051,7 +2051,7 @@ sinEsc = 0; } - IntGdiGetDCOrg(dc, &org); + org = dc->ptlDCOrig; for (idx = 0; idx < count; idx++) { Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] Tue Jan 4 15:52:59 2011 @@ -3705,7 +3705,7 @@ } if (iCode == SYSRGN) { - IntGdiGetDCOrg(pDC, &org); + org = pDC->ptlDCOrig; NtGdiOffsetRgn(hDest, org.x, org.y ); }

1 0

[tkreuzer] 50280: [WIN32K] Implement NtGdiGetBoundsRect and NtGdiSetBoundsRect. Patch by Samuel Serapion with modifications by me.
by tkreuzer＠svn.reactos.org 04 Jan '11

04 Jan '11

Author: tkreuzer Date: Tue Jan 4 12:36:19 2011 New Revision: 50280 URL: http://svn.reactos.org/svn/reactos?rev=50280&view=rev Log: [WIN32K] Implement NtGdiGetBoundsRect and NtGdiSetBoundsRect. Patch by Samuel Serapion with modifications by me. Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c trunk/reactos/subsystems/win32/win32k/objects/dcutil.c Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] Tue Jan 4 12:36:19 2011 @@ -1057,7 +1057,7 @@ cxVirtualDeviceMm = NtGdiGetDeviceCaps(hdc, HORZSIZE); cyVirtualDeviceMm = NtGdiGetDeviceCaps(hdc, VERTSIZE); } - else if (cxVirtualDevicePixel == 0 || cyVirtualDevicePixel == 0 || + else if (cxVirtualDevicePixel == 0 || cyVirtualDevicePixel == 0 || cxVirtualDeviceMm == 0 || cyVirtualDeviceMm == 0) { return FALSE; @@ -1322,28 +1322,4 @@ return Ret; } - -DWORD -APIENTRY -NtGdiGetBoundsRect( - IN HDC hdc, - OUT LPRECT prc, - IN DWORD f) -{ - DPRINT1("stub\n"); - return DCB_RESET; /* bounding rectangle always empty */ -} - -DWORD -APIENTRY -NtGdiSetBoundsRect( - IN HDC hdc, - IN LPRECT prc, - IN DWORD f) -{ - DPRINT1("stub\n"); - return DCB_DISABLE; /* bounding rectangle always empty */ -} - - /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/objects/dcutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dcutil.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dcutil.c [iso-8859-1] Tue Jan 4 12:36:19 2011 @@ -464,3 +464,92 @@ DC_UnlockDc(pdc); return Ret; } + +DWORD +APIENTRY +NtGdiGetBoundsRect( + IN HDC hdc, + OUT LPRECT prc, + IN DWORD flags) +{ + DWORD ret; + PDC pdc; + + /* Lock the DC */ + if (!(pdc = DC_LockDc(hdc))) return 0; + + /* Get the return value */ + ret = pdc->fs & DC_ACCUM_APP ? DCB_ENABLE : DCB_DISABLE; + ret |= RECTL_bIsEmptyRect(&pdc->erclBoundsApp) ? DCB_RESET : DCB_SET; + + /* Copy the rect to the caller */ + _SEH2_TRY + { + ProbeForWrite(prc, sizeof(RECT), 1); + *prc = pdc->erclBoundsApp; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ret = 0; + } + _SEH2_END; + + if (flags & DCB_RESET) + { + RECTL_vSetEmptyRect(&pdc->erclBoundsApp); + } + + DC_UnlockDc(pdc); + return ret; +} + + +DWORD +APIENTRY +NtGdiSetBoundsRect( + IN HDC hdc, + IN LPRECT prc, + IN DWORD flags) +{ + DWORD ret; + PDC pdc; + RECTL rcl; + + /* Verify arguments */ + if ((flags & DCB_ENABLE) && (flags & DCB_DISABLE)) return 0; + + /* Lock the DC */ + if (!(pdc = DC_LockDc(hdc))) return 0; + + /* Get the return value */ + ret = pdc->fs & DC_ACCUM_APP ? DCB_ENABLE : DCB_DISABLE; + ret |= RECTL_bIsEmptyRect(&pdc->erclBoundsApp) ? DCB_RESET : DCB_SET; + + if (flags & DCB_RESET) + { + RECTL_vSetEmptyRect(&pdc->erclBoundsApp); + } + + if (flags & DCB_ACCUMULATE) + { + /* Capture the rect */ + _SEH2_TRY + { + ProbeForRead(prc, sizeof(RECT), 1); + rcl = *prc; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + _SEH2_YIELD(return 0;) + } + _SEH2_END; + + RECTL_vMakeWellOrdered(&rcl); + RECTL_bUnionRect(&pdc->erclBoundsApp, &pdc->erclBoundsApp, &rcl); + } + + if (flags & DCB_ENABLE) pdc->fs |= DC_ACCUM_APP; + if (flags & DCB_DISABLE) pdc->fs &= ~DC_ACCUM_APP; + DC_UnlockDc( pdc ); + return ret; +}

1 0

[tkreuzer] 50279: fix build
by tkreuzer＠svn.reactos.org 03 Jan '11

03 Jan '11

Author: tkreuzer Date: Mon Jan 3 20:00:25 2011 New Revision: 50279 URL: http://svn.reactos.org/svn/reactos?rev=50279&view=rev Log: fix build Modified: trunk/reactos/lib/sdk/crt/printf/streamout.c Modified: trunk/reactos/lib/sdk/crt/printf/streamout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/streamo… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/streamout.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/streamout.c [iso-8859-1] Mon Jan 3 20:00:25 2011 @@ -72,6 +72,7 @@ #endif #define get_exp(f) floor(f == 0 ? 0 : (f >= 0 ? log10(f) : log10(-f))) +#define round(x) floor((x) + 0.5) void #ifdef _LIBCNT

1 0

[tkreuzer] 50278: [CRT] Fix a number of errors in floating point output.
by tkreuzer＠svn.reactos.org 03 Jan '11

03 Jan '11

Author: tkreuzer Date: Mon Jan 3 19:39:17 2011 New Revision: 50278 URL: http://svn.reactos.org/svn/reactos?rev=50278&view=rev Log: [CRT] Fix a number of errors in floating point output. Modified: trunk/reactos/lib/sdk/crt/printf/streamout.c Modified: trunk/reactos/lib/sdk/crt/printf/streamout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/streamo… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/streamout.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/streamout.c [iso-8859-1] Mon Jan 3 19:39:17 2011 @@ -71,7 +71,7 @@ # define _flsbuf(chr, stream) 0 #endif -#define get_exp(f) floor(f > 0 ? log10(f) : log10(-f)) +#define get_exp(f) floor(f == 0 ? 0 : (f >= 0 ? log10(f) : log10(-f))) void #ifdef _LIBCNT @@ -92,16 +92,30 @@ static const TCHAR _nan[] = _T("#QNAN"); static const TCHAR _infinity[] = _T("#INF"); const TCHAR *digits = digits_l; - int exponent = 0; - long double fpval; - int num_digits, val32, base = 10; - __int64 val64; - + int exponent = 0, sign; + long double fpval, fpval2; + int padding = 0, num_digits, val32, base = 10; + + /* Normalize the precision */ if (precision < 0) precision = 6; - else if (precision > 512) precision = 512; - + else if (precision > 17) + { + padding = precision - 17; + precision = 17; + } + + /* Get the float value and calculate the exponent */ fpval = va_arg_ffp(*argptr, flags); exponent = get_exp(fpval); + sign = fpval < 0 ? -1 : 1; + + /* Shift the decimal point and round */ + fpval2 = round(sign * fpval * pow(10., precision - exponent)); + if (fpval2 >= (unsigned __int64)pow(10., precision + 1)) + { + exponent++; + fpval2 = round(sign * fpval * pow(10., precision - exponent)); + } switch (chr) { @@ -111,21 +125,18 @@ if (precision > 0) precision--; if (exponent < -4 || exponent >= precision) goto case_e; - /* Skip trailing 0s */ - val64 = (__int64)(fpval * pow(10., precision) + 0.5); - while (precision && val64 % 10 == 0) + /* Skip trailing zeroes */ + while (precision && (unsigned __int64)fpval2 % 10 == 0) { precision--; - val64 /= 10; - } - + fpval2 /= 10; + } break; case _T('E'): digits = digits_u; case _T('e'): case_e: - fpval /= pow(10., exponent); val32 = exponent >= 0 ? exponent : -exponent; // FIXME: handle length of exponent field: @@ -154,13 +165,9 @@ break; } - /* CHECKME: Windows seems to handle a max of 17 digits(?) */ - num_digits = precision <= 17 ? precision: 17; - /* Handle sign */ if (fpval < 0) { - fpval = -fpval; *prefix = _T("-"); } else if (flags & FLAG_FORCE_SIGN) @@ -173,22 +180,25 @@ { (*string) -= sizeof(_nan) / sizeof(TCHAR) - 1; _tcscpy((*string), _nan); - val64 = 1; + fpval2 = 1; } else if (!_finite(fpval)) { (*string) -= sizeof(_infinity) / sizeof(TCHAR) - 1; _tcscpy((*string), _infinity); - val64 = 1; + fpval2 = 1; } else { + /* Zero padding */ + while (padding-- > 0) *--(*string) = _T('0'); + /* Digits after the decimal point */ - val64 = (__int64)(fpval * pow(10., precision) + 0.5); + num_digits = precision; while (num_digits-- > 0) { - *--(*string) = digits[val64 % 10]; - val64 /= 10; + *--(*string) = digits[(unsigned __int64)fpval2 % 10]; + fpval2 /= base; } } @@ -198,10 +208,10 @@ /* Digits before the decimal point */ do { - *--(*string) = digits[val64 % base]; - val64 /= base; - } - while (val64); + *--(*string) = digits[(unsigned __int64)fpval2 % base]; + fpval2 /= base; + } + while ((unsigned __int64)fpval2); }

1 0

[spetreolle] 50277: [CMAKE] Add apitests and pseh2_test.
by spetreolle＠svn.reactos.org 03 Jan '11

03 Jan '11

Author: spetreolle Date: Mon Jan 3 11:24:54 2011 New Revision: 50277 URL: http://svn.reactos.org/svn/reactos?rev=50277&view=rev Log: [CMAKE] Add apitests and pseh2_test. Added: trunk/rostests/tests/CMakeLists.txt (with props) trunk/rostests/tests/pseh2/CMakeLists.txt (with props) Modified: trunk/rostests/CMakeLists.txt trunk/rostests/apitests/dciman32/CMakeLists.txt trunk/rostests/apitests/gdi32/CMakeLists.txt trunk/rostests/apitests/ntdll/CMakeLists.txt trunk/rostests/apitests/user32/CMakeLists.txt trunk/rostests/apitests/ws2_32/CMakeLists.txt Modified: trunk/rostests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/CMakeLists.txt?rev=50277&… ============================================================================== --- trunk/rostests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/CMakeLists.txt [iso-8859-1] Mon Jan 3 11:24:54 2011 @@ -4,6 +4,6 @@ #add_subdirectory(dxtest) #add_subdirectory(regtests) add_subdirectory(rosautotest) -#add_subdirectory(tests) +add_subdirectory(tests) #add_subdirectory(win32) add_subdirectory(winetests) Modified: trunk/rostests/apitests/dciman32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/dciman32/CMakeLi… ============================================================================== --- trunk/rostests/apitests/dciman32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/dciman32/CMakeLists.txt [iso-8859-1] Mon Jan 3 11:24:54 2011 @@ -5,3 +5,4 @@ target_link_libraries(dciman32_apitest wine) set_module_type(dciman32_apitest win32cui) add_importlibs(dciman32_apitest msvcrt kernel32 ntdll) +add_cab_target(dciman32_apitest 7) Modified: trunk/rostests/apitests/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CMakeLists… ============================================================================== --- trunk/rostests/apitests/gdi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CMakeLists.txt [iso-8859-1] Mon Jan 3 11:24:54 2011 @@ -47,3 +47,4 @@ target_link_libraries(gdi32_apitest wine ${PSEH_LIB}) set_module_type(gdi32_apitest win32cui) add_importlibs(gdi32_apitest gdi32 user32 msvcrt kernel32 ntdll) +add_cab_target(gdi32_apitest 7) Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/CMakeLists… ============================================================================== --- trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] Mon Jan 3 11:24:54 2011 @@ -16,3 +16,4 @@ ) set_module_type(ntdll_apitest win32cui) add_importlibs(ntdll_apitest ntdll) +add_cab_target(ntdll_apitest 7) Modified: trunk/rostests/apitests/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/CMakeList… ============================================================================== --- trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] Mon Jan 3 11:24:54 2011 @@ -13,3 +13,4 @@ target_link_libraries(user32_apitest wine) set_module_type(user32_apitest win32cui) add_importlibs(user32_apitest gdi32 user32 msvcrt kernel32 ntdll) +add_cab_target(user32_apitest 7) Modified: trunk/rostests/apitests/ws2_32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/CMakeList… ============================================================================== --- trunk/rostests/apitests/ws2_32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/ws2_32/CMakeLists.txt [iso-8859-1] Mon Jan 3 11:24:54 2011 @@ -11,3 +11,4 @@ target_link_libraries(ws2_32_apitest wine) set_module_type(ws2_32_apitest win32cui) add_importlibs(ws2_32_apitest ws2_32 msvcrt kernel32 ntdll) +add_cab_target(ws2_32_apitest 7) Added: trunk/rostests/tests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/CMakeLists.txt?rev=… ============================================================================== --- trunk/rostests/tests/CMakeLists.txt (added) +++ trunk/rostests/tests/CMakeLists.txt [iso-8859-1] Mon Jan 3 11:24:54 2011 @@ -1,0 +1,1 @@ +add_subdirectory(pseh2) Propchange: trunk/rostests/tests/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/tests/pseh2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/pseh2/CMakeLists.tx… ============================================================================== --- trunk/rostests/tests/pseh2/CMakeLists.txt (added) +++ trunk/rostests/tests/pseh2/CMakeLists.txt [iso-8859-1] Mon Jan 3 11:24:54 2011 @@ -1,0 +1,8 @@ + +add_definitions(-D_DLL -D__USE_CRTIMP) + +add_executable(pseh2_test psehtest.c psehtest2.c) +target_link_libraries(pseh2_test wine ${PSEH_LIB}) +set_module_type(pseh2_test win32cui) +add_importlibs(pseh2_test msvcrt kernel32 ntdll) +add_cab_target(pseh2_test 7) Propchange: trunk/rostests/tests/pseh2/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 50276: [CRT] Enable new printf implementation.
by tkreuzer＠svn.reactos.org 03 Jan '11

03 Jan '11

Author: tkreuzer Date: Mon Jan 3 11:22:46 2011 New Revision: 50276 URL: http://svn.reactos.org/svn/reactos?rev=50276&view=rev Log: [CRT] Enable new printf implementation. Modified: trunk/reactos/config.template.rbuild Modified: trunk/reactos/config.template.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/config.template.rbuild?rev… ============================================================================== --- trunk/reactos/config.template.rbuild [iso-8859-1] (original) +++ trunk/reactos/config.template.rbuild [iso-8859-1] Mon Jan 3 11:22:46 2011 @@ -107,6 +107,6 @@  -<property name="NEWSPRINTF" value="0" /> +<property name="NEWSPRINTF" value="1" /> </group>

1 0

[tkreuzer] 50275: [CRT] Fix a bug in _ecvt that makes msvcrt_winetest::printf crash
by tkreuzer＠svn.reactos.org 03 Jan '11

03 Jan '11

Author: tkreuzer Date: Mon Jan 3 11:00:28 2011 New Revision: 50275 URL: http://svn.reactos.org/svn/reactos?rev=50275&view=rev Log: [CRT] Fix a bug in _ecvt that makes msvcrt_winetest::printf crash Modified: trunk/reactos/lib/sdk/crt/stdlib/ecvt.c Modified: trunk/reactos/lib/sdk/crt/stdlib/ecvt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdlib/ecvt.c?… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdlib/ecvt.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdlib/ecvt.c [iso-8859-1] Mon Jan 3 11:00:28 2011 @@ -18,6 +18,7 @@ static char ecvtbuf[DBL_MAX_10_EXP + 10]; char *cvtbuf, *s, *d; + if (ndigits < 0) ndigits = 0; s = cvtbuf = (char*)malloc(ndigits + NUMBER_EFMT); d = ecvtbuf;

1 0

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 January 2011