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#37755: Logic in init_fringe_bitmap should be moved to backends (maybe rif->define_fringe_bitmap) Date: Wed, 16 Oct 2019 17:18:16 -0300 Message-ID: References: <83a7a2gxp0.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="000000000000c17f7d05950ccdd1" Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="62899"; mail-complaints-to="usenet@blaine.gmane.org" Cc: 37755@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Oct 16 22:21:03 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 1iKpn4-000GCQ-0x for geb-bug-gnu-emacs@m.gmane.org; Wed, 16 Oct 2019 22:21:02 +0200 Original-Received: from localhost ([::1]:47904 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iKpn2-0006bb-HP for geb-bug-gnu-emacs@m.gmane.org; Wed, 16 Oct 2019 16:21:00 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:39884) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iKplA-0003ma-No for bug-gnu-emacs@gnu.org; Wed, 16 Oct 2019 16:19:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iKpl8-00077P-1j for bug-gnu-emacs@gnu.org; Wed, 16 Oct 2019 16:19:04 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:37814) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iKpl7-00077J-UT for bug-gnu-emacs@gnu.org; Wed, 16 Oct 2019 16:19:01 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iKpl7-00021C-OX for bug-gnu-emacs@gnu.org; Wed, 16 Oct 2019 16:19: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 20:19:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 37755 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 37755-submit@debbugs.gnu.org id=B37755.15712571157698 (code B ref 37755); Wed, 16 Oct 2019 20:19:01 +0000 Original-Received: (at 37755) by debbugs.gnu.org; 16 Oct 2019 20:18:35 +0000 Original-Received: from localhost ([127.0.0.1]:46635 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iKpkg-000206-NA for submit@debbugs.gnu.org; Wed, 16 Oct 2019 16:18:35 -0400 Original-Received: from mail-yb1-f195.google.com ([209.85.219.195]:37564) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iKpkf-0001zu-KN for 37755@debbugs.gnu.org; Wed, 16 Oct 2019 16:18:34 -0400 Original-Received: by mail-yb1-f195.google.com with SMTP id z125so8256924ybc.4 for <37755@debbugs.gnu.org>; Wed, 16 Oct 2019 13:18:33 -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=2t0VJcDuZYZC/E3au1LOgWHVjdO2TdxdTDzfcC3n50o=; b=sfcBVbZwJBCoN527CzROqQxXidPaXEgaZAGsTvIhXolQaVJNmEfvAK6eBREM0HeRRe viujw64IrbRSlvEOcK2rlxyIqnju7r5lm0IiXPB34dJQYKmkUc7Er+cv7Uea7JTv/zJq nVoG2n/n0S7r3lVOQPa7i4fgPfrNzFb7tlXNvYNl4YQ02qsiODM6r7tX8oXdcqYPz5OG TI12M46bq/9kZUec+gtNG5RaCUB23PxPEIZiwPb6Cuqp5unqa9OlyDop+UEFhOxWUdF6 LF9WQhQmFbxrGOhgO/7rClCaHfZDp8bp2o4al4UNMBsQUtnYIvH7v+GMIsWV2o9Ij+nx EcHA== 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=2t0VJcDuZYZC/E3au1LOgWHVjdO2TdxdTDzfcC3n50o=; b=JqO3dDc9uqENpSJUPtsYBWXb3ZUjrD7KaQOGRAKosq0ujbINC1duOQGGOwMPO6Lb5M xA1WEeAJpDPPWFoO19GINLWm//AXjw71U+iggLaRZBa9mX8oFjE5iRuwa43Q5v48k/BN 9x2Y4SWnMndZ9aN7LWL2RDD67YGpWdjWx+AmuWS2DE+ukhx6slR/i3e5ZCzV4MyVBRXw TX//pWA7R9oQ+CJYiiDGS5tUyEHISaL0Z8V/npml7mAVXpMhHsjWeXphAmZf9GQLM6Dn CzMgQ3+E2z852WIMYsF0NQGhuyxjjsujjqGEKrCEbM9rHx58QqngeY+KkUCdeVqpwThY HBNg== X-Gm-Message-State: APjAAAUhTWn5iA2uV7BLKOJRzhCAZsoMcas0k4+Bz7x3ltAgAI27dVxJ 5CbN+Cvd7bXdK2him8b4dXEY1xTdXpYrJ/3B4RgKaV+l X-Google-Smtp-Source: APXvYqylXVDrlsHrdwpSlxT6jga7m0XH7UAVoYAW/JvENZTWNMmGDtvceC7wf9FIqrIxybtoXsmr0+JmltmGZEmyK2o= X-Received: by 2002:a25:d015:: with SMTP id h21mr349851ybg.11.1571257107698; Wed, 16 Oct 2019 13:18:27 -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:169494 Archived-At: --000000000000c17f7d05950ccdd1 Content-Type: text/plain; charset="UTF-8" * Improved commit message according to CONTRIBUTE rules. * Made some minor changes to avoid conditional compilation warnings. * I'm aware of some issues when rendering fringe bitmaps (nothing fatal, though) and I'm still debugging these changes, but it would be great if you could review them meanwhile. --000000000000c17f7d05950ccdd1 Content-Type: text/x-patch; charset="US-ASCII"; name="0001-Fringe-refactor-move-platform-specific-code-into-rif.patch" Content-Disposition: attachment; filename="0001-Fringe-refactor-move-platform-specific-code-into-rif.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_k1tpttxc0 RnJvbSA3NjEzZTc5MDhmOTkxODcyNmFhNGFlZmNlMTNkMTBmMGUyYzVmYjkwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBtZW1lcGxleCA8Y2FybG9zam9zZXBpdGFAZ21haWwuY29tPgpE YXRlOiBUdWUsIDE1IE9jdCAyMDE5IDE2OjM3OjI0IC0wMzAwClN1YmplY3Q6IFtQQVRDSF0gRnJp bmdlIHJlZmFjdG9yOiBtb3ZlIHBsYXRmb3JtLXNwZWNpZmljIGNvZGUgaW50byByaWYKIChCdWcj Mzc3NTUpCgoqIHNyYy9mcmluZ2UuYyAoaW5pdF9mcmluZ2VfYml0bWFwKTogUmVtb3ZlIGl0Lgoq IHNyYy93MzJ0ZXJtLmMgKHczMl9kZWZpbmVfZnJpbmdlX2JpdG1hcCk6IEFkZCBOVEdVSSBwYXJ0 LgoqIHNyYy94dGVybS5jICh4X2RlZmluZV9mcmluZ2VfYml0bWFwKTogTmV3IGludGVyZmFjZSBm dW5jdGlvbiBmb3IgWDExLAphZGQgWFdJTkRPV1MgcGFydC4KKHhfY3JfZGVmaW5lX2ZyaW5nZV9i aXRtYXApOiBBZGQgQ0FJUk8gcGFydC4KLS0tCiBzcmMvZnJpbmdlLmMgIHwgMTI4ICsrKysrLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiBzcmMvdzMydGVybS5j IHwgIDEyICsrKysrCiBzcmMveHRlcm0uYyAgIHwgIDYwICsrKysrKysrKysrKysrKysrKysrKyst CiAzIGZpbGVzIGNoYW5nZWQsIDgyIGluc2VydGlvbnMoKyksIDExOCBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9zcmMvZnJpbmdlLmMgYi9zcmMvZnJpbmdlLmMKaW5kZXggMjJmM2JkYy4uYTE3 YjY4NCAxMDA2NDQKLS0tIGEvc3JjL2ZyaW5nZS5jCisrKyBiL3NyYy9mcmluZ2UuYwpAQCAtMTM4 OCwxMTIgKzEzODgsNiBAQCBERUZVTiAoImRlc3Ryb3ktZnJpbmdlLWJpdG1hcCIsIEZkZXN0cm95 X2ZyaW5nZV9iaXRtYXAsIFNkZXN0cm95X2ZyaW5nZV9iaXRtYXAsCiAgIHJldHVybiBRbmlsOwog fQogCi0KLS8qIEluaXRpYWxpemUgYml0bWFwIGJpdC4KLQotICAgT24gWCwgd2UgYml0LXN3YXAg dGhlIGJ1aWx0LWluIGJpdG1hcHMgYW5kIHJlZHVjZSBiaXRtYXAKLSAgIGZyb20gc2hvcnQgdG8g Y2hhciBhcnJheSBpZiB3aWR0aCBpcyA8PSA4IGJpdHMuCi0KLSAgIE9uIE1BQyB3aXRoIGJpZy1l bmRpYW4gQ1BVLCB3ZSBuZWVkIHRvIGJ5dGUtc3dhcCBlYWNoIHNob3J0LgotCi0gICBPbiBXMzIg YW5kIE1BQyAobGl0dGxlIGVuZGlhbiksIHRoZXJlJ3Mgbm8gbmVlZCB0byBkbyB0aGlzLgotKi8K LQotI2lmIGRlZmluZWQgKEhBVkVfWF9XSU5ET1dTKQotc3RhdGljIGNvbnN0IHVuc2lnbmVkIGNo YXIgc3dhcF9uaWJibGVbMTZdID0gewotICAweDAsIDB4OCwgMHg0LCAweGMsICAgICAgICAgICAv KiAwMDAwIDEwMDAgMDEwMCAxMTAwICovCi0gIDB4MiwgMHhhLCAweDYsIDB4ZSwgICAgICAgICAg IC8qIDAwMTAgMTAxMCAwMTEwIDExMTAgKi8KLSAgMHgxLCAweDksIDB4NSwgMHhkLCAgICAgICAg ICAgLyogMDAwMSAxMDAxIDAxMDEgMTEwMSAqLwotICAweDMsIDB4YiwgMHg3LCAweGZ9OyAgICAg ICAgICAvKiAwMDExIDEwMTEgMDExMSAxMTExICovCi0jZW5kaWYgICAgICAgICAgICAgICAgICAg ICAgICAgIC8qIEhBVkVfWF9XSU5ET1dTICovCi0KLXN0YXRpYyB2b2lkCi1pbml0X2ZyaW5nZV9i aXRtYXAgKGludCB3aGljaCwgc3RydWN0IGZyaW5nZV9iaXRtYXAgKmZiLCBpbnQgb25jZV9wKQot ewotICBpZiAob25jZV9wIHx8IGZiLT5keW5hbWljKQotICAgIHsKLSNpZiBkZWZpbmVkIChIQVZF X1hfV0lORE9XUykKLSAgICAgIHVuc2lnbmVkIHNob3J0ICpiaXRzID0gZmItPmJpdHM7Ci0gICAg ICBpbnQgajsKLQotI2lmZGVmIFVTRV9DQUlSTwotICAgICAgZm9yIChqID0gMDsgaiA8IGZiLT5o ZWlnaHQ7IGorKykKLQl7Ci0JICB1bnNpZ25lZCBzaG9ydCBiID0gKmJpdHM7Ci0jaWZkZWYgV09S RFNfQklHRU5ESUFOCi0JICAqYml0cysrID0gKGIgPDwgKDE2IC0gZmItPndpZHRoKSk7Ci0jZWxz ZQotCSAgYiA9ICh1bnNpZ25lZCBzaG9ydCkoKHN3YXBfbmliYmxlW2IgJiAweGZdIDw8IDEyKQot CQkJICAgICAgIHwgKHN3YXBfbmliYmxlWyhiPj40KSAmIDB4Zl0gPDwgOCkKLQkJCSAgICAgICB8 IChzd2FwX25pYmJsZVsoYj4+OCkgJiAweGZdIDw8IDQpCi0JCQkgICAgICAgfCAoc3dhcF9uaWJi bGVbKGI+PjEyKSAmIDB4Zl0pKTsKLQkgICpiaXRzKysgPSAoYiA+PiAoMTYgLSBmYi0+d2lkdGgp KTsKLSNlbmRpZgotCX0KLSNlbHNlICAvKiBub3QgVVNFX0NBSVJPICovCi0gICAgICBpZiAoZmIt PndpZHRoIDw9IDgpCi0JewotCSAgdW5zaWduZWQgY2hhciAqY2JpdHMgPSAodW5zaWduZWQgY2hh ciAqKWZiLT5iaXRzOwotCSAgZm9yIChqID0gMDsgaiA8IGZiLT5oZWlnaHQ7IGorKykKLQkgICAg ewotCSAgICAgIHVuc2lnbmVkIHNob3J0IGIgPSAqYml0cysrOwotCSAgICAgIHVuc2lnbmVkIGNo YXIgYzsKLQkgICAgICBjID0gKHVuc2lnbmVkIGNoYXIpKChzd2FwX25pYmJsZVtiICYgMHhmXSA8 PCA0KQotCQkJCSAgfCAoc3dhcF9uaWJibGVbKGI+PjQpICYgMHhmXSkpOwotCSAgICAgICpjYml0 cysrID0gKGMgPj4gKDggLSBmYi0+d2lkdGgpKTsKLQkgICAgfQotCX0KLSAgICAgIGVsc2UKLQl7 Ci0JICBmb3IgKGogPSAwOyBqIDwgZmItPmhlaWdodDsgaisrKQotCSAgICB7Ci0JICAgICAgdW5z aWduZWQgc2hvcnQgYiA9ICpiaXRzOwotCSAgICAgIGIgPSAodW5zaWduZWQgc2hvcnQpKChzd2Fw X25pYmJsZVtiICYgMHhmXSA8PCAxMikKLQkJCQkgICB8IChzd2FwX25pYmJsZVsoYj4+NCkgJiAw eGZdIDw8IDgpCi0JCQkJICAgfCAoc3dhcF9uaWJibGVbKGI+PjgpICYgMHhmXSA8PCA0KQotCQkJ CSAgIHwgKHN3YXBfbmliYmxlWyhiPj4xMikgJiAweGZdKSk7Ci0JICAgICAgYiA+Pj0gKDE2IC0g ZmItPndpZHRoKTsKLSNpZmRlZiBXT1JEU19CSUdFTkRJQU4KLQkgICAgICBiID0gYnN3YXBfMTYg KGIpOwotI2VuZGlmCi0JICAgICAgKmJpdHMrKyA9IGI7Ci0JICAgIH0KLQl9Ci0jZW5kaWYgLyog bm90IFVTRV9DQUlSTyAqLwotI2VuZGlmIC8qIEhBVkVfWF9XSU5ET1dTICovCi0KLSNpZmRlZiBI QVZFX05UR1VJCi0gICAgICB1bnNpZ25lZCBzaG9ydCAqYml0cyA9IGZiLT5iaXRzOwotICAgICAg aW50IGo7Ci0gICAgICBmb3IgKGogPSAwOyBqIDwgZmItPmhlaWdodDsgaisrKQotCXsKLQkgIHVu c2lnbmVkIHNob3J0IGIgPSAqYml0czsKLQkgIGIgPDw9ICgxNiAtIGZiLT53aWR0aCk7Ci0JICAv KiBXaW5kb3dzIGlzIGxpdHRsZS1lbmRpYW4sIHNvIHRoZSBuZXh0IGxpbmUgaXMgYWx3YXlzCi0J ICAgICBuZWVkZWQuICAqLwotCSAgYiA9ICgoYiA+PiA4KSB8IChiIDw8IDgpKTsKLQkgICpiaXRz KysgPSBiOwotCX0KLSNlbmRpZgotICAgIH0KLQotICBpZiAoIW9uY2VfcCkKLSAgICB7Ci0gICAg ICAvKiBYWFggSXMgU0VMRUNURURfRlJBTUUgT0sgaGVyZT8gKi8KLSAgICAgIHN0cnVjdCByZWRp c3BsYXlfaW50ZXJmYWNlICpyaWYgPSBGUkFNRV9SSUYgKFNFTEVDVEVEX0ZSQU1FICgpKTsKLQot ICAgICAgZGVzdHJveV9mcmluZ2VfYml0bWFwICh3aGljaCk7Ci0KLSAgICAgIGlmIChyaWYgJiYg cmlmLT5kZWZpbmVfZnJpbmdlX2JpdG1hcCkKLQlyaWYtPmRlZmluZV9mcmluZ2VfYml0bWFwICh3 aGljaCwgZmItPmJpdHMsIGZiLT5oZWlnaHQsIGZiLT53aWR0aCk7Ci0KLSAgICAgIGZyaW5nZV9i aXRtYXBzW3doaWNoXSA9IGZiOwotICAgICAgaWYgKHdoaWNoID49IG1heF91c2VkX2ZyaW5nZV9i aXRtYXApCi0JbWF4X3VzZWRfZnJpbmdlX2JpdG1hcCA9IHdoaWNoICsgMTsKLSAgICB9Ci19Ci0K LQogREVGVU4gKCJkZWZpbmUtZnJpbmdlLWJpdG1hcCIsIEZkZWZpbmVfZnJpbmdlX2JpdG1hcCwg U2RlZmluZV9mcmluZ2VfYml0bWFwLAogICAgICAgIDIsIDUsIDAsCiAgICAgICAgZG9jOiAvKiBE ZWZpbmUgZnJpbmdlIGJpdG1hcCBCSVRNQVAgZnJvbSBCSVRTIG9mIHNpemUgSEVJR0hUIHggV0lE VEguCkBAIC0xNjI1LDcgKzE1MTksMTcgQEAgbGlzdCAoQUxJR04gUEVSSU9ESUMpIHdoZXJlIFBF UklPRElDIG5vbi1uaWwgc3BlY2lmaWVzIHRoYXQgdGhlIGJpdG1hcAogCiAgICp4ZmIgPSBmYjsK IAotICBpbml0X2ZyaW5nZV9iaXRtYXAgKG4sIHhmYiwgMCk7CisgIC8qIFhYWCBJcyBTRUxFQ1RF RF9GUkFNRSBPSyBoZXJlPyAqLworICBzdHJ1Y3QgcmVkaXNwbGF5X2ludGVyZmFjZSAqcmlmID0g RlJBTUVfUklGIChTRUxFQ1RFRF9GUkFNRSAoKSk7CisKKyAgZGVzdHJveV9mcmluZ2VfYml0bWFw IChuKTsKKworICBpZiAocmlmICYmIHJpZi0+ZGVmaW5lX2ZyaW5nZV9iaXRtYXApCisgICAgcmlm LT5kZWZpbmVfZnJpbmdlX2JpdG1hcCAobiwgeGZiLT5iaXRzLCB4ZmItPmhlaWdodCwgeGZiLT53 aWR0aCk7CisKKyAgZnJpbmdlX2JpdG1hcHNbbl0gPSB4ZmI7CisgIGlmIChuID49IG1heF91c2Vk X2ZyaW5nZV9iaXRtYXApCisgICAgbWF4X3VzZWRfZnJpbmdlX2JpdG1hcCA9IG4gKyAxOwogCiAg IHJldHVybiBiaXRtYXA7CiB9CkBAIC0xNzQzLDE5ICsxNjQ3LDkgQEAgbWFya19mcmluZ2VfZGF0 YSAodm9pZCkKIAogLyogSW5pdGlhbGl6ZSB0aGlzIG1vZHVsZSB3aGVuIEVtYWNzIHN0YXJ0cy4g ICovCiAKLXN0YXRpYyB2b2lkIGluaXRfZnJpbmdlX29uY2VfZm9yX3BkdW1wZXIgKHZvaWQpOwot CiB2b2lkCiBpbml0X2ZyaW5nZV9vbmNlICh2b2lkKQogewotICBwZHVtcGVyX2RvX25vd19hbmRf YWZ0ZXJfbG9hZCAoaW5pdF9mcmluZ2Vfb25jZV9mb3JfcGR1bXBlcik7Ci19Ci0KLXN0YXRpYyB2 b2lkCi1pbml0X2ZyaW5nZV9vbmNlX2Zvcl9wZHVtcGVyICh2b2lkKQotewotICBmb3IgKGludCBi dCA9IE5PX0ZSSU5HRV9CSVRNQVAgKyAxOyBidCA8IE1BWF9TVEFOREFSRF9GUklOR0VfQklUTUFQ UzsgYnQrKykKLSAgICBpbml0X2ZyaW5nZV9iaXRtYXAgKGJ0LCAmc3RhbmRhcmRfYml0bWFwc1ti dF0sIDEpOwogfQogCiB2b2lkCmRpZmYgLS1naXQgYS9zcmMvdzMydGVybS5jIGIvc3JjL3czMnRl cm0uYwppbmRleCA5ZGEwODQ1Li5jNDNhZDgxIDEwMDY0NAotLS0gYS9zcmMvdzMydGVybS5jCisr KyBiL3NyYy93MzJ0ZXJtLmMKQEAgLTgzNSw2ICs4MzUsMTggQEAgdzMyX2RyYXdfZnJpbmdlX2Jp dG1hcCAoc3RydWN0IHdpbmRvdyAqdywgc3RydWN0IGdseXBoX3JvdyAqcm93LAogc3RhdGljIHZv aWQKIHczMl9kZWZpbmVfZnJpbmdlX2JpdG1hcCAoaW50IHdoaWNoLCB1bnNpZ25lZCBzaG9ydCAq Yml0cywgaW50IGgsIGludCB3ZCkKIHsKKyNpZmRlZiBIQVZFX05UR1VJCisgIGludCBqOworICBm b3IgKGogPSAwOyBqIDwgaDsgaisrKQorICAgIHsKKyAgICAgIHVuc2lnbmVkIHNob3J0IGIgPSAq Yml0czsKKyAgICAgIGIgPDw9ICgxNiAtIHdkKTsKKyAgICAgIC8qIFdpbmRvd3MgaXMgbGl0dGxl LWVuZGlhbiwgc28gdGhlIG5leHQgbGluZSBpcyBhbHdheXMKKyAgICAgICAgIG5lZWRlZC4gICov CisgICAgICBiID0gKChiID4+IDgpIHwgKGIgPDwgOCkpOworICAgICAgKmJpdHMrKyA9IGI7Cisg ICAgfQorI2VuZGlmCiAgIGlmICh3aGljaCA+PSBtYXhfZnJpbmdlX2JtcCkKICAgICB7CiAgICAg ICBpbnQgaSA9IG1heF9mcmluZ2VfYm1wOwpkaWZmIC0tZ2l0IGEvc3JjL3h0ZXJtLmMgYi9zcmMv eHRlcm0uYwppbmRleCA1ZDhiMTQ4Li45NWZiMjVlIDEwMDY0NAotLS0gYS9zcmMveHRlcm0uYwor KysgYi9zcmMveHRlcm0uYwpAQCAtNTQ4LDYgKzU0OCwxMSBAQCB4X2VuZF9jcl94bGliX2RyYXdh YmxlIChzdHJ1Y3QgZnJhbWUgKmYsIEdDIGdjKQogCiBzdGF0aWMgaW50IG1heF9mcmluZ2VfYm1w ID0gMDsKIHN0YXRpYyBjYWlyb19wYXR0ZXJuX3QgKipmcmluZ2VfYm1wID0gMDsKK3N0YXRpYyBj b25zdCB1bnNpZ25lZCBjaGFyIHN3YXBfbmliYmxlWzE2XSA9IHsKKyAgMHgwLCAweDgsIDB4NCwg MHhjLCAgICAgICAgICAgLyogMDAwMCAxMDAwIDAxMDAgMTEwMCAqLworICAweDIsIDB4YSwgMHg2 LCAweGUsICAgICAgICAgICAvKiAwMDEwIDEwMTAgMDExMCAxMTEwICovCisgIDB4MSwgMHg5LCAw eDUsIDB4ZCwgICAgICAgICAgIC8qIDAwMDEgMTAwMSAwMTAxIDExMDEgKi8KKyAgMHgzLCAweGIs IDB4NywgMHhmfTsgICAgICAgICAgLyogMDAxMSAxMDExIDAxMTEgMTExMSAqLwogCiBzdGF0aWMg dm9pZAogeF9jcl9kZWZpbmVfZnJpbmdlX2JpdG1hcCAoaW50IHdoaWNoLCB1bnNpZ25lZCBzaG9y dCAqYml0cywgaW50IGgsIGludCB3ZCkKQEAgLTU1Nyw2ICs1NjIsMjAgQEAgeF9jcl9kZWZpbmVf ZnJpbmdlX2JpdG1hcCAoaW50IHdoaWNoLCB1bnNpZ25lZCBzaG9ydCAqYml0cywgaW50IGgsIGlu dCB3ZCkKICAgY2Fpcm9fcGF0dGVybl90ICpwYXR0ZXJuOwogICB1bnNpZ25lZCBjaGFyICpkYXRh OwogCisgIGZvciAoaSA9IDA7IGkgPCBoOyBpKyspCisgICAgeworICAgICAgdW5zaWduZWQgc2hv cnQgYiA9ICpiaXRzOworI2lmZGVmIFdPUkRTX0JJR0VORElBTgorICAgICAgKmJpdHMrKyA9IChi IDw8ICgxNiAtIHdkKSk7CisjZWxzZQorICAgICAgYiA9ICh1bnNpZ25lZCBzaG9ydCkoKHN3YXBf bmliYmxlW2IgJiAweGZdIDw8IDEyKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAoc3dh cF9uaWJibGVbKGI+PjQpICYgMHhmXSA8PCA4KQorICAgICAgICAgICAgICAgICAgICAgICAgICAg fCAoc3dhcF9uaWJibGVbKGI+PjgpICYgMHhmXSA8PCA0KQorICAgICAgICAgICAgICAgICAgICAg ICAgICAgfCAoc3dhcF9uaWJibGVbKGI+PjEyKSAmIDB4Zl0pKTsKKyAgICAgICpiaXRzKysgPSAo YiA+PiAoMTYgLSB3ZCkpOworI2VuZGlmCisgICAgfQorCiAgIGlmICh3aGljaCA+PSBtYXhfZnJp bmdlX2JtcCkKICAgICB7CiAgICAgICBpID0gbWF4X2ZyaW5nZV9ibXA7CkBAIC0xMzkzLDYgKzE0 MTIsNDUgQEAgeF9hZnRlcl91cGRhdGVfd2luZG93X2xpbmUgKHN0cnVjdCB3aW5kb3cgKncsIHN0 cnVjdCBnbHlwaF9yb3cgKmRlc2lyZWRfcm93KQogI2VuZGlmCiB9CiAKKyNpZm5kZWYgVVNFX0NB SVJPCitzdGF0aWMgdm9pZAoreF9kZWZpbmVfZnJpbmdlX2JpdG1hcCAoaW50IHdoaWNoLCB1bnNp Z25lZCBzaG9ydCAqYml0cywgaW50IGgsIGludCB3ZCkKK3sKKyAgLyogT24gWCwgd2UgYml0LXN3 YXAgdGhlIGJ1aWx0LWluIGJpdG1hcHMgYW5kIHJlZHVjZSBiaXRtYXAgKi8KKyAgLyogZnJvbSBz aG9ydCB0byBjaGFyIGFycmF5IGlmIHdpZHRoIGlzIDw9IDggYml0cy4gKi8KKyAgaW50IGo7CisK KyAgaWYgKHdkIDw9IDgpCisgICAgeworICAgICAgdW5zaWduZWQgY2hhciAqY2JpdHMgPSAodW5z aWduZWQgY2hhciAqKWJpdHM7CisgICAgICBmb3IgKGogPSAwOyBqIDwgaDsgaisrKQorICAgICAg ICB7CisgICAgICAgICAgdW5zaWduZWQgc2hvcnQgYiA9ICpiaXRzKys7CisgICAgICAgICAgdW5z aWduZWQgY2hhciBjOworICAgICAgICAgIGMgPSAodW5zaWduZWQgY2hhcikoKHN3YXBfbmliYmxl W2IgJiAweGZdIDw8IDQpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8IChzd2FwX25p YmJsZVsoYj4+NCkgJiAweGZdKSk7CisgICAgICAgICAgKmNiaXRzKysgPSAoYyA+PiAoOCAtIHdk KSk7CisgICAgICAgIH0KKyAgICB9CisgIGVsc2UKKyAgICB7CisgICAgICBmb3IgKGogPSAwOyBq IDwgaDsgaisrKQorICAgICAgICB7CisgICAgICAgICAgdW5zaWduZWQgc2hvcnQgYiA9ICpiaXRz OworICAgICAgICAgIGIgPSAodW5zaWduZWQgc2hvcnQpKChzd2FwX25pYmJsZVtiICYgMHhmXSA8 PCAxMikKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8IChzd2FwX25pYmJsZVsoYj4+ NCkgJiAweGZdIDw8IDgpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAoc3dhcF9u aWJibGVbKGI+PjgpICYgMHhmXSA8PCA0KQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IHwgKHN3YXBfbmliYmxlWyhiPj4xMikgJiAweGZdKSk7CisgICAgICAgICAgYiA+Pj0gKDE2IC0g d2QpOworI2lmZGVmIFdPUkRTX0JJR0VORElBTgorICAgICAgICAgIGIgPSBic3dhcF8xNiAoYik7 CisjZW5kaWYKKyAgICAgICAgICAqYml0cysrID0gYjsKKyAgICAgICAgfQorICAgIH0KK30KKyNl bmRpZiAvKiBVU0VfQ0FJUk8gKi8KKwogc3RhdGljIHZvaWQKIHhfZHJhd19mcmluZ2VfYml0bWFw IChzdHJ1Y3Qgd2luZG93ICp3LCBzdHJ1Y3QgZ2x5cGhfcm93ICpyb3csIHN0cnVjdCBkcmF3X2Zy aW5nZV9iaXRtYXBfcGFyYW1zICpwKQogewpAQCAtMTMzNjEsNyArMTM0MTksNyBAQCB4X2FjdGl2 YXRlX3RpbWVvdXRfYXRpbWVyICh2b2lkKQogICAgIHhfY3JfZGVmaW5lX2ZyaW5nZV9iaXRtYXAs CiAgICAgeF9jcl9kZXN0cm95X2ZyaW5nZV9iaXRtYXAsCiAjZWxzZQotICAgIDAsIC8qIGRlZmlu ZV9mcmluZ2VfYml0bWFwICovCisgICAgeF9kZWZpbmVfZnJpbmdlX2JpdG1hcCwKICAgICAwLCAv KiBkZXN0cm95X2ZyaW5nZV9iaXRtYXAgKi8KICNlbmRpZgogICAgIHhfY29tcHV0ZV9nbHlwaF9z dHJpbmdfb3ZlcmhhbmdzLAotLSAKMi4yMC4xCgo= --000000000000c17f7d05950ccdd1--