From unknown Thu Aug 14 12:23:34 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#77171 <77171@debbugs.gnu.org> To: bug#77171 <77171@debbugs.gnu.org> Subject: Status: 31.0.50; Some lines in etc/HELLO display with large height on MS-Windows Reply-To: bug#77171 <77171@debbugs.gnu.org> Date: Thu, 14 Aug 2025 19:23:34 +0000 retitle 77171 31.0.50; Some lines in etc/HELLO display with large height on= MS-Windows reassign 77171 emacs submitter 77171 Eli Zaretskii severity 77171 normal tag 77171 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 22 06:36:59 2025 Received: (at submit) by debbugs.gnu.org; 22 Mar 2025 10:36:59 +0000 Received: from localhost ([127.0.0.1]:40987 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tvwDq-00024Q-Ob for submit@debbugs.gnu.org; Sat, 22 Mar 2025 06:36:59 -0400 Received: from lists.gnu.org ([2001:470:142::17]:50832) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tvwDn-000247-Uk for submit@debbugs.gnu.org; Sat, 22 Mar 2025 06:36:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tvwDg-0005UR-Ny for bug-gnu-emacs@gnu.org; Sat, 22 Mar 2025 06:36:49 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tvwDg-0005jx-FG for bug-gnu-emacs@gnu.org; Sat, 22 Mar 2025 06:36:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=Subject:To:From:Date:mime-version:in-reply-to: references; bh=sBMHNODd9Kr9SZVksMlL93IacWFMSRT7N0idgxpSNX8=; b=ho1Ks32MAa1X6v GNnfw21/ruz2H58aAFNvKk/odO7DEnfmYqgtPpd8e2ETU99U+hEnTNJRQMzOAz9B4ay55HrVAxJum HirK9fWm9402XgYoTzAsjQ8+kBQXqoaOWRiBFSNB5Jmga+XQDrrx0v0MMO4kbS0aYKEN/HjZ2O/hq QdBjbCKEzXuYLGLne/UhW/kOY1QwiISRWTw76fKIJLjMq/9m8UtrAHxo45s1vrje6z+FB+YsFH5cs sTgqKFm0d8cJIi+yH43LIiBX73jxzDSmmhJHRTrMzH2mpus/a00MegelczYGaS/p2krkDqffJ587O yHfjASaET6s6pddwZJQQ==; Date: Sat, 22 Mar 2025 12:36:45 +0200 Message-Id: <86pli9jqrm.fsf@gnu.org> From: Eli Zaretskii To: bug-gnu-emacs@gnu.org Subject: 31.0.50; Some lines in etc/HELLO display with large height on MS-Windows X-Debbugs-Cc: Cecilio Pardo X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) To reproduce: emacs -Q M-: (w32-find-non-USB-fonts) RET C-h h and observe how some lines are displayed with large whitespace above and/or below them. For example, the lines of the following scripts: Batak Cham Coptic Hanifi Rohingya Hanunoo Makasar Bisection shows that this started when DirectWrite text drawing was added to Emacs in commit edf37e811caf back in Oct 2024. Cecilio, could you please look into this? I'm guessing that the code we now use to return the metrics of character glyphs somehow returns different results from what was used before, in this particular aspect. In GNU Emacs 31.0.50 (build 782, i686-pc-mingw32) of 2025-03-22 built on ELIZ-PC Repository revision: cf7fdd374ac96ddd53a026bda2aa2b7211e5ee70 Repository branch: master Windowing system distributor 'Microsoft Corp.', version 10.0.26100 System Description: Microsoft Windows 10 Enterprise (v10.0.2009.26100.3476) Configured using: 'configure -C --prefix=/d/usr --with-wide-int --without-native-compilation --enable-checking=yes,glyphs 'CFLAGS=-O0 -gdwarf-4 -g3'' Configured features: ACL GIF GMP GNUTLS HARFBUZZ JPEG LCMS2 LIBXML2 MODULES NOTIFY W32NOTIFY PDUMPER PNG RSVG SOUND SQLITE3 THREADS TIFF TOOLKIT_SCROLL_BARS TREE_SITTER WEBP XPM ZLIB Important settings: value of $LANG: ENU locale-coding-system: cp1252 Major mode: Fundamental Minor modes in effect: enriched-mode: t tooltip-mode: t global-eldoc-mode: t show-paren-mode: t electric-indent-mode: t mouse-wheel-mode: t tool-bar-mode: t use-hard-newlines: t menu-bar-mode: t file-name-shadow-mode: t global-font-lock-mode: t font-lock-mode: t blink-cursor-mode: t minibuffer-regexp-mode: t buffer-read-only: t line-number-mode: t indent-tabs-mode: t transient-mark-mode: t auto-composition-mode: t auto-encryption-mode: t auto-compression-mode: t view-mode: t Load-path shadows: None found. Features: (shadow sort mail-extr emacsbug lisp-mnt message mailcap yank-media puny dired dired-loaddefs rfc822 mml mml-sec password-cache epa derived epg rfc6068 epg-config gnus-util text-property-search time-date subr-x mm-decode mm-bodies mm-encode mail-parse rfc2231 mailabbrev gmm-utils mailheader sendmail rfc2047 rfc2045 ietf-drums mm-util mail-prsvr mail-utils thai-util thai-word mule-util lao-util vc-git diff-mode track-changes easy-mmode files-x vc-dispatcher cl-loaddefs cl-lib enriched facemenu view rmc iso-transl tooltip cconv eldoc paren electric uniquify ediff-hook vc-hooks lisp-float-type elisp-mode mwheel touch-screen dos-w32 ls-lisp term/w32-nt disp-table term/w32-win w32-win w32-vars term/common-win tool-bar dnd fontset image regexp-opt fringe tabulated-list replace newcomment text-mode lisp-mode prog-mode register page tab-bar menu-bar rfn-eshadow isearch easymenu timer select scroll-bar mouse jit-lock font-lock syntax font-core term/tty-colors frame minibuffer nadvice seq simple cl-generic indonesian philippine cham georgian utf-8-lang misc-lang vietnamese tibetan thai tai-viet lao korean japanese eucjp-ms cp51932 hebrew greek romanian slovak czech european ethiopic indian cyrillic chinese composite emoji-zwj charscript charprop case-table epa-hook jka-cmpr-hook help abbrev obarray oclosure cl-preloaded button loaddefs theme-loaddefs faces cus-face macroexp files window text-properties overlay sha1 md5 base64 format env code-pages mule custom widget keymap hashtable-print-readable backquote threads w32notify w32 lcms2 multi-tty move-toolbar make-network-process tty-child-frames emacs) Memory information: ((conses 16 199535 13089) (symbols 48 7733 0) (strings 16 21122 3511) (string-bytes 1 478810) (vectors 16 19762) (vector-slots 8 348637 11993) (floats 8 32 65) (intervals 40 389 136) (buffers 896 12)) From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 22 10:12:51 2025 Received: (at 77171) by debbugs.gnu.org; 22 Mar 2025 14:12:51 +0000 Received: from localhost ([127.0.0.1]:44468 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tvzal-00032z-GD for submit@debbugs.gnu.org; Sat, 22 Mar 2025 10:12:51 -0400 Received: from mail.imayhem.com ([82.223.54.191]:34143 helo=zealous-pike.82-223-54-191.plesk.page) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tvzaj-00032k-4o for 77171@debbugs.gnu.org; Sat, 22 Mar 2025 10:12:49 -0400 Received: from [192.168.68.104] (224.red-88-21-10.staticip.rima-tde.net [88.21.10.224]) by zealous-pike.82-223-54-191.plesk.page (Postfix) with ESMTPSA id 321EC801CB; Sat, 22 Mar 2025 14:12:40 +0000 (UTC) Authentication-Results: zealous-pike.82-223-54-191.plesk.page; spf=pass (sender IP is 88.21.10.224) smtp.mailfrom=cpardo@imayhem.com smtp.helo=[192.168.68.104] Received-SPF: pass (zealous-pike.82-223-54-191.plesk.page: connection is authenticated) Message-ID: <7cd6ace4-eadc-494f-aded-5ccd93915cec@imayhem.com> Date: Sat, 22 Mar 2025 15:12:39 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: bug#77171: 31.0.50; Some lines in etc/HELLO display with large height on MS-Windows To: Eli Zaretskii , 77171@debbugs.gnu.org References: <86pli9jqrm.fsf@gnu.org> Content-Language: es-ES From: Cecilio Pardo In-Reply-To: <86pli9jqrm.fsf@gnu.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 77171 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) On 22/03/2025 11:36, Eli Zaretskii wrote: > Cecilio, could you please look into this? I'm guessing that the code > we now use to return the metrics of character glyphs somehow returns > different results from what was used before, in this particular > aspect. Yes, I'm on it. From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 27 17:31:01 2025 Received: (at 77171) by debbugs.gnu.org; 27 Mar 2025 21:31:01 +0000 Received: from localhost ([127.0.0.1]:51614 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1txuoW-0003u0-RF for submit@debbugs.gnu.org; Thu, 27 Mar 2025 17:31:01 -0400 Received: from mail.imayhem.com ([82.223.54.191]:53389 helo=zealous-pike.82-223-54-191.plesk.page) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1txuoU-0003tj-2n for 77171@debbugs.gnu.org; Thu, 27 Mar 2025 17:30:59 -0400 Received: from [192.168.68.104] (224.red-88-21-10.staticip.rima-tde.net [88.21.10.224]) by zealous-pike.82-223-54-191.plesk.page (Postfix) with ESMTPSA id 4FF09801A6; Thu, 27 Mar 2025 21:30:49 +0000 (UTC) Authentication-Results: zealous-pike.82-223-54-191.plesk.page; spf=pass (sender IP is 88.21.10.224) smtp.mailfrom=cpardo@imayhem.com smtp.helo=[192.168.68.104] Received-SPF: pass (zealous-pike.82-223-54-191.plesk.page: connection is authenticated) Message-ID: <26654c9b-b8f5-4073-afdc-70466e245b56@imayhem.com> Date: Thu, 27 Mar 2025 22:30:48 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: bug#77171: 31.0.50; Some lines in etc/HELLO display with large height on MS-Windows From: Cecilio Pardo To: Eli Zaretskii , 77171@debbugs.gnu.org References: <86pli9jqrm.fsf@gnu.org> <7cd6ace4-eadc-494f-aded-5ccd93915cec@imayhem.com> Content-Language: es-ES In-Reply-To: <7cd6ace4-eadc-494f-aded-5ccd93915cec@imayhem.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 77171 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) On 22/03/2025 15:12, Cecilio Pardo wrote: > On 22/03/2025 11:36, Eli Zaretskii wrote: >> Cecilio, could you please look into this?  I'm guessing that the code >> we now use to return the metrics of character glyphs somehow returns >> different results from what was used before, in this particular >> aspect. Just reporting status. The problematic font here is "Sans serif collection", which gives very big ascent and descent values for glyphs. Not even Windows own tools, such as charmap or the font selection dialog, render this font correctly. Emacs' code without directwrite directly inspects the glyph outlines to get metrics. I'm looking for a way to do the same with directwrite, or find another solution. From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 28 03:22:01 2025 Received: (at 77171) by debbugs.gnu.org; 28 Mar 2025 07:22:01 +0000 Received: from localhost ([127.0.0.1]:52591 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ty42S-0001lk-O4 for submit@debbugs.gnu.org; Fri, 28 Mar 2025 03:22:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58330) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ty42Q-0001lS-Dg for 77171@debbugs.gnu.org; Fri, 28 Mar 2025 03:21:59 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ty42K-0001ZK-Ul; Fri, 28 Mar 2025 03:21:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-version:References:Subject:In-Reply-To:To:From: Date; bh=ib1/lQlae/E2FPXPGilXijVwFtw3IRoW3oiDHT/FdO8=; b=Tj85xvGHEbLc0m2tnsZV pdh1bZgZxYCv4BCsDjfZNMqcgyi6gdsf1udanc9eh96lIGEgoUHIn/VnR4BDAMc7eyWCcJWYhWbIg TNxxXGHLArcq62WZLZ3GkpZI2UdcG92I9Kwep+tvbELP0BWPy9CVWEeXau7qgcZUK6hcoWGYSTXSW CdOrvf5919ZQD8P5BhaYHa7MqNgNKFc3PjqUMurri30cnqGi/fANMErmlNsRUkTU8vLaQ7Ux1Cutg Arn6ULvZc1zGPsSvXumqgAWl6Aqp6kifNrrqPy8CkgYSP7uG8UU5dY/C5gDVveR3FYvdYDSQMHDzt pRpvPf9PcsXB6w==; Date: Fri, 28 Mar 2025 10:21:24 +0300 Message-Id: <867c49boy3.fsf@gnu.org> From: Eli Zaretskii To: Cecilio Pardo In-Reply-To: <26654c9b-b8f5-4073-afdc-70466e245b56@imayhem.com> (message from Cecilio Pardo on Thu, 27 Mar 2025 22:30:48 +0100) Subject: Re: bug#77171: 31.0.50; Some lines in etc/HELLO display with large height on MS-Windows References: <86pli9jqrm.fsf@gnu.org> <7cd6ace4-eadc-494f-aded-5ccd93915cec@imayhem.com> <26654c9b-b8f5-4073-afdc-70466e245b56@imayhem.com> MIME-version: 1.0 Content-type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 77171 Cc: 77171@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > Date: Thu, 27 Mar 2025 22:30:48 +0100 > From: Cecilio Pardo > > On 22/03/2025 15:12, Cecilio Pardo wrote: > > On 22/03/2025 11:36, Eli Zaretskii wrote: > >> Cecilio, could you please look into this?  I'm guessing that the code > >> we now use to return the metrics of character glyphs somehow returns > >> different results from what was used before, in this particular > >> aspect. > > Just reporting status. > > The problematic font here is "Sans serif collection", which gives very > big ascent and descent values for glyphs. Not even Windows own tools, > such as charmap or the font selection dialog, render this font correctly. > > Emacs' code without directwrite directly inspects the glyph outlines to > get metrics. I'm looking for a way to do the same with directwrite, or > find another solution. Thanks for working on this. Sans serif collection is an important font collection on Windows, since it supports a lot of scripts. So it would be good for Emacs to support it in a reasonably good fashion. From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 01 04:47:26 2025 Received: (at 77171) by debbugs.gnu.org; 1 Apr 2025 08:47:26 +0000 Received: from localhost ([127.0.0.1]:45615 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tzXHJ-00060y-T7 for submit@debbugs.gnu.org; Tue, 01 Apr 2025 04:47:26 -0400 Received: from mail.imayhem.com ([82.223.54.191]:51081 helo=zealous-pike.82-223-54-191.plesk.page) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tzXHH-00060m-Fl for 77171@debbugs.gnu.org; Tue, 01 Apr 2025 04:47:24 -0400 Received: from [10.0.12.229] (66.red-2-136-43.staticip.rima-tde.net [2.136.43.66]) by zealous-pike.82-223-54-191.plesk.page (Postfix) with ESMTPSA id B3FE880196; Tue, 1 Apr 2025 08:47:12 +0000 (UTC) Authentication-Results: zealous-pike.82-223-54-191.plesk.page; spf=pass (sender IP is 2.136.43.66) smtp.mailfrom=cpardo@imayhem.com smtp.helo=[10.0.12.229] Received-SPF: pass (zealous-pike.82-223-54-191.plesk.page: connection is authenticated) Content-Type: multipart/mixed; boundary="------------0cpI14QPugXTTpxK0y0cRtmy" Message-ID: <7b26d293-0577-4bd6-bcce-57364c758e58@imayhem.com> Date: Tue, 1 Apr 2025 10:47:11 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: bug#77171: 31.0.50; Some lines in etc/HELLO display with large height on MS-Windows From: Cecilio Pardo To: Eli Zaretskii , 77171@debbugs.gnu.org References: <86pli9jqrm.fsf@gnu.org> <7cd6ace4-eadc-494f-aded-5ccd93915cec@imayhem.com> Content-Language: es-ES In-Reply-To: <7cd6ace4-eadc-494f-aded-5ccd93915cec@imayhem.com> X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 77171 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is a multi-part message in MIME format. --------------0cpI14QPugXTTpxK0y0cRtmy Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 22/03/2025 11:36, Eli Zaretskii wrote: > Cecilio, could you please look into this? I'm guessing that the code > we now use to return the metrics of character glyphs somehow returns > different results from what was used before, in this particular > aspect. The attached patch fixes this by using the GDI measurement for the vertical size of text. Doing the same with DirectWrite would be too expensive, and would imply using the "layout" parts of DirectWrite, to get the same results most of the time. Horizontal extents is different, we need to keep using DirectWrite for that. --------------0cpI14QPugXTTpxK0y0cRtmy Content-Type: text/plain; charset=UTF-8; name="0001-w32-fix-problem-with-font-vertical-measurement-for-d.patch" Content-Disposition: attachment; filename*0="0001-w32-fix-problem-with-font-vertical-measurement-for-d.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSA2MDE2NTVhNGVmZmM3YjY4NDQ4ZTgwYjdiNzk4YTczOGQ2NmM3Y2IxIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBDZWNpbGlvIFBhcmRvIDxjcGFyZG9AaW1heWhlbS5j b20+CkRhdGU6IFR1ZSwgMSBBcHIgMjAyNSAxMDoxODoxNCArMDIwMApTdWJqZWN0OiBbUEFU Q0hdIHczMjogZml4IHByb2JsZW0gd2l0aCBmb250IHZlcnRpY2FsIG1lYXN1cmVtZW50IGZv ciBkd3JpdGUKCkdseXBoIGJ5IGdseXBoIG1lYXN1cmVtZW50IG9mIHZlcnRpY2FsIHNpemUg aXMgdG9vIGV4cGVuc2l2ZSB3aXRoCkRpcmVjdFdyaXRlLiAgR0RJIG1lYXN1cmVtZW50IGZv ciB2ZXJ0aWNhbCBzaXplIGlzIGdvb2QgZm9yIERpcmVjdFdyaXRlCnRvby4KCiogc3JjL3cz MmR3cml0ZS5jICh3MzJfZHdyaXRlX3RleHRfZXh0ZW50cyk6IFVzZSB0aGUgdmVydGljYWwK bWVhc3VyZW1lbnQgZnJvbSBHREkuCiogc3JjL3czMmZvbnQuYyAodzMyZm9udF90ZXh0X2V4 dGVudHMpOiBXaGVuIERpcmVjdFdyaXRlIGlzIGFjdGl2ZSwKbWVhc3VyZSB0ZXN0IHVzaW5n IEdESSBjb2RlIGJlZm9yZSBjYWxsaW5nIHczMl9kd3JpdGVfdGV4dF9leHRlbnRzLgotLS0K IHNyYy93MzJkd3JpdGUuYyB8IDQgKy0tLQogc3JjL3czMmZvbnQuYyAgIHwgNiArKy0tLS0K IDIgZmlsZXMgY2hhbmdlZCwgMyBpbnNlcnRpb25zKCspLCA3IGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL3NyYy93MzJkd3JpdGUuYyBiL3NyYy93MzJkd3JpdGUuYwppbmRleCAxMGFm ODU0NWExMS4uYmMzNzljZDczOTUgMTAwNjQ0Ci0tLSBhL3NyYy93MzJkd3JpdGUuYworKysg Yi9zcmMvdzMyZHdyaXRlLmMKQEAgLTY3OCw2ICs2NzgsNyBAQCB3MzJfZHdyaXRlX2VuY29k ZV9jaGFyIChzdHJ1Y3QgZm9udCAqZm9udCwgaW50IGMpCiAgIHJldHVybiBGT05UX0lOVkFM SURfQ09ERTsKIH0KIAorLyogRG9lcyBub3QgZmlsbCBpbiB0aGUgYXNjZW50IGFuZCBkZXNj ZW50IGZpZWxkcyBvZiBtZXRyaWNzLiAgKi8KIGJvb2wKIHczMl9kd3JpdGVfdGV4dF9leHRl bnRzIChzdHJ1Y3QgZm9udCAqZm9udCwgY29uc3QgdW5zaWduZWQgKmNvZGUsIGludCBuZ2x5 cGhzLAogCQkJIHN0cnVjdCBmb250X21ldHJpY3MgKm1ldHJpY3MpCkBAIC02OTQsOSArNjk1 LDYgQEAgdzMyX2R3cml0ZV90ZXh0X2V4dGVudHMgKHN0cnVjdCBmb250ICpmb250LCBjb25z dCB1bnNpZ25lZCAqY29kZSwgaW50IG5nbHlwaHMsCiAgIGlmIChmb250X3NpemUgPD0gMC4w ZikKICAgICBmb250X3NpemUgPSBGUkFNRV9MSU5FX0hFSUdIVCAoU0VMRUNURURfRlJBTUUg KCkpOwogCi0gIG1ldHJpY3MtPmFzY2VudCA9IGZvbnQtPmFzY2VudDsKLSAgbWV0cmljcy0+ ZGVzY2VudCA9IGZvbnQtPmRlc2NlbnQ7Ci0KICAgcmV0dXJuIHRleHRfZXh0ZW50c19pbnRl cm5hbCAoZHdyaXRlX2ZvbnRfZmFjZSwgZm9udF9zaXplLCBjb2RlLCBuZ2x5cGhzLAogCQkJ CW1ldHJpY3MpOwogfQpkaWZmIC0tZ2l0IGEvc3JjL3czMmZvbnQuYyBiL3NyYy93MzJmb250 LmMKaW5kZXggZjQ0YTdjMTI0YzkuLjdmNTRkNmM2OGYxIDEwMDY0NAotLS0gYS9zcmMvdzMy Zm9udC5jCisrKyBiL3NyYy93MzJmb250LmMKQEAgLTQ0NCwxMCArNDQ0LDYgQEAgdzMyZm9u dF90ZXh0X2V4dGVudHMgKHN0cnVjdCBmb250ICpmb250LCBjb25zdCB1bnNpZ25lZCAqY29k ZSwKIAogICBtZW1zZXQgKG1ldHJpY3MsIDAsIHNpemVvZiAoc3RydWN0IGZvbnRfbWV0cmlj cykpOwogCi0gIGlmICh3MzJfdXNlX2RpcmVjdF93cml0ZSAodzMyX2ZvbnQpCi0gICAgICAm JiB3MzJfZHdyaXRlX3RleHRfZXh0ZW50cyAoZm9udCwgY29kZSwgbmdseXBocywgbWV0cmlj cykpCi0gICAgcmV0dXJuOwotCiAgIGZvciAoaSA9IDAsIGZpcnN0ID0gdHJ1ZTsgaSA8IG5n bHlwaHM7IGkrKykKICAgICB7CiAgICAgICBzdHJ1Y3QgdzMyX21ldHJpY19jYWNoZSAqY2hh cl9tZXRyaWM7CkBAIC01MzAsNiArNTI2LDggQEAgdzMyZm9udF90ZXh0X2V4dGVudHMgKHN0 cnVjdCBmb250ICpmb250LCBjb25zdCB1bnNpZ25lZCAqY29kZSwKICAgLyogSWYgd2UgZ290 IHRocm91Z2ggZXZlcnl0aGluZywgcmV0dXJuLiAgKi8KICAgaWYgKGkgPT0gbmdseXBocykK ICAgICB7CisgICAgICBpZiAodzMyX3VzZV9kaXJlY3Rfd3JpdGUgKHczMl9mb250KSkKKwl3 MzJfZHdyaXRlX3RleHRfZXh0ZW50cyAoZm9udCwgY29kZSwgbmdseXBocywgbWV0cmljcyk7 CiAgICAgICBpZiAoZGMgIT0gTlVMTCkKIAl7CiAJICAvKiBSZXN0b3JlIHN0YXRlIGFuZCBy ZWxlYXNlIERDLiAgKi8KLS0gCjIuMzUuMS53aW5kb3dzLjIKCg== --------------0cpI14QPugXTTpxK0y0cRtmy-- From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 03 01:32:55 2025 Received: (at 77171) by debbugs.gnu.org; 3 Apr 2025 05:32:55 +0000 Received: from localhost ([127.0.0.1]:60455 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u0DCB-0001Su-3o for submit@debbugs.gnu.org; Thu, 03 Apr 2025 01:32:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51100) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u0DC9-0001Sg-F6 for 77171@debbugs.gnu.org; Thu, 03 Apr 2025 01:32:54 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u0DC3-0005mv-K8; Thu, 03 Apr 2025 01:32:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=JM5XQQVUOhEt1g1IjzEyLCUX0cV0AbJ9ku8Dp5ZchOk=; b=e1DMNqC+UzIG vGSKnGlSn3e5/VN1S9wgntwexvvaiRsV8SMbRCUQl+KLnnxufgyWioCfx61XMjQgxOlmI0eh7Yj0L NPCYgbjsLttnA6urf3FeVXv9Sbke48TVrt9x7lSRL9DVY6bZ0gTixhFY0shAYw4pV4BjPbsbjCXje Bv08fVK99PVIYkineXzCNRvLPe7NkOKrlNKmARtKQYOF79LkHNRuXAs1Ymg0bzQQgYrfmAp96QVL1 r141U4xCnmsKanNZMwtAfdeAP1dKGsYOJA103tePu52L0PoZZW19TqnUo9ZCXggh1+N4kuyiLAImn jW3NHg1diOPTh0JoCFybiw==; Date: Thu, 03 Apr 2025 08:32:43 +0300 Message-Id: <86wmc1zu6c.fsf@gnu.org> From: Eli Zaretskii To: Cecilio Pardo In-Reply-To: <7b26d293-0577-4bd6-bcce-57364c758e58@imayhem.com> (message from Cecilio Pardo on Tue, 1 Apr 2025 10:47:11 +0200) Subject: Re: bug#77171: 31.0.50; Some lines in etc/HELLO display with large height on MS-Windows References: <86pli9jqrm.fsf@gnu.org> <7cd6ace4-eadc-494f-aded-5ccd93915cec@imayhem.com> <7b26d293-0577-4bd6-bcce-57364c758e58@imayhem.com> X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 77171 Cc: 77171@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > Date: Tue, 1 Apr 2025 10:47:11 +0200 > From: Cecilio Pardo > > On 22/03/2025 11:36, Eli Zaretskii wrote: > > > Cecilio, could you please look into this? I'm guessing that the code > > we now use to return the metrics of character glyphs somehow returns > > different results from what was used before, in this particular > > aspect. > > The attached patch fixes this by using the GDI measurement for the > vertical size of text. > > Doing the same with DirectWrite would be too expensive, and would imply > using the "layout" parts of DirectWrite, to get the same results most of > the time. Hmm... are we sure the GDI measurement will work always for the fonts for which we must use DirectWrite? For example, the color fonts? If GDI might fail for some fonts, perhaps leaving the metrics code in w32_dwrite_text_extents, and then _overriding_ that by GDI values if available, would be safer? Thanks. From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 03 03:35:23 2025 Received: (at control) by debbugs.gnu.org; 3 Apr 2025 07:35:23 +0000 Received: from localhost ([127.0.0.1]:60751 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u0F6h-00075J-B8 for submit@debbugs.gnu.org; Thu, 03 Apr 2025 03:35:23 -0400 Received: from mail-ed1-x536.google.com ([2a00:1450:4864:20::536]:53562) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1u0F6e-00072Y-6o for control@debbugs.gnu.org; Thu, 03 Apr 2025 03:35:20 -0400 Received: by mail-ed1-x536.google.com with SMTP id 4fb4d7f45d1cf-5ed1ac116e3so1051006a12.3 for ; Thu, 03 Apr 2025 00:35:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743665714; x=1744270514; darn=debbugs.gnu.org; h=to:subject:message-id:date:mime-version:from:from:to:cc:subject :date:message-id:reply-to; bh=8LU7eA5l9nY79fE6L/8h3jUtbjPAZ+KdEwcuHKl4pyo=; b=knwr1bwRoiY6/oBYF+hiF/Z8h869YyOJpAYhWuDM0Vz4ek8LyKMTD1uFiH9uRma/Bx lG9glNQ77PvYV/FD7rB3egPqp+vu9k4esFY3L7u+vPm+sL3vli2K/uf/jufbOlTtfxsd WZiGyz/73b8ukK/LQSLN4I1wy746jqzTAiW7b4dAlGuYoeHlImBZoexz339In7/2LG01 A74KywozWTuDd9vNTYPoe01cSzdEc/GIw6gVi08VudqbIRxHdkx6UeP+YG02bh9LPdFf VYzfHKSWjhA5COlIR4xvL5EdvaBaHqco9v0mfQS8eSovhxbeirOaERPEiHcpuDmNqPYy BmxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743665714; x=1744270514; h=to:subject:message-id:date:mime-version:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=8LU7eA5l9nY79fE6L/8h3jUtbjPAZ+KdEwcuHKl4pyo=; b=gQvw2c4nWz3d/T+8RpLVmEJZ+ZsKh/kglzxY0zo0QisgElvd6yO7YmAUlbSsmpk8aC kLeojFxWmQSXYu9xqzCf7i+EmutwtrOuPDeK6iheLy0L2A5eILf4pNLGe5T4NypYTH9p S+QI5kWmelFrzVtzTjUkTAQleKkow8+bQgnGPvUXJFKqhBh1cRg8vXt3LawojwfJdk/z lNaCNWwD7zGKiIRSITUTjUNDxttcLVT2oKj4lKz3RxsE6lqUn5zqbc/R3ukhe7Cfxe3Z lds5kh4I1uNdivmMltBMm/BF+o5VD0i1AmRJ4MTloKG7z6Vz3XU6vkJcAv3RyIiySl/Q 7w5w== X-Gm-Message-State: AOJu0Yy3kxofAimoRINpCvtD6xDu1EL6CMqrcoomCctwkjFptpfH9KVt Uhaqw6BeKd1qK64pP/MAbr3SHNQVArYYTmhWnDUArtau7+ZlDhfamBTZtx0hQSrNE43i5e1XYcR yVwLuQA5BS0FOudlGLsLaBJluJPUylS6yRvk= X-Gm-Gg: ASbGncv2/Qe6Dxo15eEB3g8TndGZSjVj6bGTJ+KQoCP/5Hv0WhVgWwyqoeZH3qgHJPN ILUCXApMp6qGcZTbkvQmmrCBGlt/vykhu/EEe4dN8HLzarfAn4h7Ft9Ezafu8deUi7Z7U9hrbpb hKy9LEUQGhH/qsaTZ4aYTZ6tHDCOns X-Google-Smtp-Source: AGHT+IFhkZ7RT+FCLxdtpLio2hw6JQxfEuW72t82cVWvjuNNosode9KpRAdupr6No+5kUljuQDgOaRKcMudCA3758lw= X-Received: by 2002:a05:6402:5cd:b0:5ed:1d5a:7ec1 with SMTP id 4fb4d7f45d1cf-5f08722193amr1265292a12.31.1743665713713; Thu, 03 Apr 2025 00:35:13 -0700 (PDT) Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Thu, 3 Apr 2025 00:35:13 -0700 From: Stefan Kangas MIME-Version: 1.0 Date: Thu, 3 Apr 2025 00:35:13 -0700 X-Gm-Features: ATxdqUGmD5ntWt-AltqObwVZmSv7Eim-85BZi82T0RegEiqeyS9rrs7Gd13UCKk Message-ID: Subject: control message for bug #77171 To: control@debbugs.gnu.org Content-Type: text/plain; charset="UTF-8" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) tags 77171 + patch quit From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 03 05:13:03 2025 Received: (at 77171) by debbugs.gnu.org; 3 Apr 2025 09:13:03 +0000 Received: from localhost ([127.0.0.1]:32830 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u0GdD-0000y6-5F for submit@debbugs.gnu.org; Thu, 03 Apr 2025 05:13:03 -0400 Received: from mail.imayhem.com ([82.223.54.191]:34227 helo=zealous-pike.82-223-54-191.plesk.page) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1u0GdA-0000xT-7e for 77171@debbugs.gnu.org; Thu, 03 Apr 2025 05:13:00 -0400 Received: from [10.0.12.229] (66.red-2-136-43.staticip.rima-tde.net [2.136.43.66]) by zealous-pike.82-223-54-191.plesk.page (Postfix) with ESMTPSA id EBC8780191; Thu, 3 Apr 2025 09:12:51 +0000 (UTC) Authentication-Results: zealous-pike.82-223-54-191.plesk.page; spf=pass (sender IP is 2.136.43.66) smtp.mailfrom=cpardo@imayhem.com smtp.helo=[10.0.12.229] Received-SPF: pass (zealous-pike.82-223-54-191.plesk.page: connection is authenticated) Message-ID: Date: Thu, 3 Apr 2025 11:12:51 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: bug#77171: 31.0.50; Some lines in etc/HELLO display with large height on MS-Windows To: Eli Zaretskii References: <86pli9jqrm.fsf@gnu.org> <7cd6ace4-eadc-494f-aded-5ccd93915cec@imayhem.com> <7b26d293-0577-4bd6-bcce-57364c758e58@imayhem.com> <86wmc1zu6c.fsf@gnu.org> Content-Language: es-ES From: Cecilio Pardo In-Reply-To: <86wmc1zu6c.fsf@gnu.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 77171 Cc: 77171@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) On 03/04/2025 7:32, Eli Zaretskii wrote: >> The attached patch fixes this by using the GDI measurement for the >> vertical size of text. >> >> Doing the same with DirectWrite would be too expensive, and would imply >> using the "layout" parts of DirectWrite, to get the same results most of >> the time. > > Hmm... are we sure the GDI measurement will work always for the fonts > for which we must use DirectWrite? For example, the color fonts? > > If GDI might fail for some fonts, perhaps leaving the metrics code in > w32_dwrite_text_extents, and then _overriding_ that by GDI values if > available, would be safer? We get the DirectWrite font from the underlying GDI font, so GDI will not fail, but it will indeed give incorrect metrics from color fonts, so this will need some more work. Thanks. From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 21 14:53:48 2025 Received: (at 77171) by debbugs.gnu.org; 21 Apr 2025 18:53:48 +0000 Received: from localhost ([127.0.0.1]:38693 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u6wH5-0005vZ-R4 for submit@debbugs.gnu.org; Mon, 21 Apr 2025 14:53:48 -0400 Received: from mail.imayhem.com ([82.223.54.191]:36249 helo=zealous-pike.82-223-54-191.plesk.page) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1u6wH1-0005uN-2b for 77171@debbugs.gnu.org; Mon, 21 Apr 2025 14:53:45 -0400 Received: from [192.168.68.101] (16.red-88-21-19.staticip.rima-tde.net [88.21.19.16]) by zealous-pike.82-223-54-191.plesk.page (Postfix) with ESMTPSA id 511BC801B5; Mon, 21 Apr 2025 18:53:36 +0000 (UTC) Authentication-Results: zealous-pike.82-223-54-191.plesk.page; spf=pass (sender IP is 88.21.19.16) smtp.mailfrom=cpardo@imayhem.com smtp.helo=[192.168.68.101] Received-SPF: pass (zealous-pike.82-223-54-191.plesk.page: connection is authenticated) Content-Type: multipart/mixed; boundary="------------ZgG22zIXB9xGykEdB7rGTqF4" Message-ID: <5e6e7a03-341c-40a5-9684-37d4d6e8d3d6@imayhem.com> Date: Mon, 21 Apr 2025 20:53:35 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: Cecilio Pardo Subject: Re: bug#77171: 31.0.50; Some lines in etc/HELLO display with large height on MS-Windows To: Eli Zaretskii , 77171@debbugs.gnu.org References: <86pli9jqrm.fsf@gnu.org> Content-Language: en-US In-Reply-To: <86pli9jqrm.fsf@gnu.org> X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 77171 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is a multi-part message in MIME format. --------------ZgG22zIXB9xGykEdB7rGTqF4 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Hello, The attached patch examines the actual glyph's outline with DirectWrite to compute exact values for ascent and descent and should solve the problem for any font. Specifically, Sans Serif Collection works well now, and everything on HELLO.txt looks good on my system. This adds some overhead, but I didn't find it noticeable. In case someone does, we could cache measurements as the GDI backend does. When computing the bounding box for bezier curves, I just used minmax values for start/end and control points, instead of actually evaluating the curve. This reduces the overhead and loses some precision, but I didn't see any real difference. --------------ZgG22zIXB9xGykEdB7rGTqF4 Content-Type: text/plain; charset=UTF-8; name="0001-w32-change-the-way-text-is-measured-when-using-Direc.patch" Content-Disposition: attachment; filename*0="0001-w32-change-the-way-text-is-measured-when-using-Direc.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSBlMjQzN2RhYTEyMWJkY2RlZjVkNGIwOTA2NTQ2ZDcwOTU4ZmI3YmVhIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBDZWNpbGlvIFBhcmRvIDxjcGFyZG9AaW1heWhlbS5j b20+CkRhdGU6IFNhdCwgMTkgQXByIDIwMjUgMjI6NDY6MzggKzAyMDAKU3ViamVjdDogW1BB VENIXSB3MzI6IGNoYW5nZSB0aGUgd2F5IHRleHQgaXMgbWVhc3VyZWQgd2hlbiB1c2luZyBE aXJlY3RXcml0ZS4KCk5vdyB0aGUgZ2x5cGggb3V0bGluZSBpcyBpbnNwZWN0ZWQgZGlyZWN0 bHkgdG8gZ2V0IGl0cyByZWFsIHNpemUsIGFzCnRoZSBkaXJlY3QgbWVhc3VyaW5nIGZ1bmN0 aW9ucyBnaXZlIGdlbmVyaWMgdmFsdWVzIGZvciBzb21lIGZvbnRzLgoKKiBzcmMvdzMyZHdy aXRlLmMgKGRhdGEgc3RydWN0dXJlcyk6IEFkZGVkIGRhdGEgc3RydWN0dXJlcyBmcm9tIGhl YWRlcgpmaWxlcyB0aGF0IGFyZSBub3QgcHJlc2VudCBvbiB0aGUgMzJiaXQgYnVpbGQgZW52 aXJvbm1lbnQuCih0ZXh0X2V4dGVudHNfaW50ZXJuYWwpOiBDYWxsIHRvIEdldEdseXBoUnVu T3V0bGluZSB0byBnZXQgZXhhY3QgZ2x5cGgKdmVydGljYWwgYm91bmRzLiAgQWRkIG5ldyBw YXJhbWV0ZXIgdG8gbWFrZSB0aGlzIG9wdGlvbmFsIGlmIGNhc2UgdGhhdAppbmZvcm1hdGlv biBpcyBub3QgcmVxdWlyZWQuCih3MzJfZHdyaXRlX3RleHRfZXh0ZW50cyk6IE5ldyBwYXJh bWV0ZXIgZm9yIHRleHRfZXh0ZW50c19pbnRlcm5hbC4KKHczMl9pbml0aWFsaXplX2RpcmVj dF93cml0ZSk6IE5ldyBwYXJhbWV0ZXIgZm9yIHRleHRfZXh0ZW50c19pbnRlcm5hbC4KKHcz Ml9kd3JpdGVfZHJhdyk6IE5ldyBwYXJhbWV0ZXIgZm9yIHRleHRfZXh0ZW50c19pbnRlcm5h bC4KLS0tCiBzcmMvdzMyZHdyaXRlLmMgfCAyNTkgKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKy0tCiAxIGZpbGUgY2hhbmdlZCwgMjUzIGluc2VydGlv bnMoKyksIDYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvc3JjL3czMmR3cml0ZS5jIGIv c3JjL3czMmR3cml0ZS5jCmluZGV4IDEwYWY4NTQ1YTExLi40NmYxMWYwNmQ5ZiAxMDA2NDQK LS0tIGEvc3JjL3czMmR3cml0ZS5jCisrKyBiL3NyYy93MzJkd3JpdGUuYwpAQCAtMTE1LDYg KzExNSw0MiBAQCAjZGVmaW5lIERXUklURV9FX05PQ09MT1IgX0hSRVNVTFRfVFlQRURFRl8o MHg4ODk4NTAwQ0wpCiAgIElOVDMyIHZlcnRpY2FsT3JpZ2luWTsKIH0gRFdSSVRFX0dMWVBI X01FVFJJQ1M7CiAKK3R5cGVkZWYgc3RydWN0IEQyRDFfUE9JTlRfMkYgeworICAgIGZsb2F0 IHg7CisgICAgZmxvYXQgeTsKK30gRDJEMV9QT0lOVF8yRjsKKwordHlwZWRlZiBzdHJ1Y3Qg RDJEMV9CRVpJRVJfU0VHTUVOVCB7CisgIEQyRDFfUE9JTlRfMkYgcG9pbnQxOworICBEMkQx X1BPSU5UXzJGIHBvaW50MjsKKyAgRDJEMV9QT0lOVF8yRiBwb2ludDM7Cit9IEQyRDFfQkVa SUVSX1NFR01FTlQ7CisKK3R5cGVkZWYgZW51bSBEMkQxX0ZJTExfTU9ERSB7CisgIEQyRDFf RklMTF9NT0RFX0FMVEVSTkFURSAgID0gMCwKKyAgRDJEMV9GSUxMX01PREVfV0lORElORyAg ICAgPSAxLAorICBEMkQxX0ZJTExfTU9ERV9GT1JDRV9EV09SRCA9IDB4ZmZmZmZmZmYKK30g RDJEMV9GSUxMX01PREU7CisKK3R5cGVkZWYgZW51bSBEMkQxX1BBVEhfU0VHTUVOVCB7Cisg IEQyRDFfUEFUSF9TRUdNRU5UX05PTkUgICAgICAgICAgICAgICAgICAgID0gMHgwMDAwMDAw MCwKKyAgRDJEMV9QQVRIX1NFR01FTlRfRk9SQ0VfVU5TVFJPS0VEICAgICAgICAgPSAweDAw MDAwMDAxLAorICBEMkQxX1BBVEhfU0VHTUVOVF9GT1JDRV9ST1VORF9MSU5FX0pPSU4gICA9 IDB4MDAwMDAwMDIsCisgIEQyRDFfUEFUSF9TRUdNRU5UX0ZPUkNFX0RXT1JEICAgICAgICAg ICAgID0gMHhmZmZmZmZmZgorfSBEMkQxX1BBVEhfU0VHTUVOVDsKKwordHlwZWRlZiBlbnVt IEQyRDFfRklHVVJFX0JFR0lOIHsKKyAgRDJEMV9GSUdVUkVfQkVHSU5fRklMTEVEICAgICAg PSAwLAorICBEMkQxX0ZJR1VSRV9CRUdJTl9IT0xMT1cgICAgICA9IDEsCisgIEQyRDFfRklH VVJFX0JFR0lOX0ZPUkNFX0RXT1JEID0gMHhmZmZmZmZmZgorfSBEMkQxX0ZJR1VSRV9CRUdJ TjsKKwordHlwZWRlZiBlbnVtIEQyRDFfRklHVVJFX0VORCB7CisgIEQyRDFfRklHVVJFX0VO RF9PUEVOICAgICAgICA9IDAsCisgIEQyRDFfRklHVVJFX0VORF9DTE9TRUQgICAgICA9IDEs CisgIEQyRDFfRklHVVJFX0VORF9GT1JDRV9EV09SRCA9IDB4ZmZmZmZmZmYKK30gRDJEMV9G SUdVUkVfRU5EOworCiB0eXBlZGVmIGludGVyZmFjZSBJRFdyaXRlUmVuZGVyaW5nUGFyYW1z IElEV3JpdGVSZW5kZXJpbmdQYXJhbXM7CiB0eXBlZGVmIGludGVyZmFjZSBJRFdyaXRlRm9u dCBJRFdyaXRlRm9udDsKIHR5cGVkZWYgaW50ZXJmYWNlIElEV3JpdGVHZGlJbnRlcm9wIElE V3JpdGVHZGlJbnRlcm9wOwpAQCAtMTI0LDYgKzE2MCw3IEBAICNkZWZpbmUgRFdSSVRFX0Vf Tk9DT0xPUiBfSFJFU1VMVF9UWVBFREVGXygweDg4OTg1MDBDTCkKIHR5cGVkZWYgaW50ZXJm YWNlIElEV3JpdGVCaXRtYXBSZW5kZXJUYXJnZXQgSURXcml0ZUJpdG1hcFJlbmRlclRhcmdl dDsKIHR5cGVkZWYgaW50ZXJmYWNlIElEV3JpdGVCaXRtYXBSZW5kZXJUYXJnZXQxIElEV3Jp dGVCaXRtYXBSZW5kZXJUYXJnZXQxOwogdHlwZWRlZiBpbnRlcmZhY2UgSURXcml0ZUNvbG9y R2x5cGhSdW5FbnVtZXJhdG9yIElEV3JpdGVDb2xvckdseXBoUnVuRW51bWVyYXRvcjsKK3R5 cGVkZWYgaW50ZXJmYWNlIElEMkQxU2ltcGxpZmllZEdlb21ldHJ5U2luayBJRDJEMVNpbXBs aWZpZWRHZW9tZXRyeVNpbms7CiAKIERFRklORV9HVUlEIChJSURfSURXcml0ZUJpdG1hcFJl bmRlclRhcmdldDEsIDB4NzkxZTgyOTgsIDB4M2VmMywgMHg0MjMwLCAweDk4LAogCSAgICAg MHg4MCwgMHhjOSwgMHhiZCwgMHhlYywgMHhjNCwgMHgyMCwgMHg2NCk7CkBAIC0xOTIsNyAr MjI5LDE2IEBAIERFRklORV9HVUlEIChJSURfSURXcml0ZUZhY3RvcnksIDB4Yjg1OWVlNWEs IDB4ZDgzOCwgMHg0YjViLCAweGEyLCAweGU4LCAweDFhLAogCiAgIEVNQUNTX0RXUklURV9V TlVTRUQgKFRyeUdldEZvbnRUYWJsZSk7CiAgIEVNQUNTX0RXUklURV9VTlVTRUQgKFJlbGVh c2VGb250VGFibGUpOwotICBFTUFDU19EV1JJVEVfVU5VU0VEIChHZXRHbHlwaFJ1bk91dGxp bmUpOworICBIUkVTVUxUIChTVERNRVRIT0RDQUxMVFlQRSAqR2V0R2x5cGhSdW5PdXRsaW5l KQorICAgIChJRFdyaXRlRm9udEZhY2UgKlRoaXMsCisgICAgIEZMT0FUIGVtU2l6ZSwKKyAg ICAgY29uc3QgVUlOVDE2ICpnbHlwaF9pbmRpY2VzLAorICAgICBjb25zdCBEV1JJVEVfR0xZ UEhfT0ZGU0VUICpnbHlwaF9vZmZzZXRzLAorICAgICBjb25zdCBGTE9BVCAqZ2x5cGhfYWR2 YW5jZXMsCisgICAgIFVJTlQzMiBnbHlwaF9jb3VudCwKKyAgICAgV0lOQk9PTCBpc19zaWRl d2F5cywKKyAgICAgV0lOQk9PTCBpc19yaWdodF90b19sZWZ0LAorICAgICBJRDJEMVNpbXBs aWZpZWRHZW9tZXRyeVNpbmsgKmdlb21ldHJ5X3NpbmspOwogICBFTUFDU19EV1JJVEVfVU5V U0VEIChHZXRSZWNvbW1lbmRlZFJlbmRlcmluZ01vZGUpOwogICBFTUFDU19EV1JJVEVfVU5V U0VEIChHZXRHZGlDb21wYXRpYmxlTWV0cmljcyk7CiAKQEAgLTQ3MCw4ICs1MTYsMzQgQEAg REVGSU5FX0dVSUQgKElJRF9JRFdyaXRlRmFjdG9yeSwgMHhiODU5ZWU1YSwgMHhkODM4LCAw eDRiNWIsIDB4YTIsIDB4ZTgsIDB4MWEsCiBpbnRlcmZhY2UgSURXcml0ZUZhY3RvcnkyIHsK ICAgQ09OU1RfVlRCTCBJRFdyaXRlRmFjdG9yeTJWdGJsICpscFZ0Ymw7CiB9OworCit0eXBl ZGVmIHN0cnVjdCBJRDJEMVNpbXBsaWZpZWRHZW9tZXRyeVNpbmtWdGJsIHsKKyAgQkVHSU5f SU5URVJGQUNFCisKKyAgSFJFU1VMVCAoU1RETUVUSE9EQ0FMTFRZUEUgKlF1ZXJ5SW50ZXJm YWNlKQorICAgIChJRDJEMVNpbXBsaWZpZWRHZW9tZXRyeVNpbmsgKlRoaXMsIFJFRklJRCBy aWlkLCB2b2lkICoqcHB2T2JqZWN0KTsKKyAgVUxPTkcgKFNURE1FVEhPRENBTExUWVBFICpB ZGRSZWYpIChJRDJEMVNpbXBsaWZpZWRHZW9tZXRyeVNpbmsgKlRoaXMpOworICBVTE9ORyAo U1RETUVUSE9EQ0FMTFRZUEUgKlJlbGVhc2UpIChJRDJEMVNpbXBsaWZpZWRHZW9tZXRyeVNp bmsgKlRoaXMpOworCisgICAgVk9JRCAoU1RETUVUSE9EQ0FMTFRZUEUgKlNldEZpbGxNb2Rl KShJRDJEMVNpbXBsaWZpZWRHZW9tZXRyeVNpbmsgKlRoaXMsIEQyRDFfRklMTF9NT0RFIGZp bGxNb2RlKTsKKyAgICBWT0lEIChTVERNRVRIT0RDQUxMVFlQRSAqU2V0U2VnbWVudEZsYWdz KShJRDJEMVNpbXBsaWZpZWRHZW9tZXRyeVNpbmsgKlRoaXMsIEQyRDFfUEFUSF9TRUdNRU5U IHZlcnRleEZsYWdzKTsKKyAgICBWT0lEIChTVERNRVRIT0RDQUxMVFlQRSAqQmVnaW5GaWd1 cmUpKElEMkQxU2ltcGxpZmllZEdlb21ldHJ5U2luayAqVGhpcywgRDJEMV9QT0lOVF8yRiBz dGFydFBvaW50LCBEMkQxX0ZJR1VSRV9CRUdJTiBmaWd1cmVCZWdpbik7CisgICAgVk9JRCAo U1RETUVUSE9EQ0FMTFRZUEUgKkFkZExpbmVzKShJRDJEMVNpbXBsaWZpZWRHZW9tZXRyeVNp bmsgKlRoaXMsIGNvbnN0IEQyRDFfUE9JTlRfMkYgKnBvaW50cywgVUlOVCBwb2ludHNDb3Vu dCk7CisgICAgVk9JRCAoU1RETUVUSE9EQ0FMTFRZUEUgKkFkZEJlemllcnMpKElEMkQxU2lt cGxpZmllZEdlb21ldHJ5U2luayAqVGhpcywgY29uc3QgRDJEMV9CRVpJRVJfU0VHTUVOVCAq YmV6aWVycywgVUlOVCBiZXppZXJzQ291bnQpOworICAgIFZPSUQgKFNURE1FVEhPRENBTExU WVBFICpFbmRGaWd1cmUpKElEMkQxU2ltcGxpZmllZEdlb21ldHJ5U2luayAqVGhpcywgRDJE MV9GSUdVUkVfRU5EIGZpZ3VyZUVuZCk7CisgICAgSFJFU1VMVCAoU1RETUVUSE9EQ0FMTFRZ UEUgKkNsb3NlKShJRDJEMVNpbXBsaWZpZWRHZW9tZXRyeVNpbmsgKlRoaXMpOworICBFTkRf SU5URVJGQUNFCit9IElEMkQxU2ltcGxpZmllZEdlb21ldHJ5U2lua1Z0Ymw7CisKK2ludGVy ZmFjZSBJRDJEMVNpbXBsaWZpZWRHZW9tZXRyeVNpbmsgeworICAgIGNvbnN0IElEMkQxU2lt cGxpZmllZEdlb21ldHJ5U2lua1Z0YmwgKmxwVnRibDsKK307CisKK3R5cGVkZWYgSUQyRDFT aW1wbGlmaWVkR2VvbWV0cnlTaW5rIElEV3JpdGVHZW9tZXRyeVNpbms7CisKICNlbHNlIC8q IE1JTkdXX1c2NCAqLwogIyBpbmNsdWRlIDxkd3JpdGVfMy5oPgorIyBpbmNsdWRlIDxkMmQx Lmg+CiAjZW5kaWYKIAogLyogVXNlciBjb25maWd1cmFibGUgdmFyaWFibGVzLiAgSWYgdGhl eSBhcmUgc21hbGxlciB0aGFuIDAsIHVzZQpAQCAtNDk4LDEyICs1NzAsMTI3IEBAIHJlbGVh c2VfY29tIChJVW5rbm93biAqKmkpCiAKICNkZWZpbmUgUkVMRUFTRV9DT00oaSkgcmVsZWFz ZV9jb20gKChJVW5rbm93biAqKikgJmkpCiAKKy8qIEltcGxlbWVudGF0aW9uIG9mIElEV3Jp dGVHZW9tZXRyeVNpbmssIHVzZWQgdG8gdGhlIGdldCBib3VuZGluZworICAgdmVydGljYWwg Y29vcmRpbmF0ZXMgb2YgZ2x5cGhzIChhc2NlbnQvZGVzY2VudCkuICBUaGUgbWV0aG9kcyB0 aGF0CisgICBhZmZlY3QgdGhlIGJvdW5kaW5nIGJveCBhcmUgQmVnaW5GaWd1cmUgKHdoaWNo IGdpdmVzIGEgc3RhcnQgcG9pbnQpLAorICAgQWRkQmV6aWVycyBhbmQgQWRkTGluZXMuCisK KyAgIE5vcm1hbCBwcm9jZWR1cmVzIHRvIGdldCB0ZXh0IGV4dGVudHMgZmFpbCB0byBnaXZl IGNvcnJlY3QKKyAgIGFzY2VudC9kZXNjZW50IG1ldHJpY3MgZm9yIGluZGl2aWR1YWwgZ2x5 cGhzLCB1c2luZyBhIGRlZmF1bHQgdmFsdWUKKyAgIGZvciBhbiBlbnRpcmUgZm9udC4gIFRo YXQgaXMgbm90IGFjY2VwdGFibGUsIHNwZWNpYWxseSBmb3IgZm9udHMgbGlrZQorICAgIlNh bnMgU2VyaWYgQ29sbGVjdGlvbiIsIHdoaWNoIGluY2x1ZGUgZ2x5cGhzIGZvciBtYW55IGRp ZmZlcmVudAorICAgc2NyaXB0cyBhbmQgaGF2ZSBhIGh1Z2UgZGVmYXVsdCB2YWx1ZS4KKwor ICAgQmVjYXVzZSBvZiB0aGF0LCB3ZSBuZWVkIHRvIHVzZSB0aGUgR2V0R2x5cGhSdW5PdXRs aW5lIGFuZCBleGFtaW5lCisgICB0aGUgZ2x5cGgncyBnZW9tZXRyeS4KKyovCisKK3N0cnVj dCBnZW9tZXRyeV9zaW5rCit7CisgIElEV3JpdGVHZW9tZXRyeVNpbmsgc2luazsKKyAgaW50 IGVtcHR5OworICBmbG9hdCBtaW5feSwgbWF4X3k7Cit9OworCitzdGF0aWMgSFJFU1VMVCBT VERNRVRIT0RDQUxMVFlQRQorZ2VvbWV0cnlfc2lua19RdWVyeUludGVyZmFjZSAoSVVua25v d24gKlRoaXMsIFJFRklJRCByaSwgdm9pZCAqKnIpCit7CisgIHJldHVybiBFX05PSU5URVJG QUNFOworfQorCisvKiBUaGVyZSBpcyBub3RoaW5nIHRvIGFsbG9jYXRlIG9mIGZyZWUgaGVy ZXMsIHNvIHdlIGNhbiBzYWZlbHkgc2tpcCByZWYgY291bnRpbmcuICAqLworc3RhdGljIFVM T05HIFNURE1FVEhPRENBTExUWVBFCitnZW9tZXRyeV9zaW5rX0FkZFJlZiAoSVVua25vd24g KlRoaXMpCit7CisgIHJldHVybiAxOworfQorCitzdGF0aWMgVUxPTkcgU1RETUVUSE9EQ0FM TFRZUEUKK2dlb21ldHJ5X3NpbmtfUmVsZWFzZSAoSVVua25vd24gKlRoaXMpCit7CisgIHJl dHVybiAxOworfQorCitzdGF0aWMgdm9pZCBTVERNRVRIT0RDQUxMVFlQRQorZ2VvbWV0cnlf c2lua19BZGRCZXppZXJzIChJRFdyaXRlR2VvbWV0cnlTaW5rICpUaGlzLAorCQkJICBjb25z dCBEMkQxX0JFWklFUl9TRUdNRU5UICpiZXppZXJzLCBVSU5UMzIgY291bnQpCit7CisgIHN0 cnVjdCBnZW9tZXRyeV9zaW5rICpzaW5rID0gKHN0cnVjdCBnZW9tZXRyeV9zaW5rICopIFRo aXM7CisgIGZvciAoVUlOVDMyIGkgPSAwOyBpIDwgY291bnQ7IGkrKykKKyAgICB7CisgICAg ICBpZiAoc2luay0+bWluX3kgPiBiZXppZXJzW2ldLnBvaW50MS55KQorCXNpbmstPm1pbl95 ID0gYmV6aWVyc1tpXS5wb2ludDEueTsKKyAgICAgIGlmIChzaW5rLT5tYXhfeSA8IGJlemll cnNbaV0ucG9pbnQxLnkpCisJc2luay0+bWF4X3kgPSBiZXppZXJzW2ldLnBvaW50MS55Owor ICAgICAgaWYgKHNpbmstPm1pbl95ID4gYmV6aWVyc1tpXS5wb2ludDIueSkKKwlzaW5rLT5t aW5feSA9IGJlemllcnNbaV0ucG9pbnQyLnk7CisgICAgICBpZiAoc2luay0+bWF4X3kgPCBi ZXppZXJzW2ldLnBvaW50Mi55KQorCXNpbmstPm1heF95ID0gYmV6aWVyc1tpXS5wb2ludDIu eTsKKyAgICAgIGlmIChzaW5rLT5taW5feSA+IGJlemllcnNbaV0ucG9pbnQzLnkpCisJc2lu ay0+bWluX3kgPSBiZXppZXJzW2ldLnBvaW50My55OworICAgICAgaWYgKHNpbmstPm1heF95 IDwgYmV6aWVyc1tpXS5wb2ludDMueSkKKwlzaW5rLT5tYXhfeSA9IGJlemllcnNbaV0ucG9p bnQzLnk7CisgICAgfQorfQorCitzdGF0aWMgdm9pZCBTVERNRVRIT0RDQUxMVFlQRQorZ2Vv bWV0cnlfc2lua19BZGRMaW5lcyAoSURXcml0ZUdlb21ldHJ5U2luayAqVGhpcywKKwkJCWNv bnN0IEQyRDFfUE9JTlRfMkYgKnBvaW50cywgVUlOVDMyIGNvdW50KQoreworICBzdHJ1Y3Qg Z2VvbWV0cnlfc2luayAqc2luayA9IChzdHJ1Y3QgZ2VvbWV0cnlfc2luayAqKSBUaGlzOwor ICBmb3IgKFVJTlQzMiBpID0gMDsgaSA8IGNvdW50OyBpKyspCisgICAgeworICAgICAgaWYg KHNpbmstPm1pbl95ID4gcG9pbnRzW2ldLnkpCisJc2luay0+bWluX3kgPSBwb2ludHNbaV0u eTsKKyAgICAgIGlmIChzaW5rLT5tYXhfeSA8IHBvaW50c1tpXS55KQorCXNpbmstPm1heF95 ID0gcG9pbnRzW2ldLnk7CisgICAgfQorfQorCitzdGF0aWMgdm9pZCBTVERNRVRIT0RDQUxM VFlQRQorZ2VvbWV0cnlfc2lua19CZWdpbkZpZ3VyZSAoSURXcml0ZUdlb21ldHJ5U2luayAq VGhpcywKKwkJCSAgIEQyRDFfUE9JTlRfMkYgc3RhcnRQb2ludCwKKwkJCSAgIEQyRDFfRklH VVJFX0JFR0lOIGZpZ3VyZUJlZ2luKQoreworICBzdHJ1Y3QgZ2VvbWV0cnlfc2luayAqc2lu ayA9IChzdHJ1Y3QgZ2VvbWV0cnlfc2luayAqKSBUaGlzOworICBpZiAoc2luay0+bWluX3kg PiBzdGFydFBvaW50LnkpCisgICAgc2luay0+bWluX3kgPSBzdGFydFBvaW50Lnk7CisgIGlm IChzaW5rLT5tYXhfeSA8IHN0YXJ0UG9pbnQueSkKKyAgICBzaW5rLT5tYXhfeSA9IHN0YXJ0 UG9pbnQueTsKKyAgc2luay0+ZW1wdHkgPSAwOworfQorCitzdGF0aWMgdm9pZCBTVERNRVRI T0RDQUxMVFlQRQorZ2VvbWV0cnlfc2lua19FbmRGaWd1cmUgKElEV3JpdGVHZW9tZXRyeVNp bmsgKlRoaXMsIEQyRDFfRklHVVJFX0VORCBmaWd1cmVFbmQpCit7Cit9CisKK3N0YXRpYyBI UkVTVUxUIFNURE1FVEhPRENBTExUWVBFCitnZW9tZXRyeV9zaW5rX0Nsb3NlIChJRFdyaXRl R2VvbWV0cnlTaW5rICpUaGlzKQoreworICByZXR1cm4gU19PSzsKK30KKworc3RhdGljIHZv aWQgU1RETUVUSE9EQ0FMTFRZUEUKK2dlb21ldHJ5X3NpbmtfU2V0RmlsbE1vZGUgKElEV3Jp dGVHZW9tZXRyeVNpbmsgKlRoaXMsCisJCQkgICBEMkQxX0ZJTExfTU9ERSBmaWxsTW9kZSkK K3sKK30KKworc3RhdGljIHZvaWQgU1RETUVUSE9EQ0FMTFRZUEUKK2dlb21ldHJ5X3Npbmtf U2V0U2VnbWVudEZsYWdzIChJRFdyaXRlR2VvbWV0cnlTaW5rICpUaGlzLAorCQkJICAgICAg IEQyRDFfUEFUSF9TRUdNRU5UIHZlcnRleEZsYWdzKQoreworfQorCiAvKiBHbG9iYWwgdmFy aWFibGVzIGZvciBEaXJlY3RXcml0ZS4gICovCiBzdGF0aWMgYm9vbCBkaXJlY3Rfd3JpdGVf YXZhaWxhYmxlID0gZmFsc2U7CiBzdGF0aWMgSURXcml0ZUZhY3RvcnkgKmR3cml0ZV9mYWN0 b3J5ID0gTlVMTDsKIHN0YXRpYyBJRFdyaXRlRmFjdG9yeTIgKmR3cml0ZV9mYWN0b3J5MiA9 IE5VTEw7CiBzdGF0aWMgSURXcml0ZUdkaUludGVyb3AgKmdkaV9pbnRlcm9wID0gTlVMTDsK IHN0YXRpYyBJRFdyaXRlUmVuZGVyaW5nUGFyYW1zICpyZW5kZXJpbmdfcGFyYW1zID0gTlVM TDsKK3N0YXRpYyBzdHJ1Y3QgZ2VvbWV0cnlfc2luayBkd3JpdGVfZ2VvbWV0cnlfc2luazsK K3N0YXRpYyBJRDJEMVNpbXBsaWZpZWRHZW9tZXRyeVNpbmtWdGJsIGR3cml0ZV9nZW9tZXRy eV9zaW5rX3Z0Ymw7CiAKIHN0YXRpYyBib29sCiB2ZXJpZnlfaHIgKEhSRVNVTFQgaHIsIGNv bnN0IGNoYXIgKm1zZykKQEAgLTU4MCw5ICs3NjcsMTQgQEAgY29udmVydF9tZXRyaWNzX3N6 IChpbnQgc3osIGZsb2F0IGZvbnRfc2l6ZSwgaW50IHVuaXRzX3Blcl9lbSkKICAgcmV0dXJu IChmbG9hdCkgc3ogKiBmb250X3NpemUgLyB1bml0c19wZXJfZW07CiB9CiAKLS8qIERvZXMg bm90IGZpbGwgaW4gdGhlIGFzY2VudCBhbmQgZGVzY2VudCBmaWVsZHMgb2YgbWV0cmljcy4g ICovCisKKy8qIEl0IHRoZSBjYWxsZXIgZG9lcyBub3QgbmVlZCBhc2NlbnQvZGVzY2VudCBp bmZvcm1hdGlvbiwgaXQgc2hvdWxkIHBhc3MKKyAgIG5lZWRfYXNjZW50X2Rlc2NlbnQgPSBm YWxzZS4gIFRoaXMgaXMgdXNlZCB0byBhdm9pZCB0aGUgb3ZlcmhlYWQgb2YKKyAgIGNhbGxp bmcgR2V0R2x5cGhSdW5PdXRsaW5lLiAgKi8KKwogc3RhdGljIGJvb2wKIHRleHRfZXh0ZW50 c19pbnRlcm5hbCAoSURXcml0ZUZvbnRGYWNlICpkd3JpdGVfZm9udF9mYWNlLAorCQkgICAg ICAgYm9vbCBuZWVkX2FzY2VudF9kZXNjZW50LAogCQkgICAgICAgZmxvYXQgZm9udF9zaXpl LCBjb25zdCB1bnNpZ25lZCAqY29kZSwKIAkJICAgICAgIGludCBuZ2x5cGhzLCBzdHJ1Y3Qg Zm9udF9tZXRyaWNzICptZXRyaWNzKQogewpAQCAtNjUyLDYgKzg0NCwzOSBAQCB0ZXh0X2V4 dGVudHNfaW50ZXJuYWwgKElEV3JpdGVGb250RmFjZSAqZHdyaXRlX2ZvbnRfZmFjZSwKIAlt ZXRyaWNzLT5yYmVhcmluZyA9IHJiZWFyaW5nOwogICAgIH0KICAgbWV0cmljcy0+d2lkdGgg PSByb3VuZCAod2lkdGgpOworCisgIGlmIChuZWVkX2FzY2VudF9kZXNjZW50KQorICAgIHsK KyAgICAgIGR3cml0ZV9nZW9tZXRyeV9zaW5rLm1pbl95ID0gRkxUX01BWDsKKyAgICAgIGR3 cml0ZV9nZW9tZXRyeV9zaW5rLm1heF95ID0gLUZMVF9NQVg7CisgICAgICBkd3JpdGVfZ2Vv bWV0cnlfc2luay5lbXB0eSA9IDE7CisKKyAgICAgIGhyID0gZHdyaXRlX2ZvbnRfZmFjZS0+ bHBWdGJsLT5HZXRHbHlwaFJ1bk91dGxpbmUgKGR3cml0ZV9mb250X2ZhY2UsCisJCQkJCQkJ IGZvbnRfc2l6ZSwKKwkJCQkJCQkgaW5kaWNlcywKKwkJCQkJCQkgTlVMTCwKKwkJCQkJCQkg TlVMTCwKKwkJCQkJCQkgbmdseXBocywKKwkJCQkJCQkgRkFMU0UsCisJCQkJCQkJIEZBTFNF LAorCQkJCQkJCSAmZHdyaXRlX2dlb21ldHJ5X3Npbmsuc2luayk7CisKKyAgICAgIGlmICgh dmVyaWZ5X2hyIChociwgIkZhaWxlZCB0byBHZXRHbHloUnVuT3V0bGluZSIpKQorCXsKKwkg IFNBRkVfRlJFRSAoKTsKKwkgIHJldHVybiBmYWxzZTsKKwl9CisKKyAgICAgIGlmIChkd3Jp dGVfZ2VvbWV0cnlfc2luay5lbXB0eSkKKwl7CisJICBkd3JpdGVfZ2VvbWV0cnlfc2luay5t aW5feSA9IDA7CisJICBkd3JpdGVfZ2VvbWV0cnlfc2luay5tYXhfeSA9IDA7CisJfQorCisg ICAgICBtZXRyaWNzLT5hc2NlbnQgPSAoaW50KXJvdW5kICgtZHdyaXRlX2dlb21ldHJ5X3Np bmsubWluX3kpOworICAgICAgbWV0cmljcy0+ZGVzY2VudCA9IChpbnQpcm91bmQgKGR3cml0 ZV9nZW9tZXRyeV9zaW5rLm1heF95KTsKKyAgICB9CisKICAgU0FGRV9GUkVFICgpOwogICBy ZXR1cm4gdHJ1ZTsKIH0KQEAgLTY5Nyw3ICs5MjIsOCBAQCB3MzJfZHdyaXRlX3RleHRfZXh0 ZW50cyAoc3RydWN0IGZvbnQgKmZvbnQsIGNvbnN0IHVuc2lnbmVkICpjb2RlLCBpbnQgbmds eXBocywKICAgbWV0cmljcy0+YXNjZW50ID0gZm9udC0+YXNjZW50OwogICBtZXRyaWNzLT5k ZXNjZW50ID0gZm9udC0+ZGVzY2VudDsKIAotICByZXR1cm4gdGV4dF9leHRlbnRzX2ludGVy bmFsIChkd3JpdGVfZm9udF9mYWNlLCBmb250X3NpemUsIGNvZGUsIG5nbHlwaHMsCisgIHJl dHVybiB0ZXh0X2V4dGVudHNfaW50ZXJuYWwgKGR3cml0ZV9mb250X2ZhY2UsIHRydWUsCisJ CQkJZm9udF9zaXplLCBjb2RlLCBuZ2x5cGhzLAogCQkJCW1ldHJpY3MpOwogfQogCkBAIC04 NzEsOCArMTA5NywyOSBAQCB3MzJfaW5pdGlhbGl6ZV9kaXJlY3Rfd3JpdGUgKHZvaWQpCiAg ICAgICByZXR1cm47CiAgICAgfQogCi0gIGRpcmVjdF93cml0ZV9hdmFpbGFibGUgPSB0cnVl OworICBkd3JpdGVfZ2VvbWV0cnlfc2luay5zaW5rLmxwVnRibCA9ICZkd3JpdGVfZ2VvbWV0 cnlfc2lua192dGJsOwogCisjaWZkZWYgTUlOR1dfVzY0CisgIGR3cml0ZV9nZW9tZXRyeV9z aW5rX3Z0YmwuQmFzZS5BZGRSZWYgPSBnZW9tZXRyeV9zaW5rX0FkZFJlZjsKKyAgZHdyaXRl X2dlb21ldHJ5X3NpbmtfdnRibC5CYXNlLlJlbGVhc2UgPSBnZW9tZXRyeV9zaW5rX1JlbGVh c2U7CisgIGR3cml0ZV9nZW9tZXRyeV9zaW5rX3Z0YmwuQmFzZS5RdWVyeUludGVyZmFjZSA9 CisgICAgZ2VvbWV0cnlfc2lua19RdWVyeUludGVyZmFjZTsKKyNlbHNlCisgIGR3cml0ZV9n ZW9tZXRyeV9zaW5rX3Z0YmwuQWRkUmVmID0gKHZvaWQgKikgZ2VvbWV0cnlfc2lua19BZGRS ZWY7CisgIGR3cml0ZV9nZW9tZXRyeV9zaW5rX3Z0YmwuUmVsZWFzZSA9ICh2b2lkICopIGdl b21ldHJ5X3NpbmtfUmVsZWFzZTsKKyAgZHdyaXRlX2dlb21ldHJ5X3NpbmtfdnRibC5RdWVy eUludGVyZmFjZSA9ICh2b2lkICopCisgICAgZ2VvbWV0cnlfc2lua19RdWVyeUludGVyZmFj ZTsKKyNlbmRpZgorCisgIGR3cml0ZV9nZW9tZXRyeV9zaW5rX3Z0YmwuQWRkQmV6aWVycyA9 IGdlb21ldHJ5X3NpbmtfQWRkQmV6aWVyczsKKyAgZHdyaXRlX2dlb21ldHJ5X3NpbmtfdnRi bC5BZGRMaW5lcyA9IGdlb21ldHJ5X3NpbmtfQWRkTGluZXM7CisgIGR3cml0ZV9nZW9tZXRy eV9zaW5rX3Z0YmwuQmVnaW5GaWd1cmUgPSBnZW9tZXRyeV9zaW5rX0JlZ2luRmlndXJlOwor ICBkd3JpdGVfZ2VvbWV0cnlfc2lua192dGJsLkVuZEZpZ3VyZSA9IGdlb21ldHJ5X3Npbmtf RW5kRmlndXJlOworICBkd3JpdGVfZ2VvbWV0cnlfc2lua192dGJsLkNsb3NlID0gZ2VvbWV0 cnlfc2lua19DbG9zZTsKKyAgZHdyaXRlX2dlb21ldHJ5X3NpbmtfdnRibC5TZXRGaWxsTW9k ZSA9IGdlb21ldHJ5X3NpbmtfU2V0RmlsbE1vZGU7CisgIGR3cml0ZV9nZW9tZXRyeV9zaW5r X3Z0YmwuU2V0U2VnbWVudEZsYWdzID0gZ2VvbWV0cnlfc2lua19TZXRTZWdtZW50RmxhZ3M7 CisKKyAgZGlyZWN0X3dyaXRlX2F2YWlsYWJsZSA9IHRydWU7CiAgIHczMl9pbmhpYml0X2R3 cml0ZSA9IGZhbHNlOwogfQogCkBAIC04OTYsNyArMTE0Myw3IEBAIHczMl9kd3JpdGVfZHJh dyAoSERDIGhkYywgaW50IHgsIGludCB5LCB1bnNpZ25lZCAqZ2x5cGhzLCBpbnQgbGVuLAog ICAgIHJldHVybiBmYWxzZTsKIAogICBzdHJ1Y3QgZm9udF9tZXRyaWNzIG1ldHJpY3M7Ci0g IGlmICghdGV4dF9leHRlbnRzX2ludGVybmFsIChkd3JpdGVfZm9udF9mYWNlLCBmb250X3Np emUsIGdseXBocywgbGVuLAorICBpZiAoIXRleHRfZXh0ZW50c19pbnRlcm5hbCAoZHdyaXRl X2ZvbnRfZmFjZSwgZmFsc2UsIGZvbnRfc2l6ZSwgZ2x5cGhzLCBsZW4sCiAJCQkgICAgICAm bWV0cmljcykpCiAgICAgewogICAgICAgdW5pc2NyaWJlX2ZvbnQtPmR3cml0ZV9za2lwX2Zv bnQgPSB0cnVlOwpAQCAtOTM1LDcgKzExODIsNyBAQCB3MzJfZHdyaXRlX2RyYXcgKEhEQyBo ZGMsIGludCB4LCBpbnQgeSwgdW5zaWduZWQgKmdseXBocywgaW50IGxlbiwKIAogICBmb3Ig KGludCBpID0gMDsgaSA8IGxlbjsgaSsrKQogICAgIHsKLSAgICAgIGlmICghdGV4dF9leHRl bnRzX2ludGVybmFsIChkd3JpdGVfZm9udF9mYWNlLCBmb250X3NpemUsIGdseXBocyArIGks IDEsCisgICAgICBpZiAoIXRleHRfZXh0ZW50c19pbnRlcm5hbCAoZHdyaXRlX2ZvbnRfZmFj ZSwgZmFsc2UsIGZvbnRfc2l6ZSwgZ2x5cGhzICsgaSwgMSwKIAkJCQkgICZtZXRyaWNzKSkK IAl7CiAJICB1bmlzY3JpYmVfZm9udC0+ZHdyaXRlX3NraXBfZm9udCA9IHRydWU7Ci0tIAoy LjM1LjEud2luZG93cy4yCgo= --------------ZgG22zIXB9xGykEdB7rGTqF4-- From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 21 14:58:07 2025 Received: (at 77171) by debbugs.gnu.org; 21 Apr 2025 18:58:07 +0000 Received: from localhost ([127.0.0.1]:38723 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u6wLH-0006Dk-Bx for submit@debbugs.gnu.org; Mon, 21 Apr 2025 14:58:07 -0400 Received: from mail.imayhem.com ([82.223.54.191]:54993 helo=zealous-pike.82-223-54-191.plesk.page) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1u6wLE-0006DA-5s for 77171@debbugs.gnu.org; Mon, 21 Apr 2025 14:58:05 -0400 Received: from [192.168.68.101] (16.red-88-21-19.staticip.rima-tde.net [88.21.19.16]) by zealous-pike.82-223-54-191.plesk.page (Postfix) with ESMTPSA id 1A1F9801B5; Mon, 21 Apr 2025 18:57:58 +0000 (UTC) Authentication-Results: zealous-pike.82-223-54-191.plesk.page; spf=pass (sender IP is 88.21.19.16) smtp.mailfrom=cpardo@imayhem.com smtp.helo=[192.168.68.101] Received-SPF: pass (zealous-pike.82-223-54-191.plesk.page: connection is authenticated) Message-ID: <8ac65542-fd0d-4424-a3f8-00506922a0d4@imayhem.com> Date: Mon, 21 Apr 2025 20:57:57 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: bug#77171: 31.0.50; Some lines in etc/HELLO display with large height on MS-Windows From: Cecilio Pardo To: Eli Zaretskii , 77171@debbugs.gnu.org References: <86pli9jqrm.fsf@gnu.org> <5e6e7a03-341c-40a5-9684-37d4d6e8d3d6@imayhem.com> Content-Language: es-ES In-Reply-To: <5e6e7a03-341c-40a5-9684-37d4d6e8d3d6@imayhem.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 77171 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) On 21/04/2025 20:53, Cecilio Pardo wrote: > Hello, > > The attached patch examines the actual glyph's outline with DirectWrite > to compute exact values for ascent and descent and should solve the > problem for any font. Specifically, Sans Serif Collection works well > now, and everything on HELLO.txt looks good on my system. Forgot to say that I tested this in 64 and 32bit build. Had to add some stuff from header files to work with the 32bit compiler. From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 23 10:25:47 2025 Received: (at 77171-done) by debbugs.gnu.org; 23 Apr 2025 14:25:48 +0000 Received: from localhost ([127.0.0.1]:58187 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u7b2m-0001PO-Of for submit@debbugs.gnu.org; Wed, 23 Apr 2025 10:25:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35862) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u7b2d-0001MW-BY for 77171-done@debbugs.gnu.org; Wed, 23 Apr 2025 10:25:39 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u7b2V-00027r-Cv; Wed, 23 Apr 2025 10:25:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=rRNwq0jA/F+EGAhMiO4DMlr5fqqGg2h9YpI+/Ky/f/U=; b=hJ9m9H68R4AV rRmsCp4yUaDYTvGkyr4edh6bglUzvKTu2gxkp/HReVlRQVvsYFib5QqZxdMmUL6jTZKe9VmCHt5Kk PkVgIwtcsJmSy+QUYY4goD5U1mVf5p4iHKt+712f43M7+M+jT1DhBmWlJ38QZkGm3MsUVibIqWD2q Lcbe2Z3BsovA/R/9WPEwcZOP98m6FMZWoeKP52oZaPRQ3LZwF67oNo//udNm10pRgI9wTKSEohkN4 A1q1zW+cTqdmqJ1ePNgiqmERmZofQrGJXKpeJdQTDB9biIhl05QAf74ubFzR/zBRepTm3Ro0Mm8tM nUXcaosPDOkTMO7HdpAtLA==; Date: Wed, 23 Apr 2025 17:25:19 +0300 Message-Id: <86r01jymy8.fsf@gnu.org> From: Eli Zaretskii To: Cecilio Pardo In-Reply-To: <5e6e7a03-341c-40a5-9684-37d4d6e8d3d6@imayhem.com> (message from Cecilio Pardo on Mon, 21 Apr 2025 20:53:35 +0200) Subject: Re: bug#77171: 31.0.50; Some lines in etc/HELLO display with large height on MS-Windows References: <86pli9jqrm.fsf@gnu.org> <5e6e7a03-341c-40a5-9684-37d4d6e8d3d6@imayhem.com> X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 77171-done Cc: 77171-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > Date: Mon, 21 Apr 2025 20:53:35 +0200 > From: Cecilio Pardo > > The attached patch examines the actual glyph's outline with DirectWrite > to compute exact values for ascent and descent and should solve the > problem for any font. Specifically, Sans Serif Collection works well > now, and everything on HELLO.txt looks good on my system. > > This adds some overhead, but I didn't find it noticeable. In case > someone does, we could cache measurements as the GDI backend does. > > When computing the bounding box for bezier curves, I just used minmax > values for start/end and control points, instead of actually evaluating > the curve. This reduces the overhead and loses some precision, but I > didn't see any real difference. Thanks, this solves the problems, so I've now installed this on master, and I'm therefore closing the bug. From unknown Thu Aug 14 12:23:34 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 22 May 2025 11:24:18 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator