Module: wine Branch: master Commit: 344cf57f1bb569c7593d21d14e9effb493457ff0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=344cf57f1bb569c7593d21d14e...
Author: Alexandre Julliard julliard@winehq.org Date: Thu Oct 8 12:10:59 2009 +0200
winex11: Rename the XRENDERINFO type to make it clear it's a pointer.
---
dlls/winex11.drv/x11drv.h | 4 ++-- dlls/winex11.drv/xrender.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 3faffdf..eee5849 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -138,7 +138,7 @@ typedef struct /* X physical font */ typedef UINT X_PHYSFONT;
-typedef struct tagXRENDERINFO *XRENDERINFO; +struct xrender_info;
/* X physical device */ typedef struct @@ -163,7 +163,7 @@ typedef struct Drawable gl_drawable; Pixmap pixmap; /* Pixmap for a GLXPixmap gl_drawable */ int gl_copy; - XRENDERINFO xrender; + struct xrender_info *xrender; } X11DRV_PDEVICE;
diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index d4474dd..8b2f0dd 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -140,7 +140,7 @@ typedef struct INT next; } gsCacheEntry;
-struct tagXRENDERINFO +struct xrender_info { int cache_index; Picture pict; @@ -207,11 +207,11 @@ static CRITICAL_SECTION xrender_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; #define NATIVE_BYTE_ORDER LSBFirst #endif
-static XRENDERINFO get_xrender_info(X11DRV_PDEVICE *physDev) +static struct xrender_info *get_xrender_info(X11DRV_PDEVICE *physDev) { if(!physDev->xrender) { - physDev->xrender = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct tagXRENDERINFO)); + physDev->xrender = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*physDev->xrender));
if(!physDev->xrender) { @@ -812,7 +812,7 @@ void X11DRV_XRender_Finalize(void) BOOL X11DRV_XRender_SelectFont(X11DRV_PDEVICE *physDev, HFONT hfont) { LFANDSIZE lfsz; - XRENDERINFO info; + struct xrender_info *info;
GetObjectW(hfont, sizeof(lfsz.lf), &lfsz.lf); TRACE("h=%d w=%d weight=%d it=%d charset=%d name=%s\n",