Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-25 16:10:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

[win32k] Reuse existing code to support page to device space transformations, fixes 4 gdi32 mapping tests

Browse source 
svn path=/trunk/; revision=44676
This commit is contained in:
Gregor Schneider 2009-12-20 18:59:10 +00:00
parent 85bc5f7dc1
commit f51abbcf0c
1 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
reactos/subsystems/win32/win32k/objects/coord.c
View file

@ -165,6 +165,21 @@ IntGdiModifyWorldTransform(
return TRUE; return TRUE;
} }
// FIXME: Don't use floating point in the kernel!
void windowToViewPort(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 // FIXME: Should be XFORML and use XFORMOBJ functions directly
BOOL BOOL
APIENTRY APIENTRY
@ -203,7 +218,7 @@ NtGdiGetTransform(
break; break;
case GdiPageSpaceToDeviceSpace: case GdiPageSpaceToDeviceSpace:
DPRINT1("Page space -> device space is unsupported!\n"); windowToViewPort(dc->pdcattr, XForm);
break; break;
case GdiDeviceSpaceToWorldSpace: case GdiDeviceSpaceToWorldSpace:
@ -1078,25 +1093,15 @@ DC_InvertXform(const XFORM *xformSrc,
return TRUE; return TRUE;
} }
// FIXME: Don't use floating point in the kernel!
VOID FASTCALL VOID FASTCALL
DC_UpdateXforms(PDC dc) DC_UpdateXforms(PDC dc)
{ {
XFORM xformWnd2Vport; XFORM xformWnd2Vport;
FLOAT scaleX, scaleY;
PDC_ATTR pdcattr = dc->pdcattr; PDC_ATTR pdcattr = dc->pdcattr;
XFORM xformWorld2Vport, xformWorld2Wnd, xformVport2World; XFORM xformWorld2Vport, xformWorld2Wnd, xformVport2World;
/* Construct a transformation to do the window-to-viewport conversion */ /* Construct a transformation to do the window-to-viewport conversion */
scaleX = (pdcattr->szlWindowExt.cx ? (FLOAT)pdcattr->szlViewportExt.cx / (FLOAT)pdcattr->szlWindowExt.cx : 0.0f); windowToViewPort(pdcattr, &xformWnd2Vport);
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;
/* Combine with the world transformation */ /* Combine with the world transformation */
MatrixS2XForm(&xformWorld2Vport, &dc->dclevel.mxWorldToDevice); MatrixS2XForm(&xformWorld2Vport, &dc->dclevel.mxWorldToDevice);