[ros-diffs] [jimtabor] 33509: Implement NtGdiSetVirtualResolution, SetSizeDevice and NtGdiScaleViewport/WindowExtEx. Getting ready to fix wine gdi mapping tests.

Author: jimtabor
Date: Tue May 13 18:26:02 2008
New Revision: 33509

URL: http://svn.reactos.org/svn/reactos?rev=33509&view=rev
Log:
Implement NtGdiSetVirtualResolution, SetSizeDevice and NtGdiScaleViewport/WindowExtEx.
Getting ready to fix wine gdi mapping tests.

Modified:
    trunk/reactos/subsystems/win32/win32k/include/coord.h
    trunk/reactos/subsystems/win32/win32k/objects/coord.c
    trunk/reactos/subsystems/win32/win32k/stubs/stubs.c

Modified: trunk/reactos/subsystems/win32/win32k/include/coord.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/include/coord.h [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/include/coord.h [iso-8859-1] Tue May 13 18:26:02
2008
@@ -31,4 +31,6 @@
                            CONST LPXFORM lpXForm,
                            DWORD Mode);
 
+VOID FASTCALL IntMirrorWindowOrg(PDC);
+
 #endif

Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] Tue May 13 18:26:02
2008
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id$
+/*
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -558,27 +558,167 @@
 BOOL
 STDCALL
 NtGdiScaleViewportExtEx(HDC  hDC,
-                             int  Xnum,
-                             int  Xdenom,
-                             int  Ynum,
-                             int  Ydenom,
-                             LPSIZE  Size)
-{
-   UNIMPLEMENTED;
-   return FALSE;
+                       int  Xnum,
+                     int  Xdenom,
+                       int  Ynum,
+                     int  Ydenom,
+                    LPSIZE pSize)
+{
+  PDC pDC;
+  PDC_ATTR pDc_Attr;
+  BOOL Ret = FALSE;
+  LONG X, Y;
+  
+  pDC = DC_LockDc(hDC);
+  if (!pDC)
+  {
+      SetLastWin32Error(ERROR_INVALID_HANDLE);
+      return FALSE;
+  }
+  pDc_Attr = pDC->pDc_Attr;
+  if(!pDc_Attr) pDc_Attr = &pDC->Dc_Attr;
+
+  if ( pSize )
+  {
+     NTSTATUS Status = STATUS_SUCCESS;
+
+     _SEH_TRY
+     {
+       ProbeForWrite(pSize,
+            sizeof(LPSIZE),
+                         1);
+
+       pSize->cx = pDc_Attr->szlViewportExt.cx;
+       pSize->cy = pDc_Attr->szlViewportExt.cy;
+     }
+     _SEH_HANDLE
+     {
+         Status = _SEH_GetExceptionCode();
+     }
+     _SEH_END;
+
+     if(!NT_SUCCESS(Status))
+     {
+        SetLastNtError(Status);
+        DC_UnlockDc(pDC);
+        return FALSE;
+     }
+  }
+
+  if (pDc_Attr->iMapMode > MM_TWIPS)
+  { 
+     if ( ( Xdenom ) && ( Ydenom ) )
+     {
+        X = Xnum * pDc_Attr->szlViewportExt.cx / Xdenom;
+        if ( X )
+        {
+           Y = Ynum * pDc_Attr->szlViewportExt.cy / Ydenom;
+           if ( Y )
+           {
+              pDc_Attr->szlViewportExt.cx = X; 
+              pDc_Attr->szlViewportExt.cy = Y;
+
+              IntMirrorWindowOrg(pDC);
+              
+              pDc_Attr->flXform |=
(PAGE_EXTENTS_CHANGED|INVALIDATE_ATTRIBUTES|DEVICE_TO_WORLD_INVALID);
+
+              if (pDc_Attr->iMapMode == MM_ISOTROPIC) IntFixIsotropicMapping(pDC);
+              DC_UpdateXforms(pDC);
+
+              Ret = TRUE;
+           }
+        }
+     }
+  }
+  else
+    Ret = TRUE;
+
+  DC_UnlockDc(pDC);
+  return Ret;
 }
 
 BOOL
 STDCALL
 NtGdiScaleWindowExtEx(HDC  hDC,
-                           int  Xnum,
-                           int  Xdenom,
-                           int  Ynum,
-                           int  Ydenom,
-                           LPSIZE  Size)
-{
-   UNIMPLEMENTED;
-   return FALSE;
+                     int  Xnum,
+                   int  Xdenom,
+                     int  Ynum,
+                   int  Ydenom,
+                  LPSIZE pSize)
+{
+  PDC pDC;
+  PDC_ATTR pDc_Attr;
+  BOOL Ret = FALSE;
+  LONG X, Y;
+  
+  pDC = DC_LockDc(hDC);
+  if (!pDC)
+  {
+      SetLastWin32Error(ERROR_INVALID_HANDLE);
+      return FALSE;
+  }
+  pDc_Attr = pDC->pDc_Attr;
+  if(!pDc_Attr) pDc_Attr = &pDC->Dc_Attr;
+
+  if ( pSize )
+  {
+     NTSTATUS Status = STATUS_SUCCESS;
+
+     _SEH_TRY
+     {
+       ProbeForWrite(pSize,
+            sizeof(LPSIZE),
+                         1);
+
+       X = pDc_Attr->szlWindowExt.cx;
+       if (pDc_Attr->dwLayout & LAYOUT_RTL) X = -X;
+       pSize->cx = X;
+       pSize->cy = pDc_Attr->szlWindowExt.cy;
+     }
+     _SEH_HANDLE
+     {
+         Status = _SEH_GetExceptionCode();
+     }
+     _SEH_END;
+
+     if(!NT_SUCCESS(Status))
+     {
+        SetLastNtError(Status);
+        DC_UnlockDc(pDC);
+        return FALSE;
+     }
+  }
+
+  if (pDc_Attr->iMapMode > MM_TWIPS)
+  { 
+     if (( Xdenom ) && ( Ydenom ))
+     {
+        X = Xnum * pDc_Attr->szlWindowExt.cx / Xdenom;
+        if ( X )
+        {
+           Y = Ynum * pDc_Attr->szlWindowExt.cy / Ydenom;
+           if ( Y )
+           {
+              pDc_Attr->szlWindowExt.cx = X;
+              pDc_Attr->szlWindowExt.cy = Y;
+
+              IntMirrorWindowOrg(pDC);
+              
+              pDc_Attr->flXform |=
(PAGE_EXTENTS_CHANGED|INVALIDATE_ATTRIBUTES|DEVICE_TO_WORLD_INVALID);
+
+              if (pDc_Attr->iMapMode == MM_ISOTROPIC) IntFixIsotropicMapping(pDC);
+              DC_UpdateXforms(pDC);
+
+              Ret = TRUE;
+           }
+        }
+     }
+  }
+  else
+    Ret = TRUE;
+
+  DC_UnlockDc(pDC);
+  return Ret;
 }
 
 int
@@ -1033,4 +1173,68 @@
   return TRUE;
 }
 
+/*
+ * @implemented
+ */
+BOOL
+APIENTRY
+NtGdiSetSizeDevice(
+    IN HDC hdc,
+    IN INT cxVirtualDevice,
+    IN INT cyVirtualDevice)
+{
+    PDC dc;
+    PDC_ATTR pDc_Attr;
+
+    if (!cxVirtualDevice ||
+        !cyVirtualDevice  ) return FALSE;
+
+    dc = DC_LockDc(hdc);
+    if (!dc) return FALSE;
+    
+    pDc_Attr = dc->pDc_Attr;
+    if(!pDc_Attr) pDc_Attr = &dc->Dc_Attr;
+
+    pDc_Attr->szlVirtualDeviceSize.cx = cxVirtualDevice;
+    pDc_Attr->szlVirtualDeviceSize.cy = cyVirtualDevice;
+
+//    DC_UpdateXforms(dc);    
+    DC_UnlockDc(dc);
+
+    return TRUE;
+}
+
+/*
+ * @implemented
+ */
+BOOL
+APIENTRY
+NtGdiSetVirtualResolution(
+    IN HDC hdc,
+    IN INT cxVirtualDevicePixel,
+    IN INT cyVirtualDevicePixel,
+    IN INT cxVirtualDeviceMm,
+    IN INT cyVirtualDeviceMm)
+{
+    PDC dc;
+    PDC_ATTR pDc_Attr;
+
+    // Need test types for zeros and non zeros
+
+    dc = DC_LockDc(hdc);
+    if (!dc) return FALSE;
+    
+    pDc_Attr = dc->pDc_Attr;
+    if(!pDc_Attr) pDc_Attr = &dc->Dc_Attr;
+
+    pDc_Attr->szlVirtualDevicePixel.cx = cxVirtualDevicePixel;
+    pDc_Attr->szlVirtualDevicePixel.cy = cyVirtualDevicePixel;
+    pDc_Attr->szlVirtualDeviceMm.cx = cxVirtualDeviceMm;
+    pDc_Attr->szlVirtualDeviceMm.cy = cyVirtualDeviceMm;
+
+//    DC_UpdateXforms(dc);    
+    DC_UnlockDc(dc);
+    return TRUE;
+}
+
 /* EOF */

Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/st…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/stubs/stubs.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/stubs/stubs.c [iso-8859-1] Tue May 13 18:26:02
2008
@@ -2559,37 +2559,7 @@
     return 0;
 }
 
- /*
- * @unimplemented
- */
-BOOL
-APIENTRY
-NtGdiSetSizeDevice(
-    IN HDC hdc,
-    IN INT cxVirtualDevice,
-    IN INT cyVirtualDevice)
-{
-    UNIMPLEMENTED;
-    return FALSE;
-}
-
- /*
- * @unimplemented
- */
-BOOL
-APIENTRY
-NtGdiSetVirtualResolution(
-    IN HDC hdc,
-    IN INT cxVirtualDevicePixel,
-    IN INT cyVirtualDevicePixel,
-    IN INT cxVirtualDeviceMm,
-    IN INT cyVirtualDeviceMm)
-{
-    UNIMPLEMENTED;
-    return FALSE;
-}
-
- /*
+/*
  * @unimplemented
  */
 INT