[ros-diffs] [tkreuzer] 51984: [WIN32K] Get rid of TextIntRealizeFont

Author: tkreuzer
Date: Sat May 28 20:25:53 2011
New Revision: 51984

URL: http://svn.reactos.org/svn/reactos?rev=51984&view=rev
Log:
[WIN32K]
Get rid of TextIntRealizeFont

Modified:
    branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/misc.c
    branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/objects/dclife.c
    branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/objects/gdibatch.c

Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/misc.c
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst…
==============================================================================
--- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/misc.c [iso-8859-1]
(original)
+++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/misc.c [iso-8859-1] Sat
May 28 20:25:53 2011
@@ -181,14 +181,6 @@
     return STATUS_UNSUCCESSFUL;
 }
 
-NTSTATUS
-FASTCALL
-TextIntRealizeFont(HFONT FontHandle, PTEXTOBJ pTextObj)
-{
-    ASSERT(FALSE);
-    return -1;
-}
-
 DWORD
 FASTCALL
 IntGetCharDimensions(HDC hdc, PTEXTMETRICW ptm, PDWORD height)

Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/objects/dclife.c
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst…
==============================================================================
--- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/objects/dclife.c [iso-8859-1]
(original)
+++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/objects/dclife.c [iso-8859-1]
Sat May 28 20:25:53 2011
@@ -106,7 +106,6 @@
 void
 DC_InitHack(PDC pdc)
 {
-    TextIntRealizeFont(pdc->pdcattr->hlfntNew,NULL);
     pdc->pdcattr->iCS_CP = ftGdiGetTextCharsetInfo(pdc,NULL,0);
 
     /* This should never fail */

Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/objects/gdibatch.c
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst…
==============================================================================
--- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/objects/gdibatch.c
[iso-8859-1] (original)
+++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/objects/gdibatch.c
[iso-8859-1] Sat May 28 20:25:53 2011
@@ -117,24 +117,9 @@
         break;
      case GdiBCSelObj:
      {
-        PGDIBSOBJECT pgO;
-        PTEXTOBJ pNewFnt = NULL;
-
-        if (!dc) break;
-        pgO = (PGDIBSOBJECT) pHdr;
-
-        if (NT_SUCCESS(TextIntRealizeFont((HFONT)pgO->hgdiobj,NULL)))
-        {
-           /* LFONTOBJ use share and locking. */
-           pNewFnt = TEXTOBJ_LockText(pgO->hgdiobj);
-
-           dc->dclevel.plfnt = pNewFnt;
-           dc->hlfntCur = pgO->hgdiobj;
-           pdcattr->hlfntNew = pgO->hgdiobj;
-           pdcattr->ulDirty_ |= DIRTY_CHARSET;
-           pdcattr->ulDirty_ &= ~SLOW_WIDTHS;
-        }
-        if (pNewFnt) TEXTOBJ_UnlockText(pNewFnt);
+        //PGDIBSOBJECT pgO = (PGDIBSOBJECT) pHdr;
+        ASSERT(FALSE);
+
         break;
      }
      case GdiBCDelRgn: