GetTextExtentPoint should include an inter character spacing set by

dlls/x11drv/xrender.c

@@ -1047,12 +1047,11 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag
 	SIZE tmpsz;
         deltas = HeapAlloc(GetProcessHeap(), 0, count * sizeof(INT));
 	for(i = 0; i < count; i++) {
-	    deltas[i] = char_extra;
 	    if(lpDx)
-	        deltas[i] += lpDx[i];
+	        deltas[i] = lpDx[i] + char_extra;
 	    else {
 	        GetTextExtentPointI(hdc, glyphs + i, 1, &tmpsz);
-		deltas[i] += tmpsz.cx;
+		deltas[i] = tmpsz.cx;
 	    }
 	}
     } else if(lpDx)

objects/font.c

@@ -974,6 +974,7 @@ BOOL WINAPI GetTextExtentPoint32W(
         ret = WineEngGetTextExtentPoint(dc->gdiFont, str, count, size);
 	size->cx = abs(INTERNAL_XDSTOWS(dc, size->cx));
 	size->cy = abs(INTERNAL_YDSTOWS(dc, size->cy));
+        size->cx += count * dc->charExtra;
     }
     else if(dc->funcs->pGetTextExtentPoint)
         ret = dc->funcs->pGetTextExtentPoint( dc->physDev, str, count, size );
@@ -1008,6 +1009,7 @@ BOOL WINAPI GetTextExtentPointI(
         ret = WineEngGetTextExtentPointI(dc->gdiFont, indices, count, size);
 	size->cx = abs(INTERNAL_XDSTOWS(dc, size->cx));
 	size->cy = abs(INTERNAL_YDSTOWS(dc, size->cy));
+        size->cx += count * dc->charExtra;
     }
     else if(dc->funcs->pGetTextExtentPoint) {
         FIXME("calling GetTextExtentPoint\n");