[ros-diffs] [jimtabor] 37186: - Fix RealizationInfo, it should use DC font not cFont if 0.

jimtabor at svn.reactos.org jimtabor at svn.reactos.org
Tue Nov 4 14:05:48 CET 2008


Author: jimtabor
Date: Tue Nov  4 07:05:47 2008
New Revision: 37186

URL: http://svn.reactos.org/svn/reactos?rev=37186&view=rev
Log:
- Fix RealizationInfo, it should use DC font not cFont if 0.

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

Modified: trunk/reactos/subsystems/win32/win32k/objects/font.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/objects/font.c?rev=37186&r1=37185&r2=37186&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/font.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/font.c [iso-8859-1] Tue Nov  4 07:05:47 2008
@@ -586,6 +586,7 @@
   PDC pDc;
   PTEXTOBJ pTextObj;
   PFONTGDI pFontGdi;
+  PDC_ATTR Dc_Attr;
   BOOL Ret = FALSE;
   INT i = 0;
   REALIZATION_INFO ri;
@@ -596,7 +597,9 @@
      SetLastWin32Error(ERROR_INVALID_HANDLE);
      return 0;
   }
-  pTextObj = RealizeFontInit(hf);
+  Dc_Attr = pDc->pDc_Attr;
+  if(!Dc_Attr) Dc_Attr = &pDc->Dc_Attr;
+  pTextObj = RealizeFontInit(Dc_Attr->hlfntNew);
   pFontGdi = ObjToGDI(pTextObj->Font, FONT);
   TEXTOBJ_UnlockText(pTextObj);
   DC_UnlockDc(pDc);



More information about the Ros-diffs mailing list