commit f7a4936fc4a6f4f9a5120579aed9a923582160e3
author Hans Leidekker <hans@meelstraat.net> Thu Sep 03 14:50:17 2009 +0200
committer Alexandre Julliard <julliard@winehq.org> Tue Sep 08 12:12:18 2009 +0200
tree bb02cc243cb7ad3bedc4af2af27017adb8c92a28
parent 70241904b9efacab9fb6c7d8701b1cfdb86f49f7

usp10: Make tests pass on Win7. Conform to the more recent behavior.

dlls/usp10/usp10.c

diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c
index 21c74e8..e1c79e6 100644
--- a/dlls/usp10/usp10.c
+++ b/dlls/usp10/usp10.c
@@ -1298,6 +1298,7 @@
 
     *pcGlyphs = cChars;
     if ((hr = init_script_cache(hdc, psc)) != S_OK) return hr;
+    if (!pwLogClust) return E_FAIL;
 
     if ((get_cache_pitch_family(psc) & TMPF_TRUETYPE) && !psa->fNoGlyphIndex)
     {
@@ -1329,7 +1330,7 @@
         psva[i].fReserved      = 0;
         psva[i].fShapeReserved = 0;
 
-        if (pwLogClust) pwLogClust[i] = i;
+        pwLogClust[i] = i;
     }
     return S_OK;
 }
@@ -1366,6 +1367,7 @@
 
     if (!psva) return E_INVALIDARG;
     if ((hr = init_script_cache(hdc, psc)) != S_OK) return hr;
+    if (!pGoffset) return E_FAIL;
 
     if (pABC) memset(pABC, 0, sizeof(ABC));
     for (i = 0; i < cGlyphs; i++)
@@ -1394,7 +1396,7 @@
             pABC->abcC += abc.abcC;
         }
         /* FIXME: set to more reasonable values */
-        if (pGoffset)  pGoffset[i].du = pGoffset[i].dv = 0;
+        pGoffset[i].du = pGoffset[i].dv = 0;
         if (piAdvance) piAdvance[i] = abc.abcA + abc.abcB + abc.abcC;
     }
 
@@ -1527,6 +1529,7 @@
 
     TRACE("(%p, %p, 0x%04x, %p)\n", hdc, psc, glyph, abc);
 
+    if (!abc) return E_INVALIDARG;
     if ((hr = init_script_cache(hdc, psc)) != S_OK) return hr;
 
     if (!get_cache_glyph_widths(psc, glyph, abc))