usp10: Don't trace char to glyph mappings.
This commit is contained in:
parent
68efae1615
commit
e19b2360f0
|
@ -1258,28 +1258,14 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars,
|
||||||
|
|
||||||
hfont = select_cached_font(psc);
|
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 (!psa->fNoGlyphIndex) { /* Glyph translate */
|
||||||
if (!(GetGlyphIndicesW(get_cache_hdc(psc), pwcChars, cChars, pwOutGlyphs, 0)))
|
if (!(GetGlyphIndicesW(get_cache_hdc(psc), pwcChars, cChars, pwOutGlyphs, 0)))
|
||||||
return S_FALSE;
|
return S_FALSE;
|
||||||
|
|
||||||
TRACE("After: ");
|
|
||||||
for (cnt = 0; cnt < cChars; cnt++) {
|
|
||||||
TRACE("%04x",pwOutGlyphs[cnt]);
|
|
||||||
}
|
|
||||||
TRACE("\n");
|
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
TRACE("After: ");
|
|
||||||
for (cnt = 0; cnt < cChars; cnt++) { /* no translate so set up */
|
for (cnt = 0; cnt < cChars; cnt++) { /* no translate so set up */
|
||||||
pwOutGlyphs[cnt] = pwcChars[cnt]; /* copy in to out and */
|
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 */
|
/* 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,
|
HRESULT WINAPI ScriptGetCMap(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcInChars,
|
||||||
int cChars, DWORD dwFlags, WORD *pwOutGlyphs)
|
int cChars, DWORD dwFlags, WORD *pwOutGlyphs)
|
||||||
{
|
{
|
||||||
int cnt;
|
|
||||||
HRESULT hr;
|
HRESULT hr;
|
||||||
HFONT hfont;
|
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;
|
if ((hr = get_script_cache(hdc, psc))) return hr;
|
||||||
|
|
||||||
hfont = select_cached_font(psc);
|
hfont = select_cached_font(psc);
|
||||||
|
if (GetGlyphIndicesW(get_cache_hdc(psc), pwcInChars, cChars, pwOutGlyphs, 0) == GDI_ERROR)
|
||||||
TRACE("Before: ");
|
hr = S_FALSE;
|
||||||
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");
|
|
||||||
|
|
||||||
unselect_cached_font(psc, hfont);
|
unselect_cached_font(psc, hfont);
|
||||||
return S_OK;
|
return hr;
|
||||||
}
|
}
|
||||||
|
|
||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
|
|
Loading…
Reference in New Issue