[WIN32K]

- Access the DC member directly instead of using IntGdiGetDCOrg
- Remove unused IntGdiGetDCOrg, GdiSetDCOrg, GdiGetDCOrgEx

svn path=/trunk/; revision=50281

diff --git a/reactos/subsystems/win32/win32k/objects/coord.c b/reactos/subsystems/win32/win32k/objects/coord.c
index 7f229a5..c89bc05 100644 (file)
--- a/reactos/subsystems/win32/win32k/objects/coord.c
+++ b/reactos/subsystems/win32/win32k/objects/coord.c
@@ -1152,49 +1152,6 @@ IntptlBrushOrigin(PDC pdc, LONG x, LONG y )
     return &pdc->dclevel.ptlBrushOrigin;
 }
 
-VOID
-APIENTRY
-GdiSetDCOrg(HDC hDC, LONG Left, LONG Top, PRECTL prc)
-{
-    PDC pdc;
-
-    pdc = DC_LockDc(hDC);
-    if (!pdc) return;
-
-    pdc->ptlDCOrig.x = Left;
-    pdc->ptlDCOrig.y = Top;
-
-    IntCalcFillOrigin(pdc);
-
-    if (prc) pdc->erclWindow = *prc;
-
-    DC_UnlockDc(pdc);
-}
-
-// FIXME: remove me
-BOOL FASTCALL
-IntGdiGetDCOrg(PDC pDc, PPOINTL ppt)
-{
-    *ppt = pDc->ptlDCOrig;
-    return TRUE;
-}
-
-// FIXME: remove me
-BOOL APIENTRY
-GdiGetDCOrgEx(HDC hDC, PPOINTL ppt, PRECTL prc)
-{
-    PDC pdc;
-
-    pdc = DC_LockDc(hDC);
-    if (!pdc) return FALSE;
-
-    *prc = pdc->erclWindow;
-    *ppt = pdc->ptlDCOrig;
-
-    DC_UnlockDc(pdc);
-    return TRUE;
-}
-
 static
 VOID FASTCALL
 DC_vGetAspectRatioFilter(PDC pDC, LPSIZE AspectRatio)

diff --git a/reactos/subsystems/win32/win32k/objects/path.c b/reactos/subsystems/win32/win32k/objects/path.c
index f96580a..8a9010c 100644 (file)
--- a/reactos/subsystems/win32/win32k/objects/path.c
+++ b/reactos/subsystems/win32/win32k/objects/path.c
@@ -2051,7 +2051,7 @@ PATH_ExtTextOut(PDC dc, INT x, INT y, UINT flags, const RECTL *lprc,
         sinEsc = 0;
     }
 
-    IntGdiGetDCOrg(dc, &org);
+    org = dc->ptlDCOrig;
 
     for (idx = 0; idx < count; idx++)
     {

diff --git a/reactos/subsystems/win32/win32k/objects/region.c b/reactos/subsystems/win32/win32k/objects/region.c
index ca52b08..1724c94 100644 (file)
--- a/reactos/subsystems/win32/win32k/objects/region.c
+++ b/reactos/subsystems/win32/win32k/objects/region.c
@@ -3705,7 +3705,7 @@ NtGdiGetRandomRgn(
     }
     if (iCode == SYSRGN)
     {
-        IntGdiGetDCOrg(pDC, &org);
+        org = pDC->ptlDCOrig;
         NtGdiOffsetRgn(hDest, org.x, org.y );
     }