[ros-diffs] [cfinck] 33749: Sync usp10 with Wine again, fixes the corrupted text display in AbiWord. Thanks to CMan for regression-testing! Also I removed Magnus' change in r33700. If this is really required, please name the reason and add the change to a usp10_ros.diff file as this is a Wine-synched component. Also don't forget to include a header file for the DbgPrint prototype. See issue #3280 for more details.

[cfinck at svn.reactos.org]

Author: cfinck
Date: Wed May 28 16:41:41 2008
New Revision: 33749

URL: http://svn.reactos.org/svn/reactos?rev=33749&view=rev
Log:
Sync usp10 with Wine again, fixes the corrupted text display in AbiWord.
Thanks to CMan for regression-testing!

Also I removed Magnus' change in r33700.
If this is really required, please name the reason and add the change to a usp10_ros.diff file as this is a Wine-synched component. Also don't forget to include a header file for the DbgPrint prototype.

See issue #3280 for more details.

Modified:
    trunk/reactos/dll/win32/usp10/usp10.c
    trunk/reactos/dll/win32/usp10/usp10.spec

Modified: trunk/reactos/dll/win32/usp10/usp10.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10.c?rev=33749&r1=33748&r2=33749&view=diff
==============================================================================
--- trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] Wed May 28 16:41:41 2008
@@ -1407,27 +1407,22 @@
                              int iReserved, const WORD *pwGlyphs, int cGlyphs, const int *piAdvance,
                              const int *piJustify, const GOFFSET *pGoffset)
 {
-    HFONT hfont;
     HRESULT hr = S_OK;
 
     TRACE("(%p, %p, %d, %d, %04x, %p, %p, %p, %d, %p, %d, %p, %p, %p)\n",
          hdc, psc, x, y, fuOptions, lprc, psa, pwcReserved, iReserved, pwGlyphs, cGlyphs,
          piAdvance, piJustify, pGoffset);
 
-    if (!hdc && psc && !*psc) return E_INVALIDARG;
+    if (!hdc || !psc) return E_INVALIDARG;
     if (!piAdvance || !psa || !pwGlyphs) return E_INVALIDARG;
-    if ((hr = get_script_cache(hdc, psc))) return hr;
-
-    hfont = select_cached_font(psc);
 
     fuOptions &= ETO_CLIPPED + ETO_OPAQUE;
     if  (!psa->fNoGlyphIndex)                                     /* Have Glyphs?                      */
         fuOptions |= ETO_GLYPH_INDEX;                             /* Say don't do translation to glyph */
 
-    if (!ExtTextOutW(get_cache_hdc(psc), x, y, fuOptions, lprc, pwGlyphs, cGlyphs, NULL))
+    if (!ExtTextOutW(hdc, x, y, fuOptions, lprc, pwGlyphs, cGlyphs, NULL))
         hr = S_FALSE;
 
-    unselect_cached_font(psc, hfont);
     return hr;
 }
 
@@ -1731,11 +1726,3 @@
     for (i = 0; i < nbchars; i++) widths[i] = glyph_width[i];
     return S_OK;
 }
-
-
-VOID WINAPI LpkPresent()
-{
-    /* FIXME */
-    DbgPrint("LPK: %s is unimplemented, please try again later.\n", __FUNCTION__);
-}
-

Modified: trunk/reactos/dll/win32/usp10/usp10.spec
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10.spec?rev=33749&r1=33748&r2=33749&view=diff
==============================================================================
--- trunk/reactos/dll/win32/usp10/usp10.spec [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/usp10/usp10.spec [iso-8859-1] Wed May 28 16:41:41 2008
@@ -1,4 +1,4 @@
-@ stdcall LpkPresent()
+@ stub LpkPresent
 @ stdcall ScriptApplyDigitSubstitution(ptr ptr ptr)
 @ stub ScriptApplyLogicalWidth
 @ stdcall ScriptBreak(ptr long ptr ptr)