[ros-diffs] [jimtabor] 37159: - Add new function for locking text font objects when realized. This is for batching support. - Batching works for selected fonts, due to a system initialization bug this is disabled. - Miscellaneous changes and updates.

Author: jimtabor
Date: Sun Nov  2 23:38:02 2008
New Revision: 37159

URL: http://svn.reactos.org/svn/reactos?rev=37159&view=rev
Log:
- Add new function for locking text font objects when realized. This is for batching
support.
- Batching works for selected fonts, due to a system initialization bug this is disabled.
- Miscellaneous changes and updates.


Modified:
    trunk/reactos/dll/win32/gdi32/objects/dc.c
    trunk/reactos/subsystems/win32/win32k/include/text.h
    trunk/reactos/subsystems/win32/win32k/objects/dc.c
    trunk/reactos/subsystems/win32/win32k/objects/font.c
    trunk/reactos/subsystems/win32/win32k/objects/freetype.c
    trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c
    trunk/reactos/subsystems/win32/win32k/objects/text.c

Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/dc…
==============================================================================
--- trunk/reactos/dll/win32/gdi32/objects/dc.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/gdi32/objects/dc.c [iso-8859-1] Sun Nov  2 23:38:02 2008
@@ -1535,7 +1535,7 @@
              HGDIOBJ hGdiObj)
 {
     PDC_ATTR pDc_Attr;
-//    HGDIOBJ hOldObj = NULL;
+    HGDIOBJ hOldObj = NULL;
 //    PTEB pTeb;
 
     if(!GdiGetHandleUserData(hDC, GDI_OBJECT_TYPE_DC, (PVOID)&pDc_Attr))
@@ -1580,10 +1580,15 @@
             return NtGdiSelectPen(hDC, hGdiObj);
 
         case GDI_OBJECT_TYPE_FONT:
+            hOldObj = pDc_Attr->hlfntNew;
+            if (hOldObj == hGdiObj) return hOldObj;
 #if 0
+            pDc_Attr->ulDirty_ &= ~SLOW_WIDTHS;
+            pDc_Attr->ulDirty_ |= DIRTY_CHARSET;
+            pDc_Attr->hlfntNew = hGdiObj;
             pTeb = NtCurrentTeb();
             if (((pTeb->GdiTebBatch.HDC == 0) ||
-                 (pTeb->GdiTebBatch.HDC == (ULONG)hDC)) &&
+                 (pTeb->GdiTebBatch.HDC == hDC)) &&
                 ((pTeb->GdiTebBatch.Offset + sizeof(GDIBSOBJECT)) <=
GDIBATCHBUFSIZE) &&
                (!(pDc_Attr->ulDirty_ & DC_DIBSECTION)))
             {
@@ -1594,14 +1599,15 @@
               pgO->hgdiobj = hGdiObj;
 
               pTeb->GdiTebBatch.Offset += sizeof(GDIBSOBJECT);
-              pTeb->GdiTebBatch.HDC = (ULONG)hDC;
+              pTeb->GdiTebBatch.HDC = hDC;
               pTeb->GdiBatchCount++;
               if (pTeb->GdiBatchCount >= GDI_BatchLimit) NtGdiFlush();
-              return pDc_Attr->hlfntNew;
+              return hOldObj;
             }
 #endif
             // default for select object font
             return NtGdiSelectFont(hDC, hGdiObj);
+
 #if 0
         case GDI_OBJECT_TYPE_METADC:
             return MFDRV_SelectObject( hDC, hGdiObj); 

Modified: trunk/reactos/subsystems/win32/win32k/include/text.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/include/text.h [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/include/text.h [iso-8859-1] Sun Nov  2 23:38:02
2008
@@ -54,6 +54,8 @@
   ULONG     acFaceNameGlyphs[8];
 } STRGDI, *PSTRGDI;
 
