Hans Leidekker : usp10: Don't trace char to glyph mappings.
Alexandre Julliard
julliard at winehq.org
Mon Dec 10 08:54:20 CST 2007
Module: wine
Branch: master
Commit: e19b2360f0d4652dd91b5adf0f9e0c35aa90edd9
URL: http://source.winehq.org/git/wine.git/?a=commit;h=e19b2360f0d4652dd91b5adf0f9e0c35aa90edd9
Author: Hans Leidekker <hans at it.vu.nl>
Date: Sun Dec 9 21:39:44 2007 +0100
usp10: Don't trace char to glyph mappings.
---
dlls/usp10/usp10.c | 32 +++-----------------------------
1 files changed, 3 insertions(+), 29 deletions(-)
diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c
index fb0d4da..5d77829 100644
--- a/dlls/usp10/usp10.c
+++ b/dlls/usp10/usp10.c
@@ -1258,28 +1258,14 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars,
hfont = select_cached_font(psc);
- TRACE("Before: ");
- for (cnt = 0; cnt < cChars; cnt++)
- TRACE("%4x",pwcChars[cnt]);
- TRACE("\n");
-
if (!psa->fNoGlyphIndex) { /* Glyph translate */
if (!(GetGlyphIndicesW(get_cache_hdc(psc), pwcChars, cChars, pwOutGlyphs, 0)))
return S_FALSE;
-
- TRACE("After: ");
- for (cnt = 0; cnt < cChars; cnt++) {
- TRACE("%04x",pwOutGlyphs[cnt]);
- }
- TRACE("\n");
}
else {
- TRACE("After: ");
for (cnt = 0; cnt < cChars; cnt++) { /* no translate so set up */
pwOutGlyphs[cnt] = pwcChars[cnt]; /* copy in to out and */
- TRACE("%04x",pwOutGlyphs[cnt]);
}
- TRACE("\n");
}
/* Set up a valid SCRIPT_VISATTR and LogClust for each char in this run */
@@ -1396,7 +1382,6 @@ HRESULT WINAPI ScriptPlace(HDC hdc, SCRIPT_CACHE *psc, const WORD *pwGlyphs,
HRESULT WINAPI ScriptGetCMap(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcInChars,
int cChars, DWORD dwFlags, WORD *pwOutGlyphs)
{
- int cnt;
HRESULT hr;
HFONT hfont;
@@ -1406,22 +1391,11 @@ HRESULT WINAPI ScriptGetCMap(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcInChars
if ((hr = get_script_cache(hdc, psc))) return hr;
hfont = select_cached_font(psc);
-
- TRACE("Before: ");
- for (cnt = 0; cnt < cChars; cnt++)
- TRACE("%4x",pwcInChars[cnt]);
- TRACE("\n");
-
- GetGlyphIndicesW(get_cache_hdc(psc), pwcInChars, cChars, pwOutGlyphs, 0);
-
- TRACE("After: ");
- for (cnt = 0; cnt < cChars; cnt++) {
- TRACE("%04x",pwOutGlyphs[cnt]);
- }
- TRACE("\n");
+ if (GetGlyphIndicesW(get_cache_hdc(psc), pwcInChars, cChars, pwOutGlyphs, 0) == GDI_ERROR)
+ hr = S_FALSE;
unselect_cached_font(psc, hfont);
- return S_OK;
+ return hr;
}
/***********************************************************************
More information about the wine-cvs
mailing list