Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dreimer] 39204: Fix a problem with charch not detecting a wrong arch. Add support for setting different obj and out folders for different arches
by dreimer＠svn.reactos.org 30 Jan '09

30 Jan '09

Author: dreimer Date: Fri Jan 30 01:11:43 2009 New Revision: 39204 URL: http://svn.reactos.org/svn/reactos?rev=39204&view=rev Log: Fix a problem with charch not detecting a wrong arch. Add support for setting different obj and out folders for different arches Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd trunk/tools/RosBE/RosBE-Windows/plans.txt Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] Fri Jan 30 01:11:43 2009 @@ -24,6 +24,9 @@ $ENV:ROS_ARCH = $null $ENV:ROS_PREFIX = $null +$_ROSBE_OBJPATH = "$_ROSBE_i386_OBJPATH" +$_ROSBE_OUTPATH = "$_ROSBE_i386_OUTPATH" + if ($_ROSBE_ARCH -ne $null) { $ENV:ROS_ARCH = $_ROSBE_ARCH @@ -31,8 +34,17 @@ $_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\$_ROSBE_ARCH" # HAXX - + if ($_ROSBE_ARCH -eq "arm") { + $_ROSBE_OBJPATH = "$_ROSBE_ARM_OBJPATH" + $_ROSBE_OUTPATH = "$_ROSBE_ARM_OUTPATH" + } + if ($_ROSBE_ARCH -eq "ppc") { + $_ROSBE_OBJPATH = "$_ROSBE_PPC_OBJPATH" + $_ROSBE_OUTPATH = "$_ROSBE_PPC_OUTPATH" + } if ($_ROSBE_ARCH -eq "amd64") { + $_ROSBE_OBJPATH = "$_ROSBE_AMD64_OBJPATH" + $_ROSBE_OUTPATH = "$_ROSBE_AMD64_OUTPATH" $ENV:ROS_PREFIX = "x86_64-pc-mingw32" $_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\x86_64" } @@ -42,6 +54,8 @@ if (Test-Path "$_ROSBE_TARGET_MINGWPATH\.") { "Unsupported arch specified. Fallback to Default." pause + $_ROSBE_OBJPATH = "$_ROSBE_i386_OBJPATH" + $_ROSBE_OUTPATH = "$_ROSBE_i386_OUTPATH" $ENV:ROS_ARCH = $null $ENV:ROS_PREFIX = $null $_ROSBE_TARGET_MINGWPATH = $null Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] Fri Jan 30 01:11:43 2009 @@ -33,32 +33,51 @@ goto :main ) -if not "%_ROSBE_ARCH%" == "" ( - set ROS_ARCH=%_ROSBE_ARCH% - set ROS_PREFIX=%_ROSBE_ARCH%-pc-mingw32 - set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\%_ROSBE_ARCH% +setlocal enabledelayedexpansion + +set _ROSBE_OBJPATH=%_ROSBE_i386_OBJPATH% +set _ROSBE_OUTPATH=%_ROSBE_i386_OUTPATH% + +if not "!_ROSBE_ARCH!" == "" ( + set ROS_ARCH=!_ROSBE_ARCH! + set ROS_PREFIX=!_ROSBE_ARCH!-pc-mingw32 + set _ROSBE_TARGET_MINGWPATH=!_ROSBE_BASEDIR!\!_ROSBE_ARCH! REM HAXX - if "%_ROSBE_ARCH%" == "amd64" ( + if "!_ROSBE_ARCH!" == "arm" ( + set _ROSBE_OBJPATH=!_ROSBE_ARM_OBJPATH! + set _ROSBE_OUTPATH=!_ROSBE_ARM_OUTPATH! + ) + if "!_ROSBE_ARCH!" == "ppc" ( + set _ROSBE_OBJPATH=!_ROSBE_PPC_OBJPATH! + set _ROSBE_OUTPATH=!_ROSBE_PPC_OUTPATH! + ) + if "!_ROSBE_ARCH!" == "amd64" ( + set _ROSBE_OBJPATH=!_ROSBE_AMD64_OBJPATH! + set _ROSBE_OUTPATH=!_ROSBE_AMD64_OUTPATH! set ROS_PREFIX=x86_64-pc-mingw32 - set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\x86_64 + set _ROSBE_TARGET_MINGWPATH=!_ROSBE_BASEDIR!\x86_64 ) REM Check if existant arch - if not exist "%_ROSBE_TARGET_MINGWPATH%\." ( - echo Unsupported arch specified. Fallback to Default. - pause - set ROS_ARCH= - set ROS_PREFIX= - set _ROSBE_TARGET_MINGWPATH= + if not exist "!_ROSBE_TARGET_MINGWPATH!\." ( + echo Unsupported arch specified. Fallback to Default. + pause + set _ROSBE_OBJPATH=!_ROSBE_i386_OBJPATH! + set _ROSBE_OUTPATH=!_ROSBE_i386_OUTPATH! + set ROS_ARCH= + set ROS_PREFIX= + set _ROSBE_TARGET_MINGWPATH= ) ) :: :: Set up the GCC 4.x.x build environment. :: + +endlocal :main Modified: trunk/tools/RosBE/RosBE-Windows/plans.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/plans.tx… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/plans.txt [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/plans.txt [iso-8859-1] Fri Jan 30 01:11:43 2009 @@ -1,4 +1,5 @@ - New icons for every arch we support - More Error catching - support y/n and yes/no -- Make it possible to set different obj and out folders for different arches +- Make it possible to set different obj and out folders for different arches +- support for different dep checks.

1 0

[tkreuzer] 39203: formatting, no code change
by tkreuzer＠svn.reactos.org 29 Jan '09

29 Jan '09

Author: tkreuzer Date: Thu Jan 29 15:33:38 2009 New Revision: 39203 URL: http://svn.reactos.org/svn/reactos?rev=39203&view=rev Log: formatting, no code change 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] Thu Jan 29 15:33:38 2009 @@ -37,30 +37,30 @@ void FASTCALL IntFixIsotropicMapping(PDC dc) { - ULONG xdim; - ULONG ydim; - PDC_ATTR Dc_Attr = dc->pDc_Attr; - if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; - - xdim = EngMulDiv(Dc_Attr->szlViewportExt.cx, - ((PGDIDEVICE)dc->pPDev)->GDIInfo.ulHorzSize, - ((PGDIDEVICE)dc->pPDev)->GDIInfo.ulHorzRes) / - Dc_Attr->szlWindowExt.cx; - ydim = EngMulDiv(Dc_Attr->szlViewportExt.cy, - ((PGDIDEVICE)dc->pPDev)->GDIInfo.ulVertSize, - ((PGDIDEVICE)dc->pPDev)->GDIInfo.ulVertRes) / - Dc_Attr->szlWindowExt.cy; - - if (xdim > ydim) - { - Dc_Attr->szlViewportExt.cx = Dc_Attr->szlViewportExt.cx * abs(ydim / xdim); - if (!Dc_Attr->szlViewportExt.cx) Dc_Attr->szlViewportExt.cx = 1; - } - else - { - Dc_Attr->szlViewportExt.cy = Dc_Attr->szlViewportExt.cy * abs(xdim / ydim); - if (!Dc_Attr->szlViewportExt.cy) Dc_Attr->szlViewportExt.cy = 1; - } + ULONG xdim; + ULONG ydim; + PDC_ATTR Dc_Attr = dc->pDc_Attr; + if (!Dc_Attr) Dc_Attr = &dc->Dc_Attr; + + xdim = EngMulDiv(Dc_Attr->szlViewportExt.cx, + ((PGDIDEVICE)dc->pPDev)->GDIInfo.ulHorzSize, + ((PGDIDEVICE)dc->pPDev)->GDIInfo.ulHorzRes) / + Dc_Attr->szlWindowExt.cx; + ydim = EngMulDiv(Dc_Attr->szlViewportExt.cy, + ((PGDIDEVICE)dc->pPDev)->GDIInfo.ulVertSize, + ((PGDIDEVICE)dc->pPDev)->GDIInfo.ulVertRes) / + Dc_Attr->szlWindowExt.cy; + + if (xdim > ydim) + { + Dc_Attr->szlViewportExt.cx = Dc_Attr->szlViewportExt.cx * abs(ydim / xdim); + if (!Dc_Attr->szlViewportExt.cx) Dc_Attr->szlViewportExt.cx = 1; + } + else + { + Dc_Attr->szlViewportExt.cy = Dc_Attr->szlViewportExt.cy * abs(xdim / ydim); + if (!Dc_Attr->szlViewportExt.cy) Dc_Attr->szlViewportExt.cy = 1; + } } BOOL FASTCALL @@ -68,64 +68,60 @@ LPXFORM xform1, LPXFORM xform2) { - XFORM xformTemp; - /* Check for illegal parameters */ - if (!XFormResult || !xform1 || !xform2) - { - return FALSE; - } - - /* Create the result in a temporary XFORM, since xformResult may be - * equal to xform1 or xform2 */ - xformTemp.eM11 = xform1->eM11 * xform2->eM11 + xform1->eM12 * xform2->eM21; - xformTemp.eM12 = xform1->eM11 * xform2->eM12 + xform1->eM12 * xform2->eM22; - xformTemp.eM21 = xform1->eM21 * xform2->eM11 + xform1->eM22 * xform2->eM21; - xformTemp.eM22 = xform1->eM21 * xform2->eM12 + xform1->eM22 * xform2->eM22; - xformTemp.eDx = xform1->eDx * xform2->eM11 + xform1->eDy * xform2->eM21 + xform2->eDx; - xformTemp.eDy = xform1->eDx * xform2->eM12 + xform1->eDy * xform2->eM22 + xform2->eDy; - *XFormResult = xformTemp; - - return TRUE; + XFORM xformTemp; + /* Check for illegal parameters */ + if (!XFormResult || !xform1 || !xform2) + { + return FALSE; + } + + /* Create the result in a temporary XFORM, since xformResult may be + * equal to xform1 or xform2 */ + xformTemp.eM11 = xform1->eM11 * xform2->eM11 + xform1->eM12 * xform2->eM21; + xformTemp.eM12 = xform1->eM11 * xform2->eM12 + xform1->eM12 * xform2->eM22; + xformTemp.eM21 = xform1->eM21 * xform2->eM11 + xform1->eM22 * xform2->eM21; + xformTemp.eM22 = xform1->eM21 * xform2->eM12 + xform1->eM22 * xform2->eM22; + xformTemp.eDx = xform1->eDx * xform2->eM11 + xform1->eDy * xform2->eM21 + xform2->eDx; + xformTemp.eDy = xform1->eDx * xform2->eM12 + xform1->eDy * xform2->eM22 + xform2->eDy; + *XFormResult = xformTemp; + + return TRUE; } BOOL APIENTRY NtGdiCombineTransform(LPXFORM UnsafeXFormResult, - LPXFORM Unsafexform1, - LPXFORM Unsafexform2) -{ - BOOL Ret; - - _SEH2_TRY - { - ProbeForWrite(UnsafeXFormResult, - sizeof(XFORM), - 1); - ProbeForRead(Unsafexform1, - sizeof(XFORM), - 1); - ProbeForRead(Unsafexform2, - sizeof(XFORM), - 1); - Ret = IntGdiCombineTransform(UnsafeXFormResult, Unsafexform1, Unsafexform2); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Ret = FALSE; - } - _SEH2_END; - - return Ret; + LPXFORM Unsafexform1, + LPXFORM Unsafexform2) +{ + BOOL Ret; + + _SEH2_TRY + { + ProbeForWrite(UnsafeXFormResult, sizeof(XFORM), 1); + ProbeForRead(Unsafexform1, sizeof(XFORM), 1); + ProbeForRead(Unsafexform2, sizeof(XFORM), 1); + Ret = IntGdiCombineTransform(UnsafeXFormResult, + Unsafexform1, + Unsafexform2); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Ret = FALSE; + } + _SEH2_END; + + return Ret; } int FASTCALL -IntGetGraphicsMode ( PDC dc ) -{ - PDC_ATTR Dc_Attr; - ASSERT ( dc ); - Dc_Attr = dc->pDc_Attr; - if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; - return Dc_Attr->iGraphicsMode; +IntGetGraphicsMode(PDC dc) +{ + PDC_ATTR Dc_Attr; + ASSERT(dc); + Dc_Attr = dc->pDc_Attr; + if (!Dc_Attr) Dc_Attr = &dc->Dc_Attr; + return Dc_Attr->iGraphicsMode; } BOOL @@ -134,88 +130,86 @@ CONST LPXFORM lpXForm, DWORD Mode) { - ASSERT(pDc); - XFORM xformWorld2Wnd; - - switch(Mode) - { - case MWT_IDENTITY: - xformWorld2Wnd.eM11 = 1.0f; - xformWorld2Wnd.eM12 = 0.0f; - xformWorld2Wnd.eM21 = 0.0f; - xformWorld2Wnd.eM22 = 1.0f; - xformWorld2Wnd.eDx = 0.0f; - xformWorld2Wnd.eDy = 0.0f; - XForm2MatrixS(&pDc->DcLevel.mxWorldToPage, &xformWorld2Wnd); - break; - - case MWT_LEFTMULTIPLY: - MatrixS2XForm(&xformWorld2Wnd, &pDc->DcLevel.mxWorldToPage); - IntGdiCombineTransform(&xformWorld2Wnd, lpXForm, &xformWorld2Wnd); - XForm2MatrixS(&pDc->DcLevel.mxWorldToPage, &xformWorld2Wnd); - break; - - case MWT_RIGHTMULTIPLY: - MatrixS2XForm(&xformWorld2Wnd, &pDc->DcLevel.mxWorldToPage); - IntGdiCombineTransform(&xformWorld2Wnd, &xformWorld2Wnd, lpXForm); - XForm2MatrixS(&pDc->DcLevel.mxWorldToPage, &xformWorld2Wnd); - break; - - case MWT_MAX+1: // Must be MWT_SET???? - XForm2MatrixS(&pDc->DcLevel.mxWorldToPage, lpXForm); // Do it like Wine. - break; - - default: - return FALSE; - } - DC_UpdateXforms(pDc); - return TRUE; + ASSERT(pDc); + XFORM xformWorld2Wnd; + + switch (Mode) + { + case MWT_IDENTITY: + xformWorld2Wnd.eM11 = 1.0f; + xformWorld2Wnd.eM12 = 0.0f; + xformWorld2Wnd.eM21 = 0.0f; + xformWorld2Wnd.eM22 = 1.0f; + xformWorld2Wnd.eDx = 0.0f; + xformWorld2Wnd.eDy = 0.0f; + XForm2MatrixS(&pDc->DcLevel.mxWorldToPage, &xformWorld2Wnd); + break; + + case MWT_LEFTMULTIPLY: + MatrixS2XForm(&xformWorld2Wnd, &pDc->DcLevel.mxWorldToPage); + IntGdiCombineTransform(&xformWorld2Wnd, lpXForm, &xformWorld2Wnd); + XForm2MatrixS(&pDc->DcLevel.mxWorldToPage, &xformWorld2Wnd); + break; + + case MWT_RIGHTMULTIPLY: + MatrixS2XForm(&xformWorld2Wnd, &pDc->DcLevel.mxWorldToPage); + IntGdiCombineTransform(&xformWorld2Wnd, &xformWorld2Wnd, lpXForm); + XForm2MatrixS(&pDc->DcLevel.mxWorldToPage, &xformWorld2Wnd); + break; + + case MWT_MAX+1: // Must be MWT_SET???? + XForm2MatrixS(&pDc->DcLevel.mxWorldToPage, lpXForm); // Do it like Wine. + break; + + default: + return FALSE; + } + DC_UpdateXforms(pDc); + return TRUE; } BOOL APIENTRY NtGdiGetTransform(HDC hDC, - DWORD iXform, - LPXFORM XForm) -{ - PDC dc; - NTSTATUS Status = STATUS_SUCCESS; - - dc = DC_LockDc ( hDC ); - if (!dc) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - if (!XForm) - { - DC_UnlockDc(dc); - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return FALSE; - } - - _SEH2_TRY - { - ProbeForWrite(XForm, - sizeof(XFORM), - 1); - switch(iXform) - { - case GdiWorldSpaceToPageSpace: - MatrixS2XForm(XForm, &dc->DcLevel.mxWorldToPage); - break; - default: - break; - } - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - DC_UnlockDc(dc); - return NT_SUCCESS(Status); + DWORD iXform, + LPXFORM XForm) +{ + PDC dc; + NTSTATUS Status = STATUS_SUCCESS; + + dc = DC_LockDc(hDC); + if (!dc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + if (!XForm) + { + DC_UnlockDc(dc); + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return FALSE; + } + + _SEH2_TRY + { + ProbeForWrite(XForm, sizeof(XFORM), 1); + switch (iXform) + { + case GdiWorldSpaceToPageSpace: + MatrixS2XForm(XForm, &dc->DcLevel.mxWorldToPage); + break; + default: + break; + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + DC_UnlockDc(dc); + return NT_SUCCESS(Status); } @@ -229,111 +223,103 @@ */ 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) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - - if (!UnsafePtsIn || !UnsafePtOut || Count <= 0) - { - DC_UnlockDc(dc); - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return FALSE; - } - - Size = Count * sizeof(POINT); - - Points = (LPPOINT)ExAllocatePoolWithTag(PagedPool, Size, TAG_COORD); - if(!Points) - { - DC_UnlockDc(dc); - SetLastWin32Error(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: - { +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) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + + if (!UnsafePtsIn || !UnsafePtOut || Count <= 0) + { + DC_UnlockDc(dc); + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return FALSE; + } + + Size = Count * sizeof(POINT); + + Points = (LPPOINT)ExAllocatePoolWithTag(PagedPool, Size, TAG_COORD); + if (!Points) + { + DC_UnlockDc(dc); + SetLastWin32Error(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); - SetLastWin32Error(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; - } + 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); + SetLastWin32Error(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; + DC_UnlockDc(dc); + ExFreePoolWithTag(Points, TAG_COORD); + return TRUE; } BOOL @@ -342,69 +328,70 @@ LPXFORM UnsafeXForm, DWORD Mode) { - PDC dc; - XFORM SafeXForm; - BOOL Ret = TRUE; - - dc = DC_LockDc(hDC); - if (!dc) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - - // The xform is permitted to be NULL for MWT_IDENTITY. - // However, if it is not NULL, then it must be valid even though it is not used. - if (UnsafeXForm != NULL || Mode != MWT_IDENTITY) - { - _SEH2_TRY - { - ProbeForRead(UnsafeXForm, sizeof(XFORM), 1); - RtlCopyMemory(&SafeXForm, UnsafeXForm, sizeof(XFORM)); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Ret = FALSE; - } - _SEH2_END; - } - - // Safe to handle kernel mode data. - if (Ret) Ret = IntGdiModifyWorldTransform(dc, &SafeXForm, Mode); - DC_UnlockDc(dc); - return Ret; + PDC dc; + XFORM SafeXForm; + BOOL Ret = TRUE; + + dc = DC_LockDc(hDC); + if (!dc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + + // The xform is permitted to be NULL for MWT_IDENTITY. + // However, if it is not NULL, then it must be valid even though it is not used. + if (UnsafeXForm != NULL || Mode != MWT_IDENTITY) + { + _SEH2_TRY + { + ProbeForRead(UnsafeXForm, sizeof(XFORM), 1); + RtlCopyMemory(&SafeXForm, UnsafeXForm, sizeof(XFORM)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Ret = FALSE; + } + _SEH2_END; + } + + // Safe to handle kernel mode data. + if (Ret) Ret = IntGdiModifyWorldTransform(dc, &SafeXForm, Mode); + DC_UnlockDc(dc); + return Ret; } BOOL APIENTRY NtGdiOffsetViewportOrgEx(HDC hDC, - int XOffset, - int YOffset, - LPPOINT UnsafePoint) -{ - PDC dc; - PDC_ATTR Dc_Attr; - NTSTATUS Status = STATUS_SUCCESS; - - dc = DC_LockDc ( hDC ); - if(!dc) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - Dc_Attr = dc->pDc_Attr; - if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; - - if (UnsafePoint) + int XOffset, + int YOffset, + LPPOINT UnsafePoint) +{ + PDC dc; + PDC_ATTR Dc_Attr; + NTSTATUS Status = STATUS_SUCCESS; + + dc = DC_LockDc(hDC); + if (!dc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + Dc_Attr = dc->pDc_Attr; + if (!Dc_Attr) Dc_Attr = &dc->Dc_Attr; + + if (UnsafePoint) { _SEH2_TRY { - ProbeForWrite(UnsafePoint, - sizeof(POINT), - 1); + ProbeForWrite(UnsafePoint, sizeof(POINT), 1); UnsafePoint->x = Dc_Attr->ptlViewportOrg.x; UnsafePoint->y = Dc_Attr->ptlViewportOrg.y; - if ( Dc_Attr->dwLayout & LAYOUT_RTL ) UnsafePoint->x = -UnsafePoint->x; + if (Dc_Attr->dwLayout & LAYOUT_RTL) + { + UnsafePoint->x = -UnsafePoint->x; + } } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -412,318 +399,321 @@ } _SEH2_END; - if ( !NT_SUCCESS(Status) ) - { - SetLastNtError(Status); - DC_UnlockDc(dc); - return FALSE; - } - } - - if ( Dc_Attr->dwLayout & LAYOUT_RTL ) XOffset = -XOffset; - Dc_Attr->ptlViewportOrg.x += XOffset; - Dc_Attr->ptlViewportOrg.y += YOffset; - DC_UpdateXforms(dc); - DC_UnlockDc(dc); - return TRUE; + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + DC_UnlockDc(dc); + return FALSE; + } + } + + if (Dc_Attr->dwLayout & LAYOUT_RTL) + { + XOffset = -XOffset; + } + Dc_Attr->ptlViewportOrg.x += XOffset; + Dc_Attr->ptlViewportOrg.y += YOffset; + DC_UpdateXforms(dc); + DC_UnlockDc(dc); + + return TRUE; } BOOL APIENTRY NtGdiOffsetWindowOrgEx(HDC hDC, - int XOffset, - int YOffset, - LPPOINT Point) -{ - PDC dc; - PDC_ATTR Dc_Attr; - - dc = DC_LockDc(hDC); - if (!dc) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - Dc_Attr = dc->pDc_Attr; - if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; - - if (Point) - { - NTSTATUS Status = STATUS_SUCCESS; - - _SEH2_TRY - { - ProbeForWrite(Point, - sizeof(POINT), - 1); - Point->x = Dc_Attr->ptlWindowOrg.x; - Point->y = Dc_Attr->ptlWindowOrg.y; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - DC_UnlockDc(dc); - return FALSE; - } - } - - Dc_Attr->ptlWindowOrg.x += XOffset; - Dc_Attr->ptlWindowOrg.y += YOffset; - - DC_UpdateXforms(dc); - DC_UnlockDc(dc); - - return TRUE; + int XOffset, + int YOffset, + LPPOINT Point) +{ + PDC dc; + PDC_ATTR Dc_Attr; + + dc = DC_LockDc(hDC); + if (!dc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + Dc_Attr = dc->pDc_Attr; + if (!Dc_Attr) Dc_Attr = &dc->Dc_Attr; + + if (Point) + { + NTSTATUS Status = STATUS_SUCCESS; + + _SEH2_TRY + { + ProbeForWrite(Point, sizeof(POINT), 1); + Point->x = Dc_Attr->ptlWindowOrg.x; + Point->y = Dc_Attr->ptlWindowOrg.y; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + DC_UnlockDc(dc); + return FALSE; + } + } + + Dc_Attr->ptlWindowOrg.x += XOffset; + Dc_Attr->ptlWindowOrg.y += YOffset; + + DC_UpdateXforms(dc); + DC_UnlockDc(dc); + + return TRUE; } BOOL APIENTRY NtGdiScaleViewportExtEx(HDC hDC, - int Xnum, - int Xdenom, - int Ynum, - int Ydenom, - LPSIZE pSize) -{ - PDC pDC; - PDC_ATTR pDc_Attr; - BOOL Ret = FALSE; - LONG X, Y; - - pDC = DC_LockDc(hDC); - if (!pDC) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - pDc_Attr = pDC->pDc_Attr; - if(!pDc_Attr) pDc_Attr = &pDC->Dc_Attr; - - if ( pSize ) - { - NTSTATUS Status = STATUS_SUCCESS; - - _SEH2_TRY - { - ProbeForWrite(pSize, - sizeof(LPSIZE), - 1); - - pSize->cx = pDc_Attr->szlViewportExt.cx; - pSize->cy = pDc_Attr->szlViewportExt.cy; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - DC_UnlockDc(pDC); - return FALSE; - } - } - - if (pDc_Attr->iMapMode > MM_TWIPS) - { - if ( ( Xdenom ) && ( Ydenom ) ) - { - X = Xnum * pDc_Attr->szlViewportExt.cx / Xdenom; - if ( X ) - { - Y = Ynum * pDc_Attr->szlViewportExt.cy / Ydenom; - if ( Y ) - { - pDc_Attr->szlViewportExt.cx = X; - pDc_Attr->szlViewportExt.cy = Y; - - IntMirrorWindowOrg(pDC); - - pDc_Attr->flXform |= (PAGE_EXTENTS_CHANGED|INVALIDATE_ATTRIBUTES|DEVICE_TO_WORLD_INVALID); - - if (pDc_Attr->iMapMode == MM_ISOTROPIC) IntFixIsotropicMapping(pDC); - DC_UpdateXforms(pDC); - - Ret = TRUE; - } - } - } - } - else - Ret = TRUE; - - DC_UnlockDc(pDC); - return Ret; + int Xnum, + int Xdenom, + int Ynum, + int Ydenom, + LPSIZE pSize) +{ + PDC pDC; + PDC_ATTR pDc_Attr; + BOOL Ret = FALSE; + LONG X, Y; + + pDC = DC_LockDc(hDC); + if (!pDC) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + pDc_Attr = pDC->pDc_Attr; + if (!pDc_Attr) pDc_Attr = &pDC->Dc_Attr; + + if (pSize) + { + NTSTATUS Status = STATUS_SUCCESS; + + _SEH2_TRY + { + ProbeForWrite(pSize, sizeof(LPSIZE), 1); + + pSize->cx = pDc_Attr->szlViewportExt.cx; + pSize->cy = pDc_Attr->szlViewportExt.cy; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + DC_UnlockDc(pDC); + return FALSE; + } + } + + if (pDc_Attr->iMapMode > MM_TWIPS) + { + if (Xdenom && Ydenom) + { + X = Xnum * pDc_Attr->szlViewportExt.cx / Xdenom; + if (X) + { + Y = Ynum * pDc_Attr->szlViewportExt.cy / Ydenom; + if (Y) + { + pDc_Attr->szlViewportExt.cx = X; + pDc_Attr->szlViewportExt.cy = Y; + + IntMirrorWindowOrg(pDC); + + pDc_Attr->flXform |= (PAGE_EXTENTS_CHANGED | + INVALIDATE_ATTRIBUTES | + DEVICE_TO_WORLD_INVALID); + + if (pDc_Attr->iMapMode == MM_ISOTROPIC) + { + IntFixIsotropicMapping(pDC); + } + DC_UpdateXforms(pDC); + + Ret = TRUE; + } + } + } + } + else + Ret = TRUE; + + DC_UnlockDc(pDC); + return Ret; } BOOL APIENTRY NtGdiScaleWindowExtEx(HDC hDC, - int Xnum, - int Xdenom, - int Ynum, - int Ydenom, - LPSIZE pSize) -{ - PDC pDC; - PDC_ATTR pDc_Attr; - BOOL Ret = FALSE; - LONG X, Y; - - pDC = DC_LockDc(hDC); - if (!pDC) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - pDc_Attr = pDC->pDc_Attr; - if(!pDc_Attr) pDc_Attr = &pDC->Dc_Attr; - - if ( pSize ) - { - NTSTATUS Status = STATUS_SUCCESS; - - _SEH2_TRY - { - ProbeForWrite(pSize, - sizeof(LPSIZE), - 1); - - X = pDc_Attr->szlWindowExt.cx; - if (pDc_Attr->dwLayout & LAYOUT_RTL) X = -X; - pSize->cx = X; - pSize->cy = pDc_Attr->szlWindowExt.cy; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - DC_UnlockDc(pDC); - return FALSE; - } - } - - if (pDc_Attr->iMapMode > MM_TWIPS) - { - if (( Xdenom ) && ( Ydenom )) - { - X = Xnum * pDc_Attr->szlWindowExt.cx / Xdenom; - if ( X ) - { - Y = Ynum * pDc_Attr->szlWindowExt.cy / Ydenom; - if ( Y ) - { - pDc_Attr->szlWindowExt.cx = X; - pDc_Attr->szlWindowExt.cy = Y; - - IntMirrorWindowOrg(pDC); - - pDc_Attr->flXform |= (PAGE_EXTENTS_CHANGED|INVALIDATE_ATTRIBUTES|DEVICE_TO_WORLD_INVALID); - - if (pDc_Attr->iMapMode == MM_ISOTROPIC) IntFixIsotropicMapping(pDC); - DC_UpdateXforms(pDC); - - Ret = TRUE; - } - } - } - } - else - Ret = TRUE; - - DC_UnlockDc(pDC); - return Ret; + int Xnum, + int Xdenom, + int Ynum, + int Ydenom, + LPSIZE pSize) +{ + PDC pDC; + PDC_ATTR pDc_Attr; + BOOL Ret = FALSE; + LONG X, Y; + + pDC = DC_LockDc(hDC); + if (!pDC) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + pDc_Attr = pDC->pDc_Attr; + if (!pDc_Attr) pDc_Attr = &pDC->Dc_Attr; + + if (pSize) + { + NTSTATUS Status = STATUS_SUCCESS; + + _SEH2_TRY + { + ProbeForWrite(pSize, sizeof(LPSIZE), 1); + + X = pDc_Attr->szlWindowExt.cx; + if (pDc_Attr->dwLayout & LAYOUT_RTL) X = -X; + pSize->cx = X; + pSize->cy = pDc_Attr->szlWindowExt.cy; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + DC_UnlockDc(pDC); + return FALSE; + } + } + + if (pDc_Attr->iMapMode > MM_TWIPS) + { + if (Xdenom && Ydenom) + { + X = Xnum * pDc_Attr->szlWindowExt.cx / Xdenom; + if (X) + { + Y = Ynum * pDc_Attr->szlWindowExt.cy / Ydenom; + if (Y) + { + pDc_Attr->szlWindowExt.cx = X; + pDc_Attr->szlWindowExt.cy = Y; + + IntMirrorWindowOrg(pDC); + + pDc_Attr->flXform |= (PAGE_EXTENTS_CHANGED|INVALIDATE_ATTRIBUTES|DEVICE_TO_WORLD_INVALID); + + if (pDc_Attr->iMapMode == MM_ISOTROPIC) IntFixIsotropicMapping(pDC); + DC_UpdateXforms(pDC); + + Ret = TRUE; + } + } + } + } + else + Ret = TRUE; + + DC_UnlockDc(pDC); + return Ret; } int APIENTRY IntGdiSetMapMode(PDC dc, - int MapMode) -{ - int PrevMapMode; - PDC_ATTR Dc_Attr = dc->pDc_Attr; - if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; - - PrevMapMode = Dc_Attr->iMapMode; - - Dc_Attr->iMapMode = MapMode; - - switch (MapMode) - { - case MM_TEXT: - Dc_Attr->szlWindowExt.cx = 1; - Dc_Attr->szlWindowExt.cy = 1; - Dc_Attr->szlViewportExt.cx = 1; - Dc_Attr->szlViewportExt.cy = 1; - Dc_Attr->flXform &= ~(ISO_OR_ANISO_MAP_MODE|PTOD_EFM22_NEGATIVE| - PTOD_EFM11_NEGATIVE|POSITIVE_Y_IS_UP); - Dc_Attr->flXform |= (PAGE_XLATE_CHANGED|PAGE_TO_DEVICE_SCALE_IDENTITY| - INVALIDATE_ATTRIBUTES|DEVICE_TO_WORLD_INVALID); - break; - - case MM_ISOTROPIC: - Dc_Attr->flXform |= ISO_OR_ANISO_MAP_MODE; - /* Fall through */ - - case MM_LOMETRIC: - Dc_Attr->szlWindowExt.cx = 3600; - Dc_Attr->szlWindowExt.cy = 2700; - Dc_Attr->szlViewportExt.cx = ((PGDIDEVICE)dc->pPDev)->GDIInfo.ulHorzRes; - Dc_Attr->szlViewportExt.cy = -((PGDIDEVICE)dc->pPDev)->GDIInfo.ulVertRes; - break; - - case MM_HIMETRIC: - Dc_Attr->szlWindowExt.cx = 36000; - Dc_Attr->szlWindowExt.cy = 27000; - Dc_Attr->szlViewportExt.cx = ((PGDIDEVICE)dc->pPDev)->GDIInfo.ulHorzRes; - Dc_Attr->szlViewportExt.cy = -((PGDIDEVICE)dc->pPDev)->GDIInfo.ulVertRes; - break; - - case MM_LOENGLISH: - Dc_Attr->szlWindowExt.cx = 1417; - Dc_Attr->szlWindowExt.cy = 1063; - Dc_Attr->szlViewportExt.cx = ((PGDIDEVICE)dc->pPDev)->GDIInfo.ulHorzRes; - Dc_Attr->szlViewportExt.cy = -((PGDIDEVICE)dc->pPDev)->GDIInfo.ulVertRes; - break; - - case MM_HIENGLISH: - Dc_Attr->szlWindowExt.cx = 14173; - Dc_Attr->szlWindowExt.cy = 10630; - Dc_Attr->szlViewportExt.cx = ((PGDIDEVICE)dc->pPDev)->GDIInfo.ulHorzRes; - Dc_Attr->szlViewportExt.cy = -((PGDIDEVICE)dc->pPDev)->GDIInfo.ulVertRes; - break; - - case MM_TWIPS: - Dc_Attr->szlWindowExt.cx = 20409; - Dc_Attr->szlWindowExt.cy = 15307; - Dc_Attr->szlViewportExt.cx = ((PGDIDEVICE)dc->pPDev)->GDIInfo.ulHorzRes; - Dc_Attr->szlViewportExt.cy = -((PGDIDEVICE)dc->pPDev)->GDIInfo.ulVertRes; - break; - - case MM_ANISOTROPIC: - Dc_Attr->flXform &= ~(PAGE_TO_DEVICE_IDENTITY|POSITIVE_Y_IS_UP); - Dc_Attr->flXform |= ISO_OR_ANISO_MAP_MODE; - break; - default: - Dc_Attr->iMapMode = PrevMapMode; - PrevMapMode = 0; - } + int MapMode) +{ + int PrevMapMode; + PDC_ATTR Dc_Attr = dc->pDc_Attr; + if (!Dc_Attr) Dc_Attr = &dc->Dc_Attr; + + PrevMapMode = Dc_Attr->iMapMode; + + Dc_Attr->iMapMode = MapMode; + + switch (MapMode) + { + case MM_TEXT: + Dc_Attr->szlWindowExt.cx = 1; + Dc_Attr->szlWindowExt.cy = 1; + Dc_Attr->szlViewportExt.cx = 1; + Dc_Attr->szlViewportExt.cy = 1; + Dc_Attr->flXform &= ~(ISO_OR_ANISO_MAP_MODE|PTOD_EFM22_NEGATIVE| + PTOD_EFM11_NEGATIVE|POSITIVE_Y_IS_UP); + Dc_Attr->flXform |= (PAGE_XLATE_CHANGED|PAGE_TO_DEVICE_SCALE_IDENTITY| + INVALIDATE_ATTRIBUTES|DEVICE_TO_WORLD_INVALID); + break; + + case MM_ISOTROPIC: + Dc_Attr->flXform |= ISO_OR_ANISO_MAP_MODE; + /* Fall through */ + + case MM_LOMETRIC: + Dc_Attr->szlWindowExt.cx = 3600; + Dc_Attr->szlWindowExt.cy = 2700; + Dc_Attr->szlViewportExt.cx = ((PGDIDEVICE)dc->pPDev)->GDIInfo.ulHorzRes; + Dc_Attr->szlViewportExt.cy = -((PGDIDEVICE)dc->pPDev)->GDIInfo.ulVertRes; + break; + + case MM_HIMETRIC: + Dc_Attr->szlWindowExt.cx = 36000; + Dc_Attr->szlWindowExt.cy = 27000; + Dc_Attr->szlViewportExt.cx = ((PGDIDEVICE)dc->pPDev)->GDIInfo.ulHorzRes; + Dc_Attr->szlViewportExt.cy = -((PGDIDEVICE)dc->pPDev)->GDIInfo.ulVertRes; + break; + + case MM_LOENGLISH: + Dc_Attr->szlWindowExt.cx = 1417; + Dc_Attr->szlWindowExt.cy = 1063; + Dc_Attr->szlViewportExt.cx = ((PGDIDEVICE)dc->pPDev)->GDIInfo.ulHorzRes; + Dc_Attr->szlViewportExt.cy = -((PGDIDEVICE)dc->pPDev)->GDIInfo.ulVertRes; + break; + + case MM_HIENGLISH: + Dc_Attr->szlWindowExt.cx = 14173; + Dc_Attr->szlWindowExt.cy = 10630; + Dc_Attr->szlViewportExt.cx = ((PGDIDEVICE)dc->pPDev)->GDIInfo.ulHorzRes; + Dc_Attr->szlViewportExt.cy = -((PGDIDEVICE)dc->pPDev)->GDIInfo.ulVertRes; + break; + + case MM_TWIPS: + Dc_Attr->szlWindowExt.cx = 20409; + Dc_Attr->szlWindowExt.cy = 15307; + Dc_Attr->szlViewportExt.cx = ((PGDIDEVICE)dc->pPDev)->GDIInfo.ulHorzRes; + Dc_Attr->szlViewportExt.cy = -((PGDIDEVICE)dc->pPDev)->GDIInfo.ulVertRes; + break; + + case MM_ANISOTROPIC: + Dc_Attr->flXform &= ~(PAGE_TO_DEVICE_IDENTITY|POSITIVE_Y_IS_UP); + Dc_Attr->flXform |= ISO_OR_ANISO_MAP_MODE; + break; + default: + Dc_Attr->iMapMode = PrevMapMode; + PrevMapMode = 0; + } DC_UpdateXforms(dc); - return PrevMapMode; + return PrevMapMode; } BOOL @@ -733,246 +723,238 @@ int YExtent, LPSIZE Size) { - PDC dc; - PDC_ATTR Dc_Attr; - - dc = DC_LockDc(hDC); - if ( !dc ) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - Dc_Attr = dc->pDc_Attr; - if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; - - switch (Dc_Attr->iMapMode) - { - case MM_HIENGLISH: - case MM_HIMETRIC: - case MM_LOENGLISH: - case MM_LOMETRIC: - case MM_TEXT: - case MM_TWIPS: - DC_UnlockDc(dc); - return FALSE; - - case MM_ISOTROPIC: - // Here we should (probably) check that SetWindowExtEx *really* has - // been called - break; - } - - if (Size) - { - NTSTATUS Status = STATUS_SUCCESS; - - _SEH2_TRY - { - ProbeForWrite(Size, - sizeof(SIZE), - 1); - Size->cx = Dc_Attr->szlViewportExt.cx; - Size->cy = Dc_Attr->szlViewportExt.cy; - - Dc_Attr->szlViewportExt.cx = XExtent; - Dc_Attr->szlViewportExt.cy = YExtent; - - if (Dc_Attr->iMapMode == MM_ISOTROPIC) - IntFixIsotropicMapping(dc); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - DC_UnlockDc(dc); - return FALSE; - } - } - - - DC_UpdateXforms(dc); - DC_UnlockDc(dc); - - return TRUE; + PDC dc; + PDC_ATTR Dc_Attr; + + dc = DC_LockDc(hDC); + if (!dc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + Dc_Attr = dc->pDc_Attr; + if (!Dc_Attr) Dc_Attr = &dc->Dc_Attr; + + switch (Dc_Attr->iMapMode) + { + case MM_HIENGLISH: + case MM_HIMETRIC: + case MM_LOENGLISH: + case MM_LOMETRIC: + case MM_TEXT: + case MM_TWIPS: + DC_UnlockDc(dc); + return FALSE; + + case MM_ISOTROPIC: + // Here we should (probably) check that SetWindowExtEx *really* has + // been called + break; + } + + if (Size) + { + NTSTATUS Status = STATUS_SUCCESS; + + _SEH2_TRY + { + ProbeForWrite(Size, sizeof(SIZE), 1); + Size->cx = Dc_Attr->szlViewportExt.cx; + Size->cy = Dc_Attr->szlViewportExt.cy; + + Dc_Attr->szlViewportExt.cx = XExtent; + Dc_Attr->szlViewportExt.cy = YExtent; + + if (Dc_Attr->iMapMode == MM_ISOTROPIC) + IntFixIsotropicMapping(dc); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + DC_UnlockDc(dc); + return FALSE; + } + } + + + DC_UpdateXforms(dc); + DC_UnlockDc(dc); + + return TRUE; } BOOL APIENTRY NtGdiSetViewportOrgEx(HDC hDC, - int X, - int Y, - LPPOINT Point) -{ - PDC dc; - PDC_ATTR Dc_Attr; - - dc = DC_LockDc(hDC); - if (!dc) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - Dc_Attr = dc->pDc_Attr; - if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; - - if (Point) - { - NTSTATUS Status = STATUS_SUCCESS; - - _SEH2_TRY - { - ProbeForWrite(Point, - sizeof(POINT), - 1); - Point->x = Dc_Attr->ptlViewportOrg.x; - Point->y = Dc_Attr->ptlViewportOrg.y; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - DC_UnlockDc(dc); - return FALSE; - } - } - - Dc_Attr->ptlViewportOrg.x = X; - Dc_Attr->ptlViewportOrg.y = Y; - - DC_UpdateXforms(dc); - DC_UnlockDc(dc); - - return TRUE; + int X, + int Y, + LPPOINT Point) +{ + PDC dc; + PDC_ATTR Dc_Attr; + + dc = DC_LockDc(hDC); + if (!dc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + Dc_Attr = dc->pDc_Attr; + if (!Dc_Attr) Dc_Attr = &dc->Dc_Attr; + + if (Point) + { + NTSTATUS Status = STATUS_SUCCESS; + + _SEH2_TRY + { + ProbeForWrite(Point, sizeof(POINT), 1); + Point->x = Dc_Attr->ptlViewportOrg.x; + Point->y = Dc_Attr->ptlViewportOrg.y; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + DC_UnlockDc(dc); + return FALSE; + } + } + + Dc_Attr->ptlViewportOrg.x = X; + Dc_Attr->ptlViewportOrg.y = Y; + + DC_UpdateXforms(dc); + DC_UnlockDc(dc); + + return TRUE; } BOOL APIENTRY NtGdiSetWindowExtEx(HDC hDC, - int XExtent, - int YExtent, - LPSIZE Size) -{ - PDC dc; - PDC_ATTR Dc_Attr; - - dc = DC_LockDc(hDC); - if (!dc) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - Dc_Attr = dc->pDc_Attr; - if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; - - switch (Dc_Attr->iMapMode) - { - case MM_HIENGLISH: - case MM_HIMETRIC: - case MM_LOENGLISH: - case MM_LOMETRIC: - case MM_TEXT: - case MM_TWIPS: - DC_UnlockDc(dc); - return FALSE; - } - - if (Size) - { - NTSTATUS Status = STATUS_SUCCESS; - - _SEH2_TRY - { - ProbeForWrite(Size, - sizeof(SIZE), - 1); - Size->cx = Dc_Attr->szlWindowExt.cx; - Size->cy = Dc_Attr->szlWindowExt.cy; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - DC_UnlockDc(dc); - return FALSE; - } - } - - Dc_Attr->szlWindowExt.cx = XExtent; - Dc_Attr->szlWindowExt.cy = YExtent; - - DC_UpdateXforms(dc); - DC_UnlockDc(dc); - - return TRUE; + int XExtent, + int YExtent, + LPSIZE Size) +{ + PDC dc; + PDC_ATTR Dc_Attr; + + dc = DC_LockDc(hDC); + if (!dc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + Dc_Attr = dc->pDc_Attr; + if (!Dc_Attr) Dc_Attr = &dc->Dc_Attr; + + switch (Dc_Attr->iMapMode) + { + case MM_HIENGLISH: + case MM_HIMETRIC: + case MM_LOENGLISH: + case MM_LOMETRIC: + case MM_TEXT: + case MM_TWIPS: + DC_UnlockDc(dc); + return FALSE; + } + + if (Size) + { + NTSTATUS Status = STATUS_SUCCESS; + + _SEH2_TRY + { + ProbeForWrite(Size, sizeof(SIZE), 1); + Size->cx = Dc_Attr->szlWindowExt.cx; + Size->cy = Dc_Attr->szlWindowExt.cy; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + DC_UnlockDc(dc); + return FALSE; + } + } + + Dc_Attr->szlWindowExt.cx = XExtent; + Dc_Attr->szlWindowExt.cy = YExtent; + + DC_UpdateXforms(dc); + DC_UnlockDc(dc); + + return TRUE; } BOOL APIENTRY NtGdiSetWindowOrgEx(HDC hDC, - int X, - int Y, - LPPOINT Point) -{ - PDC dc; - PDC_ATTR Dc_Attr; - - dc = DC_LockDc(hDC); - if (!dc) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - Dc_Attr = dc->pDc_Attr; - if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; - - if (Point) - { - NTSTATUS Status = STATUS_SUCCESS; - - _SEH2_TRY - { - ProbeForWrite(Point, - sizeof(POINT), - 1); - Point->x = Dc_Attr->ptlWindowOrg.x; - Point->y = Dc_Attr->ptlWindowOrg.y; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - DC_UnlockDc(dc); - return FALSE; - } - } - - Dc_Attr->ptlWindowOrg.x = X; - Dc_Attr->ptlWindowOrg.y = Y; - - DC_UpdateXforms(dc); - DC_UnlockDc(dc); - - return TRUE; + int X, + int Y, + LPPOINT Point) +{ + PDC dc; + PDC_ATTR Dc_Attr; + + dc = DC_LockDc(hDC); + if (!dc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + Dc_Attr = dc->pDc_Attr; + if (!Dc_Attr) Dc_Attr = &dc->Dc_Attr; + + if (Point) + { + NTSTATUS Status = STATUS_SUCCESS; + + _SEH2_TRY + { + ProbeForWrite(Point, sizeof(POINT), 1); + Point->x = Dc_Attr->ptlWindowOrg.x; + Point->y = Dc_Attr->ptlWindowOrg.y; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + DC_UnlockDc(dc); + return FALSE; + } + } + + Dc_Attr->ptlWindowOrg.x = X; + Dc_Attr->ptlWindowOrg.y = Y; + + DC_UpdateXforms(dc); + DC_UnlockDc(dc); + + return TRUE; } // @@ -982,32 +964,32 @@ FASTCALL IntMirrorWindowOrg(PDC dc) { - PDC_ATTR Dc_Attr; - LONG X; - - Dc_Attr = dc->pDc_Attr; - if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; - - if (!(Dc_Attr->dwLayout & LAYOUT_RTL)) - { - Dc_Attr->ptlWindowOrg.x = Dc_Attr->lWindowOrgx; // Flip it back. - return; - } - if (!Dc_Attr->szlViewportExt.cx) return; - // - // WOrgx = wox - (Width - 1) * WExtx / VExtx - // - X = (dc->erclWindow.right - dc->erclWindow.left) - 1; // Get device width - 1 - - X = ( X * Dc_Attr->szlWindowExt.cx) / Dc_Attr->szlViewportExt.cx; - - Dc_Attr->ptlWindowOrg.x = Dc_Attr->lWindowOrgx - X; // Now set the inverted win origion. - - return; + PDC_ATTR Dc_Attr; + LONG X; + + Dc_Attr = dc->pDc_Attr; + if (!Dc_Attr) Dc_Attr = &dc->Dc_Attr; + + if (!(Dc_Attr->dwLayout & LAYOUT_RTL)) + { + Dc_Attr->ptlWindowOrg.x = Dc_Attr->lWindowOrgx; // Flip it back. + return; + } + if (!Dc_Attr->szlViewportExt.cx) return; + // + // WOrgx = wox - (Width - 1) * WExtx / VExtx + // + X = (dc->erclWindow.right - dc->erclWindow.left) - 1; // Get device width - 1 + + X = (X * Dc_Attr->szlWindowExt.cx) / Dc_Attr->szlViewportExt.cx; + + Dc_Attr->ptlWindowOrg.x = Dc_Attr->lWindowOrgx - X; // Now set the inverted win origion. + + return; } // NtGdiSetLayout -// +// // The default is left to right. This function changes it to right to left, which // is the standard in Arabic and Hebrew cultures. // @@ -1021,50 +1003,55 @@ IN LONG wox, IN DWORD dwLayout) { - PDC dc; - PDC_ATTR Dc_Attr; - DWORD oLayout; - - dc = DC_LockDc(hdc); - if (!dc) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return GDI_ERROR; - } - Dc_Attr = dc->pDc_Attr; - if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; - - Dc_Attr->dwLayout = dwLayout; - oLayout = Dc_Attr->dwLayout; - - if (!(dwLayout & LAYOUT_ORIENTATIONMASK)) - { - DC_UnlockDc(dc); - return oLayout; - } - - if (dwLayout & LAYOUT_RTL) Dc_Attr->iMapMode = MM_ANISOTROPIC; - - Dc_Attr->szlWindowExt.cy = -Dc_Attr->szlWindowExt.cy; - Dc_Attr->ptlWindowOrg.x = -Dc_Attr->ptlWindowOrg.x; - - if (wox == -1) - IntMirrorWindowOrg(dc); - else - Dc_Attr->ptlWindowOrg.x = wox - Dc_Attr->ptlWindowOrg.x; - - if (!(Dc_Attr->flTextAlign & TA_CENTER)) Dc_Attr->flTextAlign |= TA_RIGHT; - - if (dc->DcLevel.flPath & DCPATH_CLOCKWISE) - dc->DcLevel.flPath &= ~DCPATH_CLOCKWISE; - else - dc->DcLevel.flPath |= DCPATH_CLOCKWISE; - - Dc_Attr->flXform |= (PAGE_EXTENTS_CHANGED|INVALIDATE_ATTRIBUTES|DEVICE_TO_WORLD_INVALID); + PDC dc; + PDC_ATTR Dc_Attr; + DWORD oLayout; + + dc = DC_LockDc(hdc); + if (!dc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return GDI_ERROR; + } + Dc_Attr = dc->pDc_Attr; + if (!Dc_Attr) Dc_Attr = &dc->Dc_Attr; + + Dc_Attr->dwLayout = dwLayout; + oLayout = Dc_Attr->dwLayout; + + if (!(dwLayout & LAYOUT_ORIENTATIONMASK)) + { + DC_UnlockDc(dc); + return oLayout; + } + + if (dwLayout & LAYOUT_RTL) + { + Dc_Attr->iMapMode = MM_ANISOTROPIC; + } + + Dc_Attr->szlWindowExt.cy = -Dc_Attr->szlWindowExt.cy; + Dc_Attr->ptlWindowOrg.x = -Dc_Attr->ptlWindowOrg.x; + + if (wox == -1) + IntMirrorWindowOrg(dc); + else + Dc_Attr->ptlWindowOrg.x = wox - Dc_Attr->ptlWindowOrg.x; + + if (!(Dc_Attr->flTextAlign & TA_CENTER)) Dc_Attr->flTextAlign |= TA_RIGHT; + + if (dc->DcLevel.flPath & DCPATH_CLOCKWISE) + dc->DcLevel.flPath &= ~DCPATH_CLOCKWISE; + else + dc->DcLevel.flPath |= DCPATH_CLOCKWISE; + + Dc_Attr->flXform |= (PAGE_EXTENTS_CHANGED | + INVALIDATE_ATTRIBUTES | + DEVICE_TO_WORLD_INVALID); // DC_UpdateXforms(dc); - DC_UnlockDc(dc); - return oLayout; + DC_UnlockDc(dc); + return oLayout; } /* @@ -1075,17 +1062,17 @@ NtGdiGetDeviceWidth( IN HDC hdc) { - PDC dc; - LONG Ret; - dc = DC_LockDc(hdc); - if (!dc) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return 0; - } - Ret = dc->erclWindow.right - dc->erclWindow.left; - DC_UnlockDc(dc); - return Ret; + PDC dc; + LONG Ret; + dc = DC_LockDc(hdc); + if (!dc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return 0; + } + Ret = dc->erclWindow.right - dc->erclWindow.left; + DC_UnlockDc(dc); + return Ret; } /* @@ -1096,16 +1083,16 @@ NtGdiMirrorWindowOrg( IN HDC hdc) { - PDC dc; - dc = DC_LockDc(hdc); - if (!dc) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - IntMirrorWindowOrg(dc); - DC_UnlockDc(dc); - return TRUE; + PDC dc; + dc = DC_LockDc(hdc); + if (!dc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + IntMirrorWindowOrg(dc); + DC_UnlockDc(dc); + return TRUE; } /* @@ -1121,19 +1108,21 @@ PDC dc; PDC_ATTR pDc_Attr; - if (!cxVirtualDevice || - !cyVirtualDevice ) return FALSE; + if (!cxVirtualDevice || !cyVirtualDevice) + { + return FALSE; + } dc = DC_LockDc(hdc); if (!dc) return FALSE; - + pDc_Attr = dc->pDc_Attr; - if(!pDc_Attr) pDc_Attr = &dc->Dc_Attr; + if (!pDc_Attr) pDc_Attr = &dc->Dc_Attr; pDc_Attr->szlVirtualDeviceSize.cx = cxVirtualDevice; pDc_Attr->szlVirtualDeviceSize.cy = cyVirtualDevice; -// DC_UpdateXforms(dc); +// DC_UpdateXforms(dc); DC_UnlockDc(dc); return TRUE; @@ -1158,16 +1147,16 @@ dc = DC_LockDc(hdc); if (!dc) return FALSE; - + pDc_Attr = dc->pDc_Attr; - if(!pDc_Attr) pDc_Attr = &dc->Dc_Attr; + if (!pDc_Attr) pDc_Attr = &dc->Dc_Attr; pDc_Attr->szlVirtualDevicePixel.cx = cxVirtualDevicePixel; pDc_Attr->szlVirtualDevicePixel.cy = cyVirtualDevicePixel; pDc_Attr->szlVirtualDeviceMm.cx = cxVirtualDeviceMm; pDc_Attr->szlVirtualDeviceMm.cy = cyVirtualDeviceMm; -// DC_UpdateXforms(dc); +// DC_UpdateXforms(dc); DC_UnlockDc(dc); return TRUE; }

