com php/gtk-src: More tsrmls_fetch work: ext/gtk+/gtktr eeview.overrides ext/gtk+/php_gtk+_types.c ext/gtk+ /phpg_custom_tree_model.c main/php_gtk.h

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

Commit:    0c07e8033566f64000661c698ad6cde4fbf56210=0AAuthor:    Elizabeth =
M Smith <[email protected]>         Wed, 18 Jul 2012 11:53:14 -0400=
=0AParents:   d972807a2eb0a5ac045ba983ac3f93d7d365b8f1=0ABranches:  master=
=0A=0ALink:       http://git.php.net/?p=3Dphp/gtk-src.git;a=3Dcommitdiff;h=
=3D0c07e8033566f64000661c698ad6cde4fbf56210=0A=0ALog:=0AMore tsrmls_fetch w=
ork=0A=0AChanged paths:=0A  M  ext/gtk+/gtktreeview.overrides=0A  M  ext/gt=
k+/php_gtk+_types.c=0A  M  ext/gtk+/phpg_custom_tree_model.c=0A  M  main/ph=
p_gtk.h=0A=0A
--368af238d7c2605d1398339630a6ef3b27dd2121
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="diff_0c07e8033566f64000661c698ad6cde4fbf56210.txt"

ZGlmZiAtLWdpdCBhL2V4dC9ndGsrL2d0a3RyZWV2aWV3Lm92ZXJyaWRlcyBiL2V4dC9ndGsrL2d0
a3RyZWV2aWV3Lm92ZXJyaWRlcwppbmRleCA2OGYxOGE0Li5lZDE3NDQ3IDEwMDY0NAotLS0gYS9l
eHQvZ3RrKy9ndGt0cmVldmlldy5vdmVycmlkZXMKKysrIGIvZXh0L2d0aysvZ3RrdHJlZXZpZXcu
b3ZlcnJpZGVzCkBAIC03NzQsMjAgKzc3NCwyMCBAQCBQSFBfTUVUSE9ECiAgICAgICAgIGNvbHVt
bl90eXBlcyA9IGVtYWxsb2MoYXJnYyAqIHNpemVvZihHVHlwZSkpOwogCiAgICAgICAgIGZvciAo
aSA9IDA7IGkgPCBhcmdjOyBpKyspIHsKLSAgICAgICAgICAgIGNvbHVtbl90eXBlc1tpXSA9IHBo
cGdfZ3R5cGVfZnJvbV96dmFsKCphcmdzW2ldKTsKKyAgICAgICAgICAgIGNvbHVtbl90eXBlc1tp
XSA9IHBocGdfZ3R5cGVfZnJvbV96dmFsKCphcmdzW2ldIFRTUk1MU19DQyk7CiAgICAgICAgICAg
ICBpZiAoY29sdW1uX3R5cGVzW2ldID09IDApIHsKICAgICAgICAgICAgICAgICBlZnJlZShjb2x1
bW5fdHlwZXMpOwotICAgICAgICAgICAgICAgIFBIUEdfVEhST1dfQ09OU1RSVUNUX0VYQ0VQVElP
TihHdGtUcmVlU3RvcmUpOworICAgICAgICAgICAgICAgIFBIUEdfVEhST1dfQ09OU1RSVUNUX0VY
Q0VQVElPTihHdGtUcmVlU3RvcmUgVFNSTUxTX0NDKTsKICAgICAgICAgICAgIH0KICAgICAgICAg
fQogCi0gICAgICAgIHdyYXBwZWRfb2JqID0gZ19vYmplY3RfbmV3dihwaHBnX2d0eXBlX2Zyb21f
enZhbCh0aGlzX3B0ciksIDAsIE5VTEwpOworICAgICAgICB3cmFwcGVkX29iaiA9IGdfb2JqZWN0
X25ld3YocGhwZ19ndHlwZV9mcm9tX3p2YWwodGhpc19wdHIgVFNSTUxTX0NDKSwgMCwgTlVMTCk7
CiAgICAgICAgIGd0a190cmVlX3N0b3JlX3NldF9jb2x1bW5fdHlwZXMoR1RLX1RSRUVfU1RPUkUo
d3JhcHBlZF9vYmopLCBhcmdjLCBjb2x1bW5fdHlwZXMpOwogCiAgICAgICAgIGVmcmVlKGNvbHVt
bl90eXBlcyk7CiAgICAgICAgIGVmcmVlKGFyZ3MpOwogICAgIH0gZWxzZSB7Ci0gICAgICAgIHdy
YXBwZWRfb2JqID0gZ19vYmplY3RfbmV3KHBocGdfZ3R5cGVfZnJvbV96dmFsKHRoaXNfcHRyKSwg
TlVMTCk7CisgICAgICAgIHdyYXBwZWRfb2JqID0gZ19vYmplY3RfbmV3KHBocGdfZ3R5cGVfZnJv
bV96dmFsKHRoaXNfcHRyIFRTUk1MU19DQyksIE5VTEwpOwogICAgIH0KIAogICAgIGlmICghd3Jh
cHBlZF9vYmopIHsKQEAgLTgyMyw3ICs4MjMsNyBAQCBQSFBfTUVUSE9ECiAgICAgICAgICB6ZW5k
X2hhc2hfZ2V0X2N1cnJlbnRfZGF0YShaX0FSUlZBTF9QKHBocF90eXBlcyksICh2b2lkKiopJml0
ZW0pID09IFNVQ0NFU1M7CiAgICAgICAgICB6ZW5kX2hhc2hfbW92ZV9mb3J3YXJkKFpfQVJSVkFM
X1AocGhwX3R5cGVzKSksIGkrKykgewogCi0gICAgICAgIGNvbHVtbl90eXBlc1tpXSA9IHBocGdf
Z3R5cGVfZnJvbV96dmFsKCppdGVtKTsKKyAgICAgICAgY29sdW1uX3R5cGVzW2ldID0gcGhwZ19n
dHlwZV9mcm9tX3p2YWwoKml0ZW0gVFNSTUxTX0NDKTsKICAgICAgICAgaWYgKGNvbHVtbl90eXBl
c1tpXSA9PSAwKSB7CiAgICAgICAgICAgICBlZnJlZShjb2x1bW5fdHlwZXMpOwogICAgICAgICAg
ICAgcGhwX2Vycm9yKEVfV0FSTklORywgImNvdWxkIG5vdCBzZXQgY29sdW1uIHR5cGVzIGZvciBH
dGtUcmVlU3RvcmUiKTsKQEAgLTE1ODgsNyArMTU4OCw3IEBAIFBIUF9NRVRIT0QKICAgICAgICAg
cmV0dXJuOwogICAgIH0KIAotICAgIHdyYXBwZWRfb2JqID0gZ19vYmplY3RfbmV3KHBocGdfZ3R5
cGVfZnJvbV96dmFsKHRoaXNfcHRyKSwKKyAgICB3cmFwcGVkX29iaiA9IGdfb2JqZWN0X25ldyhw
aHBnX2d0eXBlX2Zyb21fenZhbCh0aGlzX3B0ciBUU1JNTFNfQ0MpLAogICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICJjaGlsZC1tb2RlbCIsIEdUS19UUkVFX01PREVMKFBIUEdfR09CSkVD
VChwaHBfbW9kZWwpKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAidmlydHVhbC1y
b290IiwgcGF0aCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBOVUxMKTsKQEAgLTE1
OTgsNyArMTU5OCw3IEBAIFBIUF9NRVRIT0QKICAgICB9CiAKICAgICBpZiAoIXdyYXBwZWRfb2Jq
KSB7Ci0gICAgICAgIFBIUEdfVEhST1dfQ09OU1RSVUNUX0VYQ0VQVElPTihHdGtUcmVlTW9kZWxG
aWx0ZXIpOworICAgICAgICBQSFBHX1RIUk9XX0NPTlNUUlVDVF9FWENFUFRJT04oR3RrVHJlZU1v
ZGVsRmlsdGVyIFRTUk1MU19DQyk7CiAgICAgfQogCiAgICAgcGhwZ19nb2JqZWN0X3NldF93cmFw
cGVyKHRoaXNfcHRyLCB3cmFwcGVkX29iaiBUU1JNTFNfQ0MpOwpAQCAtMjkyMiw3ICsyOTIyLDcg
QEAgUEhQX01FVEhPRAogICAgICAgICB9CiAgICAgfQogCi0gICAgdHZjID0gR1RLX1RSRUVfVklF
V19DT0xVTU4oZ19vYmplY3RfbmV3KHBocGdfZ3R5cGVfZnJvbV96dmFsKHRoaXNfcHRyKSwgTlVM
TCkpOworICAgIHR2YyA9IEdUS19UUkVFX1ZJRVdfQ09MVU1OKGdfb2JqZWN0X25ldyhwaHBnX2d0
eXBlX2Zyb21fenZhbCh0aGlzX3B0ciBUU1JNTFNfQ0MpLCBOVUxMKSk7CiAgICAgaWYgKHBocF9j
ZWxsICYmIFpfVFlQRV9QKHBocF9jZWxsKSAhPSBJU19OVUxMKSB7CiAgICAgICAgIGNlbGwgPSBH
VEtfQ0VMTF9SRU5ERVJFUihQSFBHX0dPQkpFQ1QocGhwX2NlbGwpKTsKICAgICB9CmRpZmYgLS1n
aXQgYS9leHQvZ3RrKy9waHBfZ3RrK190eXBlcy5jIGIvZXh0L2d0aysvcGhwX2d0aytfdHlwZXMu
YwppbmRleCA4ZjcwOGIxLi5iMTIzOTMxIDEwMDY0NAotLS0gYS9leHQvZ3RrKy9waHBfZ3RrK190
eXBlcy5jCisrKyBiL2V4dC9ndGsrL3BocF9ndGsrX3R5cGVzLmMKQEAgLTEzNTMsNyArMTM1Myw3
IEBAIHp2YWwgKnBocF9nZGtfZXZlbnRfbmV3KEdka0V2ZW50ICpldmVudCkKIAlhZGRfcHJvcGVy
dHlfbG9uZyhyZXN1bHQsICJ0eXBlIiwgZXZlbnQtPnR5cGUpOwogCQogCWlmIChldmVudC0+YW55
LndpbmRvdykgewotCQl2YWx1ZSA9IHBocF9nZGtfd2luZG93X25ldyhldmVudC0+YW55LndpbmRv
dyk7CisJCXZhbHVlID0gcGhwX2dka193aW5kb3dfbmV3KGV2ZW50LT5hbnkud2luZG93IFRTUk1M
U19DQyk7CiAJCWFkZF9wcm9wZXJ0eV96dmFsKHJlc3VsdCwgIndpbmRvdyIsIHZhbHVlKTsKIAl9
IGVsc2UKIAkJYWRkX3Byb3BlcnR5X251bGwocmVzdWx0LCAid2luZG93Iik7CkBAIC0xNDE0LDcg
KzE0MTQsNyBAQCB6dmFsICpwaHBfZ2RrX2V2ZW50X25ldyhHZGtFdmVudCAqZXZlbnQpCiAJCWNh
c2UgR0RLX0VOVEVSX05PVElGWToKIAkJY2FzZSBHREtfTEVBVkVfTk9USUZZOgogCQkJaWYgKGV2
ZW50LT5jcm9zc2luZy5zdWJ3aW5kb3cpIHsKLQkJCQl2YWx1ZSA9IHBocF9nZGtfd2luZG93X25l
dyhldmVudC0+Y3Jvc3Npbmcuc3Vid2luZG93KTsKKwkJCQl2YWx1ZSA9IHBocF9nZGtfd2luZG93
X25ldyhldmVudC0+Y3Jvc3Npbmcuc3Vid2luZG93IFRTUk1MU19DQykpOwogCQkJCWFkZF9wcm9w
ZXJ0eV96dmFsKHJlc3VsdCwgInN1YndpbmRvdyIsIHZhbHVlKTsKIAkJCX0gZWxzZQogCQkJCWFk
ZF9wcm9wZXJ0eV9udWxsKHJlc3VsdCwgInN1YndpbmRvdyIpOwpAQCAtMTkyMywxMSArMTkyMywx
MCBAQCBzdGF0aWMgZnVuY3Rpb25fZW50cnkgcGhwX2dka19waXhtYXBfZnVuY3Rpb25zW10gPSB7
CiAJe05VTEwsIE5VTEwsIE5VTEx9CiB9OwogCi16dmFsICpwaHBfZ2RrX3dpbmRvd19uZXcoR2Rr
V2luZG93ICp3aW5kb3cpCit6dmFsICpwaHBfZ2RrX3dpbmRvd19uZXcoR2RrV2luZG93ICp3aW5k
b3cgVFNSTUxTX0RDKSkKIHsKIAl6dmFsICpyZXN1bHQ7CiAJenZhbCAqKndyYXBwZXJfcHRyOwot
CVRTUk1MU19GRVRDSCgpOwogCiAJaWYgKCF3aW5kb3cpIHsKIAkJTUFLRV9TVERfWlZBTChyZXN1
bHQpOwpAQCAtMjA1NiwxMCArMjA1NSwxMCBAQCBzdGF0aWMgdm9pZCBnZGtfd2luZG93X2dldF9w
cm9wZXJ0eSh6dmFsICpyZXR1cm5fdmFsdWUsIHp2YWwgKm9iamVjdCwgY2hhciAqcHJvcAogCQl9
IGVsc2UgaWYgKCFzdHJjbXAocHJvcF9uYW1lLCAicGFyZW50IikpIHsKIAkJCUdka1dpbmRvdyAq
cGFyZW50ID0gZ2RrX3dpbmRvd19nZXRfcGFyZW50KHdpbik7CiAJCQlpZiAocGFyZW50KQotCQkJ
CSpyZXR1cm5fdmFsdWUgPSAqcGhwX2dka193aW5kb3dfbmV3KHBhcmVudCk7CisJCQkJKnJldHVy
bl92YWx1ZSA9ICpwaHBfZ2RrX3dpbmRvd19uZXcocGFyZW50IFRTUk1MU19DQykpOwogCQkJcmV0
dXJuOwogCQl9IGVsc2UgaWYgKCFzdHJjbXAocHJvcF9uYW1lLCAidG9wbGV2ZWwiKSkgewotCQkJ
KnJldHVybl92YWx1ZSA9ICpwaHBfZ2RrX3dpbmRvd19uZXcoZ2RrX3dpbmRvd19nZXRfdG9wbGV2
ZWwod2luKSk7CisJCQkqcmV0dXJuX3ZhbHVlID0gKnBocF9nZGtfd2luZG93X25ldyhnZGtfd2lu
ZG93X2dldF90b3BsZXZlbCh3aW4pIFRTUk1MU19DQykpOwogCQkJcmV0dXJuOwogCQl9IGVsc2Ug
aWYgKCFzdHJjbXAocHJvcF9uYW1lLCAiY2hpbGRyZW4iKSkgewogCQkJR0xpc3QgKmNoaWxkcmVu
LCAqdG1wOwpAQCAtMjA2Nyw3ICsyMDY2LDcgQEAgc3RhdGljIHZvaWQgZ2RrX3dpbmRvd19nZXRf
cHJvcGVydHkoenZhbCAqcmV0dXJuX3ZhbHVlLCB6dmFsICpvYmplY3QsIGNoYXIgKnByb3AKIAkJ
CWNoaWxkcmVuID0gZ2RrX3dpbmRvd19nZXRfY2hpbGRyZW4od2luKTsKIAkJCWFycmF5X2luaXQo
cmV0dXJuX3ZhbHVlKTsKIAkJCWZvciAodG1wID0gY2hpbGRyZW47IHRtcDsgdG1wID0gdG1wLT5u
ZXh0KSB7Ci0JCQkJY2hpbGQgPSBwaHBfZ2RrX3dpbmRvd19uZXcodG1wLT5kYXRhKTsKKwkJCQlj
aGlsZCA9IHBocF9nZGtfd2luZG93X25ldyh0bXAtPmRhdGEgVFNSTUxTX0NDKSk7CiAJCQkJemVu
ZF9oYXNoX25leHRfaW5kZXhfaW5zZXJ0KFpfQVJSVkFMX1AocmV0dXJuX3ZhbHVlKSwgJmNoaWxk
LCBzaXplb2YoenZhbCAqKSwgTlVMTCk7CiAJCQl9CiAJCQlnX2xpc3RfZnJlZShjaGlsZHJlbik7
CkBAIC0yOTM0LDExICsyOTMzLDExIEBAIHN0YXRpYyB2b2lkIGdka19kcmFnX2NvbnRleHRfZ2V0
X3Byb3BlcnR5KHp2YWwgKnJldHVybl92YWx1ZSwgenZhbCAqb2JqZWN0LCBjaGFyCiAJCVJFVFVS
Tl9CT09MKGNvbnRleHQtPmlzX3NvdXJjZSk7CiAJfSBlbHNlIGlmICghc3RyY21wKHByb3BfbmFt
ZSwgInNvdXJjZV93aW5kb3ciKSkgewogCQlpZiAoY29udGV4dC0+c291cmNlX3dpbmRvdykKLQkJ
CSpyZXR1cm5fdmFsdWUgPSAqcGhwX2dka193aW5kb3dfbmV3KGNvbnRleHQtPnNvdXJjZV93aW5k
b3cpOworCQkJKnJldHVybl92YWx1ZSA9ICpwaHBfZ2RrX3dpbmRvd19uZXcoY29udGV4dC0+c291
cmNlX3dpbmRvdyBUU1JNTFNfQ0MpKTsKIAkJcmV0dXJuOwogCX0gZWxzZSBpZiAoIXN0cmNtcChw
cm9wX25hbWUsICJkZXN0X3dpbmRvdyIpKSB7CiAJCWlmIChjb250ZXh0LT5kZXN0X3dpbmRvdykK
LQkJCSpyZXR1cm5fdmFsdWUgPSAqcGhwX2dka193aW5kb3dfbmV3KGNvbnRleHQtPmRlc3Rfd2lu
ZG93KTsKKwkJCSpyZXR1cm5fdmFsdWUgPSAqcGhwX2dka193aW5kb3dfbmV3KGNvbnRleHQtPmRl
c3Rfd2luZG93IFRTUk1MU19DQykpOwogCQlyZXR1cm47CiAJfSBlbHNlIGlmICghc3RyY21wKHBy
b3BfbmFtZSwgInRhcmdldHMiKSkgewogCQlHTGlzdCAqdG1wOwpkaWZmIC0tZ2l0IGEvZXh0L2d0
aysvcGhwZ19jdXN0b21fdHJlZV9tb2RlbC5jIGIvZXh0L2d0aysvcGhwZ19jdXN0b21fdHJlZV9t
b2RlbC5jCmluZGV4IGMzYjJhNGEuLjM2MmU1ZjAgMTAwNjQ0Ci0tLSBhL2V4dC9ndGsrL3BocGdf
Y3VzdG9tX3RyZWVfbW9kZWwuYworKysgYi9leHQvZ3RrKy9waHBnX2N1c3RvbV90cmVlX21vZGVs
LmMKQEAgLTIzNiw3ICsyMzYsNyBAQCBzdGF0aWMgR1R5cGUgcGhwZ19jdXN0b21fdHJlZV9tb2Rl
bF9nZXRfY29sdW1uX3R5cGUoR3RrVHJlZU1vZGVsICp0cmVlX21vZGVsLCBnaQogCiAJaWYgKGNh
bGxfdXNlcl9mdW5jdGlvbl9leChFRyhmdW5jdGlvbl90YWJsZSksICZ3cmFwcGVyLCAmbWV0aG9k
X25hbWUsICZyZXR2YWwsIDEsIGFyZ3MsIDAsIE5VTEwgVFNSTUxTX0NDKSA9PSBTVUNDRVNTCiAJ
CSYmIHJldHZhbCkgewotCQlyZXN1bHQgPSBwaHBnX2d0eXBlX2Zyb21fenZhbChyZXR2YWwpOwor
CQlyZXN1bHQgPSBwaHBnX2d0eXBlX2Zyb21fenZhbChyZXR2YWwgVFNSTUxTX0NDKTsKIAkJenZh
bF9wdHJfZHRvcigmcmV0dmFsKTsKIAl9IGVsc2UgewogCQlwaHBfZXJyb3IoRV9XQVJOSU5HLCAi
Q291bGQgbm90IGludm9rZSBvbl9nZXRfY29sdW1uX3R5cGUgaGFuZGxlciIpOwpkaWZmIC0tZ2l0
IGEvbWFpbi9waHBfZ3RrLmggYi9tYWluL3BocF9ndGsuaAppbmRleCAwZTMxZTJlLi5kZTM3ZjFk
IDEwMDY0NAotLS0gYS9tYWluL3BocF9ndGsuaAorKysgYi9tYWluL3BocF9ndGsuaApAQCAtMzI5
LDcgKzMyOSw3IEBAIHZvaWQgcGhwX2d0a19jYWxsX2Z1bmN0aW9uKElOVEVSTkFMX0ZVTkNUSU9O
X1BBUkFNRVRFUlMsIHplbmRfcHJvcGVydHlfcmVmZXJlbmNlCiAKIFBIUF9HVEtfQVBJIHplbmRf
Y2xhc3NfZW50cnkqIHBocGdfcmVnaXN0ZXJfY2xhc3MoY29uc3QgY2hhciAqY2xhc3NfbmFtZSwg
emVuZF9mdW5jdGlvbl9lbnRyeSAqY2xhc3NfZnVuY3Rpb25zLCB6ZW5kX2NsYXNzX2VudHJ5ICpw
YXJlbnQsIHplbmRfdWludCBjZV9mbGFncywgcHJvcF9pbmZvX3QgKnByb3BfaW5mbywgY3JlYXRl
X29iamVjdF9mdW5jX3QgY3JlYXRlX29ial9mdW5jLCBHVHlwZSBndHlwZSBUU1JNTFNfREMpOwog
UEhQX0dUS19BUEkgemVuZF9jbGFzc19lbnRyeSogcGhwZ19yZWdpc3Rlcl9pbnRlcmZhY2UoY29u
c3QgY2hhciAqaWZhY2VfbmFtZSwgemVuZF9mdW5jdGlvbl9lbnRyeSAqaWZhY2VfbWV0aG9kcywg
R1R5cGUgZ3R5cGUgVFNSTUxTX0RDKTsKLVBIUF9HVEtfQVBJIHplbmRfY2xhc3NfZW50cnkqIHBo
cGdfY3JlYXRlX2NsYXNzKEdUeXBlIGd0eXBlKTsKK1BIUF9HVEtfQVBJIHplbmRfY2xhc3NfZW50
cnkqIHBocGdfY3JlYXRlX2NsYXNzKEdUeXBlIGd0eXBlIFRTUk1MU19EQyk7CiBQSFBfR1RLX0FQ
SSB2b2lkIHBocGdfaW5pdF9vYmplY3Qodm9pZCAqcG9iaiwgemVuZF9jbGFzc19lbnRyeSAqY2Ug
VFNSTUxTX0RDKTsKIFBIUF9HVEtfQVBJIHplbmRfYm9vbCBwaHBnX3BhcnNlX2N0b3JfcHJvcHMo
R1R5cGUgZ3R5cGUsIHp2YWwgKipwaHBfYXJncywgR1BhcmFtZXRlciAqcGFyYW1zLCBndWludCAq
bl9wYXJhbXMsIGNoYXIgKipwcm9wX25hbWVzIFRTUk1MU19EQyk7CiAKQEAgLTM3MCwxMyArMzcw
LDEzIEBAIHN0YXRpYyBpbmxpbmUgemVuZF9ib29sIHBocGdfb2JqZWN0X2lzYSh6dmFsICp6b2Jq
LCB6ZW5kX2NsYXNzX2VudHJ5ICpjZSBUU1JNTFNfCiAJcmV0dXJuIFRSVUU7CiB9CiAKLXN0YXRp
YyBpbmxpbmUgemVuZF9jbGFzc19lbnRyeSogcGhwZ19jbGFzc19mcm9tX2d0eXBlKEdUeXBlIGd0
eXBlKQorc3RhdGljIGlubGluZSB6ZW5kX2NsYXNzX2VudHJ5KiBwaHBnX2NsYXNzX2Zyb21fZ3R5
cGUoR1R5cGUgZ3R5cGUgVFNSTUxTX0RDKQogewogCXplbmRfY2xhc3NfZW50cnkgKmNlID0gTlVM
TDsKIAogCWNlID0gZ190eXBlX2dldF9xZGF0YShndHlwZSwgcGhwZ19jbGFzc19rZXkpOwogCWlm
ICghY2UpIHsKLQkJY2UgPSBwaHBnX2NyZWF0ZV9jbGFzcyhndHlwZSk7CisJCWNlID0gcGhwZ19j
cmVhdGVfY2xhc3MoZ3R5cGUgVFNSTUxTX0NDKTsKIAl9CiAJCiAJYXNzZXJ0KGNlICE9IE5VTEwp
OwpAQCAtNDM1LDIyICs0MzUsMTUgQEAgc3RhdGljIGlubGluZSBnY2hhciogcGhwZ19mcm9tX3V0
ZjgoY29uc3QgZ2NoYXIgKnN0ciwgemVuZF91aW50IHN0cl9sZW4sIGdzaXplICoKIAl9CiAKICNk
ZWZpbmUgUEhQR19USFJPV19FWENFUFRJT04oZXhjZXB0aW9uLCBtZXNzYWdlKSBcCi0gICAgZG8g
eyBcCi0JCVRTUk1MU19GRVRDSCgpOyBcCiAJCXplbmRfdGhyb3dfZXhjZXB0aW9uKGV4Y2VwdGlv
biwgbWVzc2FnZSwgMCBUU1JNTFNfQ0MpOyBcCi0JCXJldHVybjsgXAotCX0gd2hpbGUgKDApCisJ
CXJldHVybjsKIAogI2RlZmluZSBQSFBHX1RIUk9XX0NPTlNUUlVDVF9FWENFUFRJT04odHlwZSkg
XAogCVBIUEdfVEhST1dfRVhDRVBUSU9OKHBocGdfY29uc3RydWN0X2V4Y2VwdGlvbiwgImNvdWxk
IG5vdCBjb25zdHJ1Y3QgIiAjdHlwZSAiIG9iamVjdCIpOwogCiAjZGVmaW5lIFBIUEdfVEhST1df
RVhDRVBUSU9OX1dJVEhfUkVUVVJOKGV4Y2VwdGlvbiwgbWVzc2FnZSwgcmV0dmFsKSBcCi0gICAg
ZG8geyBcCi0JCVRTUk1MU19GRVRDSCgpOyBcCiAJCXplbmRfdGhyb3dfZXhjZXB0aW9uKGV4Y2Vw
dGlvbiwgbWVzc2FnZSwgMCBUU1JNTFNfQ0MpOyBcCiAJCXJldHVybiByZXR2YWw7IFwKLQl9IHdo
aWxlICgwKQotCiAKICNkZWZpbmUgTUFLRV9aVkFMX0lGX05VTEwoeikgXAogICAgZG8geyBcCkBA
IC00NTgsNyArNDUxLDcgQEAgc3RhdGljIGlubGluZSBnY2hhciogcGhwZ19mcm9tX3V0ZjgoY29u
c3QgZ2NoYXIgKnN0ciwgemVuZF91aW50IHN0cl9sZW4sIGdzaXplICoKICAgIH0gd2hpbGUgKDAp
OwogCiAKLXZvaWQgcGhwZ19yZWdpc3Rlcl9leGNlcHRpb25zKCk7Cit2b2lkIHBocGdfcmVnaXN0
ZXJfZXhjZXB0aW9ucyhUU1JNTFNfRCk7CiBnYm9vbGVhbiBwaHBnX2hhbmRsZXJfbWFyc2hhbChn
cG9pbnRlciB1c2VyX2RhdGEpOwogUEhQX0dUS19BUEkgenZhbCogcGhwZ190aHJvd19nZXJyb3Jf
ZXhjZXB0aW9uKGNvbnN0IGNoYXIgKmRvbWFpbiwgbG9uZyBjb2RlLCBjb25zdCBjaGFyICptZXNz
YWdlIFRTUk1MU19EQyk7CiAKQEAgLTQ3NCw3ICs0NjcsNyBAQCBQSFBfR1RLX0FQSSB2b2lkIHBo
cGdfcmVnaXN0ZXJfc3RyaW5nX2NvbnN0YW50KHplbmRfY2xhc3NfZW50cnkgKmNlLCBjaGFyICpu
YW1lLAogCiB2b2lkIHBocGdfZ3R5cGVfcmVnaXN0ZXJfc2VsZihUU1JNTFNfRCk7CiBQSFBfR1RL
X0FQSSB2b2lkIHBocGdfZ3R5cGVfbmV3KHp2YWwgKnpvYmosIEdUeXBlIHR5cGUgVFNSTUxTX0RD
KTsKLVBIUF9HVEtfQVBJIEdUeXBlIHBocGdfZ3R5cGVfZnJvbV96dmFsKHp2YWwgKnZhbHVlKTsK
K1BIUF9HVEtfQVBJIEdUeXBlIHBocGdfZ3R5cGVfZnJvbV96dmFsKHp2YWwgKnZhbHVlIFRTUk1M
U19EQyk7CiBQSFBfR1RLX0FQSSBHVHlwZSBwaHBnX2d0eXBlX2Zyb21fY2xhc3MoemVuZF9jbGFz
c19lbnRyeSAqY2UgVFNSTUxTX0RDKTs=

--368af238d7c2605d1398339630a6ef3b27dd2121--