Paul Vriens : usp10: Remove an unneeded check.

Alexandre Julliard julliard at winehq.org
Fri Apr 10 08:10:14 CDT 2009


Module: wine
Branch: master
Commit: 0af0bafd6ae40f9832d9c630c24a6696ac284631
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=0af0bafd6ae40f9832d9c630c24a6696ac284631

Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date:   Thu Apr  9 21:31:07 2009 +0200

usp10: Remove an unneeded check.

---

 dlls/usp10/usp10.c |   25 +++++++++++--------------
 1 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c
index fc2f8e9..21c74e8 100644
--- a/dlls/usp10/usp10.c
+++ b/dlls/usp10/usp10.c
@@ -1318,21 +1318,18 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars,
         for (i = 0; i < cChars; i++) pwOutGlyphs[i] = pwcChars[i];
     }
 
-    if (psva)
+    /* set up a valid SCRIPT_VISATTR and LogClust for each char in this run */
+    for (i = 0; i < cChars; i++)
     {
-        /* set up a valid SCRIPT_VISATTR and LogClust for each char in this run */
-        for (i = 0; i < cChars; i++)
-        {
-            /* FIXME: set to better values */
-            psva[i].uJustification = (pwcChars[i] == ' ') ? SCRIPT_JUSTIFY_BLANK : SCRIPT_JUSTIFY_CHARACTER;
-            psva[i].fClusterStart  = 1;
-            psva[i].fDiacritic     = 0;
-            psva[i].fZeroWidth     = 0;
-            psva[i].fReserved      = 0;
-            psva[i].fShapeReserved = 0;
-
-            if (pwLogClust) pwLogClust[i] = i;
-        }
+        /* FIXME: set to better values */
+        psva[i].uJustification = (pwcChars[i] == ' ') ? SCRIPT_JUSTIFY_BLANK : SCRIPT_JUSTIFY_CHARACTER;
+        psva[i].fClusterStart  = 1;
+        psva[i].fDiacritic     = 0;
+        psva[i].fZeroWidth     = 0;
+        psva[i].fReserved      = 0;
+        psva[i].fShapeReserved = 0;
+
+        if (pwLogClust) pwLogClust[i] = i;
     }
     return S_OK;
 }




More information about the wine-cvs mailing list