1 0

[tkreuzer] 39202: Fix IntGdiSetMapMode
by tkreuzer＠svn.reactos.org 29 Jan '09

29 Jan '09

Author: tkreuzer Date: Thu Jan 29 13:17:53 2009 New Revision: 39202 URL: http://svn.reactos.org/svn/reactos?rev=39202&view=rev Log: Fix IntGdiSetMapMode 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] Thu Jan 29 13:17:53 2009 @@ -675,43 +675,40 @@ break; case MM_ISOTROPIC: + Dc_Attr->flXform |= ISO_OR_ANISO_MAP_MODE; + /* Fall through */ + + case MM_LOMETRIC: Dc_Attr->szlWindowExt.cx = 3600; Dc_Attr->szlWindowExt.cy = 2700; Dc_Attr->szlViewportExt.cx = ((PGDIDEVICE)dc->pPDev)->GDIInfo.ulHorzRes; Dc_Attr->szlViewportExt.cy = -((PGDIDEVICE)dc->pPDev)->GDIInfo.ulVertRes; break; - case MM_LOMETRIC: - Dc_Attr->szlWindowExt.cx = ((PGDIDEVICE)dc->pPDev)->GDIInfo.ulHorzSize * 10; - Dc_Attr->szlWindowExt.cy = ((PGDIDEVICE)dc->pPDev)->GDIInfo.ulVertSize * 10; + case MM_HIMETRIC: + Dc_Attr->szlWindowExt.cx = 36000; + Dc_Attr->szlWindowExt.cy = 27000; Dc_Attr->szlViewportExt.cx = ((PGDIDEVICE)dc->pPDev)->GDIInfo.ulHorzRes; Dc_Attr->szlViewportExt.cy = -((PGDIDEVICE)dc->pPDev)->GDIInfo.ulVertRes; break; - case MM_HIMETRIC: - Dc_Attr->szlWindowExt.cx = ((PGDIDEVICE)dc->pPDev)->GDIInfo.ulHorzSize * 100; - Dc_Attr->szlWindowExt.cy = ((PGDIDEVICE)dc->pPDev)->GDIInfo.ulVertSize * 100; + case MM_LOENGLISH: + Dc_Attr->szlWindowExt.cx = 1417; + Dc_Attr->szlWindowExt.cy = 1063; Dc_Attr->szlViewportExt.cx = ((PGDIDEVICE)dc->pPDev)->GDIInfo.ulHorzRes; Dc_Attr->szlViewportExt.cy = -((PGDIDEVICE)dc->pPDev)->GDIInfo.ulVertRes; break; - case MM_LOENGLISH: - Dc_Attr->szlWindowExt.cx = EngMulDiv(1000, ((PGDIDEVICE)dc->pPDev)->GDIInfo.ulHorzSize, 254); - Dc_Attr->szlWindowExt.cy = EngMulDiv(1000, ((PGDIDEVICE)dc->pPDev)->GDIInfo.ulVertSize, 254); + case MM_HIENGLISH: + Dc_Attr->szlWindowExt.cx = 14173; + Dc_Attr->szlWindowExt.cy = 10630; Dc_Attr->szlViewportExt.cx = ((PGDIDEVICE)dc->pPDev)->GDIInfo.ulHorzRes; Dc_Attr->szlViewportExt.cy = -((PGDIDEVICE)dc->pPDev)->GDIInfo.ulVertRes; break; - case MM_HIENGLISH: - Dc_Attr->szlWindowExt.cx = EngMulDiv(10000, ((PGDIDEVICE)dc->pPDev)->GDIInfo.ulHorzSize, 254); - Dc_Attr->szlWindowExt.cy = EngMulDiv(10000, ((PGDIDEVICE)dc->pPDev)->GDIInfo.ulVertSize, 254); - Dc_Attr->szlViewportExt.cx = ((PGDIDEVICE)dc->pPDev)->GDIInfo.ulHorzRes; - Dc_Attr->szlViewportExt.cy = -((PGDIDEVICE)dc->pPDev)->GDIInfo.ulVertRes; - break; - case MM_TWIPS: - Dc_Attr->szlWindowExt.cx = EngMulDiv(14400, ((PGDIDEVICE)dc->pPDev)->GDIInfo.ulHorzSize, 254); - Dc_Attr->szlWindowExt.cy = EngMulDiv(14400, ((PGDIDEVICE)dc->pPDev)->GDIInfo.ulVertSize, 254); + Dc_Attr->szlWindowExt.cx = 20409; + Dc_Attr->szlWindowExt.cy = 15307; Dc_Attr->szlViewportExt.cx = ((PGDIDEVICE)dc->pPDev)->GDIInfo.ulHorzRes; Dc_Attr->szlViewportExt.cy = -((PGDIDEVICE)dc->pPDev)->GDIInfo.ulVertRes; break;

