From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Carlos Pita Newsgroups: gmane.emacs.bugs Subject: bug#37770: [PATCH] Expose scale factor through the redisplay interface Date: Wed, 16 Oct 2019 13:12:22 -0300 Message-ID: References: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="0000000000005666150595095e08" Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="49307"; mail-complaints-to="usenet@blaine.gmane.org" Cc: 37770@debbugs.gnu.org To: Robert Pluim Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Oct 16 18:13:14 2019 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1iKlvG-000Ci9-FL for geb-bug-gnu-emacs@m.gmane.org; Wed, 16 Oct 2019 18:13:14 +0200 Original-Received: from localhost ([::1]:45242 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iKlvF-0005tx-A3 for geb-bug-gnu-emacs@m.gmane.org; Wed, 16 Oct 2019 12:13:13 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:59805) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iKlv6-0005o3-H8 for bug-gnu-emacs@gnu.org; Wed, 16 Oct 2019 12:13:06 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iKlv4-0005VD-Nr for bug-gnu-emacs@gnu.org; Wed, 16 Oct 2019 12:13:04 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:37588) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iKlv4-0005V2-JP for bug-gnu-emacs@gnu.org; Wed, 16 Oct 2019 12:13:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iKlv4-0004IN-BL for bug-gnu-emacs@gnu.org; Wed, 16 Oct 2019 12:13:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Carlos Pita Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 16 Oct 2019 16:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 37770 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 37770-submit@debbugs.gnu.org id=B37770.157124236216484 (code B ref 37770); Wed, 16 Oct 2019 16:13:02 +0000 Original-Received: (at 37770) by debbugs.gnu.org; 16 Oct 2019 16:12:42 +0000 Original-Received: from localhost ([127.0.0.1]:46409 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iKluk-0004Hn-77 for submit@debbugs.gnu.org; Wed, 16 Oct 2019 12:12:42 -0400 Original-Received: from mail-yw1-f66.google.com ([209.85.161.66]:45285) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iKlui-0004HZ-2P for 37770@debbugs.gnu.org; Wed, 16 Oct 2019 12:12:40 -0400 Original-Received: by mail-yw1-f66.google.com with SMTP id x65so8820823ywf.12 for <37770@debbugs.gnu.org>; Wed, 16 Oct 2019 09:12:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=rRTyy8jKvFQvEBHDp28gt6vIpe6S5qYxD8vSMks2AAU=; b=IBjUA2zuWIvooKLjPCGoGh0Gntv/9IbNEpdK6PB2O0L+p0FHfeDXKECWA8p/CdzouD Aljgg/MTS7rDEbk5kd4iwbgAabEDzJG5vhKLCewuQ+YN/kiVNlMjEHXfpJoRbH/vtBEZ NpfIkXruW865z+3G8jOn1U96JzR7QKwH2imeHf5kpXVvWgnBZzmfhXxN7sWWkkFdBV3M BeP2gvOtUAvfM6xZTYBVlJFkRprUFIEBWBMUUjlpMegvk6h02tOR8Q9QKmhZKljk7Hid KaMPEHXQ55mtYH4OMMUxdr4Z6Ba81sluLFfKWiCrjilx4e/X6GYUCo22S5PYuHp7qhHi LeZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=rRTyy8jKvFQvEBHDp28gt6vIpe6S5qYxD8vSMks2AAU=; b=sqIIB/5aGPGXEx6M7LC3MZSSOwqQiVj8juvbzu4bC6W1XakxzbCJ/a1Srq6bZ7bjZQ qVDzVeQ82IRLtl9fWDUtahuD4OUmq/YickLLowlcmsCwwa9VfTeCwnFh4/cPqm5hEkfj 5NweO7uI4y7FAT5ZYODKGuo9l5UBiXnSV+scbvwLJ2qrMorVgj385m520hxUFL1D1pld sk2Q9fzN14WSk1wjd3YbbC9+9Ueq2tsPgC6ekQNro3J9kARtgNeWrun26X0AE/ZG6A/M dt4U6hP/nR5BilJ9FItY5vO5SwsVC4tqipQU9oxoOgM4foOVFuGql19/sWG1MReO8qog Gh3g== X-Gm-Message-State: APjAAAV35CCdHw4iDDjKmP11cpWP4b2z9bjtdrFvQQZYE6TegNokO/5K /UMJ1M5fAgOgWpGC2+SvzNTuEDIOHckqDKC0mVA= X-Google-Smtp-Source: APXvYqz+VJd1D2EE/vTj+ne0rfmm8q4LlNaSF+p8WuC8UUoIH7IVhoCLrFROsosQOcppE0Zh7lpe77mE3Jl7+j++rc8= X-Received: by 2002:a81:5088:: with SMTP id e130mr19280455ywb.91.1571242353506; Wed, 16 Oct 2019 09:12:33 -0700 (PDT) In-Reply-To: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:169460 Archived-At: --0000000000005666150595095e08 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable > This commit message doesn=CA=BCt use the ChangeLog format. Ahh, I was just informally pattern matching other commit messages I had seen in your repo. Now I've read [1] (I really like those rules, will adopt them for other projects too). Nevertheless I'm still unsure about how to format the notes that go below the actual changes. Please, tell me what do you think about the new commit message. > For the rest, it looks ok. Do you plan to make the changes to actually > use the rif interface as part of the same patch? No, those are part of bug#37689 [2]. --- [1] https://www.gnu.org/prep/standards/html_node/Change-Logs.html#Change-Lo= gs [2] https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D37689 --0000000000005666150595095e08 Content-Type: text/x-patch; charset="US-ASCII"; name="0001-Expose-scale-factor-through-the-redisplay-interface.patch" Content-Disposition: attachment; filename="0001-Expose-scale-factor-through-the-redisplay-interface.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_k1th26ir0 RnJvbSA2ZGEwOThlMGViZmJlOGUxN2FkMGZhODYwMjQ1MjIyZDEyNDk3ODg5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBtZW1lcGxleCA8Y2FybG9zam9zZXBpdGFAZ21haWwuY29tPgpE YXRlOiBUdWUsIDE1IE9jdCAyMDE5IDE5OjE0OjAzIC0wMzAwClN1YmplY3Q6IFtQQVRDSF0gRXhw b3NlIHNjYWxlIGZhY3RvciB0aHJvdWdoIHRoZSByZWRpc3BsYXkgaW50ZXJmYWNlCgoqIHNyYy9k aXNwZXh0ZXJuLmggKHJlZGlzcGxheV9pbnRlcmZhY2UpOiBhZGQgZ2V0X3NjYWxlX2ZhY3RvciBB UEkuCgoqIHNyYy94dGVybS5jICh4X2dldF9zY2FsZV9mYWN0b3IpOiBjb25zb2xpZGF0ZSB3aXRo IHhnX2dldF9zY2FsZSAoc2VlCmJ1ZyMzNzc1MikgYW5kIGV4cG9ydCB0aHJvdWdoIHRoZSByaWYu IFNpbXBsaWZ5IHNjYWxlIGluZmVycmluZwpsb2dpYyAoc2VlIG5vdGUgMSBiZWxvdykuCgoqIHNy Yy93MzJ0ZXJtLmMgKHczMl9nZXRfc2NhbGVfZmFjdG9yKTogbGlrZXdpc2Ugc2ltcGxpZnkgbG9n aWMgYW5kCmFkZCB0byB0aGUgcmlmLgoKKiBzcmMvbnN0ZXJtLm0gKG5zX2dldF9zY2FsZV9mYWN0 b3IpOiBhZGQgYSBkdW1teSBpbXBsZW1lbnRhdGlvbiB0aGF0CmFsd2F5cyByZXR1cm4gMSB0byB0 aGUgcmlmLCBzaW5jZSB0aGVyZSBhcmUgbm8gdXNlcyBvZiBhbnkgc2NhbGUKZmFjdG9yIGhlcmUu CgpOb3RlIDE6IGJvdGggeF9nZXRfc2NhbGVfZmFjdG9yIGFuZCB3MzJfZ2V0X3NjYWxlX2ZhY3Rv ciBjb21wdXRlZApkaXN0aW5jdCBzY2FsZXMgZm9yIHggYW5kIHkgYnkgdGFraW5nIHRoZSByYXRp byBiZXR3ZWVuIGVmZmVjdGl2ZQpyZXNvbHV0aW9uIGluIGVhY2ggZGlyZWN0aW9uIGFuZCBhIHN0 YW5kYXJkIDk2IGRwaSByZXNvbHV0aW9uLiAgU2luY2UKdGhpcyByYXRpbyBpcyB0aGVuIHRydW5j YXRlZCB0byBhbiBpbnRlZ2VyICh0aGUgZmxvb3IpIGl0IHNlZW1zIHRvIG1lCnRoYXQgdGhlcmUg aXMgbm8gc2Vuc2libGUgcG9zc2liaWxpdHkgdGhhdCB0aGVzZSB0d28gbnVtYmVycwpkaXZlcmdl LiBNb3Jlb3ZlciwgbW9kZXJuIHRvb2xraXRzIHJlcG9ydCBvbmUgbnVtYmVyIGFzIHNjYWxlIGZh Y3RvcgphbmQgd2UgbmVlZCBhIGNvbW1vbiBpbnRlcmZhY2UgaGVyZS4gRm9yIHRob3NlIHJlYXNv bnMgSSdtIGFyYml0cmFyaWx5CnBpY2tpbmcgdGhlIGhvcml6b250YWwgc2NhbGUgZmFjdG9yIGFz IFRIRSBzY2FsZSBmYWN0b3IuCgpOb3RlIDI6IEkgZGVjaWRlZCB0byBsZXQgZ2V0X3NjYWxlX2Zh Y3RvciByZXR1cm4gYSBkb3VibGUsIGV2ZW4gdG91Z2gKZmFjdG9ycyBjdXJyZW50bHkgaW4gdXNl IGFyZSBhbGwgaW50ZWdlcnMgQUZBSUsuIFRoaXMgaXMgaW4KYW50aWNpcGF0aW9uIG9mIGZyYWN0 aW9uYWwgc2NhbGluZy4gSSBiZWxpZXZlIGl0J3MgcHJ1ZGVudCB0byBrZWVwCnRoZSBpbnRlcmZh Y2UgZ2VuZXJhbCBpbiB0aGlzIHJlZ2FyZC4KLS0tCiBzcmMvZGlzcGV4dGVybi5oIHwgIDMgKysr CiBzcmMvbnN0ZXJtLm0gICAgIHwgIDYgKysrKysrCiBzcmMvdzMydGVybS5jICAgIHwgMjkgKysr KysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0KIHNyYy94dGVybS5jICAgICAgfCA0MSArKysrKysr KysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogNCBmaWxlcyBjaGFuZ2VkLCAzOCBp bnNlcnRpb25zKCspLCA0MSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9zcmMvZGlzcGV4dGVy bi5oIGIvc3JjL2Rpc3BleHRlcm4uaAppbmRleCAwNjE1YjE2Li5iOTNlMjVmIDEwMDY0NAotLS0g YS9zcmMvZGlzcGV4dGVybi5oCisrKyBiL3NyYy9kaXNwZXh0ZXJuLmgKQEAgLTI5NDIsNiArMjk0 Miw5IEBAIHJlc2V0X21vdXNlX2hpZ2hsaWdodCAoTW91c2VfSExJbmZvICpobGluZm8pCiAKICNp ZmRlZiBIQVZFX1dJTkRPV19TWVNURU0KIAorICAvKiBSZXR1cm4gdGhlIHNjYWxlIGZhY3RvciBm b3IgdGhlIHNjcmVlbiBjb250YWluaW5nIGZyYW1lIEYuICAqLworICBkb3VibGUgKCpnZXRfc2Nh bGVfZmFjdG9yKSAoc3RydWN0IGZyYW1lICpmKTsKKwogICAvKiBEcmF3IGEgZnJpbmdlIGJpdG1h cCBpbiB3aW5kb3cgVyBvZiByb3cgUk9XIHVzaW5nIHBhcmFtZXRlcnMgUC4gICovCiAgIHZvaWQg KCpkcmF3X2ZyaW5nZV9iaXRtYXApIChzdHJ1Y3Qgd2luZG93ICp3LCBzdHJ1Y3QgZ2x5cGhfcm93 ICpyb3csCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzdHJ1Y3QgZHJhd19mcmluZ2Vf Yml0bWFwX3BhcmFtcyAqcCk7CmRpZmYgLS1naXQgYS9zcmMvbnN0ZXJtLm0gYi9zcmMvbnN0ZXJt Lm0KaW5kZXggNTU4M2M2MS4uNmUxYjc1MSAxMDA2NDQKLS0tIGEvc3JjL25zdGVybS5tCisrKyBi L3NyYy9uc3Rlcm0ubQpAQCAtMjk1Nyw2ICsyOTU3LDExIEBAIHNvIHNvbWUga2V5IHByZXNzZXMg KFRBQikgYXJlIHN3YWxsb3dlZCBieSB0aGUgc3lzdGVtLiAgKi8KIAogICAgPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0gKi8KIAorc3RhdGljIGRvdWJsZQorbnNfZ2V0X3NjYWxlX2ZhY3RvciAoc3RydWN0IGZy YW1lICpmKQoreworICByZXR1cm4gMTsgIC8vIFRPRE8gZG8gd2UgbmVlZCB0byBkbyBzb21ldGhp bmcgZWxzZSBoZXJlPworfQogCiBleHRlcm4gaW50IG1heF91c2VkX2ZyaW5nZV9iaXRtYXA7CiBz dGF0aWMgdm9pZApAQCAtNTA4Nyw2ICs1MDkyLDcgQEAgc3RhdGljIExpc3BfT2JqZWN0IG5zX3N0 cmluZ190b19saXNwbW9kIChjb25zdCBjaGFyICpzKQogICBndWlfY2xlYXJfd2luZG93X21vdXNl X2ZhY2UsCiAgIGd1aV9nZXRfZ2x5cGhfb3ZlcmhhbmdzLAogICBndWlfZml4X292ZXJsYXBwaW5n X2FyZWEsCisgIG5zX2dldF9zY2FsZV9mYWN0b3IsCiAgIG5zX2RyYXdfZnJpbmdlX2JpdG1hcCwK ICAgMCwgLyogZGVmaW5lX2ZyaW5nZV9iaXRtYXAgKi8gLyogRklYTUU6IHNpbXBsaWZ5IG5zX2Ry YXdfZnJpbmdlX2JpdG1hcCAqLwogICAwLCAvKiBkZXN0cm95X2ZyaW5nZV9iaXRtYXAgKi8KZGlm ZiAtLWdpdCBhL3NyYy93MzJ0ZXJtLmMgYi9zcmMvdzMydGVybS5jCmluZGV4IDlkYTA4NDUuLjZk NDMwYzYgMTAwNjQ0Ci0tLSBhL3NyYy93MzJ0ZXJtLmMKKysrIGIvc3JjL3czMnRlcm0uYwpAQCAt MzA0LDIwICszMDQsMTYgQEAgdzMyX3Jlc3RvcmVfZ2x5cGhfc3RyaW5nX2NsaXAgKHN0cnVjdCBn bHlwaF9zdHJpbmcgKnMpCiAgICAgfQogfQogCi1zdGF0aWMgdm9pZAotdzMyX2dldF9zY2FsZV9m YWN0b3Ioc3RydWN0IHczMl9kaXNwbGF5X2luZm8gKmRweWluZm8sIGludCAqc2NhbGVfeCwgaW50 ICpzY2FsZV95KQorc3RhdGljIGRvdWJsZQordzMyX2dldF9zY2FsZV9mYWN0b3Ioc3RydWN0IGZy YW1lICpmKQogeworICBzdHJ1Y3QgdzMyX2Rpc3BsYXlfaW5mbyAqZHB5aW5mbyA9IEZSQU1FX0RJ U1BMQVlfSU5GTyAoZik7CiAgIGNvbnN0IGludCBiYXNlX3JlcyA9IDk2OwogCi0gICpzY2FsZV94 ID0gKnNjYWxlX3kgPSAxOwotCi0gIGlmIChkcHlpbmZvKQotICAgIHsKLSAgICAgIGlmIChkcHlp bmZvLT5yZXN4ID4gYmFzZV9yZXMpCi0JKnNjYWxlX3ggPSBmbG9vciAoZHB5aW5mby0+cmVzeCAv IGJhc2VfcmVzKTsKLSAgICAgIGlmIChkcHlpbmZvLT5yZXN5ID4gYmFzZV9yZXMpCi0JKnNjYWxl X3kgPSBmbG9vciAoZHB5aW5mby0+cmVzeSAvIGJhc2VfcmVzKTsKLSAgICB9CisgIGlmIChkcHlp bmZvICYmIGRweWluZm8tPnJlc3ggPiBiYXNlX3JlcykKKyAgICByZXR1cm4gZmxvb3IgKGRweWlu Zm8tPnJlc3ggLyBiYXNlX3Jlcyk7CisgIGVsc2UKKyAgICByZXR1cm4gMTsKIH0KIAogLyoKQEAg LTMzNCwxMiArMzMwLDggQEAgdzMyX2dldF9zY2FsZV9mYWN0b3Ioc3RydWN0IHczMl9kaXNwbGF5 X2luZm8gKmRweWluZm8sIGludCAqc2NhbGVfeCwgaW50ICpzY2FsZV8KIHN0YXRpYyB2b2lkCiB3 MzJfZHJhd191bmRlcndhdmUgKHN0cnVjdCBnbHlwaF9zdHJpbmcgKnMsIENPTE9SUkVGIGNvbG9y KQogewotICBzdHJ1Y3QgdzMyX2Rpc3BsYXlfaW5mbyAqZHB5aW5mbyA9IEZSQU1FX0RJU1BMQVlf SU5GTyAocy0+Zik7Ci0KLSAgaW50IHNjYWxlX3gsIHNjYWxlX3k7Ci0gIHczMl9nZXRfc2NhbGVf ZmFjdG9yIChkcHlpbmZvLCAmc2NhbGVfeCwgJnNjYWxlX3kpOwotCi0gIGludCB3YXZlX2hlaWdo dCA9IDMgKiBzY2FsZV95LCB3YXZlX2xlbmd0aCA9IDIgKiBzY2FsZV94LCB0aGlja25lc3MgPSBz Y2FsZV95OworICBkb3VibGUgc2NhbGUgPSB3MzJfZ2V0X3NjYWxlX2ZhY3RvciAocy0+Zik7Cisg IGludCB3YXZlX2hlaWdodCA9IDMgKiBzY2FsZSwgd2F2ZV9sZW5ndGggPSAyICogc2NhbGUsIHRo aWNrbmVzcyA9IHNjYWxlOwogICBpbnQgZHgsIGR5LCB4MCwgeTAsIHdpZHRoLCB4MSwgeTEsIHgy LCB5Miwgb2RkLCB4bWF4OwogICBFbWFjc19SZWN0YW5nbGUgd2F2ZV9jbGlwLCBzdHJpbmdfY2xp cCwgZmluYWxfY2xpcDsKICAgUkVDVCB3MzJfZmluYWxfY2xpcCwgdzMyX3N0cmluZ19jbGlwOwpA QCAtMzQ4LDcgKzM0MCw3IEBAIHczMl9kcmF3X3VuZGVyd2F2ZSAoc3RydWN0IGdseXBoX3N0cmlu ZyAqcywgQ09MT1JSRUYgY29sb3IpCiAgIGR4ID0gd2F2ZV9sZW5ndGg7CiAgIGR5ID0gd2F2ZV9o ZWlnaHQgLSAxOwogICB4MCA9IHMtPng7Ci0gIHkwID0gcy0+eWJhc2UgKyB3YXZlX2hlaWdodCAv IDIgLSBzY2FsZV95OworICB5MCA9IHMtPnliYXNlICsgd2F2ZV9oZWlnaHQgLyAyIC0gc2NhbGU7 CiAgIHdpZHRoID0gcy0+d2lkdGg7CiAgIHhtYXggPSB4MCArIHdpZHRoOwogCkBAIC03MTkyLDYg KzcxODQsNyBAQCB3MzJfbWFrZV9yZGIgKGNoYXIgKnhybV9vcHRpb24pCiAgIGd1aV9jbGVhcl93 aW5kb3dfbW91c2VfZmFjZSwKICAgZ3VpX2dldF9nbHlwaF9vdmVyaGFuZ3MsCiAgIGd1aV9maXhf b3ZlcmxhcHBpbmdfYXJlYSwKKyAgdzMyX2dldF9zY2FsZV9mYWN0b3IsCiAgIHczMl9kcmF3X2Zy aW5nZV9iaXRtYXAsCiAgIHczMl9kZWZpbmVfZnJpbmdlX2JpdG1hcCwKICAgdzMyX2Rlc3Ryb3lf ZnJpbmdlX2JpdG1hcCwKZGlmZiAtLWdpdCBhL3NyYy94dGVybS5jIGIvc3JjL3h0ZXJtLmMKaW5k ZXggNWQ4YjE0OC4uNjcyNTNhNiAxMDA2NDQKLS0tIGEvc3JjL3h0ZXJtLmMKKysrIGIvc3JjL3h0 ZXJtLmMKQEAgLTM2MTEsMjEgKzM2MTEsMjEgQEAgeF9kcmF3X3N0cmV0Y2hfZ2x5cGhfc3RyaW5n IChzdHJ1Y3QgZ2x5cGhfc3RyaW5nICpzKQogICBzLT5iYWNrZ3JvdW5kX2ZpbGxlZF9wID0gdHJ1 ZTsKIH0KIAotc3RhdGljIHZvaWQKLXhfZ2V0X3NjYWxlX2ZhY3RvcihEaXNwbGF5ICpkaXNwLCBp bnQgKnNjYWxlX3gsIGludCAqc2NhbGVfeSkKK3N0YXRpYyBkb3VibGUKK3hfZ2V0X3NjYWxlX2Zh Y3RvcihzdHJ1Y3QgZnJhbWUgKmYpCiB7CisjaWZkZWYgVVNFX0dUSworICByZXR1cm4geGdfZ2V0 X3NjYWxlIChmKTsKKyNlbHNlCisgIERpc3BsYXkgKmRpc3AgPSBGUkFNRV9YX0RJU1BMQVkgKGYp OworICBzdHJ1Y3QgeF9kaXNwbGF5X2luZm8gKmRweWluZm8gPSB4X2Rpc3BsYXlfaW5mb19mb3Jf ZGlzcGxheSAoZGlzcCk7CiAgIGNvbnN0IGludCBiYXNlX3JlcyA9IDk2OwotICBzdHJ1Y3QgeF9k aXNwbGF5X2luZm8gKiBkcHlpbmZvID0geF9kaXNwbGF5X2luZm9fZm9yX2Rpc3BsYXkgKGRpc3Ap OwotCi0gICpzY2FsZV94ID0gKnNjYWxlX3kgPSAxOwogCi0gIGlmIChkcHlpbmZvKQotICAgIHsK LSAgICAgIGlmIChkcHlpbmZvLT5yZXN4ID4gYmFzZV9yZXMpCi0JKnNjYWxlX3ggPSBmbG9vciAo ZHB5aW5mby0+cmVzeCAvIGJhc2VfcmVzKTsKLSAgICAgIGlmIChkcHlpbmZvLT5yZXN5ID4gYmFz ZV9yZXMpCi0JKnNjYWxlX3kgPSBmbG9vciAoZHB5aW5mby0+cmVzeSAvIGJhc2VfcmVzKTsKLSAg ICB9CisgIGlmIChkcHlpbmZvICYmIGRweWluZm8tPnJlc3ggPiBiYXNlX3JlcykKKyAgICByZXR1 cm4gZmxvb3IgKGRweWluZm8tPnJlc3ggLyBiYXNlX3Jlcyk7CisgIGVsc2UKKyAgICByZXR1cm4g MTsKKyNlbmRpZiAvKiBVU0VfR1RLICovCiB9CiAKIC8qCkBAIC0zNjQxLDI3ICszNjQxLDIxIEBA IHhfZ2V0X3NjYWxlX2ZhY3RvcihEaXNwbGF5ICpkaXNwLCBpbnQgKnNjYWxlX3gsIGludCAqc2Nh bGVfeSkKIHN0YXRpYyB2b2lkCiB4X2RyYXdfdW5kZXJ3YXZlIChzdHJ1Y3QgZ2x5cGhfc3RyaW5n ICpzKQogewotICBEaXNwbGF5ICpkaXNwbGF5ID0gRlJBTUVfWF9ESVNQTEFZIChzLT5mKTsKLQog ICAvKiBBZGp1c3QgZm9yIHNjYWxlL0hpRFBJLiAgKi8KLSAgaW50IHNjYWxlX3gsIHNjYWxlX3k7 Ci0KLSAgeF9nZXRfc2NhbGVfZmFjdG9yIChkaXNwbGF5LCAmc2NhbGVfeCwgJnNjYWxlX3kpOwot Ci0gIGludCB3YXZlX2hlaWdodCA9IDMgKiBzY2FsZV95LCB3YXZlX2xlbmd0aCA9IDIgKiBzY2Fs ZV94OwotCisgIGRvdWJsZSBzY2FsZSA9IHhfZ2V0X3NjYWxlX2ZhY3RvciAocy0+Zik7CisgIGlu dCB3YXZlX2hlaWdodCA9IDMgKiBzY2FsZSwgd2F2ZV9sZW5ndGggPSAyICogc2NhbGU7CiAjaWZk ZWYgVVNFX0NBSVJPCiAgIHhfZHJhd19ob3Jpem9udGFsX3dhdmUgKHMtPmYsIHMtPmdjLCBzLT54 LCBzLT55YmFzZSAtIHdhdmVfaGVpZ2h0ICsgMywKIAkJCSAgcy0+d2lkdGgsIHdhdmVfaGVpZ2h0 LCB3YXZlX2xlbmd0aCk7CiAjZWxzZSAgLyogbm90IFVTRV9DQUlSTyAqLwotICBpbnQgZHgsIGR5 LCB4MCwgeTAsIHdpZHRoLCB4MSwgeTEsIHgyLCB5MiwgeG1heCwgdGhpY2tuZXNzID0gc2NhbGVf eTs7CisgIGludCBkeCwgZHksIHgwLCB5MCwgd2lkdGgsIHgxLCB5MSwgeDIsIHkyLCB4bWF4LCB0 aGlja25lc3MgPSBzY2FsZTsKICAgYm9vbCBvZGQ7CiAgIFhSZWN0YW5nbGUgd2F2ZV9jbGlwLCBz dHJpbmdfY2xpcCwgZmluYWxfY2xpcDsKIAogICBkeCA9IHdhdmVfbGVuZ3RoOwogICBkeSA9IHdh dmVfaGVpZ2h0IC0gMTsKICAgeDAgPSBzLT54OwotICB5MCA9IHMtPnliYXNlICsgd2F2ZV9oZWln aHQgLyAyIC0gc2NhbGVfeTsKKyAgeTAgPSBzLT55YmFzZSArIHdhdmVfaGVpZ2h0IC8gMiAtIHNj YWxlOwogICB3aWR0aCA9IHMtPndpZHRoOwogICB4bWF4ID0geDAgKyB3aWR0aDsKIApAQCAtMTA1 NTcsNyArMTA1NTEsNyBAQCB4X3NldF9vZmZzZXQgKHN0cnVjdCBmcmFtZSAqZiwgcmVnaXN0ZXIg aW50IHhvZmYsIHJlZ2lzdGVyIGludCB5b2ZmLCBpbnQgY2hhbmdlXwogewogICBpbnQgbW9kaWZp ZWRfdG9wLCBtb2RpZmllZF9sZWZ0OwogI2lmZGVmIFVTRV9HVEsKLSAgaW50IHNjYWxlID0geGdf Z2V0X3NjYWxlIChmKTsKKyAgZG91YmxlIHNjYWxlID0geF9nZXRfc2NhbGVfZmFjdG9yIChmKTsK ICNlbmRpZgogCiAgIGlmIChjaGFuZ2VfZ3Jhdml0eSA+IDApCkBAIC0xMzM1Niw2ICsxMzM1MCw3 IEBAIHhfYWN0aXZhdGVfdGltZW91dF9hdGltZXIgKHZvaWQpCiAgICAgZ3VpX2NsZWFyX3dpbmRv d19tb3VzZV9mYWNlLAogICAgIGd1aV9nZXRfZ2x5cGhfb3ZlcmhhbmdzLAogICAgIGd1aV9maXhf b3ZlcmxhcHBpbmdfYXJlYSwKKyAgICB4X2dldF9zY2FsZV9mYWN0b3IsCiAgICAgeF9kcmF3X2Zy aW5nZV9iaXRtYXAsCiAjaWZkZWYgVVNFX0NBSVJPCiAgICAgeF9jcl9kZWZpbmVfZnJpbmdlX2Jp dG1hcCwKLS0gCjIuMjAuMQoK --0000000000005666150595095e08--