com php/gtk-src: Beginning removal of tsrmls_fetch calls (ugh): ext/gtk+/gtk.overrides generator/arg_types .php generator/templates.php main/php_gtk.c main/ phpg_exceptions.c main/phpg_gobject.c main/phpg_g type.c main/phpg_support.c

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

Commit:    d972807a2eb0a5ac045ba983ac3f93d7d365b8f1=0AAuthor:    Elizabeth =
M Smith <[email protected]>         Wed, 18 Jul 2012 11:40:53 -0400=
=0AParents:   7d73feb32c54325a3c249756999b3e56942de5f6=0ABranches:  master=
=0A=0ALink:       http://git.php.net/?p=3Dphp/gtk-src.git;a=3Dcommitdiff;h=
=3Dd972807a2eb0a5ac045ba983ac3f93d7d365b8f1=0A=0ALog:=0ABeginning removal o=
f tsrmls_fetch calls (ugh)=0A=0AChanged paths:=0A  M  ext/gtk+/gtk.override=
s=0A  M  generator/arg_types.php=0A  M  generator/templates.php=0A  M  main=
/php_gtk.c=0A  M  main/phpg_exceptions.c=0A  M  main/phpg_gobject.c=0A  M  =
main/phpg_gtype.c=0A  M  main/phpg_support.c=0A=0A
--13e00f561f74e5e5ac12d2e133302223f5589ce9
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="diff_d972807a2eb0a5ac045ba983ac3f93d7d365b8f1.txt"

