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: Tue, 15 Oct 2019 21:32:25 -0300 Message-ID: References: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="000000000000dc08dd0594fc3c1f" Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="126389"; mail-complaints-to="usenet@blaine.gmane.org" To: 37770@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Oct 16 02:33:12 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 1iKXFY-000WkP-8I for geb-bug-gnu-emacs@m.gmane.org; Wed, 16 Oct 2019 02:33:12 +0200 Original-Received: from localhost ([::1]:34188 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iKXFW-0006x5-Kg for geb-bug-gnu-emacs@m.gmane.org; Tue, 15 Oct 2019 20:33:10 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:51366) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iKXFP-0006uT-Mx for bug-gnu-emacs@gnu.org; Tue, 15 Oct 2019 20:33:05 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iKXFO-0003Nv-0G for bug-gnu-emacs@gnu.org; Tue, 15 Oct 2019 20:33:03 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:36206) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iKXFN-0003Nr-TN for bug-gnu-emacs@gnu.org; Tue, 15 Oct 2019 20:33:01 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iKXFN-0008Jf-Nx for bug-gnu-emacs@gnu.org; Tue, 15 Oct 2019 20:33:01 -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 00:33:01 +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 X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.157118596531939 (code B ref -1); Wed, 16 Oct 2019 00:33:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 16 Oct 2019 00:32:45 +0000 Original-Received: from localhost ([127.0.0.1]:45027 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iKXF6-0008J5-Mg for submit@debbugs.gnu.org; Tue, 15 Oct 2019 20:32:45 -0400 Original-Received: from lists.gnu.org ([209.51.188.17]:56702) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iKXF4-0008It-4V for submit@debbugs.gnu.org; Tue, 15 Oct 2019 20:32:42 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:51276) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iKXF2-0006tN-DA for bug-gnu-emacs@gnu.org; Tue, 15 Oct 2019 20:32:41 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iKXF0-0003JB-Ly for bug-gnu-emacs@gnu.org; Tue, 15 Oct 2019 20:32:40 -0400 Original-Received: from mail-yw1-xc44.google.com ([2607:f8b0:4864:20::c44]:46454) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iKXF0-0003J5-G4 for bug-gnu-emacs@gnu.org; Tue, 15 Oct 2019 20:32:38 -0400 Original-Received: by mail-yw1-xc44.google.com with SMTP id l64so7911243ywe.13 for ; Tue, 15 Oct 2019 17:32:38 -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; bh=97YkB9qtiD0j8HvviTkxo5OP5lLz7ZxukMMG6KlCMlw=; b=VQUg3l7noNw0iD8g3lj7jMgLukWH1DdUpOEXHdkA6K2mJbAbfpZATqOaNwwMtHWexc 78bXcvAPEeFbyq/45Y4iTw4FeYL+jXOArNX5KfhNooQ1ukGS+UqHKgYPwQREIpV7/mJQ kFH84ct5YXz2qETxO6avDMG0wqj+MYe/JrQ/vzjpTdPVGa2wjOX3rk385pBU/pAR9UfF CEQ/3i28RmzHWjr8NJlhMN07W2UUyLoVJlfL/oZueGonX+N0hvj3dMv5oei+mE2VNfqU JOKxBCA1MO/FPtBnh5heqKBXf8swERKXPcLiopTLq6ThbCNKLz+xgzuFnd8mkbQPrWe8 CcRg== 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; bh=97YkB9qtiD0j8HvviTkxo5OP5lLz7ZxukMMG6KlCMlw=; b=MKFJ3+ELYPS3+GSikCYcc0oXAFU9k04S2RJxO0f0/rb/A0VLJFAxa0KZJBMSmKdz9+ AJeYCqprchCsFpDgigPlTDmOstEks6YgJSJRgx15H989Q/1nd+TOkiwOYGBMJSl4AwHo m+rX4ey902o/nOacrWTeTI2lqj0e6l9kB/Wvdghuq98EbAqWxS1FpOH4Xubevym/W5TC ugh+9HF/6RVLlI2Ym+bYuI1iHrhSSVj4YD2onwDTQq2AmH7LVMFhULkw9jytmLV+VfeG DuDD4JFqMmRLVi4fqg7TFU/ausLNQwhqleBv8POQvA4KCEm1QwkhzmPVGHcp9ypbxz0W UnXQ== X-Gm-Message-State: APjAAAVmGeNIIunPv+AQSVA9WIOUVFyemL13OyVTUIqifxLTZeEyf0Es Giv4bAhN9c4D0vv1Z3HLj3QVMMvjOtrctAmZHxlwfthT X-Google-Smtp-Source: APXvYqzyan/vMZNkYUpBKVwPUHG0haYnTehRRyyDiIKto4f3ZVjGmQqukFWduUXO5B0kPw1Qah7yRqNCI9wnxCWD3ZE= X-Received: by 2002:a81:d34b:: with SMTP id d11mr18713657ywl.423.1571185957261; Tue, 15 Oct 2019 17:32:37 -0700 (PDT) In-Reply-To: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. 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:169407 Archived-At: --000000000000dc08dd0594fc3c1f Content-Type: text/plain; charset="UTF-8" I have updated my patch a bit: 1. Instead of setting the new API to NULL when the scale factor is ignored or unsupported by the backend, I'm setting it to a dummy function returning 1. This keeps backwards compatibility and is more convenient for the user of the interface. 2. get_scale_factor now returns a double. Even though current scale factors are integers, this is an interface that will better have to make it through the forthcoming era of fractional scaling. --000000000000dc08dd0594fc3c1f 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_k1sji8qc0 RnJvbSA1YjZlMjc2ZTNkZDliNGNiMDZiY2YwZTIxZTk5MjI3YjIxMzRhOGJmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBtZW1lcGxleCA8Y2FybG9zam9zZXBpdGFAZ21haWwuY29tPgpE YXRlOiBUdWUsIDE1IE9jdCAyMDE5IDE5OjE0OjAzIC0wMzAwClN1YmplY3Q6IFtQQVRDSF0gRXhw b3NlIHNjYWxlIGZhY3RvciB0aHJvdWdoIHRoZSByZWRpc3BsYXkgaW50ZXJmYWNlCgoqIHNyYy9k aXNwZXh0ZXJuLmg6IGFkZCBnZXRfc2NhbGVfZmFjdG9yIEFQSS4KKiBzcmMveHRlcm0uYzoKICAt IFVuaWZ5IHVzYWdlcyBvZiB4Z19nZXRfc2NhbGUgYW5kIHhfZ2V0X3NjYWxlX2ZhY3RvciBpbnRv IGEKICAgIGNvbnNvbGlkYXRlZCB4X2dldF9zY2FsZV9mYWN0b3IgdGhhdCBpcyBleHBvcnRlZCBi eSB0aGUgcmlmLgogIC0gU2ltcGxpZnkgc2NhbGUgaW5mZXJyaW5nIGxvZ2ljIChzZWUgbm90ZSBi ZWxvdykuCiogc3JjL3czMnRlcm0uYzoKICAtIFNpbXBsaWZ5IHczMl9nZXRfc2NhbGVfZmFjdG9y IGluIGEgc2ltaWxhciB3YXkgKHNlZSBub3RlKS4KICAtIEFkZCBpdCB0byB0aGUgcmlmLgoqIHNy Yy9uc3Rlcm0ubToKICAtIEp1c3QgYWRkIGEgZHVtbXkgaW1wbGVtZW50YXRpb24gdGhhdCBhbHdh eXMgcmV0dXJuIDEgdG8gdGhlIHJpZiwKICAgIHNpbmNlIHRoZXJlIGFyZSBubyB1c2VzIG9mIGFu eSBzY2FsZSBmYWN0b3IgaGVyZS4KCk5vdGUgMTogYm90aCB4X2dldF9zY2FsZV9mYWN0b3IgYW5k IHczMl9nZXRfc2NhbGVfZmFjdG9yIGNvbXB1dGVkCmRpc3RpbmN0IHNjYWxlcyBmb3IgeCBhbmQg eSBieSB0YWtpbmcgdGhlIHJhdGlvIGJldHdlZW4gZWZmZWN0aXZlCnJlc29sdXRpb24gaW4gZWFj aCBkaXJlY3Rpb24gYW5kIGEgc3RhbmRhcmQgOTYgZHBpIHJlc29sdXRpb24uICBTaW5jZQp0aGlz IHJhdGlvIGlzIHRoZW4gdHJ1bmNhdGVkIHRvIGFuIGludGVnZXIgKHRoZSBmbG9vcikgaXQgc2Vl bXMgdG8gbWUKdGhhdCB0aGVyZSBpcyBubyBzZW5zaWJsZSBwb3NzaWJpbGl0eSB0aGF0IHRoZXNl IHR3byBudW1iZXJzCmRpdmVyZ2UuIE1vcmVvdmVyLCBtb2Rlcm4gdG9vbGtpdHMgcmVwb3J0IG9u ZSBudW1iZXIgYXMgc2NhbGUgZmFjdG9yCmFuZCB3ZSBuZWVkIGEgY29tbW9uIGludGVyZmFjZSBo ZXJlLiBGb3IgdGhvc2UgcmVhc29ucyBJJ20gYXJiaXRyYXJpbHkKcGlja2luZyB0aGUgaG9yaXpv bnRhbCBzY2FsZSBmYWN0b3IgYXMgVEhFIHNjYWxlIGZhY3Rvci4KCk5vdGUgMjogSSBkZWNpZGVk IHRvIGxldCBnZXRfc2NhbGVfZmFjdG9yIHJldHVybiBhIGRvdWJsZSwgZXZlbiB0b3VnaApmYWN0 b3JzIGN1cnJlbnRseSBpbiB1c2UgYXJlIGFsbCBpbnRlZ2VycyBBRkFJSy4gVGhpcyBpcyBpbgph bnRpY2lwYXRpb24gb2YgZnJhY3Rpb25hbCBzY2FsaW5nLiBJIGJlbGlldmUgaXQncyBwcnVkZW50 IHRvIGtlZXAKdGhlIGludGVyZmFjZSBnZW5lcmFsIGluIHRoaXMgcmVnYXJkLgotLS0KIHNyYy9k aXNwZXh0ZXJuLmggfCAgMyArKysKIHNyYy9uc3Rlcm0ubSAgICAgfCAgNiArKysrKysKIHNyYy93 MzJ0ZXJtLmMgICAgfCAyOSArKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLQogc3JjL3h0ZXJt LmMgICAgICB8IDQxICsrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiA0 IGZpbGVzIGNoYW5nZWQsIDM4IGluc2VydGlvbnMoKyksIDQxIGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL3NyYy9kaXNwZXh0ZXJuLmggYi9zcmMvZGlzcGV4dGVybi5oCmluZGV4IDA2MTViMTYu LmI5M2UyNWYgMTAwNjQ0Ci0tLSBhL3NyYy9kaXNwZXh0ZXJuLmgKKysrIGIvc3JjL2Rpc3BleHRl cm4uaApAQCAtMjk0Miw2ICsyOTQyLDkgQEAgcmVzZXRfbW91c2VfaGlnaGxpZ2h0IChNb3VzZV9I TEluZm8gKmhsaW5mbykKIAogI2lmZGVmIEhBVkVfV0lORE9XX1NZU1RFTQogCisgIC8qIFJldHVy biB0aGUgc2NhbGUgZmFjdG9yIGZvciB0aGUgc2NyZWVuIGNvbnRhaW5pbmcgZnJhbWUgRi4gICov CisgIGRvdWJsZSAoKmdldF9zY2FsZV9mYWN0b3IpIChzdHJ1Y3QgZnJhbWUgKmYpOworCiAgIC8q IERyYXcgYSBmcmluZ2UgYml0bWFwIGluIHdpbmRvdyBXIG9mIHJvdyBST1cgdXNpbmcgcGFyYW1l dGVycyBQLiAgKi8KICAgdm9pZCAoKmRyYXdfZnJpbmdlX2JpdG1hcCkgKHN0cnVjdCB3aW5kb3cg KncsIHN0cnVjdCBnbHlwaF9yb3cgKnJvdywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IHN0cnVjdCBkcmF3X2ZyaW5nZV9iaXRtYXBfcGFyYW1zICpwKTsKZGlmZiAtLWdpdCBhL3NyYy9u c3Rlcm0ubSBiL3NyYy9uc3Rlcm0ubQppbmRleCA1NTgzYzYxLi42ZTFiNzUxIDEwMDY0NAotLS0g YS9zcmMvbnN0ZXJtLm0KKysrIGIvc3JjL25zdGVybS5tCkBAIC0yOTU3LDYgKzI5NTcsMTEgQEAg c28gc29tZSBrZXkgcHJlc3NlcyAoVEFCKSBhcmUgc3dhbGxvd2VkIGJ5IHRoZSBzeXN0ZW0uICAq LwogCiAgICA9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PSAqLwogCitzdGF0aWMgZG91YmxlCituc19nZXRfc2Nh bGVfZmFjdG9yIChzdHJ1Y3QgZnJhbWUgKmYpCit7CisgIHJldHVybiAxOyAgLy8gVE9ETyBkbyB3 ZSBuZWVkIHRvIGRvIHNvbWV0aGluZyBlbHNlIGhlcmU/Cit9CiAKIGV4dGVybiBpbnQgbWF4X3Vz ZWRfZnJpbmdlX2JpdG1hcDsKIHN0YXRpYyB2b2lkCkBAIC01MDg3LDYgKzUwOTIsNyBAQCBzdGF0 aWMgTGlzcF9PYmplY3QgbnNfc3RyaW5nX3RvX2xpc3Btb2QgKGNvbnN0IGNoYXIgKnMpCiAgIGd1 aV9jbGVhcl93aW5kb3dfbW91c2VfZmFjZSwKICAgZ3VpX2dldF9nbHlwaF9vdmVyaGFuZ3MsCiAg IGd1aV9maXhfb3ZlcmxhcHBpbmdfYXJlYSwKKyAgbnNfZ2V0X3NjYWxlX2ZhY3RvciwKICAgbnNf ZHJhd19mcmluZ2VfYml0bWFwLAogICAwLCAvKiBkZWZpbmVfZnJpbmdlX2JpdG1hcCAqLyAvKiBG SVhNRTogc2ltcGxpZnkgbnNfZHJhd19mcmluZ2VfYml0bWFwICovCiAgIDAsIC8qIGRlc3Ryb3lf ZnJpbmdlX2JpdG1hcCAqLwpkaWZmIC0tZ2l0IGEvc3JjL3czMnRlcm0uYyBiL3NyYy93MzJ0ZXJt LmMKaW5kZXggOWRhMDg0NS4uNmQ0MzBjNiAxMDA2NDQKLS0tIGEvc3JjL3czMnRlcm0uYworKysg Yi9zcmMvdzMydGVybS5jCkBAIC0zMDQsMjAgKzMwNCwxNiBAQCB3MzJfcmVzdG9yZV9nbHlwaF9z dHJpbmdfY2xpcCAoc3RydWN0IGdseXBoX3N0cmluZyAqcykKICAgICB9CiB9CiAKLXN0YXRpYyB2 b2lkCi13MzJfZ2V0X3NjYWxlX2ZhY3RvcihzdHJ1Y3QgdzMyX2Rpc3BsYXlfaW5mbyAqZHB5aW5m bywgaW50ICpzY2FsZV94LCBpbnQgKnNjYWxlX3kpCitzdGF0aWMgZG91YmxlCit3MzJfZ2V0X3Nj YWxlX2ZhY3RvcihzdHJ1Y3QgZnJhbWUgKmYpCiB7CisgIHN0cnVjdCB3MzJfZGlzcGxheV9pbmZv ICpkcHlpbmZvID0gRlJBTUVfRElTUExBWV9JTkZPIChmKTsKICAgY29uc3QgaW50IGJhc2VfcmVz ID0gOTY7CiAKLSAgKnNjYWxlX3ggPSAqc2NhbGVfeSA9IDE7Ci0KLSAgaWYgKGRweWluZm8pCi0g ICAgewotICAgICAgaWYgKGRweWluZm8tPnJlc3ggPiBiYXNlX3JlcykKLQkqc2NhbGVfeCA9IGZs b29yIChkcHlpbmZvLT5yZXN4IC8gYmFzZV9yZXMpOwotICAgICAgaWYgKGRweWluZm8tPnJlc3kg PiBiYXNlX3JlcykKLQkqc2NhbGVfeSA9IGZsb29yIChkcHlpbmZvLT5yZXN5IC8gYmFzZV9yZXMp OwotICAgIH0KKyAgaWYgKGRweWluZm8gJiYgZHB5aW5mby0+cmVzeCA+IGJhc2VfcmVzKQorICAg IHJldHVybiBmbG9vciAoZHB5aW5mby0+cmVzeCAvIGJhc2VfcmVzKTsKKyAgZWxzZQorICAgIHJl dHVybiAxOwogfQogCiAvKgpAQCAtMzM0LDEyICszMzAsOCBAQCB3MzJfZ2V0X3NjYWxlX2ZhY3Rv cihzdHJ1Y3QgdzMyX2Rpc3BsYXlfaW5mbyAqZHB5aW5mbywgaW50ICpzY2FsZV94LCBpbnQgKnNj YWxlXwogc3RhdGljIHZvaWQKIHczMl9kcmF3X3VuZGVyd2F2ZSAoc3RydWN0IGdseXBoX3N0cmlu ZyAqcywgQ09MT1JSRUYgY29sb3IpCiB7Ci0gIHN0cnVjdCB3MzJfZGlzcGxheV9pbmZvICpkcHlp bmZvID0gRlJBTUVfRElTUExBWV9JTkZPIChzLT5mKTsKLQotICBpbnQgc2NhbGVfeCwgc2NhbGVf eTsKLSAgdzMyX2dldF9zY2FsZV9mYWN0b3IgKGRweWluZm8sICZzY2FsZV94LCAmc2NhbGVfeSk7 Ci0KLSAgaW50IHdhdmVfaGVpZ2h0ID0gMyAqIHNjYWxlX3ksIHdhdmVfbGVuZ3RoID0gMiAqIHNj YWxlX3gsIHRoaWNrbmVzcyA9IHNjYWxlX3k7CisgIGRvdWJsZSBzY2FsZSA9IHczMl9nZXRfc2Nh bGVfZmFjdG9yIChzLT5mKTsKKyAgaW50IHdhdmVfaGVpZ2h0ID0gMyAqIHNjYWxlLCB3YXZlX2xl bmd0aCA9IDIgKiBzY2FsZSwgdGhpY2tuZXNzID0gc2NhbGU7CiAgIGludCBkeCwgZHksIHgwLCB5 MCwgd2lkdGgsIHgxLCB5MSwgeDIsIHkyLCBvZGQsIHhtYXg7CiAgIEVtYWNzX1JlY3RhbmdsZSB3 YXZlX2NsaXAsIHN0cmluZ19jbGlwLCBmaW5hbF9jbGlwOwogICBSRUNUIHczMl9maW5hbF9jbGlw LCB3MzJfc3RyaW5nX2NsaXA7CkBAIC0zNDgsNyArMzQwLDcgQEAgdzMyX2RyYXdfdW5kZXJ3YXZl IChzdHJ1Y3QgZ2x5cGhfc3RyaW5nICpzLCBDT0xPUlJFRiBjb2xvcikKICAgZHggPSB3YXZlX2xl bmd0aDsKICAgZHkgPSB3YXZlX2hlaWdodCAtIDE7CiAgIHgwID0gcy0+eDsKLSAgeTAgPSBzLT55 YmFzZSArIHdhdmVfaGVpZ2h0IC8gMiAtIHNjYWxlX3k7CisgIHkwID0gcy0+eWJhc2UgKyB3YXZl X2hlaWdodCAvIDIgLSBzY2FsZTsKICAgd2lkdGggPSBzLT53aWR0aDsKICAgeG1heCA9IHgwICsg d2lkdGg7CiAKQEAgLTcxOTIsNiArNzE4NCw3IEBAIHczMl9tYWtlX3JkYiAoY2hhciAqeHJtX29w dGlvbikKICAgZ3VpX2NsZWFyX3dpbmRvd19tb3VzZV9mYWNlLAogICBndWlfZ2V0X2dseXBoX292 ZXJoYW5ncywKICAgZ3VpX2ZpeF9vdmVybGFwcGluZ19hcmVhLAorICB3MzJfZ2V0X3NjYWxlX2Zh Y3RvciwKICAgdzMyX2RyYXdfZnJpbmdlX2JpdG1hcCwKICAgdzMyX2RlZmluZV9mcmluZ2VfYml0 bWFwLAogICB3MzJfZGVzdHJveV9mcmluZ2VfYml0bWFwLApkaWZmIC0tZ2l0IGEvc3JjL3h0ZXJt LmMgYi9zcmMveHRlcm0uYwppbmRleCA1ZDhiMTQ4Li42NzI1M2E2IDEwMDY0NAotLS0gYS9zcmMv eHRlcm0uYworKysgYi9zcmMveHRlcm0uYwpAQCAtMzYxMSwyMSArMzYxMSwyMSBAQCB4X2RyYXdf c3RyZXRjaF9nbHlwaF9zdHJpbmcgKHN0cnVjdCBnbHlwaF9zdHJpbmcgKnMpCiAgIHMtPmJhY2tn cm91bmRfZmlsbGVkX3AgPSB0cnVlOwogfQogCi1zdGF0aWMgdm9pZAoteF9nZXRfc2NhbGVfZmFj dG9yKERpc3BsYXkgKmRpc3AsIGludCAqc2NhbGVfeCwgaW50ICpzY2FsZV95KQorc3RhdGljIGRv dWJsZQoreF9nZXRfc2NhbGVfZmFjdG9yKHN0cnVjdCBmcmFtZSAqZikKIHsKKyNpZmRlZiBVU0Vf R1RLCisgIHJldHVybiB4Z19nZXRfc2NhbGUgKGYpOworI2Vsc2UKKyAgRGlzcGxheSAqZGlzcCA9 IEZSQU1FX1hfRElTUExBWSAoZik7CisgIHN0cnVjdCB4X2Rpc3BsYXlfaW5mbyAqZHB5aW5mbyA9 IHhfZGlzcGxheV9pbmZvX2Zvcl9kaXNwbGF5IChkaXNwKTsKICAgY29uc3QgaW50IGJhc2VfcmVz ID0gOTY7Ci0gIHN0cnVjdCB4X2Rpc3BsYXlfaW5mbyAqIGRweWluZm8gPSB4X2Rpc3BsYXlfaW5m b19mb3JfZGlzcGxheSAoZGlzcCk7Ci0KLSAgKnNjYWxlX3ggPSAqc2NhbGVfeSA9IDE7CiAKLSAg aWYgKGRweWluZm8pCi0gICAgewotICAgICAgaWYgKGRweWluZm8tPnJlc3ggPiBiYXNlX3JlcykK LQkqc2NhbGVfeCA9IGZsb29yIChkcHlpbmZvLT5yZXN4IC8gYmFzZV9yZXMpOwotICAgICAgaWYg KGRweWluZm8tPnJlc3kgPiBiYXNlX3JlcykKLQkqc2NhbGVfeSA9IGZsb29yIChkcHlpbmZvLT5y ZXN5IC8gYmFzZV9yZXMpOwotICAgIH0KKyAgaWYgKGRweWluZm8gJiYgZHB5aW5mby0+cmVzeCA+ IGJhc2VfcmVzKQorICAgIHJldHVybiBmbG9vciAoZHB5aW5mby0+cmVzeCAvIGJhc2VfcmVzKTsK KyAgZWxzZQorICAgIHJldHVybiAxOworI2VuZGlmIC8qIFVTRV9HVEsgKi8KIH0KIAogLyoKQEAg LTM2NDEsMjcgKzM2NDEsMjEgQEAgeF9nZXRfc2NhbGVfZmFjdG9yKERpc3BsYXkgKmRpc3AsIGlu dCAqc2NhbGVfeCwgaW50ICpzY2FsZV95KQogc3RhdGljIHZvaWQKIHhfZHJhd191bmRlcndhdmUg KHN0cnVjdCBnbHlwaF9zdHJpbmcgKnMpCiB7Ci0gIERpc3BsYXkgKmRpc3BsYXkgPSBGUkFNRV9Y X0RJU1BMQVkgKHMtPmYpOwotCiAgIC8qIEFkanVzdCBmb3Igc2NhbGUvSGlEUEkuICAqLwotICBp bnQgc2NhbGVfeCwgc2NhbGVfeTsKLQotICB4X2dldF9zY2FsZV9mYWN0b3IgKGRpc3BsYXksICZz Y2FsZV94LCAmc2NhbGVfeSk7Ci0KLSAgaW50IHdhdmVfaGVpZ2h0ID0gMyAqIHNjYWxlX3ksIHdh dmVfbGVuZ3RoID0gMiAqIHNjYWxlX3g7Ci0KKyAgZG91YmxlIHNjYWxlID0geF9nZXRfc2NhbGVf ZmFjdG9yIChzLT5mKTsKKyAgaW50IHdhdmVfaGVpZ2h0ID0gMyAqIHNjYWxlLCB3YXZlX2xlbmd0 aCA9IDIgKiBzY2FsZTsKICNpZmRlZiBVU0VfQ0FJUk8KICAgeF9kcmF3X2hvcml6b250YWxfd2F2 ZSAocy0+Ziwgcy0+Z2MsIHMtPngsIHMtPnliYXNlIC0gd2F2ZV9oZWlnaHQgKyAzLAogCQkJICBz LT53aWR0aCwgd2F2ZV9oZWlnaHQsIHdhdmVfbGVuZ3RoKTsKICNlbHNlICAvKiBub3QgVVNFX0NB SVJPICovCi0gIGludCBkeCwgZHksIHgwLCB5MCwgd2lkdGgsIHgxLCB5MSwgeDIsIHkyLCB4bWF4 LCB0aGlja25lc3MgPSBzY2FsZV95OzsKKyAgaW50IGR4LCBkeSwgeDAsIHkwLCB3aWR0aCwgeDEs IHkxLCB4MiwgeTIsIHhtYXgsIHRoaWNrbmVzcyA9IHNjYWxlOwogICBib29sIG9kZDsKICAgWFJl Y3RhbmdsZSB3YXZlX2NsaXAsIHN0cmluZ19jbGlwLCBmaW5hbF9jbGlwOwogCiAgIGR4ID0gd2F2 ZV9sZW5ndGg7CiAgIGR5ID0gd2F2ZV9oZWlnaHQgLSAxOwogICB4MCA9IHMtPng7Ci0gIHkwID0g cy0+eWJhc2UgKyB3YXZlX2hlaWdodCAvIDIgLSBzY2FsZV95OworICB5MCA9IHMtPnliYXNlICsg d2F2ZV9oZWlnaHQgLyAyIC0gc2NhbGU7CiAgIHdpZHRoID0gcy0+d2lkdGg7CiAgIHhtYXggPSB4 MCArIHdpZHRoOwogCkBAIC0xMDU1Nyw3ICsxMDU1MSw3IEBAIHhfc2V0X29mZnNldCAoc3RydWN0 IGZyYW1lICpmLCByZWdpc3RlciBpbnQgeG9mZiwgcmVnaXN0ZXIgaW50IHlvZmYsIGludCBjaGFu Z2VfCiB7CiAgIGludCBtb2RpZmllZF90b3AsIG1vZGlmaWVkX2xlZnQ7CiAjaWZkZWYgVVNFX0dU SwotICBpbnQgc2NhbGUgPSB4Z19nZXRfc2NhbGUgKGYpOworICBkb3VibGUgc2NhbGUgPSB4X2dl dF9zY2FsZV9mYWN0b3IgKGYpOwogI2VuZGlmCiAKICAgaWYgKGNoYW5nZV9ncmF2aXR5ID4gMCkK QEAgLTEzMzU2LDYgKzEzMzUwLDcgQEAgeF9hY3RpdmF0ZV90aW1lb3V0X2F0aW1lciAodm9pZCkK ICAgICBndWlfY2xlYXJfd2luZG93X21vdXNlX2ZhY2UsCiAgICAgZ3VpX2dldF9nbHlwaF9vdmVy aGFuZ3MsCiAgICAgZ3VpX2ZpeF9vdmVybGFwcGluZ19hcmVhLAorICAgIHhfZ2V0X3NjYWxlX2Zh Y3RvciwKICAgICB4X2RyYXdfZnJpbmdlX2JpdG1hcCwKICNpZmRlZiBVU0VfQ0FJUk8KICAgICB4 X2NyX2RlZmluZV9mcmluZ2VfYml0bWFwLAotLSAKMi4yMC4xCgo= --000000000000dc08dd0594fc3c1f--