com php/gtk-src: More tsrmls fixes: ext/gtk+/gtk-2.10.overrides ext/gtk+/gtk.overrides ext/gtk+/gtkclipboard.overrides ext/gtk+/gtktextview.overrides ext/gtk+/gtktreeview.overrides main/php_gtk.h

--33e4c6dab93e91ad4015311ec8e3d2074c763512
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Commit:    ca38c464c92e0366fe0b5ea16ebd8dca488131f8=0AAuthor:    Elizabeth =
M Smith <[email protected]>         Wed, 18 Jul 2012 21:49:57 -0400=
=0AParents:   68a733751e399aee4e4d0056c52b17f72cc2e4a5=0ABranches:  master=
=0A=0ALink:       http://git.php.net/?p=3Dphp/gtk-src.git;a=3Dcommitdiff;h=
=3Dca38c464c92e0366fe0b5ea16ebd8dca488131f8=0A=0ALog:=0AMore tsrmls fixes=
=0A=0AChanged paths:=0A  M  ext/gtk+/gtk-2.10.overrides=0A  M  ext/gtk+/gtk=
.overrides=0A  M  ext/gtk+/gtkclipboard.overrides=0A  M  ext/gtk+/gtktextvi=
ew.overrides=0A  M  ext/gtk+/gtktreeview.overrides=0A  M  main/php_gtk.h=0A=
=0A
--33e4c6dab93e91ad4015311ec8e3d2074c763512
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="diff_ca38c464c92e0366fe0b5ea16ebd8dca488131f8.txt"