1 0

[tkreuzer] 39201: Add more tests for SetMapMode
by tkreuzer＠svn.reactos.org 29 Jan '09

29 Jan '09

Author: tkreuzer Date: Thu Jan 29 13:16:45 2009 New Revision: 39201 URL: http://svn.reactos.org/svn/reactos?rev=39201&view=rev Log: Add more tests for SetMapMode Modified: trunk/rostests/apitests/gdi32api/tests/SetMapMode.c Modified: trunk/rostests/apitests/gdi32api/tests/SetMapMode.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/S… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/SetMapMode.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32api/tests/SetMapMode.c [iso-8859-1] Thu Jan 29 13:16:45 2009 @@ -6,6 +6,7 @@ { HDC hDC; SIZE WindowExt, ViewportExt; + ULONG ulMapMode; hDC = CreateCompatibleDC(NULL); ASSERT(hDC); @@ -13,21 +14,167 @@ GetWindowExtEx(hDC, &WindowExt); GetViewportExtEx(hDC, &ViewportExt); - ASSERT(WindowExt.cx == 1); - ASSERT(WindowExt.cy == 1); - ASSERT(ViewportExt.cx == 1); - ASSERT(ViewportExt.cy == 1); + ulMapMode = SetMapMode(hDC, MM_ISOTROPIC); + TEST(ulMapMode == MM_TEXT); + TEST(WindowExt.cx == 1); + TEST(WindowExt.cy == 1); + TEST(ViewportExt.cx == 1); + TEST(ViewportExt.cy == 1); - SetMapMode(hDC, MM_ISOTROPIC); + SetLastError(0); + ulMapMode = SetMapMode(hDC, 0); + TEST(GetLastError() == 0); + TEST(ulMapMode == 0); + /* Go through all valid values */ + ulMapMode = SetMapMode(hDC, 1); + TEST(ulMapMode == MM_ISOTROPIC); + ulMapMode = SetMapMode(hDC, 2); + TEST(ulMapMode == 1); + ulMapMode = SetMapMode(hDC, 3); + TEST(ulMapMode == 2); + ulMapMode = SetMapMode(hDC, 4); + TEST(ulMapMode == 3); + ulMapMode = SetMapMode(hDC, 5); + TEST(ulMapMode == 4); + ulMapMode = SetMapMode(hDC, 6); + TEST(ulMapMode == 5); + ulMapMode = SetMapMode(hDC, 7); + TEST(ulMapMode == 6); + ulMapMode = SetMapMode(hDC, 8); + TEST(ulMapMode == 7); + + /* Test invalid value */ + ulMapMode = SetMapMode(hDC, 9); + TEST(ulMapMode == 0); + ulMapMode = SetMapMode(hDC, 10); + TEST(ulMapMode == 0); + + TEST(GetLastError() == 0); + + /* Test NULL DC */ + ulMapMode = SetMapMode((HDC)0, 2); + TEST(ulMapMode == 0); + TEST(GetLastError() == ERROR_INVALID_PARAMETER); + + /* Test NULL DC and invalid mode */ + ulMapMode = SetMapMode((HDC)0, 10); + TEST(ulMapMode == 0); + TEST(GetLastError() == ERROR_INVALID_PARAMETER); + + /* Test invalid DC */ + ulMapMode = SetMapMode((HDC)0x12345, 2); + TEST(ulMapMode == 0); + TEST(GetLastError() == ERROR_INVALID_PARAMETER); + + /* Test invalid DC and invalid mode */ + ulMapMode = SetMapMode((HDC)0x12345, 10); + TEST(ulMapMode == 0); + TEST(GetLastError() == ERROR_INVALID_PARAMETER); + + DeleteDC(hDC); + + /* Test a deleted DC */ + ulMapMode = SetMapMode(hDC, 2); + TEST(ulMapMode == 0); + TEST(GetLastError() == ERROR_INVALID_PARAMETER); + + /* Test MM_TEXT */ + hDC = CreateCompatibleDC(NULL); + SetMapMode(hDC, MM_TEXT); GetWindowExtEx(hDC, &WindowExt); GetViewportExtEx(hDC, &ViewportExt); + TEST(WindowExt.cx == 1); + TEST(WindowExt.cy == 1); + TEST(ViewportExt.cx == 1); + TEST(ViewportExt.cy == 1); + DeleteDC(hDC); + /* Test MM_ISOTROPIC */ + hDC = CreateCompatibleDC(NULL); + SetMapMode(hDC, MM_ISOTROPIC); + GetWindowExtEx(hDC, &WindowExt); + GetViewportExtEx(hDC, &ViewportExt); TEST(WindowExt.cx == 3600); TEST(WindowExt.cy == 2700); TEST(ViewportExt.cx == GetDeviceCaps(GetDC(0), HORZRES)); TEST(ViewportExt.cy == -GetDeviceCaps(GetDC(0), VERTRES)); + DeleteDC(hDC); + /* Test MM_ANISOTROPIC */ + hDC = CreateCompatibleDC(NULL); + SetMapMode(hDC, MM_ANISOTROPIC); + GetWindowExtEx(hDC, &WindowExt); + GetViewportExtEx(hDC, &ViewportExt); + TEST(WindowExt.cx == 1); + TEST(WindowExt.cy == 1); + TEST(ViewportExt.cx == 1); + TEST(ViewportExt.cy == 1); + + /* set MM_ISOTROPIC first, the values will be kept */ + SetMapMode(hDC, MM_ISOTROPIC); + SetMapMode(hDC, MM_ANISOTROPIC); + GetWindowExtEx(hDC, &WindowExt); + GetViewportExtEx(hDC, &ViewportExt); + TEST(WindowExt.cx == 3600); + TEST(WindowExt.cy == 2700); + TEST(ViewportExt.cx == GetDeviceCaps(GetDC(0), HORZRES)); + TEST(ViewportExt.cy == -GetDeviceCaps(GetDC(0), VERTRES)); + DeleteDC(hDC); + + /* Test MM_LOMETRIC */ + hDC = CreateCompatibleDC(NULL); + SetMapMode(hDC, MM_LOMETRIC); + GetWindowExtEx(hDC, &WindowExt); + GetViewportExtEx(hDC, &ViewportExt); + TEST(WindowExt.cx == 3600); + TEST(WindowExt.cy == 2700); + TEST(ViewportExt.cx == GetDeviceCaps(GetDC(0), HORZRES)); + TEST(ViewportExt.cy == -GetDeviceCaps(GetDC(0), VERTRES)); + DeleteDC(hDC); + + /* Test MM_HIMETRIC */ + hDC = CreateCompatibleDC(NULL); + SetMapMode(hDC, MM_HIMETRIC); + GetWindowExtEx(hDC, &WindowExt); + GetViewportExtEx(hDC, &ViewportExt); + TEST(WindowExt.cx == 36000); + TEST(WindowExt.cy == 27000); + TEST(ViewportExt.cx == GetDeviceCaps(GetDC(0), HORZRES)); + TEST(ViewportExt.cy == -GetDeviceCaps(GetDC(0), VERTRES)); + DeleteDC(hDC); + + /* Test MM_LOENGLISH */ + hDC = CreateCompatibleDC(NULL); + SetMapMode(hDC, MM_LOENGLISH); + GetWindowExtEx(hDC, &WindowExt); + GetViewportExtEx(hDC, &ViewportExt); + TEST(WindowExt.cx == 1417); + TEST(WindowExt.cy == 1063); + TEST(ViewportExt.cx == GetDeviceCaps(GetDC(0), HORZRES)); + TEST(ViewportExt.cy == -GetDeviceCaps(GetDC(0), VERTRES)); + DeleteDC(hDC); + + /* Test MM_HIENGLISH */ + hDC = CreateCompatibleDC(NULL); + SetMapMode(hDC, MM_HIENGLISH); + GetWindowExtEx(hDC, &WindowExt); + GetViewportExtEx(hDC, &ViewportExt); + TEST(WindowExt.cx == 14173); + TEST(WindowExt.cy == 10630); + TEST(ViewportExt.cx == GetDeviceCaps(GetDC(0), HORZRES)); + TEST(ViewportExt.cy == -GetDeviceCaps(GetDC(0), VERTRES)); + DeleteDC(hDC); + + /* Test MM_TWIPS */ + hDC = CreateCompatibleDC(NULL); + SetMapMode(hDC, MM_TWIPS); + GetWindowExtEx(hDC, &WindowExt); + GetViewportExtEx(hDC, &ViewportExt); + TEST(WindowExt.cx == 20409); + TEST(WindowExt.cy == 15307); + TEST(ViewportExt.cx == GetDeviceCaps(GetDC(0), HORZRES)); + TEST(ViewportExt.cy == -GetDeviceCaps(GetDC(0), VERTRES)); DeleteDC(hDC); return APISTATUS_NORMAL;

