[ros-diffs] [jimtabor] 28374: Removed NtGdiSetWorldTransform. Made the code info updates. Need to report from wine Path.c in win32k. I guess around in the next two weeks will be ok.

Author: jimtabor
Date: Fri Aug 17 02:08:02 2007
New Revision: 28374

URL: http://svn.reactos.org/svn/reactos?rev=28374&view=rev
Log:
Removed NtGdiSetWorldTransform. Made the code info updates. Need to report from wine
Path.c in win32k. I guess around in the next two weeks will be ok.

Modified:
    trunk/reactos/dll/win32/gdi32/gdi32.def
    trunk/reactos/include/reactos/win32k/ntgdibad.h
    trunk/reactos/subsystems/win32/win32k/objects/coord.c
    trunk/reactos/subsystems/win32/win32k/objects/path.c
    trunk/reactos/subsystems/win32/win32k/w32ksvc.db

Modified: trunk/reactos/dll/win32/gdi32/gdi32.def
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?…
==============================================================================
--- trunk/reactos/dll/win32/gdi32/gdi32.def (original)
+++ trunk/reactos/dll/win32/gdi32/gdi32.def Fri Aug 17 02:08:02 2007
@@ -469,7 +469,7 @@
 LineTo@12=NtGdiLineTo@12
 MaskBlt@48
 MirrorRgn@8
-ModifyWorldTransform@12=NtGdiModifyWorldTransform@12
+ModifyWorldTransform@12
 MoveToEx@16=NtGdiMoveToEx@16
 NamedEscape@32
 OffsetClipRgn@12=NtGdiOffsetClipRgn@12
@@ -580,7 +580,7 @@
 SetWinMetaFileBits@16
 SetWindowExtEx@16=NtGdiSetWindowExtEx@16
 SetWindowOrgEx@16=NtGdiSetWindowOrgEx@16
-SetWorldTransform@8=NtGdiSetWorldTransform@8
+SetWorldTransform@8
 StartDocA@8
 StartDocW@8
 StartFormPage@4

Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg…
==============================================================================
--- trunk/reactos/include/reactos/win32k/ntgdibad.h (original)
+++ trunk/reactos/include/reactos/win32k/ntgdibad.h Fri Aug 17 02:08:02 2007
@@ -775,14 +775,6 @@
 	LPPOINT	Point
 	);
 
-/* Use NtGdiModifyWorldTransform with MWT_MAX + 1; */
-BOOL
-STDCALL
-NtGdiSetWorldTransform (
-	HDC		hDC,
-	CONST LPXFORM	Xform
-	);
-
 /* Use NtGdiStretchDIBitsInternal. */
 INT
 STDCALL

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 (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/coord.c Fri Aug 17 02:08:02 2007
@@ -924,57 +924,5 @@
   return TRUE;
 }
 
-BOOL
-STDCALL
-NtGdiSetWorldTransform(HDC  hDC,
-                      CONST LPXFORM  XForm)
-{
-  PDC  dc;
-  NTSTATUS Status = STATUS_SUCCESS;
-
-  dc = DC_LockDc (hDC);
-  if ( !dc )
-  {
-    SetLastWin32Error(ERROR_INVALID_HANDLE);
-    return  FALSE;
-  }
-
-  if (!XForm)
-  {
-    DC_UnlockDc(dc);
-    /* Win doesn't set LastError */
-    return  FALSE;
-  }
-
-  /* Check that graphics mode is GM_ADVANCED */
-  if ( dc->Dc_Attr.iGraphicsMode != GM_ADVANCED )
-  {
-    DC_UnlockDc(dc);
-    return  FALSE;
-  }
-
-  _SEH_TRY
-  {
-    ProbeForRead(XForm,
-                 sizeof(XFORM),
-                 1);
-    dc->w.xformWorld2Wnd = *XForm;
-  }
-  _SEH_HANDLE
-  {
-    Status = _SEH_GetExceptionCode();
-  }
-  _SEH_END;
-
-  if(!NT_SUCCESS(Status))
-  {
-    DC_UnlockDc(dc);
-    return FALSE;
-  }
-
-  DC_UpdateXforms(dc);
-  DC_UnlockDc(dc);
-  return  TRUE;
-}
 
 /* EOF */

Modified: trunk/reactos/subsystems/win32/win32k/objects/path.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/path.c (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/path.c Fri Aug 17 02:08:02 2007
@@ -448,7 +448,7 @@
     /* Go to GM_ADVANCED temporarily to restore the world transform */
     graphicsMode = NtGdiGetGraphicsMode( dc->hSelf );
     NtGdiSetGraphicsMode( dc->hSelf, GM_ADVANCED );
-    NtGdiSetWorldTransform( dc->hSelf, &xform );
+    NtGdiModifyWorldTransform( dc->hSelf, &xform, MWT_MAX+1 );
     NtGdiSetGraphicsMode( dc->hSelf, graphicsMode );
     return TRUE;
   }

Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original)
+++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Fri Aug 17 02:08:02 2007
@@ -715,7 +715,6 @@
 NtGdiSetViewportOrgEx                   4
 NtGdiSetWindowExtEx                     4
 NtGdiSetWindowOrgEx                     4
-NtGdiSetWorldTransform                  2
 NtGdiStretchDIBits                      13
 NtGdiTranslateCharsetInfo               3
 NtGdiUpdateICMRegKey                    4