+#define TEXTOBJECT_INIT 0x00010000
+
 /* GDI logical font object */
 typedef struct
 {
@@ -62,9 +64,13 @@
    BASEOBJECT    BaseObject;
    LFTYPE        lft;
    FLONG         fl;
-   ENUMLOGFONTEXDVW logfont;  //LOGFONTW   logfont;
    FONTOBJ      *Font;
-   BOOLEAN       Initialized; /* Don't reinitialize for each DC */
+   WCHAR         FullName[LF_FULLFACESIZE];
+   WCHAR         Style[LF_FACESIZE];
+   WCHAR         FaceName[LF_FACESIZE];
+   DWORD         dwOffsetEndArray;
+// Fixed:
+   ENUMLOGFONTEXDVW logfont;
 } TEXTOBJ, *PTEXTOBJ;
 
 /*  Internal interface  */
@@ -76,7 +82,8 @@
 #define  TEXTOBJ_LockText(hBMObj) ((PTEXTOBJ) GDIOBJ_LockObj ((HGDIOBJ) hBMObj,
GDI_OBJECT_TYPE_FONT))
 #define  TEXTOBJ_UnlockText(pBMObj) GDIOBJ_UnlockObjByPtr ((POBJ)pBMObj)
 
-NTSTATUS FASTCALL TextIntRealizeFont(HFONT FontHandle);
+PTEXTOBJ FASTCALL RealizeFontInit(HFONT);
+NTSTATUS FASTCALL TextIntRealizeFont(HFONT,PTEXTOBJ);
 NTSTATUS FASTCALL TextIntCreateFontIndirect(CONST LPLOGFONTW lf, HFONT *NewFont);
 BOOL FASTCALL InitFontSupport(VOID);
 BOOL FASTCALL IntIsFontRenderingEnabled(VOID);

Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] Sun Nov  2 23:38:02
2008
@@ -2216,7 +2216,7 @@
     if(!pDc_Attr) pDc_Attr = &pDC->Dc_Attr;
 
     /* FIXME: what if not successful? */
-    if(NT_SUCCESS(TextIntRealizeFont((HFONT)hFont)))
+    if(NT_SUCCESS(TextIntRealizeFont((HFONT)hFont,NULL)))
     {
         hOrgFont = pDc_Attr->hlfntNew;
         pDc_Attr->hlfntNew = hFont;
@@ -2668,7 +2668,7 @@
   Dc_Attr->hpen = NtGdiGetStockObject( BLACK_PEN );
 ////
   Dc_Attr->hlfntNew = NtGdiGetStockObject(SYSTEM_FONT);
-  TextIntRealizeFont(Dc_Attr->hlfntNew);
+  TextIntRealizeFont(Dc_Attr->hlfntNew,NULL);
 
   NewDC->DcLevel.hpal = NtGdiGetStockObject(DEFAULT_PALETTE);
   NewDC->DcLevel.laPath.eMiterLimit = 10.0;

Modified: trunk/reactos/subsystems/win32/win32k/objects/font.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/font.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/font.c [iso-8859-1] Sun Nov  2 23:38:02
2008
@@ -55,6 +55,27 @@
   return Count;
 }
 
+PTEXTOBJ
+FASTCALL
+RealizeFontInit(HFONT hFont)
+{
+  NTSTATUS Status = STATUS_SUCCESS;
+  PTEXTOBJ pTextObj;
+
+  pTextObj = TEXTOBJ_LockText(hFont);
+
+  if ( pTextObj && !pTextObj->fl & TEXTOBJECT_INIT)
+  {
+     Status = TextIntRealizeFont(hFont, pTextObj);
+     if (!NT_SUCCESS(Status))
+     {
+        TEXTOBJ_UnlockText(pTextObj);
+        return NULL;
+     }
+  }
+  return pTextObj;
+}
+
 /** Functions ******************************************************************/
 
 INT
@@ -146,7 +167,7 @@
   if(!Dc_Attr) Dc_Attr = &Dc->Dc_Attr;
 
   hFont = Dc_Attr->hlfntNew;
-  TextObj = TEXTOBJ_LockText(hFont);
+  TextObj = RealizeFontInit(hFont);
   DC_UnlockDc(Dc);
 
   if (TextObj == NULL)
@@ -193,7 +214,7 @@
   if(!Dc_Attr) Dc_Attr = &pDc->Dc_Attr;
 
   hFont = Dc_Attr->hlfntNew;
-  TextObj = TEXTOBJ_LockText(hFont);
+  TextObj = RealizeFontInit(hFont);
         
   if ( TextObj == NULL)
   {
@@ -363,7 +384,7 @@
   Dc_Attr = dc->pDc_Attr;
   if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr;
   hFont = Dc_Attr->hlfntNew;
-  TextObj = TEXTOBJ_LockText(hFont);
+  TextObj = RealizeFontInit(hFont);
   DC_UnlockDc(dc);
   if (TextObj == NULL)
     {
@@ -543,7 +564,7 @@
   }
   hNewFont = TextObj->BaseObject.hHmgr;
 
-  TextObj->lft = cjElfw;
+  TextObj->lft = lft;
   TextObj->fl  = fl;
   RtlCopyMemory (&TextObj->logfont, &SafeLogfont, sizeof(ENUMLOGFONTEXDVW));
 

Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] Sun Nov  2
23:38:02 2008
@@ -1488,7 +1488,7 @@
   eM11 = xForm.eM11;
   
   hFont = Dc_Attr->hlfntNew;
-  TextObj = TEXTOBJ_LockText(hFont);
+  TextObj = RealizeFontInit(hFont);
 
   if (!TextObj)
    {
@@ -2249,7 +2249,7 @@
   Dc_Attr = Dc->pDc_Attr;
   if(!Dc_Attr) Dc_Attr = &Dc->Dc_Attr;
   hFont = Dc_Attr->hlfntNew;
-  TextObj = TEXTOBJ_LockText(hFont);
+  TextObj = RealizeFontInit(hFont);
 
   if ( TextObj == NULL)
     {
@@ -2465,7 +2465,7 @@
   }
   Dc_Attr = dc->pDc_Attr;
   if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr;
-  TextObj = TEXTOBJ_LockText(Dc_Attr->hlfntNew);
+  TextObj = RealizeFontInit(Dc_Attr->hlfntNew);
   if (NULL != TextObj)
     {
       FontGDI = ObjToGDI(TextObj->Font, FONT);
@@ -2743,7 +2743,7 @@
 
 NTSTATUS
 FASTCALL
-TextIntRealizeFont(HFONT FontHandle)
+TextIntRealizeFont(HFONT FontHandle, PTEXTOBJ pTextObj)
 {
   NTSTATUS Status = STATUS_SUCCESS;
   PTEXTOBJ TextObj;
@@ -2751,21 +2751,26 @@
   PW32PROCESS Win32Process;
   UINT MatchScore;
 
-  TextObj = TEXTOBJ_LockText(FontHandle);
-  if (NULL == TextObj)
-    {
-      return STATUS_INVALID_HANDLE;
-    }
-
-  if (TextObj->Initialized)
-    {
-      TEXTOBJ_UnlockText(TextObj);
-      return STATUS_SUCCESS;
-    }
+  if (!pTextObj)
+  {
+     TextObj = TEXTOBJ_LockText(FontHandle);
+     if (NULL == TextObj)
+     {
+       return STATUS_INVALID_HANDLE;
+     }
+
+     if (TextObj->fl & TEXTOBJECT_INIT)
+     {
+       TEXTOBJ_UnlockText(TextObj);
+       return STATUS_SUCCESS;
+     }
+  }
+  else
+     TextObj = pTextObj;
 
   if (! RtlCreateUnicodeString(&FaceName,
TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfFaceName))
     {
-      TEXTOBJ_UnlockText(TextObj);
+      if (!pTextObj) TEXTOBJ_UnlockText(TextObj);
       return STATUS_NO_MEMORY;
     }
   SubstituteFontFamily(&FaceName, 0);
@@ -2803,12 +2808,12 @@
       FontGdi->flRealizedType = 0;
       FontGdi->Underline = TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfUnderline
? 0xff : 0;
       FontGdi->StrikeOut = TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfStrikeOut
? 0xff : 0;
-      TextObj->Initialized = TRUE;
+      TextObj->fl |= TEXTOBJECT_INIT;
       Status = STATUS_SUCCESS;
     }
 
   RtlFreeUnicodeString(&FaceName);
-  TEXTOBJ_UnlockText(TextObj);
+  if (!pTextObj) TEXTOBJ_UnlockText(TextObj);
 
   ASSERT((NT_SUCCESS(Status) ^ (NULL == TextObj->Font)) != 0);
 
@@ -3040,7 +3045,7 @@
 }
 
 
-////////////////
+//////////////////
 //
 // Functions needing sorting.
 //
@@ -3343,7 +3348,7 @@
       }
    }
 