1 0

[dreimer] 39200: Set the Default Settings of options.exe to the proper values.
by dreimer＠svn.reactos.org 29 Jan '09

29 Jan '09

Author: dreimer Date: Thu Jan 29 12:12:18 2009 New Revision: 39200 URL: http://svn.reactos.org/svn/reactos?rev=39200&view=rev Log: Set the Default Settings of options.exe to the proper values. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 trunk/tools/RosBE/RosBE-Windows/Root/options.cmd trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c trunk/tools/RosBE/RosBE-Windows/Tools/config/options.h Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 [iso-8859-1] Thu Jan 29 12:12:18 2009 @@ -13,7 +13,9 @@ # Run options.exe # if (Test-Path "$_ROSBE_BASEDIR\Tools\options.exe") { + Push-Location "$_ROSBE_BASEDIR" & "$_ROSBE_BASEDIR\Tools\options.exe" | out-null + Pop-Location if (Test-Path "$ENV:APPDATA\RosBE\rosbe-options.cmd") { & "$ENV:APPDATA\RosBE\rosbe-options.cmd" } Modified: trunk/tools/RosBE/RosBE-Windows/Root/options.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/opt… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/options.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/options.cmd [iso-8859-1] Thu Jan 29 12:12:18 2009 @@ -18,7 +18,9 @@ :: Run options.exe :: if exist "%_ROSBE_BASEDIR%\Tools\options.exe" ( + pushd "%_ROSBE_BASEDIR%" call "%_ROSBE_BASEDIR%\Tools\options.exe" + popd if exist "%APPDATA%\RosBE\rosbe-options.cmd" ( call "%APPDATA%\RosBE\rosbe-options.cmd" ) Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c [iso-8859-1] Thu Jan 29 12:12:18 2009 @@ -242,6 +242,8 @@ { LoadedSettings->foreground = 0xa; LoadedSettings->background = 0; + LoadedSettings->showtime = 1; + LoadedSettings->writelog = 1; GetCurrentDirectory(MAX_PATH, LoadedSettings->mingwpath); if ((wcslen(LoadedSettings->mingwpath) + wcslen(MINGWVERSION)) < MAX_PATH) wcscat(LoadedSettings->mingwpath, MINGWVERSION); Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/options.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/options.h [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/options.h [iso-8859-1] Thu Jan 29 12:12:18 2009 @@ -14,7 +14,7 @@ #include <wchar.h> #include "resources.h" -#define MINGWVERSION L"\\4.1.3" +#define MINGWVERSION L"\\i386" typedef struct _SETTINGS {

