Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-11 07:05:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

[WIN32K:NTGDI]: Remove redundant code.

Browse source 
svn path=/trunk/; revision=71596
This commit is contained in:
Hermès Bélusca-Maïto 2016-06-08 23:07:32 +00:00
parent cdae0d1bf7
commit 57360a0d04
1 changed files with 3 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
reactos/win32ss/gdi/ntgdi/coord.c
View file

@ -1341,7 +1341,7 @@ GreGetWindowExtEx(
_In_ HDC hdc, _In_ HDC hdc,
_Out_ LPSIZE lpSize) _Out_ LPSIZE lpSize)
{ {
return GreGetDCPoint(hdc, GdiGetWindowExt, (PPOINTL)lpSize); return GreGetDCPoint(hdc, GdiGetWindowExt, (PPOINTL)lpSize);
} }
BOOL BOOL
@ -1350,7 +1350,7 @@ GreGetViewportExtEx(
_In_ HDC hdc, _In_ HDC hdc,
_Out_ LPSIZE lpSize) _Out_ LPSIZE lpSize)
{ {
return GreGetDCPoint(hdc, GdiGetViewPortExt, (PPOINTL)lpSize); return GreGetDCPoint(hdc, GdiGetViewPortExt, (PPOINTL)lpSize);
} }
BOOL APIENTRY BOOL APIENTRY
@ -1360,10 +1360,7 @@ NtGdiGetDCPoint(
PPOINTL Point) PPOINTL Point)
{ {
BOOL Ret = TRUE; BOOL Ret = TRUE;
DC *pdc;
POINTL SafePoint; POINTL SafePoint;
SIZE Size;
PSIZEL pszlViewportExt;
if (!Point) if (!Point)
{ {
@ -1371,50 +1368,7 @@ NtGdiGetDCPoint(
return FALSE; return FALSE;
} }
pdc = DC_LockDc(hDC); Ret = GreGetDCPoint(hDC, iPoint, &SafePoint);
if (!pdc)
{
EngSetLastError(ERROR_INVALID_HANDLE);
return FALSE;
}
switch (iPoint)
{
case GdiGetViewPortExt:
pszlViewportExt = DC_pszlViewportExt(pdc);
SafePoint.x = pszlViewportExt->cx;
SafePoint.y = pszlViewportExt->cy;
break;
case GdiGetWindowExt:
SafePoint.x = pdc->pdcattr->szlWindowExt.cx;
SafePoint.y = pdc->pdcattr->szlWindowExt.cy;
break;
case GdiGetViewPortOrg:
SafePoint = pdc->pdcattr->ptlViewportOrg;
break;
case GdiGetWindowOrg:
SafePoint = pdc->pdcattr->ptlWindowOrg;
break;
case GdiGetDCOrg:
SafePoint = pdc->ptlDCOrig;
break;
case GdiGetAspectRatioFilter:
DC_vGetAspectRatioFilter(pdc, &Size);
SafePoint.x = Size.cx;
SafePoint.y = Size.cy;
break;
default:
EngSetLastError(ERROR_INVALID_PARAMETER);
Ret = FALSE;
break;
}
if (Ret) if (Ret)
{ {
_SEH2_TRY _SEH2_TRY
@ -1429,7 +1383,6 @@ NtGdiGetDCPoint(
_SEH2_END; _SEH2_END;
} }
DC_UnlockDc(pdc);
return Ret; return Ret;
} }