Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-30 09:50:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

[WIN32SS][NTGDI] Fix ExtTextOut about TA_UPDATECP (#1546)

Browse source 
Add WORLD_XFORM_CHANGED flag to some positioning functions.
Fix IntExtTextOutW function for TA_UPDATECP alignment, so that it can correctly update the current position. CORE-14994
This commit is contained in:
Katayama Hirofumi MZ 2019-05-01 16:51:00 +09:00 committed by GitHub
parent 0ac563b3ec
commit f7bc0543cb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
win32ss/gdi/ntgdi/coord.c
View file

@ -600,7 +600,7 @@ NtGdiOffsetViewportOrgEx(
}
pdcattr->ptlViewportOrg.x += XOffset;
pdcattr->ptlViewportOrg.y += YOffset;
pdcattr->flXform |= PAGE_XLATE_CHANGED | DEVICE_TO_WORLD_INVALID;
pdcattr->flXform |= PAGE_XLATE_CHANGED | WORLD_XFORM_CHANGED | DEVICE_TO_WORLD_INVALID;
DC_UnlockDc(dc);
@ -652,7 +652,7 @@ NtGdiOffsetWindowOrgEx(
pdcattr->ptlWindowOrg.x += XOffset;
pdcattr->ptlWindowOrg.y += YOffset;
pdcattr->flXform |= PAGE_XLATE_CHANGED|DEVICE_TO_WORLD_INVALID;
pdcattr->flXform |= PAGE_XLATE_CHANGED | WORLD_XFORM_CHANGED | DEVICE_TO_WORLD_INVALID;
DC_UnlockDc(dc);
@ -701,6 +701,7 @@ NtGdiScaleViewportExtEx(
pdcattr->flXform |= (PAGE_EXTENTS_CHANGED |
INVALIDATE_ATTRIBUTES |
WORLD_XFORM_CHANGED |
DEVICE_TO_WORLD_INVALID);
if (pdcattr->iMapMode == MM_ISOTROPIC)
@ -802,7 +803,10 @@ NtGdiScaleWindowExtEx(
IntMirrorWindowOrg(pDC);
pdcattr->flXform |= (PAGE_EXTENTS_CHANGED|INVALIDATE_ATTRIBUTES|DEVICE_TO_WORLD_INVALID);
pdcattr->flXform |= (PAGE_EXTENTS_CHANGED |
INVALIDATE_ATTRIBUTES |
WORLD_XFORM_CHANGED |
DEVICE_TO_WORLD_INVALID);
Ret = TRUE;
}
@ -896,8 +900,9 @@ IntGdiSetMapMode(
pdcattr->iMapMode = MapMode;
/* Update xform flags */
pdcattr->flXform = flXform | (PAGE_XLATE_CHANGED|PAGE_EXTENTS_CHANGED|
INVALIDATE_ATTRIBUTES|DEVICE_TO_PAGE_INVALID|DEVICE_TO_WORLD_INVALID);
pdcattr->flXform = flXform | (PAGE_XLATE_CHANGED | PAGE_EXTENTS_CHANGED |
INVALIDATE_ATTRIBUTES | DEVICE_TO_PAGE_INVALID |
WORLD_XFORM_CHANGED | DEVICE_TO_WORLD_INVALID);
return iPrevMapMode;
}
@ -929,7 +934,7 @@ GreSetViewportOrgEx(
pdcattr->ptlViewportOrg.x = X;
pdcattr->ptlViewportOrg.y = Y;
pdcattr->flXform |= PAGE_XLATE_CHANGED | DEVICE_TO_WORLD_INVALID;
pdcattr->flXform |= PAGE_XLATE_CHANGED | WORLD_XFORM_CHANGED | DEVICE_TO_WORLD_INVALID;
DC_UnlockDc(dc);
return TRUE;
@ -980,7 +985,7 @@ NtGdiSetViewportOrgEx(
pdcattr->ptlViewportOrg.x = X;
pdcattr->ptlViewportOrg.y = Y;
pdcattr->flXform |= PAGE_XLATE_CHANGED | DEVICE_TO_WORLD_INVALID;
pdcattr->flXform |= PAGE_XLATE_CHANGED | WORLD_XFORM_CHANGED | DEVICE_TO_WORLD_INVALID;
DC_UnlockDc(dc);
@ -1032,7 +1037,7 @@ NtGdiSetWindowOrgEx(
pdcattr->ptlWindowOrg.x = X;
pdcattr->ptlWindowOrg.y = Y;
pdcattr->flXform |= PAGE_XLATE_CHANGED | DEVICE_TO_WORLD_INVALID;
pdcattr->flXform |= PAGE_XLATE_CHANGED | WORLD_XFORM_CHANGED | DEVICE_TO_WORLD_INVALID;
DC_UnlockDc(dc);
@ -1068,7 +1073,7 @@ IntMirrorWindowOrg(PDC dc)
X = (X * pdcattr->szlWindowExt.cx) / cx;
pdcattr->ptlWindowOrg.x = pdcattr->lWindowOrgx - X; // Now set the inverted win origion.
pdcattr->flXform |= PAGE_XLATE_CHANGED | DEVICE_TO_WORLD_INVALID;
pdcattr->flXform |= PAGE_XLATE_CHANGED | WORLD_XFORM_CHANGED | DEVICE_TO_WORLD_INVALID;
return;
}
@ -1108,6 +1113,7 @@ DC_vSetLayout(
pdcattr->flXform |= (PAGE_EXTENTS_CHANGED |
INVALIDATE_ATTRIBUTES |
WORLD_XFORM_CHANGED |
DEVICE_TO_WORLD_INVALID);
}

7
win32ss/gdi/ntgdi/freetype.c
View file

@ -6306,8 +6306,11 @@ IntExtTextOutW(
MouseSafetyOnDrawEnd(dc->ppdev);
}
if (pdcattr->flTextAlign & TA_UPDATECP) {
pdcattr->ptlCurrent.x = DestRect.right - dc->ptlDCOrig.x;
if (pdcattr->flTextAlign & TA_UPDATECP)
{
pdcattr->ptlCurrent.x = vecs[2].x - dc->ptlDCOrig.x;
pdcattr->ptlCurrent.y = vecs[2].y - dc->ptlDCOrig.y;
IntDPtoLP(dc, &pdcattr->ptlCurrent, 1);
}
IntUnLockFreeType();