Commit 9be30c83 authored by Jeff Latimer's avatar Jeff Latimer Committed by Alexandre Julliard

usp10: Set defaults for ScriptGetFontProperties.

Set defaults similar to Win XP for Kashida and set the default char in ScriptGetFontProperties.
parent 9c6c83e9
...@@ -123,6 +123,7 @@ HRESULT WINAPI ScriptGetFontProperties(HDC hdc, SCRIPT_CACHE *psc, SCRIPT_FONTPR ...@@ -123,6 +123,7 @@ HRESULT WINAPI ScriptGetFontProperties(HDC hdc, SCRIPT_CACHE *psc, SCRIPT_FONTPR
{ {
HDC phdc; HDC phdc;
Scriptcache *pScriptcache; Scriptcache *pScriptcache;
TEXTMETRICW ptm;
TRACE("%p,%p,%p\n", hdc, psc, sfp); TRACE("%p,%p,%p\n", hdc, psc, sfp);
if (!hdc && !*psc) { if (!hdc && !*psc) {
...@@ -146,9 +147,12 @@ HRESULT WINAPI ScriptGetFontProperties(HDC hdc, SCRIPT_CACHE *psc, SCRIPT_FONTPR ...@@ -146,9 +147,12 @@ HRESULT WINAPI ScriptGetFontProperties(HDC hdc, SCRIPT_CACHE *psc, SCRIPT_FONTPR
/* return something sensible? */ /* return something sensible? */
if (NULL != sfp) { if (NULL != sfp) {
sfp->wgBlank = 0; sfp->wgBlank = 0;
sfp->wgDefault = 0; if (GetTextMetricsW(phdc, &ptm))
sfp->wgDefault = ptm.tmDefaultChar;
else
sfp->wgDefault = 0;
sfp->wgInvalid = 0; sfp->wgInvalid = 0;
sfp->wgKashida = 1; sfp->wgKashida = 0xffff;
sfp->iKashidaWidth = 0; sfp->iKashidaWidth = 0;
} }
return 0; return 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment