wine/dlls/x11drv/xrender.c

[Uwe Bonnes]

Changelog:
	wine/dlls/x11drv/xrender.c: get_gasp_flags()
	Don't use heapalleced pointer for other purpose

-- 
Uwe Bonnes                bon at elektron.ikp.physik.tu-darmstadt.de

Institut fuer Kernphysik  Schlossgartenstrasse 9  64289 Darmstadt
--------- Tel. 06151 162516 -------- Fax. 06151 164321 ----------
Index: wine/dlls/x11drv/xrender.c
===================================================================
RCS file: /home/wine/wine/dlls/x11drv/xrender.c,v
retrieving revision 1.72
diff -u -w -r1.72 xrender.c
--- wine/dlls/x11drv/xrender.c	12 Sep 2005 11:11:30 -0000	1.72
+++ wine/dlls/x11drv/xrender.c	19 Sep 2005 12:12:10 -0000
@@ -425,7 +425,7 @@
 static BOOL get_gasp_flags(X11DRV_PDEVICE *physDev, WORD *flags)
 {
     DWORD size;
-    WORD *gasp;
+    WORD *gasp, *pWord;
     WORD num_recs;
     DWORD ppem;
     TEXTMETRICW tm;
@@ -442,15 +442,15 @@
     GetTextMetricsW(physDev->hdc, &tm);
     ppem = abs(X11DRV_YWStoDS(physDev, tm.tmAscent + tm.tmDescent - tm.tmInternalLeading));
 
-    gasp++;
-    num_recs = get_be_word(*gasp);
-    gasp++;
+    pWord = gasp++;
+    num_recs = get_be_word(*pWord);
+    pWord++;
     while(num_recs--)
     {
-        *flags = get_be_word(*(gasp + 1));
-        if(ppem <= get_be_word(*gasp))
+        *flags = get_be_word(*(pWord + 1));
+        if(ppem <= get_be_word(*pWord))
             break;
-        gasp += 2;
+        pWord += 2;
     }
     TRACE("got flags %04x for ppem %ld\n", *flags, ppem);