1 0

[tkreuzer] 39199: Add a comment, remove a comment
by tkreuzer＠svn.reactos.org 29 Jan '09

29 Jan '09

Author: tkreuzer Date: Thu Jan 29 10:00:22 2009 New Revision: 39199 URL: http://svn.reactos.org/svn/reactos?rev=39199&view=rev Log: Add a comment, remove a comment Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/except.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/except.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/except.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/except.c [iso-8859-1] Thu Jan 29 10:00:22 2009 @@ -17,6 +17,7 @@ KIDT_INIT KiInterruptInitTable[] = { + /* Id, Dpl, IST, ServiceRoutine */ {0x00, 0x00, 0x00, KiDivideErrorFault}, {0x01, 0x00, 0x00, KiDebugTrapOrFault}, {0x02, 0x00, 0x03, KiNmiInterrupt}, @@ -119,7 +120,6 @@ case STATUS_BREAKPOINT: /* Decrement RIP by one */ - // FIXME: that doesn't work, why? Context.Rip--; break;

1 0

[tkreuzer] 39198: fix Ki386InitializeTss
by tkreuzer＠svn.reactos.org 29 Jan '09

29 Jan '09

Author: tkreuzer Date: Thu Jan 29 09:56:54 2009 New Revision: 39198 URL: http://svn.reactos.org/svn/reactos?rev=39198&view=rev Log: fix Ki386InitializeTss Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c [iso-8859-1] Thu Jan 29 09:56:54 2009 @@ -384,6 +384,7 @@ TssEntry->Bits.LongMode = 0; TssEntry->Bits.DefaultBig = 0; TssEntry->Bits.Granularity = 0; + TssEntry->MustBeZero = 0; /* Descriptor base is the TSS address */ TssEntry->BaseLow = (ULONG64)Tss & 0xffff; @@ -395,8 +396,11 @@ TssEntry->LimitLow = sizeof(KTSS64) -1; TssEntry->Bits.LimitHigh = 0; + /* Zero out the TSS */ + RtlZeroMemory(Tss, sizeof(KTSS)); + /* FIXME: I/O Map? */ - Tss->IoMapBase = 0; + Tss->IoMapBase = 0x68; /* Setup ring 0 stack pointer */ Tss->Rsp0 = Stack;

