mirror of
https://github.com/reactos/reactos.git
synced 2024-08-11 13:48:01 +00:00
Another coordinate transformation change. Fixes final problem with bug 1201.
svn path=/trunk/; revision=20463
This commit is contained in:
parent
61b0f100bc
commit
42c1f0fab7
|
@ -1488,17 +1488,6 @@ NtGdiExtTextOut(
|
||||||
|
|
||||||
// TODO: Write test-cases to exactly match real Windows in different
|
// TODO: Write test-cases to exactly match real Windows in different
|
||||||
// bad parameters (e.g. does Windows check the DC or the RECT first?).
|
// bad parameters (e.g. does Windows check the DC or the RECT first?).
|
||||||
if (lprc && (fuOptions & (ETO_OPAQUE | ETO_CLIPPED)))
|
|
||||||
{
|
|
||||||
// At least one of the two flags were specified. Copy lprc. Once.
|
|
||||||
Status = MmCopyFromCaller(&SpecifiedDestRect, lprc, sizeof(RECT));
|
|
||||||
if (!NT_SUCCESS(Status))
|
|
||||||
{
|
|
||||||
SetLastWin32Error(ERROR_INVALID_PARAMETER);
|
|
||||||
return FALSE;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
dc = DC_LockDc(hDC);
|
dc = DC_LockDc(hDC);
|
||||||
if (!dc)
|
if (!dc)
|
||||||
{
|
{
|
||||||
|
@ -1512,6 +1501,18 @@ NtGdiExtTextOut(
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (lprc && (fuOptions & (ETO_OPAQUE | ETO_CLIPPED)))
|
||||||
|
{
|
||||||
|
// At least one of the two flags were specified. Copy lprc. Once.
|
||||||
|
Status = MmCopyFromCaller(&SpecifiedDestRect, lprc, sizeof(RECT));
|
||||||
|
if (!NT_SUCCESS(Status))
|
||||||
|
{
|
||||||
|
SetLastWin32Error(ERROR_INVALID_PARAMETER);
|
||||||
|
return FALSE;
|
||||||
|
}
|
||||||
|
IntLPtoDP(dc, (POINT *) &SpecifiedDestRect, 2);
|
||||||
|
}
|
||||||
|
|
||||||
if (NULL != UnsafeDx && Count > 0)
|
if (NULL != UnsafeDx && Count > 0)
|
||||||
{
|
{
|
||||||
Dx = ExAllocatePoolWithTag(PagedPool, Count * sizeof(INT), TAG_GDITEXT);
|
Dx = ExAllocatePoolWithTag(PagedPool, Count * sizeof(INT), TAG_GDITEXT);
|
||||||
|
|
Loading…
Reference in a new issue