[ros-diffs] [tkreuzer] 32731: remove a reference to GDIOBJ_AllocObjDepricated

Author: tkreuzer
Date: Thu Mar 20 19:19:50 2008
New Revision: 32731

URL: http://svn.reactos.org/svn/reactos?rev=3D32731&view=3Drev
Log:
remove a reference to GDIOBJ_AllocObjDepricated

Modified:
    trunk/reactos/subsystems/win32/win32k/objects/metafile.c

Modified: trunk/reactos/subsystems/win32/win32k/objects/metafile.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3=
2k/objects/metafile.c?rev=3D32731&r1=3D32730&r2=3D32731&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/reactos/subsystems/win32/win32k/objects/metafile.c (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/metafile.c Thu Mar 20 19:=
19:50 2008
@@ -230,23 +230,20 @@
           NtClose( Dc->hFile );
     }
 =

-  hmf =3D GDIOBJ_AllocObjDepricated(GdiHandleTable, GDI_OBJECT_TYPE_ENHMET=
AFILE);
-  if (hmf !=3D NULL)
+  phmf =3D GDIOBJ_AllocObjWithHandle(GdiHandleTable, GDI_OBJECT_TYPE_ENHME=
TAFILE);
+  if (phmf !=3D NULL)
   {
-     phmf =3D GDIOBJ_LockObj(GdiHandleTable, hmf, GDI_OBJECT_TYPE_ENHMETAF=
ILE);
-	 if (phmf !=3D NULL)
-	 {
-         if (Dc->hFile !=3D NULL)
-         {
-             phmf->on_disk =3D TRUE;
-	     }
-         else
-         {
-	         phmf->on_disk =3D FALSE;
-         }
-		 GDIOBJ_UnlockObjByPtr(GdiHandleTable, phmf);
-		 phmf->emh =3D Dc->emh;
-	 }
+    hmf =3D phmf->BaseObject.hHmgr;
+    if (Dc->hFile !=3D NULL)
+    {
+      phmf->on_disk =3D TRUE;
+    }
+    else
+    {
+      phmf->on_disk =3D FALSE;
+    }
+    phmf->emh =3D Dc->emh;
+    GDIOBJ_UnlockObjByPtr(GdiHandleTable, phmf);
   }
 =

   Dc->emh =3D NULL;  /* So it won't be deleted */