1 0

[dchapyshev] 39197: - Merge with r39196. Fix the handle leak in taskmgr
by dchapyshev＠svn.reactos.org 29 Jan '09

29 Jan '09

Author: dchapyshev Date: Thu Jan 29 09:34:11 2009 New Revision: 39197 URL: http://svn.reactos.org/svn/reactos?rev=39197&view=rev Log: - Merge with r39196. Fix the handle leak in taskmgr Modified: branches/ros-branch-0_3_8/reactos/dll/win32/lsasrv/lsarpc.c Modified: branches/ros-branch-0_3_8/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_8/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_8/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_8/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Thu Jan 29 09:34:11 2009 @@ -189,7 +189,10 @@ /* This is our fake handle, don't go too much long way */ if (*ObjectHandle == (LSA_HANDLE)0xcafe) + { + *ObjectHandle = NULL; Status = STATUS_SUCCESS; + } TRACE("LsarClose done (Status: 0x%08lx)!\n", Status);

1 0

[cwittich] 39196: fix lsa handle leak See issue #3999 for more details.
by cwittich＠svn.reactos.org 29 Jan '09

29 Jan '09

Author: cwittich Date: Thu Jan 29 08:42:13 2009 New Revision: 39196 URL: http://svn.reactos.org/svn/reactos?rev=39196&view=rev Log: fix lsa handle leak See issue #3999 for more details. Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Thu Jan 29 08:42:13 2009 @@ -189,7 +189,10 @@ /* This is our fake handle, don't go too much long way */ if (*ObjectHandle == (LSA_HANDLE)0xcafe) + { + *ObjectHandle = NULL; Status = STATUS_SUCCESS; + } TRACE("LsarClose done (Status: 0x%08lx)!\n", Status);