-   TextObj = TEXTOBJ_LockText(Dc_Attr->hlfntNew);
+   TextObj = RealizeFontInit(Dc_Attr->hlfntNew);
    if(TextObj == NULL)
    {
       goto fail;
@@ -3796,7 +3801,7 @@
    Dc_Attr = dc->pDc_Attr;
    if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr;
    hFont = Dc_Attr->hlfntNew;
-   TextObj = TEXTOBJ_LockText(hFont);
+   TextObj = RealizeFontInit(hFont);
    DC_UnlockDc(dc);
 
    if (TextObj == NULL)
@@ -3964,7 +3969,7 @@
    Dc_Attr = dc->pDc_Attr;
    if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr;
    hFont = Dc_Attr->hlfntNew;
-   TextObj = TEXTOBJ_LockText(hFont);
+   TextObj = RealizeFontInit(hFont);
    DC_UnlockDc(dc);
 
    if (TextObj == NULL)
@@ -4076,7 +4081,7 @@
   Dc_Attr = dc->pDc_Attr;
   if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr;
   hFont = Dc_Attr->hlfntNew;
-  TextObj = TEXTOBJ_LockText(hFont);
+  TextObj = RealizeFontInit(hFont);
   DC_UnlockDc(dc);
   if (!TextObj)
    {

Modified: trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c [iso-8859-1] Sun Nov  2
23:38:02 2008
@@ -64,6 +64,7 @@
 GdiFlushUserBatch(PDC dc, PGDIBATCHHDR pHdr)
 {
   PDC_ATTR Dc_Attr = NULL;
+  UserEnterExclusive();
   if (dc)
   {
     Dc_Attr = dc->pDc_Attr;
@@ -95,8 +96,8 @@
         PGDIBSOBJECT pgO;
         if(!dc) break;
         pgO = (PGDIBSOBJECT) pHdr;
-        if(NT_SUCCESS(TextIntRealizeFont((HFONT) pgO->hgdiobj)))
-                      Dc_Attr->hlfntNew = (HFONT) pgO->hgdiobj;
+        TextIntRealizeFont((HFONT) pgO->hgdiobj, NULL);
+        Dc_Attr->ulDirty_ &= ~(DIRTY_CHARSET);
      }
      case GdiBCDelObj:
      case GdiBCDelRgn:
@@ -108,7 +109,7 @@
      default:
         break;
   }
-
+  UserLeave();
   return pHdr->Size; // Return the full size of the structure.
 }
 

Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] Sun Nov  2 23:38:02
2008
@@ -209,7 +209,7 @@
     }
   Dc_Attr = dc->pDc_Attr;
   if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr;
-  TextObj = TEXTOBJ_LockText(Dc_Attr->hlfntNew);
+  TextObj = RealizeFontInit(Dc_Attr->hlfntNew);
   if ( TextObj )
   {
     Result = TextIntGetTextExtentPoint(dc, TextObj, String, Count, MaxExtent,
@@ -339,7 +339,7 @@
    hFont = Dc_Attr->hlfntNew;
    DC_UnlockDc(Dc);
 
-   TextObj = TEXTOBJ_LockText(hFont);
+   TextObj = RealizeFontInit(hFont);
    ASSERT(TextObj != NULL);
    Count = min(Count,
wcslen(TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfFaceName));
    Status = MmCopyToCaller(FaceName,
TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfFaceName, Count * sizeof(WCHAR));