Jeff Latimer : usp10: ScriptTextOut updated to reflect that it must have a hdc passed to it.

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: 8bdeffa4efc12718aaacb61921d427a98da73dcc
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=8bdeffa4efc12718aaacb619...

Author: Jeff Latimer 
Date:   Fri Jun  9 20:06:51 2006 +1000

usp10: ScriptTextOut updated to reflect that it must have a hdc passed to it.

---

dlls/usp10/tests/usp10.c |   18 ++++++++++--------
 dlls/usp10/usp10.c       |   25 ++++++++++---------------
 2 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c
index f65a1fa..cbaf44a 100644
--- a/dlls/usp10/tests/usp10.c
+++ b/dlls/usp10/tests/usp10.c
@@ -363,13 +363,13 @@ void test_ScriptTextOut(void)
     int             cMaxItems;
     SCRIPT_ITEM     pItem[255];
     int             pcItems;
-    WCHAR           TestItem1[6] = {'T', 'e', 's', 't', 0x0166, 0}; 
+    WCHAR           TestItem1[6] = {'T', 'e', 's', 't', 'a', 0};

SCRIPT_CACHE    psc;
     int             cChars;
     int             cMaxGlyphs;
     unsigned short  pwOutGlyphs1[256];
-    unsigned short  pwLogClust[256];
+    WORD            pwLogClust[256];
     SCRIPT_VISATTR  psva[256];
     int             pcGlyphs;
     int             piAdvance[256];
@@ -422,7 +422,8 @@ void test_ScriptTextOut(void)
         ok (psc != NULL, "psc should not be null and have SCRIPT_CACHE buffer address\n");
         ok (pcGlyphs == cChars, "Chars in (%d) should equal Glyphs out (%d)\n", cChars, pcGlyphs);
         if (hr ==0) {
-            hr = ScriptPlace(NULL, &psc, pwOutGlyphs1, pcGlyphs, psva, &pItem[0].a, piAdvance,
+            /* Note hdc is needed as glyph info is not yet in psc                  */
+            hr = ScriptPlace(hdc, &psc, pwOutGlyphs1, pcGlyphs, psva, &pItem[0].a, piAdvance,
                              pGoffset, pABC);
             ok (hr == 0, "Should return 0 not (%08x)\n", (unsigned int) hr);
             ScriptFreeCache(&psc);              /* Get rid of psc for next test set */
@@ -444,25 +445,26 @@ void test_ScriptTextOut(void)
                                     "got %08x\n", (unsigned int)hr);
             ok( psc == NULL, "Expected psc to be NULL, got %p\n", psc);

-            /* Set psc to NULL, to be able to check if a pointer is returned in psc */
+            /* Set psc to NULL, to be able to check if a pointer is returned in psc
+             * hdc is required for this one rather than the usual optional          */
             psc = NULL;
             hr = ScriptTextOut(NULL, &psc, 0, 0, 0, NULL, &pItem[0].a, NULL, 0, pwOutGlyphs1, pcGlyphs,
                                piAdvance, NULL, pGoffset);
-            ok( hr == E_PENDING, "(NULL,&psc,), expected E_PENDING, got %08x\n", (unsigned int)hr);
+            ok( hr == E_INVALIDARG, "(NULL,&psc,), expected E_INVALIDARG, got %08x\n", (unsigned int)hr);
             ok( psc == NULL, "Expected psc to be NULL, got %p\n", psc);

-            /* Se that is gets a psc and that returns 0 status */
+            /* Set that is gets a psc and that returns 0 status */
             hr = ScriptTextOut(hdc, &psc, 0, 0, 0, NULL, &pItem[0].a, NULL, 0, pwOutGlyphs1, pcGlyphs,
                                piAdvance, NULL, pGoffset);
             ok (hr == 0, "ScriptTextOut should return 0 not (%08x)\n", (unsigned int) hr);
             ok (psc != NULL, "psc should not be null and have SCRIPT_CACHE buffer address\n");

-            /* Test Rect Rgn is acceptable and that it works without hdc */
+            /* Test Rect Rgn is acceptable */
             rect.top = 10;
             rect.bottom = 20;
             rect.left = 10;
             rect.right = 40;
-            hr = ScriptTextOut(NULL, &psc, 0, 0, 0, &rect, &pItem[0].a, NULL, 0, pwOutGlyphs1, pcGlyphs,
+            hr = ScriptTextOut(hdc, &psc, 0, 0, 0, &rect, &pItem[0].a, NULL, 0, pwOutGlyphs1, pcGlyphs,
                                piAdvance, NULL, pGoffset);
             ok (hr == 0, "ScriptTextOut should return 0 not (%08x)\n", (unsigned int) hr);
             ok (psc != NULL, "psc should not be null and have SCRIPT_CACHE buffer address\n");
diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c
index 9919658..4bf7031 100644
--- a/dlls/usp10/usp10.c
+++ b/dlls/usp10/usp10.c
@@ -604,23 +604,18 @@ HRESULT WINAPI ScriptTextOut(const HDC h
          hdc, psc, x, y, fuOptions, lprc, psa, pwcReserved, iReserved, pwGlyphs, cGlyphs,
          piAdvance, piJustify, pGoffset);

-    if  (!psc || !piAdvance || !psa || !pwGlyphs)
+    if  (!hdc || !psc || !piAdvance || !psa || !pwGlyphs)         /* hdc is mandatory                 */
         return E_INVALIDARG;

-    if  (!hdc && !*psc) {
-        TRACE("No Script_Cache (psc) and no hdc. Ask for one. Hdc=%p, psc=%p\n", hdc, *psc);
-	return E_PENDING;
-    }   else 
-        if  (hdc && !*psc) {
-            pScriptcache = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(Scriptcache) );
-            pScriptcache->hdc = hdc;
-            phdc = hdc;
-            *psc = pScriptcache;
-        }   else
-            if  (*psc) {
-                pScriptcache = *psc;
-                phdc = pScriptcache->hdc;
-            }
+    if  (!*psc) {
+        pScriptcache = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(Scriptcache) );
+        pScriptcache->hdc = hdc;
+        phdc = hdc;
+        *psc = pScriptcache;
+    } else {
+        pScriptcache = *psc;
+        phdc = pScriptcache->hdc;
+    }

fuOptions &= ETO_CLIPPED + ETO_OPAQUE;
     if  (!psa->fNoGlyphIndex)                                     /* Have Glyphs?                      */