1 0

[mkupfer] 39195: remove outdated unimplemented MessageBox
by mkupfer＠svn.reactos.org 29 Jan '09

29 Jan '09

Author: mkupfer Date: Thu Jan 29 07:53:13 2009 New Revision: 39195 URL: http://svn.reactos.org/svn/reactos?rev=39195&view=rev Log: remove outdated unimplemented MessageBox Modified: trunk/reactos/dll/cpl/sysdm/hardprof.c trunk/reactos/dll/cpl/sysdm/userprofile.c Modified: trunk/reactos/dll/cpl/sysdm/hardprof.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/hardprof.c?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/hardprof.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/hardprof.c [iso-8859-1] Thu Jan 29 07:53:13 2009 @@ -22,10 +22,6 @@ switch (uMsg) { - case WM_INITDIALOG: - MessageBox(hwndDlg, _T("Dialog not yet implemented!"), NULL, 0); - break; - case WM_COMMAND: if ((LOWORD(wParam) == IDOK) || (LOWORD(wParam) == IDCANCEL)) { @@ -60,7 +56,6 @@ SendMessage(GetDlgItem(hwndDlg, IDC_HRDPROFDWN), BM_SETIMAGE,(WPARAM)IMAGE_ICON, (LPARAM)(HANDLE)LoadIcon(hApplet, MAKEINTRESOURCE(IDI_DOWN))); - MessageBox(hwndDlg, _T("Dialog not yet implemented!"), NULL, 0); } break; Modified: trunk/reactos/dll/cpl/sysdm/userprofile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/userprofile.… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/userprofile.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/userprofile.c [iso-8859-1] Thu Jan 29 07:53:13 2009 @@ -139,7 +139,6 @@ switch (uMsg) { case WM_INITDIALOG: - MessageBox(hwndDlg, _T("Dialog not yet implemented!"), NULL, 0); OnInitDialog(hwndDlg); break;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs