usp10: Set defaults for ScriptGetFontProperties.

Set defaults similar to Win XP for Kashida and set the default char in ScriptGetFontProperties.

usp10: Set defaults for ScriptGetFontProperties.
9be30c83 · Jeff Latimer · Alexandre Julliard · 9c6c83e9 · 9be30c83
Commit 9be30c83 authored Apr 20, 2006 by Jeff Latimer Committed by Alexandre Julliard Apr 20, 2006
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

usp10.c dlls/usp10/usp10.c +5 -1

No files found.
--- a/dlls/usp10/usp10.c
+++ b/dlls/usp10/usp10.c
@@ -123,6 +123,7 @@ HRESULT WINAPI ScriptGetFontProperties(HDC hdc, SCRIPT_CACHE *psc, SCRIPT_FONTPR
 {
    HDC phdc;
    Scriptcache *pScriptcache;
+    TEXTMETRICW ptm;

    TRACE("%p,%p,%p\n", hdc, psc, sfp);
    if  (!hdc && !*psc) {
@@ -146,9 +147,12 @@ HRESULT WINAPI ScriptGetFontProperties(HDC hdc, SCRIPT_CACHE *psc, SCRIPT_FONTPR
    /* return something sensible? */
    if (NULL != sfp) {
        sfp->wgBlank       = 0;
+        if  (GetTextMetricsW(phdc, &ptm)) 
+            sfp->wgDefault = ptm.tmDefaultChar;
+        else
            sfp->wgDefault = 0;
        sfp->wgInvalid     = 0;
-        sfp->wgKashida     = 1;
+        sfp->wgKashida     = 0xffff;
        sfp->iKashidaWidth = 0;
    }
    return 0;