[WIN32K] Don't call IntIsFontRenderingEnabled() while holding an exclusive GDI object...

Should fix GUI hangs.

svn path=/trunk/; revision=75582

diff --git a/reactos/win32ss/gdi/ntgdi/freetype.c b/reactos/win32ss/gdi/ntgdi/freetype.c
index 0c8fbdf..485f097 100644 (file)
--- a/reactos/win32ss/gdi/ntgdi/freetype.c
+++ b/reactos/win32ss/gdi/ntgdi/freetype.c
@@ -5111,6 +5111,10 @@ GreExtTextOutW(
         return FALSE;
     }
 
         return FALSE;
     }
 

+    /* NOTE: This function locks the screen DC, so it must never be called
+       with a DC already locked */
+    Render = IntIsFontRenderingEnabled();
+

     // TODO: Write test-cases to exactly match real Windows in different
     // bad parameters (e.g. does Windows check the DC or the RECT first?).
     dc = DC_LockDc(hDC);
     // TODO: Write test-cases to exactly match real Windows in different
     // bad parameters (e.g. does Windows check the DC or the RECT first?).
     dc = DC_LockDc(hDC);


@@ -5238,7 +5242,6 @@ GreExtTextOutW(
     EmuBold = (plf->lfWeight >= FW_BOLD && FontGDI->OriginalWeight <= FW_NORMAL);
     EmuItalic = (plf->lfItalic && !FontGDI->OriginalItalic);
 
     EmuBold = (plf->lfWeight >= FW_BOLD && FontGDI->OriginalWeight <= FW_NORMAL);
     EmuItalic = (plf->lfItalic && !FontGDI->OriginalItalic);
 

-    Render = IntIsFontRenderingEnabled();

     if (Render)
         RenderMode = IntGetFontRenderMode(plf);
     else
     if (Render)
         RenderMode = IntGetFontRenderMode(plf);
     else