ZGlmZiAtLWdpdCBhL2V4dC9ndGsrL2d0ay0yLjEwLm92ZXJyaWRlcyBiL2V4dC9ndGsrL2d0ay0y
LjEwLm92ZXJyaWRlcwppbmRleCBlOTg4MGQ1Li42YTBjNTA3IDEwMDY0NAotLS0gYS9leHQvZ3Rr
Ky9ndGstMi4xMC5vdmVycmlkZXMKKysrIGIvZXh0L2d0aysvZ3RrLTIuMTAub3ZlcnJpZGVzCkBA
IC0zOSw3ICszOSw5IEBAIHN0YXRpYyB2b2lkIHBocGdfbGlua19idXR0b25fc2V0X3VyaV9ob29r
X2Z1bmNfbWFyc2hhbChHdGtMaW5rQnV0dG9uICpidXR0b24sIGNvCiAgICAgZ3NpemUgY3BfbGVu
OwogICAgIHplbmRfYm9vbCBmcmVlX3Jlc3VsdDsKIAotICAgIFRTUk1MU19GRVRDSCgpOworI2lm
ZGVmIFpUUworICAgIFRTUk1MU19EID0gY2JkLT5UU1JNTFNfQzsKKyNlbmRpZgogCiAgICAgaWYg
KCF6ZW5kX2lzX2NhbGxhYmxlKGNiZC0+Y2FsbGJhY2ssIDAsICZjYWxsYmFja19uYW1lIFBIUEdU
S19aRU5EX0lTX0NBTExBQkxFKSkgewogICAgICAgICBwaHBfZXJyb3IoRV9XQVJOSU5HLCAiVW5h
YmxlIHRvIGludm9rZSBjYWxsYmFjayAnJXMnIHNwZWNpZmllZCBpbiAlcyBvbiBsaW5lICVsZCIs
IGNhbGxiYWNrX25hbWUsIGNiZC0+c3JjX2ZpbGVuYW1lLCBjYmQtPnNyY19saW5lbm8pOwpAQCAt
MzI0LDE3ICszMjYsMTkgQEAgcGhwZ19yZWNlbnRfY2hvb3Nlcl9zb3J0X2Z1bmNfbWFyc2hhbChH
dGtSZWNlbnRJbmZvICphLCBHdGtSZWNlbnRJbmZvICpiLCBncG9pbnQKICAgICBpbnQgYXJnYyA9
IDAsIHN0YXR1cyA9IDA7CiAgICAgenZhbCAqKiphcmd2ID0gTlVMTCwgKnJldHZhbCA9IE5VTEw7
IAogICAgIHp2YWwgKnppbmZvX2EgPSBOVUxMLCAqemluZm9fYiA9IE5VTEw7Ci0gICAgcGhwZ19j
Yl9kYXRhX3QgKmNhbGxkYXRhID0gKHBocGdfY2JfZGF0YV90ICopZGF0YTsKLSAgICAKLSAgICBU
U1JNTFNfRkVUQ0goKTsKKyAgICBwaHBnX2NiX2RhdGFfdCAqY2JkID0gKHBocGdfY2JfZGF0YV90
ICopZGF0YTsKKyAgCisjaWZkZWYgWlRTCisgICAgVFNSTUxTX0QgPSBjYmQtPlRTUk1MU19DOwor
I2VuZGlmCiAKLSAgICBpZiAoIXplbmRfaXNfY2FsbGFibGUoY2FsbGRhdGEtPmNhbGxiYWNrLCAw
LCAmY2FsbGJhY2sgUEhQR1RLX1pFTkRfSVNfQ0FMTEFCTEUpKSB7CisgICAgaWYgKCF6ZW5kX2lz
X2NhbGxhYmxlKGNiZC0+Y2FsbGJhY2ssIDAsICZjYWxsYmFjayBQSFBHVEtfWkVORF9JU19DQUxM
QUJMRSkpIHsKICAgICAgICAgcGhwX2Vycm9yKAogICAgICAgICAgICAgRV9XQVJOSU5HLAogICAg
ICAgICAgICAgIlVuYWJsZSB0byBpbnZva2UgY2FsbGJhY2sgJyVzJyBzcGVjaWZpZWQgaW4gJXMg
b24gbGluZSAlbGQiLAogICAgICAgICAgICAgY2FsbGJhY2ssCi0gICAgICAgICAgICBjYWxsZGF0
YS0+c3JjX2ZpbGVuYW1lLAotICAgICAgICAgICAgY2FsbGRhdGEtPnNyY19saW5lbm8KKyAgICAg
ICAgICAgIGNiZC0+c3JjX2ZpbGVuYW1lLAorICAgICAgICAgICAgY2JkLT5zcmNfbGluZW5vCiAg
ICAgICAgICk7CiAgICAgICAgIAogICAgICAgICBlZnJlZShjYWxsYmFjayk7CkBAIC0zNDQsMTQg
KzM0OCwxNCBAQCBwaHBnX3JlY2VudF9jaG9vc2VyX3NvcnRfZnVuY19tYXJzaGFsKEd0a1JlY2Vu
dEluZm8gKmEsIEd0a1JlY2VudEluZm8gKmIsIGdwb2ludAogICAgIHBocGdfZ2JveGVkX25ldygm
emluZm9fYSxHVEtfVFlQRV9SRUNFTlRfSU5GTyxhLFRSVUUsVFJVRSBUU1JNTFNfQ0MpOwogICAg
IHBocGdfZ2JveGVkX25ldygmemluZm9fYixHVEtfVFlQRV9SRUNFTlRfSU5GTyxiLFRSVUUsVFJV
RSBUU1JNTFNfQ0MpOwogCi0gICAgYXJndiA9IHBocF9ndGtfaGFzaF9hc19hcnJheV9vZmZzZXQo
Y2FsbGRhdGEtPnVzZXJfYXJncywyLCZhcmdjKTsKKyAgICBhcmd2ID0gcGhwX2d0a19oYXNoX2Fz
X2FycmF5X29mZnNldChjYmQtPnVzZXJfYXJncywyLCZhcmdjKTsKICAgICBhcmd2WzBdID0gJnpp
bmZvX2E7CiAgICAgYXJndlsxXSA9ICZ6aW5mb19iOwogCiAgICAgY2FsbF91c2VyX2Z1bmN0aW9u
X2V4KAogICAgICAgICBFRyhmdW5jdGlvbl90YWJsZSksCiAgICAgICAgIE5VTEwsCi0gICAgICAg
IGNhbGxkYXRhLT5jYWxsYmFjaywKKyAgICAgICAgY2JkLT5jYWxsYmFjaywKICAgICAgICAgJnJl
dHZhbCwKICAgICAgICAgYXJnYywKICAgICAgICAgYXJndiwKQEAgLTU4NiwxNyArNTkwLDE5IEBA
IHBocGdfYXNzaXN0YW50X2ZvcndhcmRfcGFnZV9mdW5jX21hcnNoYWwoZ2ludCBjdXIsIGdwb2lu
dGVyIGRhdGEpCiAgICAgaW50IGFyZ2MgPSAwLCBzdGF0dXMgPSAwOwogICAgIHp2YWwgKioqYXJn
diA9IE5VTEwsICpyZXR2YWwgPSBOVUxMOwogICAgIHp2YWwgKnpjdXI7Ci0gICAgcGhwZ19jYl9k
YXRhX3QgKmNhbGxkYXRhID0gKHBocGdfY2JfZGF0YV90ICopZGF0YTsKKyAgICBwaHBnX2NiX2Rh
dGFfdCAqY2JkID0gKHBocGdfY2JfZGF0YV90ICopZGF0YTsKICAgICAKLSAgICBUU1JNTFNfRkVU
Q0goKTsKKyNpZmRlZiBaVFMKKyAgICBUU1JNTFNfRCA9IGNiZC0+VFNSTUxTX0M7CisjZW5kaWYK
IAotICAgIGlmICghemVuZF9pc19jYWxsYWJsZShjYWxsZGF0YS0+Y2FsbGJhY2ssIDAsICZjYWxs
YmFjayBQSFBHVEtfWkVORF9JU19DQUxMQUJMRSkpIHsKKyAgICBpZiAoIXplbmRfaXNfY2FsbGFi
bGUoY2JkLT5jYWxsYmFjaywgMCwgJmNhbGxiYWNrIFBIUEdUS19aRU5EX0lTX0NBTExBQkxFKSkg
ewogICAgICAgICBwaHBfZXJyb3IoCiAgICAgICAgICAgICBFX1dBUk5JTkcsCiAgICAgICAgICAg
ICAiVW5hYmxlIHRvIGludm9rZSBjYWxsYmFjayAnJXMnIHNwZWNpZmllZCBpbiAlcyBvbiBsaW5l
ICVsZCIsCiAgICAgICAgICAgICBjYWxsYmFjaywKLSAgICAgICAgICAgIGNhbGxkYXRhLT5zcmNf
ZmlsZW5hbWUsCi0gICAgICAgICAgICBjYWxsZGF0YS0+c3JjX2xpbmVubworICAgICAgICAgICAg
Y2JkLT5zcmNfZmlsZW5hbWUsCisgICAgICAgICAgICBjYmQtPnNyY19saW5lbm8KICAgICAgICAg
KTsKICAgICAgICAgCiAgICAgICAgIGVmcmVlKGNhbGxiYWNrKTsKQEAgLTYwNiwxMyArNjEyLDEz
IEBAIHBocGdfYXNzaXN0YW50X2ZvcndhcmRfcGFnZV9mdW5jX21hcnNoYWwoZ2ludCBjdXIsIGdw
b2ludGVyIGRhdGEpCiAgICAgTUFLRV9TVERfWlZBTCh6Y3VyKTsKICAgICBaVkFMX0xPTkcoemN1
cixjdXIpOwogCi0gICAgYXJndiA9IHBocF9ndGtfaGFzaF9hc19hcnJheV9vZmZzZXQoY2FsbGRh
dGEtPnVzZXJfYXJncywxLCZhcmdjKTsKKyAgICBhcmd2ID0gcGhwX2d0a19oYXNoX2FzX2FycmF5
X29mZnNldChjYmQtPnVzZXJfYXJncywxLCZhcmdjKTsKICAgICBhcmd2WzBdID0gJnpjdXI7CiAK
ICAgICBjYWxsX3VzZXJfZnVuY3Rpb25fZXgoCiAgICAgICAgIEVHKGZ1bmN0aW9uX3RhYmxlKSwK
ICAgICAgICAgTlVMTCwKLSAgICAgICAgY2FsbGRhdGEtPmNhbGxiYWNrLAorICAgICAgICBjYmQt
PmNhbGxiYWNrLAogICAgICAgICAmcmV0dmFsLAogICAgICAgICBhcmdjLAogICAgICAgICBhcmd2
LApkaWZmIC0tZ2l0IGEvZXh0L2d0aysvZ3RrLm92ZXJyaWRlcyBiL2V4dC9ndGsrL2d0ay5vdmVy
cmlkZXMKaW5kZXggYzcwOGNiNi4uZmY3MmZkMSAxMDA2NDQKLS0tIGEvZXh0L2d0aysvZ3RrLm92
ZXJyaWRlcworKysgYi9leHQvZ3RrKy9ndGsub3ZlcnJpZGVzCkBAIC04MTMsNyArODEzLDkgQEAg
c3RhdGljIGdib29sZWFuIHBocGdfYWNjZWxncm91cF9maW5kX2Z1bmNfbWFyc2hhbChHdGtBY2Nl
bEtleSAqa2V5LCBHQ2xvc3VyZSAqY2wKICAgICB6dmFsICpwaHBfa2V5ID0gTlVMTCwgKnJldHZh
bCA9IE5VTEw7CiAgICAgZ2Jvb2xlYW4gcmV0dXJuX3ZhbHVlOwogCi0gICAgVFNSTUxTX0ZFVENI
KCk7CisjaWZkZWYgWlRTCisgICAgVFNSTUxTX0QgPSBjYmQtPlRTUk1MU19DOworI2VuZGlmCiAK
ICAgICBpZiAoIXplbmRfaXNfY2FsbGFibGUoY2JkLT5jYWxsYmFjaywgMCwgJmNhbGxiYWNrX25h
bWUgUEhQR1RLX1pFTkRfSVNfQ0FMTEFCTEUpKSB7CiAgICAgICAgIHBocF9lcnJvcihFX1dBUk5J
TkcsICJVbmFibGUgdG8gaW52b2tlIGNhbGxiYWNrICclcycgc3BlY2lmaWVkIGluICVzIG9uIGxp
bmUgJWxkIiwgY2FsbGJhY2tfbmFtZSwgY2JkLT5zcmNfZmlsZW5hbWUsIGNiZC0+c3JjX2xpbmVu
byk7CkBAIC0xMTM5LDcgKzExNDEsOSBAQCBzdGF0aWMgdm9pZCBwaHBnX2Fib3V0X2RpYWxvZ19h
Y3RpdmF0ZV9saW5rX2Z1bmNfbWFyc2hhbChHdGtBYm91dERpYWxvZyAqYWJvdXQsCiAgICAgZ3Np
emUgY3BfbGVuOwogICAgIHplbmRfYm9vbCBmcmVlX3Jlc3VsdDsKIAotICAgIFRTUk1MU19GRVRD
SCgpOworI2lmZGVmIFpUUworICAgIFRTUk1MU19EID0gY2JkLT5UU1JNTFNfQzsKKyNlbmRpZgog
CiAgICAgaWYgKCF6ZW5kX2lzX2NhbGxhYmxlKGNiZC0+Y2FsbGJhY2ssIDAsICZjYWxsYmFja19u
YW1lIFBIUEdUS19aRU5EX0lTX0NBTExBQkxFKSkgewogICAgICAgICBwaHBfZXJyb3IoRV9XQVJO
SU5HLCAiVW5hYmxlIHRvIGludm9rZSBjYWxsYmFjayAnJXMnIHNwZWNpZmllZCBpbiAlcyBvbiBs
aW5lICVsZCIsIGNhbGxiYWNrX25hbWUsIGNiZC0+c3JjX2ZpbGVuYW1lLCBjYmQtPnNyY19saW5l
bm8pOwpkaWZmIC0tZ2l0IGEvZXh0L2d0aysvZ3RrY2xpcGJvYXJkLm92ZXJyaWRlcyBiL2V4dC9n
dGsrL2d0a2NsaXBib2FyZC5vdmVycmlkZXMKaW5kZXggYTVhNjliYy4uNWU2NWRkMiAxMDA2NDQK
LS0tIGEvZXh0L2d0aysvZ3RrY2xpcGJvYXJkLm92ZXJyaWRlcworKysgYi9leHQvZ3RrKy9ndGtj
bGlwYm9hcmQub3ZlcnJpZGVzCkBAIC0yNSw3ICsyNSw5IEBAIHN0YXRpYyB2b2lkIHBocGdfY2xp
cGJvYXJkX3JlcXVlc3RfY29udGVudHNfbWFyc2hhbChHdGtDbGlwYm9hcmQgKmNsaXBib2FyZCwK
ICAgICB6dmFsICpwaHBfY2xpcGJvYXJkID0gTlVMTDsKICAgICB6dmFsICpwaHBfc2VsX2RhdGEg
PSBOVUxMOwogICAgIAotICAgIFRTUk1MU19GRVRDSCgpOworI2lmZGVmIFpUUworICAgIFRTUk1M
U19EID0gY2JkLT5UU1JNTFNfQzsKKyNlbmRpZgogCiAgICAgaWYgKCF6ZW5kX2lzX2NhbGxhYmxl
KGNiZC0+Y2FsbGJhY2ssIDAsICZjYWxsYmFja19uYW1lIFBIUEdUS19aRU5EX0lTX0NBTExBQkxF
KSkgewogICAgICAgICBwaHBfZXJyb3IoRV9XQVJOSU5HLCAiVW5hYmxlIHRvIGludm9rZSBjYWxs
YmFjayAnJXMnIHNwZWNpZmllZCBpbiAlcyBvbiBsaW5lICVsZCIsIGNhbGxiYWNrX25hbWUsIGNi
ZC0+c3JjX2ZpbGVuYW1lLCBjYmQtPnNyY19saW5lbm8pOwpAQCAtMTk2LDcgKzE5OCw5IEBAIHN0
YXRpYyB2b2lkIHBocGdfY2xpcGJvYXJkX3JlcXVlc3RfdGV4dF9tYXJzaGFsKEd0a0NsaXBib2Fy
ZCAqY2xpcGJvYXJkLAogICAgIGdzaXplIGNwX2xlbjsKICAgICB6ZW5kX2Jvb2wgZnJlZV9jcF9z
dHI7CiAgICAgCi0gICAgVFNSTUxTX0ZFVENIKCk7CisjaWZkZWYgWlRTCisgICAgVFNSTUxTX0Qg
PSBjYmQtPlRTUk1MU19DOworI2VuZGlmCiAKICAgICBpZiAoIXplbmRfaXNfY2FsbGFibGUoY2Jk
LT5jYWxsYmFjaywgMCwgJmNhbGxiYWNrX25hbWUgUEhQR1RLX1pFTkRfSVNfQ0FMTEFCTEUpKSB7
CiAgICAgICAgIHBocF9lcnJvcihFX1dBUk5JTkcsICJVbmFibGUgdG8gaW52b2tlIGNhbGxiYWNr
ICclcycgc3BlY2lmaWVkIGluICVzIG9uIGxpbmUgJWxkIiwgY2FsbGJhY2tfbmFtZSwgY2JkLT5z
cmNfZmlsZW5hbWUsIGNiZC0+c3JjX2xpbmVubyk7CmRpZmYgLS1naXQgYS9leHQvZ3RrKy9ndGt0
ZXh0dmlldy5vdmVycmlkZXMgYi9leHQvZ3RrKy9ndGt0ZXh0dmlldy5vdmVycmlkZXMKaW5kZXgg
ZmQ5NTk1My4uN2M5NzcwOSAxMDA2NDQKLS0tIGEvZXh0L2d0aysvZ3RrdGV4dHZpZXcub3ZlcnJp
ZGVzCisrKyBiL2V4dC9ndGsrL2d0a3RleHR2aWV3Lm92ZXJyaWRlcwpAQCAtMzk4LDcgKzM5OCw5
IEBAIHN0YXRpYyBnYm9vbGVhbiBwaHBnX3RleHRfaXRlcl9jaGFyX3ByZWRpY2F0ZV9mdW5jX21h
cnNoYWwgKGd1bmljaGFyIGNoLCBncG9pbnRlCiAgICAgZ2NoYXIgKmNwX3JldDsgZ3NpemUgY3Bf
bGVuOwogICAgIHplbmRfYm9vbCB0b3JldHVybiwgZnJlZV9yZXN1bHQgPSBGQUxTRTsKIAotICAg
IFRTUk1MU19GRVRDSCgpOworI2lmZGVmIFpUUworICAgIFRTUk1MU19EID0gY2JkLT5UU1JNTFNf
QzsKKyNlbmRpZgogCiAgICAgaWYgKCF6ZW5kX2lzX2NhbGxhYmxlKGNiZC0+Y2FsbGJhY2ssIDAs
ICZjYWxsYmFja19uYW1lIFBIUEdUS19aRU5EX0lTX0NBTExBQkxFKSkgewogICAgICAgICBwaHBf
ZXJyb3IoRV9XQVJOSU5HLCAiVW5hYmxlIHRvIGludm9rZSBjYWxsYmFjayAnJXMnIHNwZWNpZmll
ZCBpbiAlcyBvbiBsaW5lICVsZCIsIGNhbGxiYWNrX25hbWUsIGNiZC0+c3JjX2ZpbGVuYW1lLCBj
YmQtPnNyY19saW5lbm8pOwpAQCAtNTYwLDcgKzU2Miw5IEBAIHN0YXRpYyB2b2lkIHBocGdfdGV4
dF90YWdfdGFibGVfZm9yZWFjaF9mdW5jX21hcnNoYWwoR3RrVGV4dFRhZ1RhYmxlICp0YWJsZSwg
Z3BvCiAgICAgY2hhciAqY2FsbGJhY2tfbmFtZTsKICAgICB6dmFsICpwaHBfdGFibGUgPSBOVUxM
OwogCi0gICAgVFNSTUxTX0ZFVENIKCk7CisjaWZkZWYgWlRTCisgICAgVFNSTUxTX0QgPSBjYmQt
PlRTUk1MU19DOworI2VuZGlmCiAKICAgICBpZiAoIXplbmRfaXNfY2FsbGFibGUoY2JkLT5jYWxs
YmFjaywgMCwgJmNhbGxiYWNrX25hbWUgUEhQR1RLX1pFTkRfSVNfQ0FMTEFCTEUpKSB7CiAgICAg
ICAgIHBocF9lcnJvcihFX1dBUk5JTkcsICJVbmFibGUgdG8gaW52b2tlIGNhbGxiYWNrICclcycg
c3BlY2lmaWVkIGluICVzIG9uIGxpbmUgJWxkIiwgY2FsbGJhY2tfbmFtZSwgY2JkLT5zcmNfZmls
ZW5hbWUsIGNiZC0+c3JjX2xpbmVubyk7CmRpZmYgLS1naXQgYS9leHQvZ3RrKy9ndGt0cmVldmll
dy5vdmVycmlkZXMgYi9leHQvZ3RrKy9ndGt0cmVldmlldy5vdmVycmlkZXMKaW5kZXggNTY0NzRk
ZS4uYjQ2OTM5NyAxMDA2NDQKLS0tIGEvZXh0L2d0aysvZ3RrdHJlZXZpZXcub3ZlcnJpZGVzCisr
KyBiL2V4dC9ndGsrL2d0a3RyZWV2aWV3Lm92ZXJyaWRlcwpAQCAtMTM4Niw3ICsxMzg2LDkgQEAg
Z2Jvb2xlYW4gcGhwZ190cmVlX21vZGVsX2ZvcmVhY2hfbWFyc2hhbChHdGtUcmVlTW9kZWwgKm1v
ZGVsLAogICAgIGNoYXIgKmNhbGxiYWNrX25hbWU7CiAgICAgenZhbCAqcGhwX21vZGVsID0gTlVM
TCwgKnBocF9wYXRoID0gTlVMTCwgKnBocF9pdGVyID0gTlVMTDsKICAgICBnYm9vbGVhbiByZXQ7
Ci0gICAgVFNSTUxTX0ZFVENIKCk7CisjaWZkZWYgWlRTCisgICAgVFNSTUxTX0QgPSBjYmQtPlRT
Uk1MU19DOworI2VuZGlmCiAKICAgICBpZiAoIXplbmRfaXNfY2FsbGFibGUoY2JkLT5jYWxsYmFj
aywgMCwgJmNhbGxiYWNrX25hbWUgUEhQR1RLX1pFTkRfSVNfQ0FMTEFCTEUpKSB7CiAgICAgICAg
IHBocF9lcnJvcihFX1dBUk5JTkcsICJVbmFibGUgdG8gaW52b2tlIGNhbGxiYWNrICclcycgc3Bl
Y2lmaWVkIGluICVzIG9uIGxpbmUgJWxkIiwgY2FsbGJhY2tfbmFtZSwgY2JkLT5zcmNfZmlsZW5h
bWUsIGNiZC0+c3JjX2xpbmVubyk7CkBAIC0xODkzLDcgKzE4OTUsOSBAQCBzdGF0aWMgdm9pZCBw
aHBnX3RyZWVfc2VsZWN0aW9uX2ZvcmVhY2hfZnVuY19tYXJzaGFsIChHdGtUcmVlTW9kZWwgKm1v
ZGVsLCBHdGtUcgogICAgIGNoYXIgKmNhbGxiYWNrX25hbWU7CiAgICAgenZhbCAqcGhwX21vZGVs
ID0gTlVMTCwgKnBocF9wYXRoID0gTlVMTCwgKnBocF9pdGVyID0gTlVMTDsKIAotICAgIFRTUk1M
U19GRVRDSCgpOworI2lmZGVmIFpUUworICAgIFRTUk1MU19EID0gY2JkLT5UU1JNTFNfQzsKKyNl
bmRpZgogCiAgICAgaWYgKCF6ZW5kX2lzX2NhbGxhYmxlKGNiZC0+Y2FsbGJhY2ssIDAsICZjYWxs
YmFja19uYW1lIFBIUEdUS19aRU5EX0lTX0NBTExBQkxFKSkgewogICAgICAgICBwaHBfZXJyb3Io
RV9XQVJOSU5HLCAiVW5hYmxlIHRvIGludm9rZSBjYWxsYmFjayAnJXMnIHNwZWNpZmllZCBpbiAl
cyBvbiBsaW5lICVsZCIsIGNhbGxiYWNrX25hbWUsIGNiZC0+c3JjX2ZpbGVuYW1lLCBjYmQtPnNy
Y19saW5lbm8pOwpAQCAtMTk2Nyw3ICsxOTcxLDkgQEAgc3RhdGljIGdib29sZWFuIHBocGdfdHJl
ZV9zZWxlY3Rpb25fZnVuY19tYXJzaGFsKEd0a1RyZWVTZWxlY3Rpb24gKnNlbGVjdGlvbiwKICAg
ICBjaGFyICpjYWxsYmFja19uYW1lOwogICAgIHp2YWwgKnBocF9zZWxlY3Rpb24gPSBOVUxMLCAq
cGhwX21vZGVsID0gTlVMTCwgKnBocF9wYXRoID0gTlVMTCwgKnBocF9wYXRoX2N1cnJlbnRseV9z
ZWxlY3RlZDsKICAgICBnYm9vbGVhbiBhbGxvd190b2dnbGUgPSBUUlVFOwotICAgIFRTUk1MU19G
RVRDSCgpOworI2lmZGVmIFpUUworICAgIFRTUk1MU19EID0gY2JkLT5UU1JNTFNfQzsKKyNlbmRp
ZgogCiAgICAgaWYgKCF6ZW5kX2lzX2NhbGxhYmxlKGNiZC0+Y2FsbGJhY2ssIDAsICZjYWxsYmFj
a19uYW1lIFBIUEdUS19aRU5EX0lTX0NBTExBQkxFKSkgewogICAgICAgICBwaHBfZXJyb3IoRV9X
QVJOSU5HLCAiVW5hYmxlIHRvIGludm9rZSBjYWxsYmFjayAnJXMnIHNwZWNpZmllZCBpbiAlcyBv
biBsaW5lICVsZCIsIGNhbGxiYWNrX25hbWUsIGNiZC0+c3JjX2ZpbGVuYW1lLCBjYmQtPnNyY19s
aW5lbm8pOwpAQCAtMjEwNyw3ICsyMTEzLDkgQEAgc3RhdGljIGdpbnQgcGhwZ190cmVlX2l0ZXJf
Y29tcGFyZV9mdW5jX21hcnNoYWwoR3RrVHJlZU1vZGVsICptb2RlbCwgR3RrVHJlZUl0ZXIKICAg
ICBjaGFyICpjYWxsYmFja19uYW1lOwogICAgIHp2YWwgKnBocF9tb2RlbCA9IE5VTEwsICpwaHBf
aXRlcl9hID0gTlVMTCwgKnBocF9pdGVyX2IgPSBOVUxMOwogICAgIGdpbnQgY29tcGFyZWQgPSAw
OwotICAgIFRTUk1MU19GRVRDSCgpOworI2lmZGVmIFpUUworICAgIFRTUk1MU19EID0gY2JkLT5U
U1JNTFNfQzsKKyNlbmRpZgogCiAgICAgaWYgKCF6ZW5kX2lzX2NhbGxhYmxlKGNiZC0+Y2FsbGJh
Y2ssIDAsICZjYWxsYmFja19uYW1lIFBIUEdUS19aRU5EX0lTX0NBTExBQkxFKSkgewogICAgICAg
ICBwaHBfZXJyb3IoRV9XQVJOSU5HLCAiVW5hYmxlIHRvIGludm9rZSBjYWxsYmFjayAnJXMnIHNw
ZWNpZmllZCBpbiAlcyBvbiBsaW5lICVsZCIsIGNhbGxiYWNrX25hbWUsIGNiZC0+c3JjX2ZpbGVu
YW1lLCBjYmQtPnNyY19saW5lbm8pOwpAQCAtMjI3OSw3ICsyMjg3LDkgQEAgc3RhdGljIGdib29s
ZWFuIHBocGdfdHJlZV92aWV3X2NvbHVtbl9kcm9wX2Z1bmNfbWFyc2hhbCAoR3RrVHJlZVZpZXcg
KnRyZWVfdmlldywKICAgICBjaGFyICpjYWxsYmFja19uYW1lOwogICAgIHp2YWwgKnBocF92aWV3
ID0gTlVMTCwgKnBocF9jb2x1bW4gPSBOVUxMLCAqcGhwX3ByZXZfY29sdW1uID0gTlVMTCwgKnBo
cF9uZXh0X2NvbHVtbiA9IE5VTEw7CiAgICAgZ2Jvb2xlYW4gbWF5X2Ryb3AgPSBGQUxTRTsKLSAg
ICBUU1JNTFNfRkVUQ0goKTsKKyNpZmRlZiBaVFMKKyAgICBUU1JNTFNfRCA9IGNiZC0+VFNSTUxT
X0M7CisjZW5kaWYKIAogICAgIGlmICghemVuZF9pc19jYWxsYWJsZShjYmQtPmNhbGxiYWNrLCAw
LCAmY2FsbGJhY2tfbmFtZSBQSFBHVEtfWkVORF9JU19DQUxMQUJMRSkpIHsKICAgICAgICAgcGhw
X2Vycm9yKEVfV0FSTklORywgIlVuYWJsZSB0byBpbnZva2UgY2FsbGJhY2sgJyVzJyBzcGVjaWZp
ZWQgaW4gJXMgb24gbGluZSAlbGQiLCBjYWxsYmFja19uYW1lLCBjYmQtPnNyY19maWxlbmFtZSwg
Y2JkLT5zcmNfbGluZW5vKTsKQEAgLTIzNjYsNyArMjM3Niw5IEBAIHN0YXRpYyBnYm9vbGVhbiBw
aHBnX3RyZWVfdmlld19yb3dfc2VwYXJhdG9yX2Z1bmNfbWFyc2hhbChHdGtUcmVlTW9kZWwgKm1v
ZGVsLCBHCiAgICAgY2hhciAqY2FsbGJhY2tfbmFtZTsKICAgICB6dmFsICpwaHBfbW9kZWwgPSBO
VUxMLCAqcGhwX2l0ZXIgPSBOVUxMOwogICAgIGdib29sZWFuIGlzX3NlcGFyYXRvciA9IEZBTFNF
OwotICAgIFRTUk1MU19GRVRDSCgpOworI2lmZGVmIFpUUworICAgIFRTUk1MU19EID0gY2JkLT5U
U1JNTFNfQzsKKyNlbmRpZgogCiAgICAgaWYgKCF6ZW5kX2lzX2NhbGxhYmxlKGNiZC0+Y2FsbGJh
Y2ssIDAsICZjYWxsYmFja19uYW1lIFBIUEdUS19aRU5EX0lTX0NBTExBQkxFKSkgewogICAgICAg
ICBwaHBfZXJyb3IoRV9XQVJOSU5HLCAiVW5hYmxlIHRvIGludm9rZSBjYWxsYmFjayAnJXMnIHNw
ZWNpZmllZCBpbiAlcyBvbiBsaW5lICVsZCIsIGNhbGxiYWNrX25hbWUsIGNiZC0+c3JjX2ZpbGVu
YW1lLCBjYmQtPnNyY19saW5lbm8pOwpAQCAtMjQ0OCw3ICsyNDYwLDkgQEAgc3RhdGljIHZvaWQg
cGhwZ19jZWxsX2RhdGFfZnVuY19tYXJzaGFsKEd0a0NlbGxMYXlvdXQgKmNlbGxfbGF5b3V0LCBH
dGtDZWxsUmVuZGUKICAgICBpbnQgbl9hcmdzID0gMDsKICAgICBjaGFyICpjYWxsYmFja19uYW1l
OwogICAgIHp2YWwgKnBocF9jZWxsX2xheW91dCA9IE5VTEwsICpwaHBfcmVuZGVyZXIgPSBOVUxM
LCAqcGhwX21vZGVsID0gTlVMTCwgKnBocF9pdGVyID0gTlVMTDsKLSAgICBUU1JNTFNfRkVUQ0go
KTsKKyNpZmRlZiBaVFMKKyAgICBUU1JNTFNfRCA9IGNiZC0+VFNSTUxTX0M7CisjZW5kaWYKIAog
ICAgIGlmICghemVuZF9pc19jYWxsYWJsZShjYmQtPmNhbGxiYWNrLCAwLCAmY2FsbGJhY2tfbmFt
ZSBQSFBHVEtfWkVORF9JU19DQUxMQUJMRSkpIHsKICAgICAgICAgcGhwX2Vycm9yKEVfV0FSTklO
RywgIlVuYWJsZSB0byBpbnZva2UgY2FsbGJhY2sgJyVzJyBzcGVjaWZpZWQgaW4gJXMgb24gbGlu
ZSAlbGQiLCBjYWxsYmFja19uYW1lLCBjYmQtPnNyY19maWxlbmFtZSwgY2JkLT5zcmNfbGluZW5v
KTsKQEAgLTI3NTksNyArMjc3Myw5IEBAIHN0YXRpYyBnYm9vbGVhbiBwaHBnX3RyZWVfdmlld19z
ZWFyY2hfZXF1YWxfZnVuY19tYXJzaGFsIChHdGtUcmVlTW9kZWwgKm1vZGVsLCBnCiAgICAgZ2No
YXIgKmNwX2tleTsKICAgICBnc2l6ZSBjcF9sZW47CiAgICAgemVuZF9ib29sIGZyZWVfcmVzdWx0
OwotICAgIFRTUk1MU19GRVRDSCgpOworI2lmZGVmIFpUUworICAgIFRTUk1MU19EID0gY2JkLT5U
U1JNTFNfQzsKKyNlbmRpZgogCiAgICAgaWYgKCF6ZW5kX2lzX2NhbGxhYmxlKGNiZC0+Y2FsbGJh
Y2ssIDAsICZjYWxsYmFja19uYW1lIFBIUEdUS19aRU5EX0lTX0NBTExBQkxFKSkgewogICAgICAg
ICBwaHBfZXJyb3IoRV9XQVJOSU5HLCAiVW5hYmxlIHRvIGludm9rZSBjYWxsYmFjayAnJXMnIHNw
ZWNpZmllZCBpbiAlcyBvbiBsaW5lICVsZCIsIGNhbGxiYWNrX25hbWUsIGNiZC0+c3JjX2ZpbGVu
YW1lLCBjYmQtPnNyY19saW5lbm8pOwpkaWZmIC0tZ2l0IGEvbWFpbi9waHBfZ3RrLmggYi9tYWlu
L3BocF9ndGsuaAppbmRleCBkZTM3ZjFkLi5mNDVjODdjIDEwMDY0NAotLS0gYS9tYWluL3BocF9n
dGsuaAorKysgYi9tYWluL3BocF9ndGsuaApAQCAtMTAwLDYgKzEwMCw5IEBAIHR5cGVkZWYgc3Ry
dWN0IHsKIAl6dmFsICp1c2VyX2FyZ3M7CiAJY2hhciAqc3JjX2ZpbGVuYW1lOwogCWxvbmcgc3Jj
X2xpbmVubzsKKyNpZmRlZiBaVFMKKwlUU1JNTFNfRDsKKyNlbmRpZgogfSBwaHBnX2NiX2RhdGFf
dDsKIAogI2luY2x1ZGUgInBocF9ndGtfbW9kdWxlLmgiCkBAIC0xMzgsNiArMTQxLDkgQEAgc3Rh
dGljIGlubGluZSBwaHBnX2NiX2RhdGFfdCogcGhwZ19jYl9kYXRhX25ldyh6dmFsICpjYWxsYmFj
aywgenZhbCAqdXNlcl9hcmdzIFQKIAljYmQtPnVzZXJfYXJncyA9IHVzZXJfYXJnczsKIAljYmQt
PnNyY19maWxlbmFtZSA9IGVzdHJkdXAoemVuZF9nZXRfZXhlY3V0ZWRfZmlsZW5hbWUoVFNSTUxT
X0MpKTsKIAljYmQtPnNyY19saW5lbm8gPSB6ZW5kX2dldF9leGVjdXRlZF9saW5lbm8oVFNSTUxT
X0MpOworI2lmZGVmIFpUUworCWNiZC0+VFNSTUxTX0MgPSBUU1JNTFNfQzsKKyNlbmRpZgogCXJl
dHVybiBjYmQ7CiB9CiBQSFBfR1RLX0FQSSB2b2lkIHBocGdfY2JfZGF0YV9kZXN0cm95KGdwb2lu
dGVyIGRhdGEpOw==

--33e4c6dab93e91ad4015311ec8e3d2074c763512--