ZGlmZiAtLWdpdCBhL2V4dC9ndGsrL2d0ay5vdmVycmlkZXMgYi9leHQvZ3RrKy9ndGsub3ZlcnJp
ZGVzCmluZGV4IGQ5MDI3ZjIuLjVmNmZmODggMTAwNjQ0Ci0tLSBhL2V4dC9ndGsrL2d0ay5vdmVy
cmlkZXMKKysrIGIvZXh0L2d0aysvZ3RrLm92ZXJyaWRlcwpAQCAtMTI5NCwxMyArMTI5NCwxMyBA
QCBQSFBfTUVUSE9ECiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJnN0ZXBfaW5jciwgJnBh
Z2VfaW5jciwgJnBhZ2Vfc2l6ZSkpCiAgICAgICAgIHJldHVybjsKIAotICAgIHdyYXBwZWRfb2Jq
ID0gZ19vYmplY3RfbmV3KHBocGdfZ3R5cGVfZnJvbV96dmFsKHRoaXNfcHRyKSwKKyAgICB3cmFw
cGVkX29iaiA9IGdfb2JqZWN0X25ldyhwaHBnX2d0eXBlX2Zyb21fenZhbCh0aGlzX3B0ciBUU1JN
TFNfQ0MpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJ2YWx1ZSIsIHZhbHVlLCAi
bG93ZXIiLCBsb3dlciwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAidXBwZXIiLCB1
cHBlciwgInN0ZXBfaW5jcmVtZW50Iiwgc3RlcF9pbmNyLAogICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICJwYWdlX2luY3JlbWVudCIsIHBhZ2VfaW5jciwgInBhZ2Vfc2l6ZSIsIHBhZ2Vf
c2l6ZSwgTlVMTCk7CiAKICAgICBpZiAoIXdyYXBwZWRfb2JqKSB7Ci0gICAgICAgIFBIUEdfVEhS
T1dfQ09OU1RSVUNUX0VYQ0VQVElPTihHdGtBZGp1c3RtZW50KTsKKyAgICAgICAgUEhQR19USFJP
V19DT05TVFJVQ1RfRVhDRVBUSU9OKEd0a0FkanVzdG1lbnQgVFNSTUxTX0NDKTsKICAgICB9CiAK
ICAgICBwaHBnX2dvYmplY3Rfc2V0X3dyYXBwZXIodGhpc19wdHIsIHdyYXBwZWRfb2JqIFRTUk1M
U19DQyk7CkBAIC0xMzc2LDIwICsxMzc2LDIwIEBAIFBIUF9NRVRIT0QKICAgICB6ZW5kX2Jvb2wg
ZnJlZV90ZXh0ID0gRkFMU0UsIHVzZV91bmRlcmxpbmUgPSAxOwogCiAgICAgaWYgKCFwaHBfZ3Rr
X3BhcnNlX2FyZ3MoWkVORF9OVU1fQVJHUygpLCAifHViIiwgJnRleHQsICZmcmVlX3RleHQsICZ1
c2VfdW5kZXJsaW5lKSkgewotICAgICAgICBQSFBHX1RIUk9XX0NPTlNUUlVDVF9FWENFUFRJT04o
R3RrQnV0dG9uKTsKKyAgICAgICAgUEhQR19USFJPV19DT05TVFJVQ1RfRVhDRVBUSU9OKEd0a0J1
dHRvbiBUU1JNTFNfQ0MpOwogICAgIH0KIAogICAgIGlmICh0ZXh0KSB7Ci0gICAgICAgIHdyYXBw
ZWRfb2JqID0gKEdPYmplY3QgKilnX29iamVjdF9uZXcocGhwZ19ndHlwZV9mcm9tX3p2YWwodGhp
c19wdHIpLCAibGFiZWwiLAorICAgICAgICB3cmFwcGVkX29iaiA9IChHT2JqZWN0ICopZ19vYmpl
Y3RfbmV3KHBocGdfZ3R5cGVfZnJvbV96dmFsKHRoaXNfcHRyIFRTUk1MU19DQyksICJsYWJlbCIs
CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdGV4dCwgInVz
ZS11bmRlcmxpbmUiLCB1c2VfdW5kZXJsaW5lLCBOVUxMKTsKICAgICB9IGVsc2UgewotICAgICAg
ICB3cmFwcGVkX29iaiA9IChHT2JqZWN0ICopZ19vYmplY3RfbmV3KHBocGdfZ3R5cGVfZnJvbV96
dmFsKHRoaXNfcHRyKSwgTlVMTCk7CisgICAgICAgIHdyYXBwZWRfb2JqID0gKEdPYmplY3QgKiln
X29iamVjdF9uZXcocGhwZ19ndHlwZV9mcm9tX3p2YWwodGhpc19wdHIgVFNSTUxTX0NDKSwgTlVM
TCk7CiAgICAgfQogCiAgICAgaWYgKGZyZWVfdGV4dCkgZ19mcmVlKHRleHQpOwogCiAgICAgaWYg
KCF3cmFwcGVkX29iaikgewotICAgICAgICBQSFBHX1RIUk9XX0NPTlNUUlVDVF9FWENFUFRJT04o
R3RrQnV0dG9uKTsKKyAgICAgICAgUEhQR19USFJPV19DT05TVFJVQ1RfRVhDRVBUSU9OKEd0a0J1
dHRvbiBUU1JNTFNfQ0MpOwogICAgIH0KIAogICAgIHBocGdfZ29iamVjdF9zZXRfd3JhcHBlcih0
aGlzX3B0ciwgd3JhcHBlZF9vYmogVFNSTUxTX0NDKTsKQEAgLTE0MTEsNyArMTQxMSw3IEBAIFBI
UF9NRVRIT0QKICAgICB6ZW5kX2Jvb2wgZnJlZV9zdG9ja19pZDsKIAogICAgIGlmICghcGhwX2d0
a19wYXJzZV9hcmdzKFpFTkRfTlVNX0FSR1MoKSwgInUiLCAmc3RvY2tfaWQsICZmcmVlX3N0b2Nr
X2lkKSkgewotICAgICAgICBQSFBHX1RIUk9XX0NPTlNUUlVDVF9FWENFUFRJT04oR3RrQnV0dG9u
KTsKKyAgICAgICAgUEhQR19USFJPV19DT05TVFJVQ1RfRVhDRVBUSU9OKEd0a0J1dHRvbiBUU1JN
TFNfQ0MpOwogICAgIH0KIAogICAgIHdyYXBwZWRfb2JqID0gKEdPYmplY3QgKilnX29iamVjdF9u
ZXcocGhwZ19ndHlwZV9mcm9tX2NsYXNzKEVHKHNjb3BlKSBUU1JNTFNfQ0MpLCAibGFiZWwiLCBz
dG9ja19pZCwKQEAgLTE0MjAsNyArMTQyMCw3IEBAIFBIUF9NRVRIT0QKICAgICBpZiAoZnJlZV9z
dG9ja19pZCkgZ19mcmVlKHN0b2NrX2lkKTsKIAogICAgIGlmICghd3JhcHBlZF9vYmopIHsKLSAg
ICAgICAgUEhQR19USFJPV19DT05TVFJVQ1RfRVhDRVBUSU9OKEd0a0J1dHRvbik7CisgICAgICAg
IFBIUEdfVEhST1dfQ09OU1RSVUNUX0VYQ0VQVElPTihHdGtCdXR0b24gVFNSTUxTX0NDKTsKICAg
ICB9CiAKICAgICBwaHBnX2dvYmplY3RfbmV3KCZyZXR1cm5fdmFsdWUsIHdyYXBwZWRfb2JqIFRT
Uk1MU19DQyk7CkBAIC0xNTIwLDIwICsxNTIwLDIwIEBAIFBIUF9NRVRIT0QKICAgICB6ZW5kX2Jv
b2wgZnJlZV90ZXh0ID0gRkFMU0UsIHVzZV91bmRlcmxpbmUgPSAxOwogCiAgICAgaWYgKCFwaHBf
Z3RrX3BhcnNlX2FyZ3MoWkVORF9OVU1fQVJHUygpLCAifHViIiwgJnRleHQsICZmcmVlX3RleHQs
ICZ1c2VfdW5kZXJsaW5lKSkgewotICAgICAgICBQSFBHX1RIUk9XX0NPTlNUUlVDVF9FWENFUFRJ
T04oR3RrQ2hlY2tCdXR0b24pOworICAgICAgICBQSFBHX1RIUk9XX0NPTlNUUlVDVF9FWENFUFRJ
T04oR3RrQ2hlY2tCdXR0b24gVFNSTUxTX0NDKTsKICAgICB9CiAKICAgICBpZiAodGV4dCkgewot
ICAgICAgICB3cmFwcGVkX29iaiA9IChHT2JqZWN0ICopZ19vYmplY3RfbmV3KHBocGdfZ3R5cGVf
ZnJvbV96dmFsKHRoaXNfcHRyKSwgImxhYmVsIiwKKyAgICAgICAgd3JhcHBlZF9vYmogPSAoR09i
amVjdCAqKWdfb2JqZWN0X25ldyhwaHBnX2d0eXBlX2Zyb21fenZhbCh0aGlzX3B0ciBUU1JNTFNf
Q0MpLCAibGFiZWwiLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgIHRleHQsICJ1c2UtdW5kZXJsaW5lIiwgdXNlX3VuZGVybGluZSwgTlVMTCk7CiAgICAgfSBl
bHNlIHsKLSAgICAgICAgd3JhcHBlZF9vYmogPSAoR09iamVjdCAqKWdfb2JqZWN0X25ldyhwaHBn
X2d0eXBlX2Zyb21fenZhbCh0aGlzX3B0ciksIE5VTEwpOworICAgICAgICB3cmFwcGVkX29iaiA9
IChHT2JqZWN0ICopZ19vYmplY3RfbmV3KHBocGdfZ3R5cGVfZnJvbV96dmFsKHRoaXNfcHRyIFRT
Uk1MU19DQyksIE5VTEwpOwogICAgIH0KIAogICAgIGlmIChmcmVlX3RleHQpIGdfZnJlZSh0ZXh0
KTsKIAogICAgIGlmICghd3JhcHBlZF9vYmopIHsKLSAgICAgICAgUEhQR19USFJPV19DT05TVFJV
Q1RfRVhDRVBUSU9OKEd0a0NoZWNrQnV0dG9uKTsKKyAgICAgICAgUEhQR19USFJPV19DT05TVFJV
Q1RfRVhDRVBUSU9OKEd0a0NoZWNrQnV0dG9uIFRTUk1MU19DQyk7CiAgICAgfQogCiAgICAgcGhw
Z19nb2JqZWN0X3NldF93cmFwcGVyKHRoaXNfcHRyLCB3cmFwcGVkX29iaiBUU1JNTFNfQ0MpOwpA
QCAtMTU1OCwxMCArMTU1OCwxMCBAQCBQSFBfTUVUSE9ECiAgICAgemVuZF9ib29sIGZyZWVfdGV4
dCA9IEZBTFNFLCB1c2VfdW5kZXJsaW5lID0gMTsKIAogICAgIGlmICghcGhwX2d0a19wYXJzZV9h
cmdzKFpFTkRfTlVNX0FSR1MoKSwgInx1YiIsICZ0ZXh0LCAmZnJlZV90ZXh0LCAmdXNlX3VuZGVy
bGluZSkpIHsKLSAgICAgICAgUEhQR19USFJPV19DT05TVFJVQ1RfRVhDRVBUSU9OKEd0a01lbnVJ
dGVtKTsKKyAgICAgICAgUEhQR19USFJPV19DT05TVFJVQ1RfRVhDRVBUSU9OKEd0a01lbnVJdGVt
IFRTUk1MU19DQyk7CiAgICAgfQogCi0gICAgd3JhcHBlZF9vYmogPSAoR09iamVjdCAqKWdfb2Jq
ZWN0X25ldyhwaHBnX2d0eXBlX2Zyb21fenZhbCh0aGlzX3B0ciksIE5VTEwpOworICAgIHdyYXBw
ZWRfb2JqID0gKEdPYmplY3QgKilnX29iamVjdF9uZXcocGhwZ19ndHlwZV9mcm9tX3p2YWwodGhp
c19wdHIgVFNSTUxTX0NDKSwgTlVMTCk7CiAgICAgaWYgKHRleHQpIHsKICAgICAgICAgR3RrV2lk
Z2V0ICphY2NlbF9sYWJlbDsKICAgICAgICAgYWNjZWxfbGFiZWwgPSBnX29iamVjdF9uZXcoR1RL
X1RZUEVfQUNDRUxfTEFCRUwsIE5VTEwpOwpAQCAtMTU3OCw3ICsxNTc4LDcgQEAgUEhQX01FVEhP
RAogICAgIGlmIChmcmVlX3RleHQpIGdfZnJlZSh0ZXh0KTsKIAogICAgIGlmICghd3JhcHBlZF9v
YmopIHsKLSAgICAgICAgUEhQR19USFJPV19DT05TVFJVQ1RfRVhDRVBUSU9OKEd0a01lbnVJdGVt
KTsKKyAgICAgICAgUEhQR19USFJPV19DT05TVFJVQ1RfRVhDRVBUSU9OKEd0a01lbnVJdGVtIFRT
Uk1MU19DQyk7CiAgICAgfQogCiAgICAgcGhwZ19nb2JqZWN0X3NldF93cmFwcGVyKHRoaXNfcHRy
LCB3cmFwcGVkX29iaiBUU1JNTFNfQ0MpOwpAQCAtNTQ2NCwyMCArNTQ2NCwyMCBAQCBQSFBfTUVU
SE9ECiAgICAgemVuZF9ib29sIGZyZWVfdGV4dCA9IEZBTFNFLCB1c2VfdW5kZXJsaW5lID0gMTsK
IAogICAgIGlmICghcGhwX2d0a19wYXJzZV9hcmdzKFpFTkRfTlVNX0FSR1MoKSwgInx1YiIsICZ0
ZXh0LCAmZnJlZV90ZXh0LCAmdXNlX3VuZGVybGluZSkpIHsKLSAgICAgICAgUEhQR19USFJPV19D
T05TVFJVQ1RfRVhDRVBUSU9OKEd0a1RvZ2dsZUJ1dHRvbik7CisgICAgICAgIFBIUEdfVEhST1df
Q09OU1RSVUNUX0VYQ0VQVElPTihHdGtUb2dnbGVCdXR0b24gVFNSTUxTX0NDKTsKICAgICB9CiAK
ICAgICBpZiAodGV4dCkgewotICAgICAgICB3cmFwcGVkX29iaiA9IChHT2JqZWN0ICopZ19vYmpl
Y3RfbmV3KHBocGdfZ3R5cGVfZnJvbV96dmFsKHRoaXNfcHRyKSwgImxhYmVsIiwKKyAgICAgICAg
d3JhcHBlZF9vYmogPSAoR09iamVjdCAqKWdfb2JqZWN0X25ldyhwaHBnX2d0eXBlX2Zyb21fenZh
bCh0aGlzX3B0ciBUU1JNTFNfQ0MpLCAibGFiZWwiLAogICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgIHRleHQsICJ1c2UtdW5kZXJsaW5lIiwgdXNlX3VuZGVybGlu
ZSwgTlVMTCk7CiAgICAgfSBlbHNlIHsKLSAgICAgICAgd3JhcHBlZF9vYmogPSAoR09iamVjdCAq
KWdfb2JqZWN0X25ldyhwaHBnX2d0eXBlX2Zyb21fenZhbCh0aGlzX3B0ciksIE5VTEwpOworICAg
ICAgICB3cmFwcGVkX29iaiA9IChHT2JqZWN0ICopZ19vYmplY3RfbmV3KHBocGdfZ3R5cGVfZnJv
bV96dmFsKHRoaXNfcHRyIFRTUk1MU19DQyksIE5VTEwpOwogICAgIH0KIAogICAgIGlmIChmcmVl
X3RleHQpIGdfZnJlZSh0ZXh0KTsKIAogICAgIGlmICghd3JhcHBlZF9vYmopIHsKLSAgICAgICAg
UEhQR19USFJPV19DT05TVFJVQ1RfRVhDRVBUSU9OKEd0a1RvZ2dsZUJ1dHRvbik7CisgICAgICAg
IFBIUEdfVEhST1dfQ09OU1RSVUNUX0VYQ0VQVElPTihHdGtUb2dnbGVCdXR0b24gVFNSTUxTX0ND
KTsKICAgICB9CiAKICAgICBwaHBnX2dvYmplY3Rfc2V0X3dyYXBwZXIodGhpc19wdHIsIHdyYXBw
ZWRfb2JqIFRTUk1MU19DQyk7CmRpZmYgLS1naXQgYS9nZW5lcmF0b3IvYXJnX3R5cGVzLnBocCBi
L2dlbmVyYXRvci9hcmdfdHlwZXMucGhwCmluZGV4IDE5ZDhmM2IuLjg2NmRlMmUgMTAwNjQ0Ci0t
LSBhL2dlbmVyYXRvci9hcmdfdHlwZXMucGhwCisrKyBiL2dlbmVyYXRvci9hcmdfdHlwZXMucGhw
CkBAIC05MTAsNyArOTEwLDcgQEAgY2xhc3MgR1R5cGVfQXJnIGV4dGVuZHMgQXJnX1R5cGUgewog
ICAgICAgICAkaW5mby0+dmFyX2xpc3QtPmFkZCgnenZhbCcsICcqcGhwXycgLiAkbmFtZSAuICcg
PSBOVUxMJyk7CiAgICAgICAgICRpbmZvLT5hcmdfbGlzdFtdID0gJG5hbWU7CiAgICAgICAgICRp
bmZvLT5hZGRfcGFyc2VfbGlzdCgnVicsICcmcGhwXycgLiAkbmFtZSk7Ci0gICAgICAgICRpbmZv
LT5wcmVfY29kZVtdID0gIiAgICBpZiAoKCRuYW1lID0gcGhwZ19ndHlwZV9mcm9tX3p2YWwocGhw
XyRuYW1lKSkgPT0gMCkge1xuIiAuCisgICAgICAgICRpbmZvLT5wcmVfY29kZVtdID0gIiAgICBp
ZiAoKCRuYW1lID0gcGhwZ19ndHlwZV9mcm9tX3p2YWwocGhwXyRuYW1lIFRTUk1MU19DQykpID09
IDApIHtcbiIgLgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICIgICAgICAgICRpbmZvLT5l
cnJvcl9hY3Rpb247XG4iIC4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiICAgIH1cbiI7
CiAgICAgfQpkaWZmIC0tZ2l0IGEvZ2VuZXJhdG9yL3RlbXBsYXRlcy5waHAgYi9nZW5lcmF0b3Iv
dGVtcGxhdGVzLnBocAppbmRleCBiNzFkYTE2Li5hMDk4MDg2IDEwMDY0NAotLS0gYS9nZW5lcmF0
b3IvdGVtcGxhdGVzLnBocAorKysgYi9nZW5lcmF0b3IvdGVtcGxhdGVzLnBocApAQCAtMTg4LDcg
KzE4OCw3IEBAIHN0YXRpYyBQSFBfTUVUSE9EKCUoY2xhc3MpLCAlKG5hbWUpKQogICAgIH0KIAog
JShwcmVfY29kZSkKLSAgICB3cmFwcGVkX29iaiA9IChHT2JqZWN0ICopIGdfb2JqZWN0X25ld3Yo
cGhwZ19ndHlwZV9mcm9tX3p2YWwodGhpc19wdHIpLCAwLCBOVUxMKTsKKyAgICB3cmFwcGVkX29i
aiA9IChHT2JqZWN0ICopIGdfb2JqZWN0X25ld3YocGhwZ19ndHlwZV9mcm9tX3p2YWwodGhpc19w
dHIgVFNSTUxTX0NDKSwgMCwgTlVMTCk7CiAlKHBvc3RfY29kZSkKICAgICBpZiAoIXdyYXBwZWRf
b2JqKSB7CiAgICAgICAgIFBIUEdfVEhST1dfQ09OU1RSVUNUX0VYQ0VQVElPTiglKGNsYXNzKSk7
CmRpZmYgLS1naXQgYS9tYWluL3BocF9ndGsuYyBiL21haW4vcGhwX2d0ay5jCmluZGV4IGU2NzRk
ZjkuLjg3MWY5ZDUgMTAwNjQ0Ci0tLSBhL21haW4vcGhwX2d0ay5jCisrKyBiL21haW4vcGhwX2d0
ay5jCkBAIC0xODksNyArMTg5LDcgQEAgUEhQX1JJTklUX0ZVTkNUSU9OKGd0aykKIAlwaHBfZ3Rr
X2hhbmRsZXJzLmdldF9wcm9wZXJ0eV9wdHJfcHRyID0gcGhwZ19nZXRfcHJvcGVydHlfcHRyX3B0
cjsKIAlwaHBfZ3RrX2hhbmRsZXJzLmNsb25lX29iaiA9IE5VTEw7CiAKLQlwaHBnX3JlZ2lzdGVy
X2V4Y2VwdGlvbnMoKTsKKwlwaHBnX3JlZ2lzdGVyX2V4Y2VwdGlvbnMoVFNSTUxTX0MpOwogCiAJ
LyoKIAkgKiBJbml0aWFsaXplIHRoZSB0eXBlIHN5c3RlbSBhbmQgdGhlIEdUeXBlIHdyYXBwZXIg
Y2xhc3MuCmRpZmYgLS1naXQgYS9tYWluL3BocGdfZXhjZXB0aW9ucy5jIGIvbWFpbi9waHBnX2V4
Y2VwdGlvbnMuYwppbmRleCA3ZmNmYjYyLi5iODllNGE3IDEwMDY0NAotLS0gYS9tYWluL3BocGdf
ZXhjZXB0aW9ucy5jCisrKyBiL21haW4vcGhwZ19leGNlcHRpb25zLmMKQEAgLTI3LDEwICsyNyw5
IEBAIFBIUF9HVEtfQVBJIHplbmRfY2xhc3NfZW50cnkgKnBocGdfY29uc3RydWN0X2V4Y2VwdGlv
biA9IE5VTEw7CiBQSFBfR1RLX0FQSSB6ZW5kX2NsYXNzX2VudHJ5ICpwaHBnX3R5cGVfZXhjZXB0
aW9uID0gTlVMTDsKIFBIUF9HVEtfQVBJIHplbmRfY2xhc3NfZW50cnkgKnBocGdfZ2Vycm9yX2V4
Y2VwdGlvbiA9IE5VTEw7CiAKLXZvaWQgcGhwZ19yZWdpc3Rlcl9leGNlcHRpb25zKCkKK3ZvaWQg
cGhwZ19yZWdpc3Rlcl9leGNlcHRpb25zKFRTUk1MU19EKQogewogCXplbmRfY2xhc3NfZW50cnkg
Y2U7Ci0JVFNSTUxTX0ZFVENIKCk7CiAKIAlJTklUX0NMQVNTX0VOVFJZKGNlLCAiUGhwR3RrRXhj
ZXB0aW9uIiwgTlVMTCk7CiAjaWYgWkVORF9FWFRFTlNJT05fQVBJX05PID4gMjIwMDUxMDI1CmRp
ZmYgLS1naXQgYS9tYWluL3BocGdfZ29iamVjdC5jIGIvbWFpbi9waHBnX2dvYmplY3QuYwppbmRl
eCA0MzlhMDYxLi4zZTExYjYzIDEwMDY0NAotLS0gYS9tYWluL3BocGdfZ29iamVjdC5jCisrKyBi
L21haW4vcGhwZ19nb2JqZWN0LmMKQEAgLTIwOSw3ICsyMDksNyBAQCBQSFBfR1RLX0FQSSB2b2lk
IHBocGdfZ29iamVjdF9uZXcoenZhbCAqKnpvYmosIEdPYmplY3QgKm9iaiBUU1JNTFNfREMpCiAg
ICAgICAgICAgICB6ZW5kX29iamVjdHNfc3RvcmVfYWRkX3JlZigqem9iaiBUU1JNTFNfQ0MpOwog
ICAgICAgICB9CiAgICAgfSBlbHNlIHsKLSAgICAgICAgY2UgPSBwaHBnX2NsYXNzX2Zyb21fZ3R5
cGUoR19PQkpFQ1RfVFlQRShvYmopKTsKKyAgICAgICAgY2UgPSBwaHBnX2NsYXNzX2Zyb21fZ3R5
cGUoR19PQkpFQ1RfVFlQRShvYmopIFRTUk1MU19DQyk7CiAgICAgICAgIG9iamVjdF9pbml0X2V4
KCp6b2JqLCBjZSk7CiAKICAgICAgICAgZ19vYmplY3RfcmVmKG9iaik7CkBAIC0yNjEsMTEgKzI2
MSwxMSBAQCB6ZW5kX2Jvb2wgcGhwZ19nb2JqZWN0X2NvbnN0cnVjdCh6dmFsICp0aGlzX3B0ciwg
R1R5cGUgb2JqZWN0X3R5cGUsIHp2YWwgKnByb3BzCiAKICAgICBpZiAoR19UWVBFX0lTX0FCU1RS
QUNUKG9iamVjdF90eXBlKSkgewogICAgICAgICBzbnByaW50ZihidWYsIDEyOCwgIkNhbm5vdCBp
bnN0YW50aWF0ZSBhYnN0cmFjdCBjbGFzcyAlcyIsIGdfdHlwZV9uYW1lKG9iamVjdF90eXBlKSk7
Ci0gICAgICAgIFBIUEdfVEhST1dfRVhDRVBUSU9OX1dJVEhfUkVUVVJOKHBocGdfY29uc3RydWN0
X2V4Y2VwdGlvbiwgYnVmLCAwKTsKKyAgICAgICAgUEhQR19USFJPV19FWENFUFRJT05fV0lUSF9S
RVRVUk4ocGhwZ19jb25zdHJ1Y3RfZXhjZXB0aW9uLCBidWYsIDAgVFNSTUxTX0NDKTsKICAgICB9
CiAKICAgICBpZiAoKGtsYXNzID0gZ190eXBlX2NsYXNzX3JlZihvYmplY3RfdHlwZSkpID09IE5V
TEwpIHsKLSAgICAgICAgUEhQR19USFJPV19FWENFUFRJT05fV0lUSF9SRVRVUk4ocGhwZ19jb25z
dHJ1Y3RfZXhjZXB0aW9uLCAiQ291bGQgbm90IGdldCBhIHJlZmVyZW5jZSB0byB0eXBlIGNsYXNz
IiwgMCk7CisgICAgICAgIFBIUEdfVEhST1dfRVhDRVBUSU9OX1dJVEhfUkVUVVJOKHBocGdfY29u
c3RydWN0X2V4Y2VwdGlvbiwgIkNvdWxkIG5vdCBnZXQgYSByZWZlcmVuY2UgdG8gdHlwZSBjbGFz
cyIsIDAgVFNSTUxTX0NDKTsKICAgICB9CiAKICAgICBpZiAocHJvcHMpIHsKQEAgLTM0OSw5ICsz
NDksOSBAQCBzdGF0aWMgUEhQX01FVEhPRChHT2JqZWN0LCBfX2NvbnN0cnVjdCkKICAgICB9CiAK
ICAgICBpZiAocGhwX3R5cGUpIHsKLSAgICAgICAgbXlfdHlwZSA9IHBocGdfZ3R5cGVfZnJvbV96
dmFsKHBocF90eXBlKTsKKyAgICAgICAgbXlfdHlwZSA9IHBocGdfZ3R5cGVfZnJvbV96dmFsKHBo
cF90eXBlIFRTUk1MU19DQyk7CiAgICAgfSBlbHNlIHsKLSAgICAgICAgbXlfdHlwZSA9IHBocGdf
Z3R5cGVfZnJvbV96dmFsKHRoaXNfcHRyKTsKKyAgICAgICAgbXlfdHlwZSA9IHBocGdfZ3R5cGVf
ZnJvbV96dmFsKHRoaXNfcHRyIFRTUk1MU19DQyk7CiAgICAgfQogCiAgICAgcGhwZ19nb2JqZWN0
X2NvbnN0cnVjdCh0aGlzX3B0ciwgbXlfdHlwZSwgcGhwX3Byb3BzIFRTUk1MU19DQyk7CkBAIC03
NjQsNyArNzY0LDcgQEAgc3RhdGljIHZvaWQgcGhwZ19zaWduYWxfbGlzdF9pbXBsKElOVEVSTkFM
X0ZVTkNUSU9OX1BBUkFNRVRFUlMsIHplbmRfYm9vbCBsaXN0X24KICAgICBpZiAoIXBocF9ndGtf
cGFyc2VfYXJncyhaRU5EX05VTV9BUkdTKCksICJWIiwgJnBocF90eXBlKSkKICAgICAgICAgcmV0
dXJuOwogCi0gICAgdHlwZSA9IHBocGdfZ3R5cGVfZnJvbV96dmFsKHBocF90eXBlKTsKKyAgICB0
eXBlID0gcGhwZ19ndHlwZV9mcm9tX3p2YWwocGhwX3R5cGUgVFNSTUxTX0NDKTsKICAgICBpZiAo
IXR5cGUpCiAgICAgICAgIHJldHVybjsKIApAQCAtODMwLDcgKzgzMCw3IEBAIHN0YXRpYyBQSFBf
TUVUSE9EKEdPYmplY3QsIHNpZ25hbF9xdWVyeSkKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAot
ICAgIGd0eXBlID0gcGhwZ19ndHlwZV9mcm9tX3p2YWwocGhwX3R5cGUpOworICAgIGd0eXBlID0g
cGhwZ19ndHlwZV9mcm9tX3p2YWwocGhwX3R5cGUgVFNSTUxTX0NDKTsKICAgICBpZiAoIWd0eXBl
KQogICAgICAgICByZXR1cm47CiAKQEAgLTkwMSw3ICs5MDEsNyBAQCBzdGF0aWMgUEhQX01FVEhP
RChHT2JqZWN0LCBsaXN0X3Byb3BlcnRpZXMpCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAg
ICBpZiAoKHR5cGUgPSBwaHBnX2d0eXBlX2Zyb21fenZhbChwaHBfdHlwZSkpID09IDApIHsKKyAg
ICBpZiAoKHR5cGUgPSBwaHBnX2d0eXBlX2Zyb21fenZhbChwaHBfdHlwZSBUU1JNTFNfQ0MpKSA9
PSAwKSB7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKQEAgLTEyMDIsNyArMTIwMiw3IEBAIHN0
YXRpYyBpbnQgcGhwZ19yZWdpc3Rlcl9wcm9wZXJ0aWVzKEdUeXBlIHR5cGUsIHp2YWwgKnByb3Bl
cnRpZXMpCiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogCi0gICAgICAgIHByb3BfdHlw
ZSA9IHBocGdfZ3R5cGVfZnJvbV96dmFsKHBocF9wcm9wX3R5cGUpOworICAgICAgICBwcm9wX3R5
cGUgPSBwaHBnX2d0eXBlX2Zyb21fenZhbChwaHBfcHJvcF90eXBlIFRTUk1MU19DQyk7CiAgICAg
ICAgIGlmIChwcm9wX3R5cGUgPT0gMCkgewogICAgICAgICAgICAgcmV0dmFsID0gRkFJTFVSRTsK
ICAgICAgICAgICAgIGJyZWFrOwpAQCAtMTI2Niw3ICsxMjY2LDcgQEAgc3RhdGljIGludCBwaHBn
X2NyZWF0ZV9zaWduYWwoR1R5cGUgdHlwZSwgY29uc3QgY2hhciAqc2lnbmFsX25hbWUsIHp2YWwg
KmRhdGEgVFMKICAgICAgICAgcmV0dXJuIEZBSUxVUkU7CiAgICAgfQogCi0gICAgcmV0dXJuX3R5
cGUgPSBwaHBnX2d0eXBlX2Zyb21fenZhbChwaHBfcmV0dXJuX3R5cGUpOworICAgIHJldHVybl90
eXBlID0gcGhwZ19ndHlwZV9mcm9tX3p2YWwocGhwX3JldHVybl90eXBlIFRTUk1MU19DQyk7CiAg
ICAgaWYgKDAgPT0gcmV0dXJuX3R5cGUpIHsKICAgICAgICAgcmV0dXJuIEZBSUxVUkU7CiAgICAg
fQpAQCAtMTI3Nyw3ICsxMjc3LDcgQEAgc3RhdGljIGludCBwaHBnX2NyZWF0ZV9zaWduYWwoR1R5
cGUgdHlwZSwgY29uc3QgY2hhciAqc2lnbmFsX25hbWUsIHp2YWwgKmRhdGEgVFMKICAgICAgICAg
IHplbmRfaGFzaF9nZXRfY3VycmVudF9kYXRhKFpfQVJSVkFMX1AocGhwX3BhcmFtX3R5cGVzKSwg
KHZvaWQqKikmaXRlbSkgPT0gU1VDQ0VTUzsKICAgICAgICAgIHplbmRfaGFzaF9tb3ZlX2Zvcndh
cmQoWl9BUlJWQUxfUChwaHBfcGFyYW1fdHlwZXMpKSwgaSsrKSB7CiAKLSAgICAgICAgcGFyYW1f
dHlwZXNbaV0gPSBwaHBnX2d0eXBlX2Zyb21fenZhbCgqaXRlbSk7CisgICAgICAgIHBhcmFtX3R5
cGVzW2ldID0gcGhwZ19ndHlwZV9mcm9tX3p2YWwoKml0ZW0gVFNSTUxTX0NDKTsKICAgICAgICAg
aWYgKDAgPT0gcGFyYW1fdHlwZXNbaV0pIHsKICAgICAgICAgICAgIHBocF9lcnJvcl9kb2NyZWYo
TlVMTCBUU1JNTFNfQ0MsIEVfV0FSTklORywgImNvdWxkIG5vdCBnZXQgdHlwZSBvZiBwYXJhbSAj
JWQgZ29yIHNpZ25hbCAnJXMnIiwgaSsxLCBzaWduYWxfbmFtZSk7CiAgICAgICAgICAgICBlZnJl
ZShwYXJhbV90eXBlcyk7CmRpZmYgLS1naXQgYS9tYWluL3BocGdfZ3R5cGUuYyBiL21haW4vcGhw
Z19ndHlwZS5jCmluZGV4IGUwYWYxMjUuLmIwMjA1MmQgMTAwNjQ0Ci0tLSBhL21haW4vcGhwZ19n
dHlwZS5jCisrKyBiL21haW4vcGhwZ19ndHlwZS5jCkBAIC0xNDAsMTAgKzE0MCw5IEBAIFBIUF9H
VEtfQVBJIEdUeXBlIHBocGdfZ3R5cGVfZnJvbV9jbGFzcyh6ZW5kX2NsYXNzX2VudHJ5ICpjZSBU
U1JNTFNfREMpCiB9CiAKIC8qIFRPRE8gYWRkIHN1cHBvcnQgZm9yIGJveGVkIHR5cGVzICovCi1Q
SFBfR1RLX0FQSSBHVHlwZSBwaHBnX2d0eXBlX2Zyb21fenZhbCh6dmFsICp2YWx1ZSkKK1BIUF9H
VEtfQVBJIEdUeXBlIHBocGdfZ3R5cGVfZnJvbV96dmFsKHp2YWwgKnZhbHVlIFRTUk1MU19EQykK
IHsKIAlHVHlwZSB0eXBlOwotCVRTUk1MU19GRVRDSCgpOwogCiAJaWYgKCF2YWx1ZSkgewogCQlw
aHBfZXJyb3IoRV9XQVJOSU5HLCAiUEhQLUdUSyBpbnRlcm5hbCBlcnJvcjogY291bGQgbm90IGdl
dCB0eXBlY29kZSBmcm9tIHZhbHVlIik7CmRpZmYgLS1naXQgYS9tYWluL3BocGdfc3VwcG9ydC5j
IGIvbWFpbi9waHBnX3N1cHBvcnQuYwppbmRleCBkYjFlOTRkLi42ZWM2OWVmIDEwMDY0NAotLS0g
YS9tYWluL3BocGdfc3VwcG9ydC5jCisrKyBiL21haW4vcGhwZ19zdXBwb3J0LmMKQEAgLTUxMCwx
NiArNTEwLDE1IEBAIHN0YXRpYyBpbnQgdW5zZXRfYWJzdHJhY3RfZmxhZyh6ZW5kX2Z1bmN0aW9u
ICpmdW5jLCBpbnQgbnVtX2FyZ3MsIHZhX2xpc3QgYXJncywKICAgICByZXR1cm4gWkVORF9IQVNI
X0FQUExZX0tFRVA7CiB9CiAKLVBIUF9HVEtfQVBJIHplbmRfY2xhc3NfZW50cnkqIHBocGdfY3Jl
YXRlX2NsYXNzKEdUeXBlIGd0eXBlKQorUEhQX0dUS19BUEkgemVuZF9jbGFzc19lbnRyeSogcGhw
Z19jcmVhdGVfY2xhc3MoR1R5cGUgZ3R5cGUgVFNSTUxTX0RDKQogewogICAgIHplbmRfY2xhc3Nf
ZW50cnkgKnBhcmVudF9jZSwgKmlmYWNlX2NlLCAqY2U7CiAgICAgZ2NoYXIqIGd0eXBlX25hbWU7
CiAgICAgR1R5cGUgcGFyZW50X3R5cGUsICppZmFjZXM7CiAgICAgZ3VpbnQgaSwgbl9pZmFjZXMg
PSAwOwotICAgIFRTUk1MU19GRVRDSCgpOwogCiAgICAgcGFyZW50X3R5cGUgPSBnX3R5cGVfcGFy
ZW50KGd0eXBlKTsKLSAgICBwYXJlbnRfY2UgPSBwaHBnX2NsYXNzX2Zyb21fZ3R5cGUocGFyZW50
X3R5cGUpOworICAgIHBhcmVudF9jZSA9IHBocGdfY2xhc3NfZnJvbV9ndHlwZShwYXJlbnRfdHlw
ZSBUU1JNTFNfQ0MpOwogCiAgICAgZ3R5cGVfbmFtZSA9IChnY2hhciAqKSBnX3R5cGVfbmFtZShn
dHlwZSk7CiAgICAgY2UgPSBwaHBnX3JlZ2lzdGVyX2NsYXNzKGd0eXBlX25hbWUsIE5VTEwsIHBh
cmVudF9jZSwgMCwgTlVMTCwgTlVMTCwgZ3R5cGUgVFNSTUxTX0NDKTsKQEAgLTUyNyw3ICs1MjYs
NyBAQCBQSFBfR1RLX0FQSSB6ZW5kX2NsYXNzX2VudHJ5KiBwaHBnX2NyZWF0ZV9jbGFzcyhHVHlw
ZSBndHlwZSkKICAgICBpZmFjZXMgPSBnX3R5cGVfaW50ZXJmYWNlcyhndHlwZSwgJm5faWZhY2Vz
KTsKICAgICBpZiAobl9pZmFjZXMpIHsKICAgICAgICAgZm9yIChpID0gMDsgaSA8IG5faWZhY2Vz
OyBpKyspIHsKLSAgICAgICAgICAgIGlmYWNlX2NlID0gcGhwZ19jbGFzc19mcm9tX2d0eXBlKGlm
YWNlc1tpXSk7CisgICAgICAgICAgICBpZmFjZV9jZSA9IHBocGdfY2xhc3NfZnJvbV9ndHlwZShp
ZmFjZXNbaV0gVFNSTUxTX0NDKTsKICAgICAgICAgICAgIHplbmRfY2xhc3NfaW1wbGVtZW50cyhj
ZSBUU1JNTFNfQ0MsIDEsIGlmYWNlX2NlKTsKICAgICAgICAgICAgIGlmICghR19UWVBFX0lTX0lO
VEVSRkFDRShndHlwZSkpIHsKICNpZiBkZWZpbmVkKFBIUF9WRVJTSU9OX0lEKSAmJiBQSFBfVkVS
U0lPTl9JRCA+PSA1MDMwMCAmJiBaVFM=

--13e00f561f74e5e5ac12d2e133302223f5589ce9--