diff options
| author | marha <marha@users.sourceforge.net> | 2012-04-16 09:37:37 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-04-16 09:43:48 +0200 |
| commit | 00eae6f01bf11ec6a90dfc68e607b6a1a250a118 (patch) | |
| tree | b814d518076840b7433d02bc3b5957c1dd54de25 /xorg-server/hw/xwin/winfont.c | |
| parent | a50d2ee664302147942dd5ed6428f9bab9d4e76a (diff) | |
| parent | d6d3999ccb2cb72d55820770260172eccbbb68d7 (diff) | |
| download | vcxsrv-00eae6f01bf11ec6a90dfc68e607b6a1a250a118.tar.gz vcxsrv-00eae6f01bf11ec6a90dfc68e607b6a1a250a118.tar.bz2 vcxsrv-00eae6f01bf11ec6a90dfc68e607b6a1a250a118.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/Xext/securitysrv.h
xorg-server/glx/glxext.h
xorg-server/glx/indirect_reqsize.c
xorg-server/glx/indirect_size_get.c
xorg-server/hw/xwin/winclip.c
xorg-server/hw/xwin/winfont.c
xorg-server/hw/xwin/winglobals.c
xorg-server/hw/xwin/winglobals.h
xorg-server/hw/xwin/winmonitors.h
xorg-server/include/closestr.h
xorg-server/include/pixmapstr.h
xorg-server/include/servermd.h
xorg-server/include/site.h
xorg-server/include/windowstr.h
xorg-server/include/xkbstr.h
Diffstat (limited to 'xorg-server/hw/xwin/winfont.c')
| -rw-r--r-- | xorg-server/hw/xwin/winfont.c | 46 |
1 files changed, 24 insertions, 22 deletions
diff --git a/xorg-server/hw/xwin/winfont.c b/xorg-server/hw/xwin/winfont.c index 5a3011c0a..e7356486d 100644 --- a/xorg-server/hw/xwin/winfont.c +++ b/xorg-server/hw/xwin/winfont.c @@ -37,36 +37,38 @@ /* See Porting Layer Definition - p. 32 */ /* See mfb/mfbfont.c - mfbRealizeFont() - which is empty :) */ Bool -winRealizeFontNativeGDI (ScreenPtr pScreen, FontPtr pFont) +winRealizeFontNativeGDI(ScreenPtr pScreen, FontPtr pFont) { - BOOL fResult = TRUE; - winScreenPriv(pScreen); - - winDebug ("winRealizeFont (%p, %p)\n", pScreen, pFont); + BOOL fResult = TRUE; - WIN_UNWRAP(RealizeFont); - if (pScreen->RealizeFont) - fResult = (*pScreen->RealizeFont) (pScreen, pFont); - WIN_WRAP(RealizeFont, winRealizeFontNativeGDI); - - return fResult; + winScreenPriv(pScreen); + + winDebug("winRealizeFont (%p, %p)\n", pScreen, pFont); + + WIN_UNWRAP(RealizeFont); + if (pScreen->RealizeFont) + fResult = (*pScreen->RealizeFont) (pScreen, pFont); + WIN_WRAP(RealizeFont, winRealizeFontNativeGDI); + + return fResult; } /* See Porting Layer Definition - p. 32 */ /* See mfb/mfbfont.c - mfbUnrealizeFont() - which is empty :) */ Bool -winUnrealizeFontNativeGDI (ScreenPtr pScreen, FontPtr pFont) +winUnrealizeFontNativeGDI(ScreenPtr pScreen, FontPtr pFont) { - BOOL fResult = TRUE; - winScreenPriv(pScreen); - - winDebug ("winUnrealizeFont (%p, %p)\n", pScreen, pFont); + BOOL fResult = TRUE; + + winScreenPriv(pScreen); + + winDebug("winUnrealizeFont (%p, %p)\n", pScreen, pFont); + + WIN_UNWRAP(UnrealizeFont); + if (pScreen->UnrealizeFont) + fResult = (*pScreen->UnrealizeFont) (pScreen, pFont); + WIN_WRAP(UnrealizeFont, winUnrealizeFontNativeGDI); - WIN_UNWRAP(UnrealizeFont); - if (pScreen->UnrealizeFont) - fResult = (*pScreen->UnrealizeFont) (pScreen, pFont); - WIN_WRAP(UnrealizeFont, winUnrealizeFontNativeGDI); - - return fResult; + return fResult; } #endif |