90457 2012-07-03 06:33:27 -0700 [WK2][EFL] Ewk_View should report the load progress 2012-07-03 23:35:12 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 61838 1 cdumez cdumez gyuyoung.kim kenneth lucas.de.marchi ryuan.choi tonikitoo webkit.review.bot oldest_to_newest 662178 0 cdumez 2012-07-03 06:33:27 -0700 Ewk_View should report the load progress and we should use this information in the MiniBrowser to display it in the title bar. 662184 1 150598 cdumez 2012-07-03 06:44:17 -0700 Created attachment 150598 Patch 662389 2 150648 cdumez 2012-07-03 11:19:43 -0700 Created attachment 150648 Patch Rebase on master 662633 3 150648 kenneth 2012-07-03 18:54:30 -0700 Comment on attachment 150648 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=150648&action=review > Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:575 > + EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData, -1); > + EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, -1); Wouldnt 0 be a better value? It is not loaded? instead of invalid... seems like more code to handle for users of this api > Tools/MiniBrowser/efl/main.c:95 > + char label[4096]; Wouldnt it be better to use a string builder or so instead? then get the string from that. 662670 4 150715 cdumez 2012-07-03 22:55:50 -0700 Created attachment 150715 Patch Take Kenneth feedback into consideration. 662681 5 150715 webkit.review.bot 2012-07-03 23:35:07 -0700 Comment on attachment 150715 Patch Clearing flags on attachment: 150715 Committed r121830: <http://trac.webkit.org/changeset/121830> 662682 6 webkit.review.bot 2012-07-03 23:35:12 -0700 All reviewed patches have been landed. Closing bug. 150598 2012-07-03 06:44:17 -0700 2012-07-03 11:19:43 -0700 Patch 90457_load_progress.patch text/plain 8431 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA2NTgxNjVlLi41YTZkNTk1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQg QEAKKzIwMTItMDctMDMgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVs LmNvbT4KKworICAgICAgICBbV0syXVtFRkxdIEV3a19WaWV3IHNob3VsZCByZXBvcnQgdGhlIGxv YWQgcHJvZ3Jlc3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTkwNDU3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgVGhlIEV3a19WaWV3IG5vdyByZXBvcnRzIHRoZSBlc3RpbWF0ZWQgbG9hZCBwcm9ncmVzcwor ICAgICAgICBvZiB0aGUgcGFnZSB2aWEgdGhlIG5ldyAibG9hZCxwcm9ncmVzcyIuCisgICAgICAg IEEgbWV0aG9kIGlzIGFsc28gYWRkZWQgdG8gRXdrX1ZpZXcgaW4gb3JkZXIgdG8KKyAgICAgICAg cmV0cmlldmUgdGhlIGN1cnJlbnQgbG9hZCBwcm9ncmVzcy4KKworICAgICAgICAqIFVJUHJvY2Vz cy9BUEkvZWZsL2V3a192aWV3LmNwcDoKKyAgICAgICAgKGV3a192aWV3X2xvYWRfcHJvZ3Jlc3Nf Z2V0KToKKyAgICAgICAgKGV3a192aWV3X2xvYWRfcHJvZ3Jlc3NfY2hhbmdlZCk6CisgICAgICAg ICogVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJ L2VmbC9ld2tfdmlld19sb2FkZXJfY2xpZW50LmNwcDoKKyAgICAgICAgKGRpZENoYW5nZVByb2dy ZXNzKToKKyAgICAgICAgKGV3a192aWV3X2xvYWRlcl9jbGllbnRfYXR0YWNoKToKKyAgICAgICAg KiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlld19wcml2YXRlLmg6CisKIDIwMTItMDctMDIgIE1h cnRpbiBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtUZXh0dXJl TWFwcGVyXSBUaGUgVGV4dHVyZU1hcHBlciBzaG91bGQgc3VwcG9ydCBlZGdlLWRpc3RhbmNlIGFu dGktYW50aWFsaWFzaW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2VmbC9ld2tfdmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tf dmlldy5jcHAKaW5kZXggYTE5NmE5NS4uZWE4NWMyYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcApAQCAtNTY4LDYgKzU2OCwyNSBAQCB2b2lkIGV3 a192aWV3X3RpdGxlX2NoYW5nZWQoRXZhc19PYmplY3QqIGV3a1ZpZXcsIGNvbnN0IGNoYXIqIHRp dGxlKQogICAgIGV2YXNfb2JqZWN0X3NtYXJ0X2NhbGxiYWNrX2NhbGwoZXdrVmlldywgInRpdGxl LGNoYW5nZWQiLCBjb25zdF9jYXN0PGNoYXIqPih0aXRsZSkpOwogfQogCitkb3VibGUgZXdrX3Zp ZXdfbG9hZF9wcm9ncmVzc19nZXQoY29uc3QgRXZhc19PYmplY3QqIGV3a1ZpZXcpCit7CisgICAg RVdLX1ZJRVdfU0RfR0VUX09SX1JFVFVSTihld2tWaWV3LCBzbWFydERhdGEsIC0xKTsKKyAgICBF V0tfVklFV19QUklWX0dFVF9PUl9SRVRVUk4oc21hcnREYXRhLCBwcml2LCAtMSk7CisKKyAgICBy ZXR1cm4gV0tQYWdlR2V0RXN0aW1hdGVkUHJvZ3Jlc3ModG9BUEkocHJpdi0+cGFnZUNsaWVudC0+ cGFnZSgpKSk7Cit9CisKKy8qKgorICogQGludGVybmFsCisgKiBSZXBvcnRzIGxvYWQgcHJvZ3Jl c3MgY2hhbmdlZC4KKyAqCisgKiBFbWl0cyBzaWduYWw6ICJsb2FkLHByb2dyZXNzIiB3aXRoIHBv aW50ZXIgdG8gYSBkb3VibGUgZnJvbSAwLjAgdG8gMS4wLgorICovCit2b2lkIGV3a192aWV3X2xv YWRfcHJvZ3Jlc3NfY2hhbmdlZChFdmFzX09iamVjdCogZXdrVmlldywgZG91YmxlIHByb2dyZXNz KQoreworICAgIGV2YXNfb2JqZWN0X3NtYXJ0X2NhbGxiYWNrX2NhbGwoZXdrVmlldywgImxvYWQs cHJvZ3Jlc3MiLCAmcHJvZ3Jlc3MpOworfQorCiAvKioKICAqIEBpbnRlcm5hbAogICogVGhlIHZp ZXcgcmVjZWl2ZWQgYSBuZXcgaW50ZW50IHJlcXVlc3QuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9lZmwvZXdrX3ZpZXcuaAppbmRleCA0ZGY4ZDE4Li43MDJkNjUyIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5oCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmgKQEAgLTI3LDYgKzI3LDcgQEAK ICAqIFRoZSBmb2xsb3dpbmcgc2lnbmFscyAoc2VlIGV2YXNfb2JqZWN0X3NtYXJ0X2NhbGxiYWNr X2FkZCgpKSBhcmUgZW1pdHRlZDoKICAqCiAgKiAtICJpbnRlbnQscmVxdWVzdCxuZXciLCBFd2tf SW50ZW50X1JlcXVlc3QqOiByZXBvcnRzIG5ldyBXZWIgaW50ZW50IHJlcXVlc3QuCisgKiAtICJs b2FkLHByb2dyZXNzIiwgZG91YmxlKjogbG9hZCBwcm9ncmVzcyBoYXMgY2hhbmdlZCAodmFsdWUg ZnJvbSAwLjAgdG8gMS4wKS4KICAqIC0gInRpdGxlLGNoYW5nZWQiLCBjb25zdCBjaGFyKjogdGl0 bGUgb2YgdGhlIG1haW4gZnJhbWUgd2FzIGNoYW5nZWQuCiAgKi8KIApAQCAtMjQyLDYgKzI0Mywx OCBAQCBFQVBJIEVpbmFfQm9vbCAgICBld2tfdmlld19mb3J3YXJkX3Bvc3NpYmxlKEV2YXNfT2Jq ZWN0ICpvKTsKICAqLwogRUFQSSBjb25zdCBjaGFyICpld2tfdmlld190aXRsZV9nZXQoY29uc3Qg RXZhc19PYmplY3QgKm8pOwogCisvKioKKyAqIEdldHMgdGhlIGN1cnJlbnQgbG9hZCBwcm9ncmVz cyBvZiBwYWdlLgorICoKKyAqIFRoZSBwcm9ncmVzcyBlc3RpbWF0aW9uIGZyb20gMC4wIHRvIDEu MC4KKyAqCisgKiBAcGFyYW0gbyB2aWV3IG9iamVjdCB0byBnZXQgdGhlIGN1cnJlbnQgcHJvZ3Jl c3MKKyAqCisgKiBAcmV0dXJuIHRoZSBsb2FkIHByb2dyZXMgb2YgcGFnZSwgdmFsdWUgZnJvbSAw LjAgdG8gMS4wIG9uIHN1Y2Nlc3MKKyAqICAgICAgIG9yIC0xLjAgb24gZmFpbHVyZQorICovCitF QVBJIGRvdWJsZSBld2tfdmlld19sb2FkX3Byb2dyZXNzX2dldChjb25zdCBFdmFzX09iamVjdCAq byk7CisKICNpZmRlZiBfX2NwbHVzcGx1cwogfQogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlld19sb2FkZXJfY2xpZW50LmNwcCBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3X2xvYWRlcl9jbGllbnQuY3Bw CmluZGV4IDgzZGRmNDguLjMzYjQ1MzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZWZsL2V3a192aWV3X2xvYWRlcl9jbGllbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3X2xvYWRlcl9jbGllbnQuY3BwCkBAIC01Myw2 ICs1MywxMiBAQCBzdGF0aWMgdm9pZCBkaWRSZWNlaXZlSW50ZW50Rm9yRnJhbWUoV0tQYWdlUmVm IHBhZ2UsIFdLRnJhbWVSZWYgZnJhbWUsIFdLSW50ZW50RAogfQogI2VuZGlmCiAKK3N0YXRpYyB2 b2lkIGRpZENoYW5nZVByb2dyZXNzKFdLUGFnZVJlZiBwYWdlLCBjb25zdCB2b2lkKiBjbGllbnRJ bmZvKQoreworICAgIEV2YXNfT2JqZWN0KiBld2tWaWV3ID0gc3RhdGljX2Nhc3Q8RXZhc19PYmpl Y3QqPihjb25zdF9jYXN0PHZvaWQqPihjbGllbnRJbmZvKSk7CisgICAgZXdrX3ZpZXdfbG9hZF9w cm9ncmVzc19jaGFuZ2VkKGV3a1ZpZXcsIFdLUGFnZUdldEVzdGltYXRlZFByb2dyZXNzKHBhZ2Up KTsKK30KKwogdm9pZCBld2tfdmlld19sb2FkZXJfY2xpZW50X2F0dGFjaChXS1BhZ2VSZWYgcGFn ZVJlZiwgRXZhc19PYmplY3QqIGV3a1ZpZXcpCiB7CiAgICAgV0tQYWdlTG9hZGVyQ2xpZW50IGxv YWRDbGllbnQ7CkBAIC02Myw1ICs2OSw4IEBAIHZvaWQgZXdrX3ZpZXdfbG9hZGVyX2NsaWVudF9h dHRhY2goV0tQYWdlUmVmIHBhZ2VSZWYsIEV2YXNfT2JqZWN0KiBld2tWaWV3KQogI2lmIEVOQUJM RShXRUJfSU5URU5UUykKICAgICBsb2FkQ2xpZW50LmRpZFJlY2VpdmVJbnRlbnRGb3JGcmFtZSA9 IGRpZFJlY2VpdmVJbnRlbnRGb3JGcmFtZTsKICNlbmRpZgorICAgIGxvYWRDbGllbnQuZGlkU3Rh cnRQcm9ncmVzcyA9IGRpZENoYW5nZVByb2dyZXNzOworICAgIGxvYWRDbGllbnQuZGlkQ2hhbmdl UHJvZ3Jlc3MgPSBkaWRDaGFuZ2VQcm9ncmVzczsKKyAgICBsb2FkQ2xpZW50LmRpZEZpbmlzaFBy b2dyZXNzID0gZGlkQ2hhbmdlUHJvZ3Jlc3M7CiAgICAgV0tQYWdlU2V0UGFnZUxvYWRlckNsaWVu dChwYWdlUmVmLCAmbG9hZENsaWVudCk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlld19wcml2YXRlLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2VmbC9ld2tfdmlld19wcml2YXRlLmgKaW5kZXggYmQxNTg2Yi4uZTlmZWNkYiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXdfcHJp dmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3X3By aXZhdGUuaApAQCAtMzcsNiArMzcsNyBAQCB0eXBlZGVmIHN0cnVjdCBfRXdrX0ludGVudCBFd2tf SW50ZW50Owogdm9pZCBld2tfdmlld19kaXNwbGF5KEV2YXNfT2JqZWN0KiBld2tWaWV3LCBjb25z dCBXZWJDb3JlOjpJbnRSZWN0JiByZWN0KTsKIHZvaWQgZXdrX3ZpZXdfaW1hZ2VfZGF0YV9zZXQo RXZhc19PYmplY3QqIGV3a1ZpZXcsIHZvaWQqIGltYWdlRGF0YSwgY29uc3QgV2ViQ29yZTo6SW50 U2l6ZSYgc2l6ZSk7CiB2b2lkIGV3a192aWV3X3RpdGxlX2NoYW5nZWQoRXZhc19PYmplY3QqIGV3 a1ZpZXcsIGNvbnN0IGNoYXIqIHRpdGxlKTsKK3ZvaWQgZXdrX3ZpZXdfbG9hZF9wcm9ncmVzc19j aGFuZ2VkKEV2YXNfT2JqZWN0KiBld2tWaWV3LCBkb3VibGUgcHJvZ3Jlc3MpOwogCiBFdmFzX09i amVjdCogZXdrX3ZpZXdfYmFzZV9hZGQoRXZhcyogY2FudmFzLCBXS0NvbnRleHRSZWYsIFdLUGFn ZUdyb3VwUmVmKTsKIApkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdl TG9nCmluZGV4IDJjNDZhMzYuLmRiM2Q1MjkgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZwor KysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxMi0wNy0wMyAgQ2hyaXN0 b3BoZSBEdW1leiAgPGNocmlzdG9waGUuZHVtZXpAaW50ZWwuY29tPgorCisgICAgICAgIFtXSzJd W0VGTF0gRXdrX1ZpZXcgc2hvdWxkIHJlcG9ydCB0aGUgbG9hZCBwcm9ncmVzcworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTA0NTcKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVcGRhdGUgRUZMIE1pbmlCcm93 c2VyIHNvIHRoYXQgaXQgbGlzdGVucyBmb3IgdGhlCisgICAgICAgICJsb2FkLHByb2dyZXNzIiBv biB0aGUgRXdrX1ZpZXcgYW5kIHVwZGF0ZXMgaXRzCisgICAgICAgIHdpbmRvdyB0aXRsZSBhY2Nv cmRpbmdseS4KKworICAgICAgICAqIE1pbmlCcm93c2VyL2VmbC9tYWluLmM6CisgICAgICAgICh0 aXRsZV9zZXQpOgorICAgICAgICAob25fdGl0bGVfY2hhbmdlZCk6CisgICAgICAgIChvbl9wcm9n cmVzcyk6CisgICAgICAgIChicm93c2VyQ3JlYXRlKToKKwogMjAxMi0wNy0wMiAgR2VvcmdlIFN0 YWlrb3MgIDxzdGFpa29zQHdlYmtpdC5vcmc+CiAKICAgICAgICAgW0JsYWNrQmVycnldIEVuYWJs ZSBzY29wZWQgc3R5bGUgZm9yIEJsYWNrQmVycnkuCmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJv d3Nlci9lZmwvbWFpbi5jIGIvVG9vbHMvTWluaUJyb3dzZXIvZWZsL21haW4uYwppbmRleCA3M2My NTNiLi4xZGUxMDVmIDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci9lZmwvbWFpbi5jCisr KyBiL1Rvb2xzL01pbmlCcm93c2VyL2VmbC9tYWluLmMKQEAgLTI2LDYgKzI2LDcgQEAKIHN0YXRp YyBjb25zdCBpbnQgREVGQVVMVF9XSURUSCA9IDgwMDsKIHN0YXRpYyBjb25zdCBpbnQgREVGQVVM VF9IRUlHSFQgPSA2MDA7CiBzdGF0aWMgY29uc3QgY2hhciBERUZBVUxUX1VSTFtdID0gImh0dHA6 Ly93d3cuZ29vZ2xlLmNvbS8iOworc3RhdGljIGNvbnN0IGNoYXIgREVGQVVMVF9USVRMRVtdID0g IkVGTCBNaW5pQnJvd3NlciI7CiAKICNkZWZpbmUgaW5mbyhmb3JtYXQsIGFyZ3MuLi4pICAgICAg IFwKICAgICBkbyB7ICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKQEAgLTg3LDEyICs4OCw0 MSBAQCBvbl9rZXlfZG93bih2b2lkICpkYXRhLCBFdmFzICplLCBFdmFzX09iamVjdCAqb2JqLCB2 b2lkICpldmVudF9pbmZvKQogfQogCiBzdGF0aWMgdm9pZAordGl0bGVfc2V0KEVjb3JlX0V2YXMg KmVlLCBjb25zdCBjaGFyICp0aXRsZSwgaW50IHByb2dyZXNzKQoreworICAgIGNvbnN0IGNoYXIg KmFwcG5hbWUgPSBERUZBVUxUX1RJVExFOworICAgIGNvbnN0IGNoYXIgKnNlcGFyYXRvciA9ICIg LSAiOworICAgIGNoYXIgbGFiZWxbNDA5Nl07CisKKyAgICBpZiAoIXRpdGxlIHx8ICEqdGl0bGUp IHsKKyAgICAgICAgZWNvcmVfZXZhc190aXRsZV9zZXQoZWUsIGFwcG5hbWUpOworICAgICAgICBy ZXR1cm47CisgICAgfQorCisgICAgaWYgKHByb2dyZXNzIDwgMTAwKQorICAgICAgICBzbnByaW50 ZihsYWJlbCwgc2l6ZW9mKGxhYmVsKSwgIiVzICglZCUlKSVzJXMiLCB0aXRsZSwgcHJvZ3Jlc3Ms IHNlcGFyYXRvciwgYXBwbmFtZSk7CisgICAgZWxzZQorICAgICAgICBzbnByaW50ZihsYWJlbCwg c2l6ZW9mKGxhYmVsKSwgIiVzICVzJXMiLCB0aXRsZSwgc2VwYXJhdG9yLCBhcHBuYW1lKTsKKwor ICAgIGVjb3JlX2V2YXNfdGl0bGVfc2V0KGVlLCBsYWJlbCk7Cit9CisKK3N0YXRpYyB2b2lkCiBv bl90aXRsZV9jaGFuZ2VkKHZvaWQgKnVzZXJfZGF0YSwgRXZhc19PYmplY3QgKndlYnZpZXcsIHZv aWQgKmV2ZW50X2luZm8pCiB7CiAgICAgTWluaUJyb3dzZXIgKmFwcCA9IChNaW5pQnJvd3NlciAq KXVzZXJfZGF0YTsKICAgICBjb25zdCBjaGFyICp0aXRsZSA9IChjb25zdCBjaGFyICopZXZlbnRf aW5mbzsKIAotICAgIGVjb3JlX2V2YXNfdGl0bGVfc2V0KGFwcC0+ZWUsIHRpdGxlKTsKKyAgICB0 aXRsZV9zZXQoYXBwLT5lZSwgdGl0bGUsIDEwMCk7Cit9CisKK3N0YXRpYyB2b2lkCitvbl9wcm9n cmVzcyh2b2lkICp1c2VyX2RhdGEsIEV2YXNfT2JqZWN0ICp3ZWJ2aWV3LCB2b2lkICpldmVudF9p bmZvKQoreworICAgIE1pbmlCcm93c2VyICphcHAgPSAoTWluaUJyb3dzZXIgKil1c2VyX2RhdGE7 CisgICAgZG91YmxlIHByb2dyZXNzID0gKihkb3VibGUgKilldmVudF9pbmZvOworCisgICAgdGl0 bGVfc2V0KGFwcC0+ZWUsIGV3a192aWV3X3RpdGxlX2dldChhcHAtPmJyb3dzZXIpLCBwcm9ncmVz cyAqIDEwMCk7CiB9CiAKIHN0YXRpYyBNaW5pQnJvd3NlciAqYnJvd3NlckNyZWF0ZShjb25zdCBj aGFyICp1cmwpCkBAIC0xMDEsNyArMTMxLDcgQEAgc3RhdGljIE1pbmlCcm93c2VyICpicm93c2Vy Q3JlYXRlKGNvbnN0IGNoYXIgKnVybCkKIAogICAgIGFwcC0+ZWUgPSBlY29yZV9ldmFzX25ldygw LCAwLCAwLCBERUZBVUxUX1dJRFRILCBERUZBVUxUX0hFSUdIVCwgMCk7CiAKLSAgICBlY29yZV9l dmFzX3RpdGxlX3NldChhcHAtPmVlLCAiRUZMIE1pbmlCcm93c2VyIik7CisgICAgZWNvcmVfZXZh c190aXRsZV9zZXQoYXBwLT5lZSwgREVGQVVMVF9USVRMRSk7CiAgICAgZWNvcmVfZXZhc19jYWxs YmFja19yZXNpemVfc2V0KGFwcC0+ZWUsIG9uX2Vjb3JlX2V2YXNfcmVzaXplKTsKICAgICBlY29y ZV9ldmFzX2JvcmRlcmxlc3Nfc2V0KGFwcC0+ZWUsIDApOwogICAgIGVjb3JlX2V2YXNfc2hvdyhh cHAtPmVlKTsKQEAgLTEyMSw2ICsxNTEsNyBAQCBzdGF0aWMgTWluaUJyb3dzZXIgKmJyb3dzZXJD cmVhdGUoY29uc3QgY2hhciAqdXJsKQogICAgIGFwcC0+YnJvd3NlciA9IGV3a192aWV3X2FkZChh cHAtPmV2YXMpOwogICAgIGV2YXNfb2JqZWN0X25hbWVfc2V0KGFwcC0+YnJvd3NlciwgImJyb3dz ZXIiKTsKIAorICAgIGV2YXNfb2JqZWN0X3NtYXJ0X2NhbGxiYWNrX2FkZChhcHAtPmJyb3dzZXIs ICJsb2FkLHByb2dyZXNzIiwgb25fcHJvZ3Jlc3MsIGFwcCk7CiAgICAgZXZhc19vYmplY3Rfc21h cnRfY2FsbGJhY2tfYWRkKGFwcC0+YnJvd3NlciwgInRpdGxlLGNoYW5nZWQiLCBvbl90aXRsZV9j aGFuZ2VkLCBhcHApOwogCiAgICAgZXZhc19vYmplY3RfZXZlbnRfY2FsbGJhY2tfYWRkKGFwcC0+ YnJvd3NlciwgRVZBU19DQUxMQkFDS19LRVlfRE9XTiwgb25fa2V5X2Rvd24sIGFwcCk7Cg== 150648 2012-07-03 11:19:43 -0700 2012-07-03 22:55:50 -0700 Patch 90457_load_progress.patch text/plain 8460 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA4Nzg5YzRjLi44Nzk4NzJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQg QEAKKzIwMTItMDctMDMgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVs LmNvbT4KKworICAgICAgICBbV0syXVtFRkxdIEV3a19WaWV3IHNob3VsZCByZXBvcnQgdGhlIGxv YWQgcHJvZ3Jlc3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTkwNDU3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgVGhlIEV3a19WaWV3IG5vdyByZXBvcnRzIHRoZSBlc3RpbWF0ZWQgbG9hZCBwcm9ncmVzcwor ICAgICAgICBvZiB0aGUgcGFnZSB2aWEgdGhlIG5ldyAibG9hZCxwcm9ncmVzcyIuCisgICAgICAg IEEgbWV0aG9kIGlzIGFsc28gYWRkZWQgdG8gRXdrX1ZpZXcgaW4gb3JkZXIgdG8KKyAgICAgICAg cmV0cmlldmUgdGhlIGN1cnJlbnQgbG9hZCBwcm9ncmVzcy4KKworICAgICAgICAqIFVJUHJvY2Vz cy9BUEkvZWZsL2V3a192aWV3LmNwcDoKKyAgICAgICAgKGV3a192aWV3X2xvYWRfcHJvZ3Jlc3Nf Z2V0KToKKyAgICAgICAgKGV3a192aWV3X2xvYWRfcHJvZ3Jlc3NfY2hhbmdlZCk6CisgICAgICAg ICogVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJ L2VmbC9ld2tfdmlld19sb2FkZXJfY2xpZW50LmNwcDoKKyAgICAgICAgKGRpZENoYW5nZVByb2dy ZXNzKToKKyAgICAgICAgKGV3a192aWV3X2xvYWRlcl9jbGllbnRfYXR0YWNoKToKKyAgICAgICAg KiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlld19wcml2YXRlLmg6CisKIDIwMTItMDctMDMgIFRv ciBBcm5lIFZlc3Riw7ggIDx0b3IuYXJuZS52ZXN0Ym9Abm9raWEuY29tPgogCiAgICAgICAgIFtR dF0gTWFrZSB1c2Ugb2YgLnFtYWtlLmNhY2hlIGZvciBjYWNoaW5nIGZlYXR1cmVzCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHAgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHAKaW5kZXggZTY5ZDhmMC4u MGNkZDZlZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdr X3ZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3 LmNwcApAQCAtNTY5LDYgKzU2OSwyNSBAQCB2b2lkIGV3a192aWV3X3RpdGxlX2NoYW5nZWQoRXZh c19PYmplY3QqIGV3a1ZpZXcsIGNvbnN0IGNoYXIqIHRpdGxlKQogICAgIGV2YXNfb2JqZWN0X3Nt YXJ0X2NhbGxiYWNrX2NhbGwoZXdrVmlldywgInRpdGxlLGNoYW5nZWQiLCBjb25zdF9jYXN0PGNo YXIqPih0aXRsZSkpOwogfQogCitkb3VibGUgZXdrX3ZpZXdfbG9hZF9wcm9ncmVzc19nZXQoY29u c3QgRXZhc19PYmplY3QqIGV3a1ZpZXcpCit7CisgICAgRVdLX1ZJRVdfU0RfR0VUX09SX1JFVFVS Tihld2tWaWV3LCBzbWFydERhdGEsIC0xKTsKKyAgICBFV0tfVklFV19QUklWX0dFVF9PUl9SRVRV Uk4oc21hcnREYXRhLCBwcml2LCAtMSk7CisKKyAgICByZXR1cm4gV0tQYWdlR2V0RXN0aW1hdGVk UHJvZ3Jlc3ModG9BUEkocHJpdi0+cGFnZUNsaWVudC0+cGFnZSgpKSk7Cit9CisKKy8qKgorICog QGludGVybmFsCisgKiBSZXBvcnRzIGxvYWQgcHJvZ3Jlc3MgY2hhbmdlZC4KKyAqCisgKiBFbWl0 cyBzaWduYWw6ICJsb2FkLHByb2dyZXNzIiB3aXRoIHBvaW50ZXIgdG8gYSBkb3VibGUgZnJvbSAw LjAgdG8gMS4wLgorICovCit2b2lkIGV3a192aWV3X2xvYWRfcHJvZ3Jlc3NfY2hhbmdlZChFdmFz X09iamVjdCogZXdrVmlldywgZG91YmxlIHByb2dyZXNzKQoreworICAgIGV2YXNfb2JqZWN0X3Nt YXJ0X2NhbGxiYWNrX2NhbGwoZXdrVmlldywgImxvYWQscHJvZ3Jlc3MiLCAmcHJvZ3Jlc3MpOwor fQorCiAvKioKICAqIEBpbnRlcm5hbAogICogVGhlIHZpZXcgcmVjZWl2ZWQgYSBuZXcgaW50ZW50 IHJlcXVlc3QuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9l d2tfdmlldy5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuaApp bmRleCAxYzYzZDllLi41NjVlZTkyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL2VmbC9ld2tfdmlldy5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv ZWZsL2V3a192aWV3LmgKQEAgLTI4LDYgKzI4LDcgQEAKICAqCiAgKiAtICJpbnRlbnQscmVxdWVz dCxuZXciLCBFd2tfSW50ZW50X1JlcXVlc3QqOiByZXBvcnRzIG5ldyBXZWIgaW50ZW50IHJlcXVl c3QuCiAgKiAtICJpbnRlbnQsc2VydmljZSxyZWdpc3RlciIsIEV3a19JbnRlbnRfU2VydmljZSo6 IHJlcG9ydHMgbmV3IFdlYiBpbnRlbnQgc2VydmljZSByZWdpc3RyYXRpb24uCisgKiAtICJsb2Fk LHByb2dyZXNzIiwgZG91YmxlKjogbG9hZCBwcm9ncmVzcyBoYXMgY2hhbmdlZCAodmFsdWUgZnJv bSAwLjAgdG8gMS4wKS4KICAqIC0gInRpdGxlLGNoYW5nZWQiLCBjb25zdCBjaGFyKjogdGl0bGUg b2YgdGhlIG1haW4gZnJhbWUgd2FzIGNoYW5nZWQuCiAgKi8KIApAQCAtMjUzLDYgKzI1NCwxOCBA QCBFQVBJIEVpbmFfQm9vbCAgICBld2tfdmlld19mb3J3YXJkX3Bvc3NpYmxlKEV2YXNfT2JqZWN0 ICpvKTsKICAqLwogRUFQSSBjb25zdCBjaGFyICpld2tfdmlld190aXRsZV9nZXQoY29uc3QgRXZh c19PYmplY3QgKm8pOwogCisvKioKKyAqIEdldHMgdGhlIGN1cnJlbnQgbG9hZCBwcm9ncmVzcyBv ZiBwYWdlLgorICoKKyAqIFRoZSBwcm9ncmVzcyBlc3RpbWF0aW9uIGZyb20gMC4wIHRvIDEuMC4K KyAqCisgKiBAcGFyYW0gbyB2aWV3IG9iamVjdCB0byBnZXQgdGhlIGN1cnJlbnQgcHJvZ3Jlc3MK KyAqCisgKiBAcmV0dXJuIHRoZSBsb2FkIHByb2dyZXMgb2YgcGFnZSwgdmFsdWUgZnJvbSAwLjAg dG8gMS4wIG9uIHN1Y2Nlc3MKKyAqICAgICAgIG9yIC0xLjAgb24gZmFpbHVyZQorICovCitFQVBJ IGRvdWJsZSBld2tfdmlld19sb2FkX3Byb2dyZXNzX2dldChjb25zdCBFdmFzX09iamVjdCAqbyk7 CisKICNpZmRlZiBfX2NwbHVzcGx1cwogfQogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlld19sb2FkZXJfY2xpZW50LmNwcCBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3X2xvYWRlcl9jbGllbnQuY3BwCmlu ZGV4IGM4YTVmNmIuLmYzZjBmZDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvZWZsL2V3a192aWV3X2xvYWRlcl9jbGllbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3X2xvYWRlcl9jbGllbnQuY3BwCkBAIC02NSw2ICs2 NSwxMiBAQCBzdGF0aWMgdm9pZCByZWdpc3RlckludGVudFNlcnZpY2VGb3JGcmFtZShXS1BhZ2VS ZWYgcGFnZSwgV0tGcmFtZVJlZiBmcmFtZSwgV0tJbgogfQogI2VuZGlmCiAKK3N0YXRpYyB2b2lk IGRpZENoYW5nZVByb2dyZXNzKFdLUGFnZVJlZiBwYWdlLCBjb25zdCB2b2lkKiBjbGllbnRJbmZv KQoreworICAgIEV2YXNfT2JqZWN0KiBld2tWaWV3ID0gc3RhdGljX2Nhc3Q8RXZhc19PYmplY3Qq Pihjb25zdF9jYXN0PHZvaWQqPihjbGllbnRJbmZvKSk7CisgICAgZXdrX3ZpZXdfbG9hZF9wcm9n cmVzc19jaGFuZ2VkKGV3a1ZpZXcsIFdLUGFnZUdldEVzdGltYXRlZFByb2dyZXNzKHBhZ2UpKTsK K30KKwogdm9pZCBld2tfdmlld19sb2FkZXJfY2xpZW50X2F0dGFjaChXS1BhZ2VSZWYgcGFnZVJl ZiwgRXZhc19PYmplY3QqIGV3a1ZpZXcpCiB7CiAgICAgV0tQYWdlTG9hZGVyQ2xpZW50IGxvYWRD bGllbnQ7CkBAIC03OCw1ICs4NCw4IEBAIHZvaWQgZXdrX3ZpZXdfbG9hZGVyX2NsaWVudF9hdHRh Y2goV0tQYWdlUmVmIHBhZ2VSZWYsIEV2YXNfT2JqZWN0KiBld2tWaWV3KQogI2lmIEVOQUJMRShX RUJfSU5URU5UU19UQUcpCiAgICAgbG9hZENsaWVudC5yZWdpc3RlckludGVudFNlcnZpY2VGb3JG cmFtZSA9IHJlZ2lzdGVySW50ZW50U2VydmljZUZvckZyYW1lOwogI2VuZGlmCisgICAgbG9hZENs aWVudC5kaWRTdGFydFByb2dyZXNzID0gZGlkQ2hhbmdlUHJvZ3Jlc3M7CisgICAgbG9hZENsaWVu dC5kaWRDaGFuZ2VQcm9ncmVzcyA9IGRpZENoYW5nZVByb2dyZXNzOworICAgIGxvYWRDbGllbnQu ZGlkRmluaXNoUHJvZ3Jlc3MgPSBkaWRDaGFuZ2VQcm9ncmVzczsKICAgICBXS1BhZ2VTZXRQYWdl TG9hZGVyQ2xpZW50KHBhZ2VSZWYsICZsb2FkQ2xpZW50KTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3X3ByaXZhdGUuaCBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3X3ByaXZhdGUuaAppbmRleCA4ZjAyMTcx Li4yMDYzYmFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9l d2tfdmlld19wcml2YXRlLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwv ZXdrX3ZpZXdfcHJpdmF0ZS5oCkBAIC0zOSw2ICszOSw3IEBAIHR5cGVkZWYgc3RydWN0IF9Fd2tf SW50ZW50X1NlcnZpY2UgRXdrX0ludGVudF9TZXJ2aWNlOwogCiB2b2lkIGV3a192aWV3X2Rpc3Bs YXkoRXZhc19PYmplY3QqIGV3a1ZpZXcsIGNvbnN0IFdlYkNvcmU6OkludFJlY3QmIHJlY3QpOwog dm9pZCBld2tfdmlld19pbWFnZV9kYXRhX3NldChFdmFzX09iamVjdCogZXdrVmlldywgdm9pZCog aW1hZ2VEYXRhLCBjb25zdCBXZWJDb3JlOjpJbnRTaXplJiBzaXplKTsKK3ZvaWQgZXdrX3ZpZXdf bG9hZF9wcm9ncmVzc19jaGFuZ2VkKEV2YXNfT2JqZWN0KiBld2tWaWV3LCBkb3VibGUgcHJvZ3Jl c3MpOwogdm9pZCBld2tfdmlld190aXRsZV9jaGFuZ2VkKEV2YXNfT2JqZWN0KiBld2tWaWV3LCBj b25zdCBjaGFyKiB0aXRsZSk7CiAKIEV2YXNfT2JqZWN0KiBld2tfdmlld19iYXNlX2FkZChFdmFz KiBjYW52YXMsIFdLQ29udGV4dFJlZiwgV0tQYWdlR3JvdXBSZWYpOwpkaWZmIC0tZ2l0IGEvVG9v bHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDNjODAxZTUuLmNkZWMyZjkgMTAw NjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwyMCBAQAorMjAxMi0wNy0wMyAgQ2hyaXN0b3BoZSBEdW1leiAgPGNocmlzdG9waGUuZHVtZXpA aW50ZWwuY29tPgorCisgICAgICAgIFtXSzJdW0VGTF0gRXdrX1ZpZXcgc2hvdWxkIHJlcG9ydCB0 aGUgbG9hZCBwcm9ncmVzcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9OTA0NTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBVcGRhdGUgRUZMIE1pbmlCcm93c2VyIHNvIHRoYXQgaXQgbGlzdGVucyBmb3IgdGhl CisgICAgICAgICJsb2FkLHByb2dyZXNzIiBvbiB0aGUgRXdrX1ZpZXcgYW5kIHVwZGF0ZXMgaXRz CisgICAgICAgIHdpbmRvdyB0aXRsZSBhY2NvcmRpbmdseS4KKworICAgICAgICAqIE1pbmlCcm93 c2VyL2VmbC9tYWluLmM6CisgICAgICAgICh0aXRsZV9zZXQpOgorICAgICAgICAob25fdGl0bGVf Y2hhbmdlZCk6CisgICAgICAgIChvbl9wcm9ncmVzcyk6CisgICAgICAgIChicm93c2VyQ3JlYXRl KToKKwogMjAxMi0wNy0wMyAgQmFsYXpzIEtlbGVtZW4gIDxrYmFsYXpzQHdlYmtpdC5vcmc+CiAK ICAgICAgICAgW1F0XVtXVFJdIEdldCByaWQgb2YgdXNpbmcgRHVtcFJlbmRlclRyZWVTdXBwb3J0 UXQKZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL2VmbC9tYWluLmMgYi9Ub29scy9NaW5p QnJvd3Nlci9lZmwvbWFpbi5jCmluZGV4IDczYzI1M2IuLjFkZTEwNWYgMTAwNjQ0Ci0tLSBhL1Rv b2xzL01pbmlCcm93c2VyL2VmbC9tYWluLmMKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvZWZsL21h aW4uYwpAQCAtMjYsNiArMjYsNyBAQAogc3RhdGljIGNvbnN0IGludCBERUZBVUxUX1dJRFRIID0g ODAwOwogc3RhdGljIGNvbnN0IGludCBERUZBVUxUX0hFSUdIVCA9IDYwMDsKIHN0YXRpYyBjb25z dCBjaGFyIERFRkFVTFRfVVJMW10gPSAiaHR0cDovL3d3dy5nb29nbGUuY29tLyI7CitzdGF0aWMg Y29uc3QgY2hhciBERUZBVUxUX1RJVExFW10gPSAiRUZMIE1pbmlCcm93c2VyIjsKIAogI2RlZmlu ZSBpbmZvKGZvcm1hdCwgYXJncy4uLikgICAgICAgXAogICAgIGRvIHsgICAgICAgICAgICAgICAg ICAgICAgICAgICAgXApAQCAtODcsMTIgKzg4LDQxIEBAIG9uX2tleV9kb3duKHZvaWQgKmRhdGEs IEV2YXMgKmUsIEV2YXNfT2JqZWN0ICpvYmosIHZvaWQgKmV2ZW50X2luZm8pCiB9CiAKIHN0YXRp YyB2b2lkCit0aXRsZV9zZXQoRWNvcmVfRXZhcyAqZWUsIGNvbnN0IGNoYXIgKnRpdGxlLCBpbnQg cHJvZ3Jlc3MpCit7CisgICAgY29uc3QgY2hhciAqYXBwbmFtZSA9IERFRkFVTFRfVElUTEU7Cisg ICAgY29uc3QgY2hhciAqc2VwYXJhdG9yID0gIiAtICI7CisgICAgY2hhciBsYWJlbFs0MDk2XTsK KworICAgIGlmICghdGl0bGUgfHwgISp0aXRsZSkgeworICAgICAgICBlY29yZV9ldmFzX3RpdGxl X3NldChlZSwgYXBwbmFtZSk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBpZiAocHJv Z3Jlc3MgPCAxMDApCisgICAgICAgIHNucHJpbnRmKGxhYmVsLCBzaXplb2YobGFiZWwpLCAiJXMg KCVkJSUpJXMlcyIsIHRpdGxlLCBwcm9ncmVzcywgc2VwYXJhdG9yLCBhcHBuYW1lKTsKKyAgICBl bHNlCisgICAgICAgIHNucHJpbnRmKGxhYmVsLCBzaXplb2YobGFiZWwpLCAiJXMgJXMlcyIsIHRp dGxlLCBzZXBhcmF0b3IsIGFwcG5hbWUpOworCisgICAgZWNvcmVfZXZhc190aXRsZV9zZXQoZWUs IGxhYmVsKTsKK30KKworc3RhdGljIHZvaWQKIG9uX3RpdGxlX2NoYW5nZWQodm9pZCAqdXNlcl9k YXRhLCBFdmFzX09iamVjdCAqd2Vidmlldywgdm9pZCAqZXZlbnRfaW5mbykKIHsKICAgICBNaW5p QnJvd3NlciAqYXBwID0gKE1pbmlCcm93c2VyICopdXNlcl9kYXRhOwogICAgIGNvbnN0IGNoYXIg KnRpdGxlID0gKGNvbnN0IGNoYXIgKilldmVudF9pbmZvOwogCi0gICAgZWNvcmVfZXZhc190aXRs ZV9zZXQoYXBwLT5lZSwgdGl0bGUpOworICAgIHRpdGxlX3NldChhcHAtPmVlLCB0aXRsZSwgMTAw KTsKK30KKworc3RhdGljIHZvaWQKK29uX3Byb2dyZXNzKHZvaWQgKnVzZXJfZGF0YSwgRXZhc19P YmplY3QgKndlYnZpZXcsIHZvaWQgKmV2ZW50X2luZm8pCit7CisgICAgTWluaUJyb3dzZXIgKmFw cCA9IChNaW5pQnJvd3NlciAqKXVzZXJfZGF0YTsKKyAgICBkb3VibGUgcHJvZ3Jlc3MgPSAqKGRv dWJsZSAqKWV2ZW50X2luZm87CisKKyAgICB0aXRsZV9zZXQoYXBwLT5lZSwgZXdrX3ZpZXdfdGl0 bGVfZ2V0KGFwcC0+YnJvd3NlciksIHByb2dyZXNzICogMTAwKTsKIH0KIAogc3RhdGljIE1pbmlC cm93c2VyICpicm93c2VyQ3JlYXRlKGNvbnN0IGNoYXIgKnVybCkKQEAgLTEwMSw3ICsxMzEsNyBA QCBzdGF0aWMgTWluaUJyb3dzZXIgKmJyb3dzZXJDcmVhdGUoY29uc3QgY2hhciAqdXJsKQogCiAg ICAgYXBwLT5lZSA9IGVjb3JlX2V2YXNfbmV3KDAsIDAsIDAsIERFRkFVTFRfV0lEVEgsIERFRkFV TFRfSEVJR0hULCAwKTsKIAotICAgIGVjb3JlX2V2YXNfdGl0bGVfc2V0KGFwcC0+ZWUsICJFRkwg TWluaUJyb3dzZXIiKTsKKyAgICBlY29yZV9ldmFzX3RpdGxlX3NldChhcHAtPmVlLCBERUZBVUxU X1RJVExFKTsKICAgICBlY29yZV9ldmFzX2NhbGxiYWNrX3Jlc2l6ZV9zZXQoYXBwLT5lZSwgb25f ZWNvcmVfZXZhc19yZXNpemUpOwogICAgIGVjb3JlX2V2YXNfYm9yZGVybGVzc19zZXQoYXBwLT5l ZSwgMCk7CiAgICAgZWNvcmVfZXZhc19zaG93KGFwcC0+ZWUpOwpAQCAtMTIxLDYgKzE1MSw3IEBA IHN0YXRpYyBNaW5pQnJvd3NlciAqYnJvd3NlckNyZWF0ZShjb25zdCBjaGFyICp1cmwpCiAgICAg YXBwLT5icm93c2VyID0gZXdrX3ZpZXdfYWRkKGFwcC0+ZXZhcyk7CiAgICAgZXZhc19vYmplY3Rf bmFtZV9zZXQoYXBwLT5icm93c2VyLCAiYnJvd3NlciIpOwogCisgICAgZXZhc19vYmplY3Rfc21h cnRfY2FsbGJhY2tfYWRkKGFwcC0+YnJvd3NlciwgImxvYWQscHJvZ3Jlc3MiLCBvbl9wcm9ncmVz cywgYXBwKTsKICAgICBldmFzX29iamVjdF9zbWFydF9jYWxsYmFja19hZGQoYXBwLT5icm93c2Vy LCAidGl0bGUsY2hhbmdlZCIsIG9uX3RpdGxlX2NoYW5nZWQsIGFwcCk7CiAKICAgICBldmFzX29i amVjdF9ldmVudF9jYWxsYmFja19hZGQoYXBwLT5icm93c2VyLCBFVkFTX0NBTExCQUNLX0tFWV9E T1dOLCBvbl9rZXlfZG93biwgYXBwKTsK 150715 2012-07-03 22:55:50 -0700 2012-07-03 23:35:07 -0700 Patch 90457_load_progress.patch text/plain 8459 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAwMzA5ZWUxLi4wMzA1NDM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjYg QEAKIDIwMTItMDctMDMgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVs LmNvbT4KIAorICAgICAgICBbV0syXVtFRkxdIEV3a19WaWV3IHNob3VsZCByZXBvcnQgdGhlIGxv YWQgcHJvZ3Jlc3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTkwNDU3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgVGhlIEV3a19WaWV3IG5vdyByZXBvcnRzIHRoZSBlc3RpbWF0ZWQgbG9hZCBwcm9ncmVzcwor ICAgICAgICBvZiB0aGUgcGFnZSB2aWEgdGhlIG5ldyAibG9hZCxwcm9ncmVzcyIuCisgICAgICAg IEEgbWV0aG9kIGlzIGFsc28gYWRkZWQgdG8gRXdrX1ZpZXcgaW4gb3JkZXIgdG8KKyAgICAgICAg cmV0cmlldmUgdGhlIGN1cnJlbnQgbG9hZCBwcm9ncmVzcy4KKworICAgICAgICAqIFVJUHJvY2Vz cy9BUEkvZWZsL2V3a192aWV3LmNwcDoKKyAgICAgICAgKGV3a192aWV3X2xvYWRfcHJvZ3Jlc3Nf Z2V0KToKKyAgICAgICAgKGV3a192aWV3X2xvYWRfcHJvZ3Jlc3NfY2hhbmdlZCk6CisgICAgICAg ICogVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJ L2VmbC9ld2tfdmlld19sb2FkZXJfY2xpZW50LmNwcDoKKyAgICAgICAgKGRpZENoYW5nZVByb2dy ZXNzKToKKyAgICAgICAgKGV3a192aWV3X2xvYWRlcl9jbGllbnRfYXR0YWNoKToKKyAgICAgICAg KiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlld19wcml2YXRlLmg6CisKKzIwMTItMDctMDMgIENo cmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVsLmNvbT4KKwogICAgICAgICBb V0syXSBBZGQgc3VwcG9ydCBmb3IgQmF0dGVyeSBTdGF0dXMgQVBJCiAgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04OTU1OAogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHAKaW5kZXggZTY5ZDhmMC4uYjE0NDVlNCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcApAQCAt NTY5LDYgKzU2OSwyNSBAQCB2b2lkIGV3a192aWV3X3RpdGxlX2NoYW5nZWQoRXZhc19PYmplY3Qq IGV3a1ZpZXcsIGNvbnN0IGNoYXIqIHRpdGxlKQogICAgIGV2YXNfb2JqZWN0X3NtYXJ0X2NhbGxi YWNrX2NhbGwoZXdrVmlldywgInRpdGxlLGNoYW5nZWQiLCBjb25zdF9jYXN0PGNoYXIqPih0aXRs ZSkpOwogfQogCitkb3VibGUgZXdrX3ZpZXdfbG9hZF9wcm9ncmVzc19nZXQoY29uc3QgRXZhc19P YmplY3QqIGV3a1ZpZXcpCit7CisgICAgRVdLX1ZJRVdfU0RfR0VUX09SX1JFVFVSTihld2tWaWV3 LCBzbWFydERhdGEsIDApOworICAgIEVXS19WSUVXX1BSSVZfR0VUX09SX1JFVFVSTihzbWFydERh dGEsIHByaXYsIDApOworCisgICAgcmV0dXJuIFdLUGFnZUdldEVzdGltYXRlZFByb2dyZXNzKHRv QVBJKHByaXYtPnBhZ2VDbGllbnQtPnBhZ2UoKSkpOworfQorCisvKioKKyAqIEBpbnRlcm5hbAor ICogUmVwb3J0cyBsb2FkIHByb2dyZXNzIGNoYW5nZWQuCisgKgorICogRW1pdHMgc2lnbmFsOiAi bG9hZCxwcm9ncmVzcyIgd2l0aCBwb2ludGVyIHRvIGEgZG91YmxlIGZyb20gMC4wIHRvIDEuMC4K KyAqLwordm9pZCBld2tfdmlld19sb2FkX3Byb2dyZXNzX2NoYW5nZWQoRXZhc19PYmplY3QqIGV3 a1ZpZXcsIGRvdWJsZSBwcm9ncmVzcykKK3sKKyAgICBldmFzX29iamVjdF9zbWFydF9jYWxsYmFj a19jYWxsKGV3a1ZpZXcsICJsb2FkLHByb2dyZXNzIiwgJnByb2dyZXNzKTsKK30KKwogLyoqCiAg KiBAaW50ZXJuYWwKICAqIFRoZSB2aWV3IHJlY2VpdmVkIGEgbmV3IGludGVudCByZXF1ZXN0Lgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuaCBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmgKaW5kZXggMWM2M2Q5 ZS4uMGI4ZGYzZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwv ZXdrX3ZpZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmll dy5oCkBAIC0yOCw2ICsyOCw3IEBACiAgKgogICogLSAiaW50ZW50LHJlcXVlc3QsbmV3IiwgRXdr X0ludGVudF9SZXF1ZXN0KjogcmVwb3J0cyBuZXcgV2ViIGludGVudCByZXF1ZXN0LgogICogLSAi aW50ZW50LHNlcnZpY2UscmVnaXN0ZXIiLCBFd2tfSW50ZW50X1NlcnZpY2UqOiByZXBvcnRzIG5l dyBXZWIgaW50ZW50IHNlcnZpY2UgcmVnaXN0cmF0aW9uLgorICogLSAibG9hZCxwcm9ncmVzcyIs IGRvdWJsZSo6IGxvYWQgcHJvZ3Jlc3MgaGFzIGNoYW5nZWQgKHZhbHVlIGZyb20gMC4wIHRvIDEu MCkuCiAgKiAtICJ0aXRsZSxjaGFuZ2VkIiwgY29uc3QgY2hhcio6IHRpdGxlIG9mIHRoZSBtYWlu IGZyYW1lIHdhcyBjaGFuZ2VkLgogICovCiAKQEAgLTI1Myw2ICsyNTQsMTcgQEAgRUFQSSBFaW5h X0Jvb2wgICAgZXdrX3ZpZXdfZm9yd2FyZF9wb3NzaWJsZShFdmFzX09iamVjdCAqbyk7CiAgKi8K IEVBUEkgY29uc3QgY2hhciAqZXdrX3ZpZXdfdGl0bGVfZ2V0KGNvbnN0IEV2YXNfT2JqZWN0ICpv KTsKIAorLyoqCisgKiBHZXRzIHRoZSBjdXJyZW50IGxvYWQgcHJvZ3Jlc3Mgb2YgcGFnZS4KKyAq CisgKiBUaGUgcHJvZ3Jlc3MgZXN0aW1hdGlvbiBmcm9tIDAuMCB0byAxLjAuCisgKgorICogQHBh cmFtIG8gdmlldyBvYmplY3QgdG8gZ2V0IHRoZSBjdXJyZW50IHByb2dyZXNzCisgKgorICogQHJl dHVybiB0aGUgbG9hZCBwcm9ncmVzIG9mIHBhZ2UsIHZhbHVlIGZyb20gMC4wIHRvIDEuMC4KKyAq LworRUFQSSBkb3VibGUgZXdrX3ZpZXdfbG9hZF9wcm9ncmVzc19nZXQoY29uc3QgRXZhc19PYmpl Y3QgKm8pOworCiAjaWZkZWYgX19jcGx1c3BsdXMKIH0KICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXdfbG9hZGVyX2NsaWVudC5jcHAg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlld19sb2FkZXJfY2xpZW50 LmNwcAppbmRleCBjOGE1ZjZiLi5mM2YwZmQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlld19sb2FkZXJfY2xpZW50LmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlld19sb2FkZXJfY2xpZW50LmNwcApAQCAt NjUsNiArNjUsMTIgQEAgc3RhdGljIHZvaWQgcmVnaXN0ZXJJbnRlbnRTZXJ2aWNlRm9yRnJhbWUo V0tQYWdlUmVmIHBhZ2UsIFdLRnJhbWVSZWYgZnJhbWUsIFdLSW4KIH0KICNlbmRpZgogCitzdGF0 aWMgdm9pZCBkaWRDaGFuZ2VQcm9ncmVzcyhXS1BhZ2VSZWYgcGFnZSwgY29uc3Qgdm9pZCogY2xp ZW50SW5mbykKK3sKKyAgICBFdmFzX09iamVjdCogZXdrVmlldyA9IHN0YXRpY19jYXN0PEV2YXNf T2JqZWN0Kj4oY29uc3RfY2FzdDx2b2lkKj4oY2xpZW50SW5mbykpOworICAgIGV3a192aWV3X2xv YWRfcHJvZ3Jlc3NfY2hhbmdlZChld2tWaWV3LCBXS1BhZ2VHZXRFc3RpbWF0ZWRQcm9ncmVzcyhw YWdlKSk7Cit9CisKIHZvaWQgZXdrX3ZpZXdfbG9hZGVyX2NsaWVudF9hdHRhY2goV0tQYWdlUmVm IHBhZ2VSZWYsIEV2YXNfT2JqZWN0KiBld2tWaWV3KQogewogICAgIFdLUGFnZUxvYWRlckNsaWVu dCBsb2FkQ2xpZW50OwpAQCAtNzgsNSArODQsOCBAQCB2b2lkIGV3a192aWV3X2xvYWRlcl9jbGll bnRfYXR0YWNoKFdLUGFnZVJlZiBwYWdlUmVmLCBFdmFzX09iamVjdCogZXdrVmlldykKICNpZiBF TkFCTEUoV0VCX0lOVEVOVFNfVEFHKQogICAgIGxvYWRDbGllbnQucmVnaXN0ZXJJbnRlbnRTZXJ2 aWNlRm9yRnJhbWUgPSByZWdpc3RlckludGVudFNlcnZpY2VGb3JGcmFtZTsKICNlbmRpZgorICAg IGxvYWRDbGllbnQuZGlkU3RhcnRQcm9ncmVzcyA9IGRpZENoYW5nZVByb2dyZXNzOworICAgIGxv YWRDbGllbnQuZGlkQ2hhbmdlUHJvZ3Jlc3MgPSBkaWRDaGFuZ2VQcm9ncmVzczsKKyAgICBsb2Fk Q2xpZW50LmRpZEZpbmlzaFByb2dyZXNzID0gZGlkQ2hhbmdlUHJvZ3Jlc3M7CiAgICAgV0tQYWdl U2V0UGFnZUxvYWRlckNsaWVudChwYWdlUmVmLCAmbG9hZENsaWVudCk7CiB9CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlld19wcml2YXRlLmggYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlld19wcml2YXRlLmgKaW5kZXgg OGYwMjE3MS4uMjA2M2JhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9lZmwvZXdrX3ZpZXdfcHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvZWZsL2V3a192aWV3X3ByaXZhdGUuaApAQCAtMzksNiArMzksNyBAQCB0eXBlZGVmIHN0cnVj dCBfRXdrX0ludGVudF9TZXJ2aWNlIEV3a19JbnRlbnRfU2VydmljZTsKIAogdm9pZCBld2tfdmll d19kaXNwbGF5KEV2YXNfT2JqZWN0KiBld2tWaWV3LCBjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiBy ZWN0KTsKIHZvaWQgZXdrX3ZpZXdfaW1hZ2VfZGF0YV9zZXQoRXZhc19PYmplY3QqIGV3a1ZpZXcs IHZvaWQqIGltYWdlRGF0YSwgY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYgc2l6ZSk7Cit2b2lkIGV3 a192aWV3X2xvYWRfcHJvZ3Jlc3NfY2hhbmdlZChFdmFzX09iamVjdCogZXdrVmlldywgZG91Ymxl IHByb2dyZXNzKTsKIHZvaWQgZXdrX3ZpZXdfdGl0bGVfY2hhbmdlZChFdmFzX09iamVjdCogZXdr VmlldywgY29uc3QgY2hhciogdGl0bGUpOwogCiBFdmFzX09iamVjdCogZXdrX3ZpZXdfYmFzZV9h ZGQoRXZhcyogY2FudmFzLCBXS0NvbnRleHRSZWYsIFdLUGFnZUdyb3VwUmVmKTsKZGlmZiAtLWdp dCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAxY2U5NWRiLi43OWU4 Zjk2IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjAgQEAKKzIwMTItMDctMDMgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhl LmR1bWV6QGludGVsLmNvbT4KKworICAgICAgICBbV0syXVtFRkxdIEV3a19WaWV3IHNob3VsZCBy ZXBvcnQgdGhlIGxvYWQgcHJvZ3Jlc3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTkwNDU3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgVXBkYXRlIEVGTCBNaW5pQnJvd3NlciBzbyB0aGF0IGl0IGxpc3RlbnMg Zm9yIHRoZQorICAgICAgICAibG9hZCxwcm9ncmVzcyIgb24gdGhlIEV3a19WaWV3IGFuZCB1cGRh dGVzIGl0cworICAgICAgICB3aW5kb3cgdGl0bGUgYWNjb3JkaW5nbHkuCisKKyAgICAgICAgKiBN aW5pQnJvd3Nlci9lZmwvbWFpbi5jOgorICAgICAgICAodGl0bGVfc2V0KToKKyAgICAgICAgKG9u X3RpdGxlX2NoYW5nZWQpOgorICAgICAgICAob25fcHJvZ3Jlc3MpOgorICAgICAgICAoYnJvd3Nl ckNyZWF0ZSk6CisKIDIwMTItMDctMDMgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5v cmc+CiAKICAgICAgICAgZGlzYWJsZSBmYWlsaW5nIG1vY2stY2hyb21pdW0tbWFjIHB5dGhvbiB1 bml0IHRlc3RzCmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci9lZmwvbWFpbi5jIGIvVG9v bHMvTWluaUJyb3dzZXIvZWZsL21haW4uYwppbmRleCA3M2MyNTNiLi4yMTQ0OGQyIDEwMDY0NAot LS0gYS9Ub29scy9NaW5pQnJvd3Nlci9lZmwvbWFpbi5jCisrKyBiL1Rvb2xzL01pbmlCcm93c2Vy L2VmbC9tYWluLmMKQEAgLTI2LDYgKzI2LDcgQEAKIHN0YXRpYyBjb25zdCBpbnQgREVGQVVMVF9X SURUSCA9IDgwMDsKIHN0YXRpYyBjb25zdCBpbnQgREVGQVVMVF9IRUlHSFQgPSA2MDA7CiBzdGF0 aWMgY29uc3QgY2hhciBERUZBVUxUX1VSTFtdID0gImh0dHA6Ly93d3cuZ29vZ2xlLmNvbS8iOwor c3RhdGljIGNvbnN0IGNoYXIgQVBQX05BTUVbXSA9ICJFRkwgTWluaUJyb3dzZXIiOwogCiAjZGVm aW5lIGluZm8oZm9ybWF0LCBhcmdzLi4uKSAgICAgICBcCiAgICAgZG8geyAgICAgICAgICAgICAg ICAgICAgICAgICAgICBcCkBAIC04NywxMiArODgsNDEgQEAgb25fa2V5X2Rvd24odm9pZCAqZGF0 YSwgRXZhcyAqZSwgRXZhc19PYmplY3QgKm9iaiwgdm9pZCAqZXZlbnRfaW5mbykKIH0KIAogc3Rh dGljIHZvaWQKK3RpdGxlX3NldChFY29yZV9FdmFzICplZSwgY29uc3QgY2hhciAqdGl0bGUsIGlu dCBwcm9ncmVzcykKK3sKKyAgICBFaW5hX1N0cmJ1ZiogYnVmZmVyOworCisgICAgaWYgKCF0aXRs ZSB8fCAhKnRpdGxlKSB7CisgICAgICAgIGVjb3JlX2V2YXNfdGl0bGVfc2V0KGVlLCBBUFBfTkFN RSk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBidWZmZXIgPSBlaW5hX3N0cmJ1Zl9u ZXcoKTsKKyAgICBpZiAocHJvZ3Jlc3MgPCAxMDApCisgICAgICAgIGVpbmFfc3RyYnVmX2FwcGVu ZF9wcmludGYoYnVmZmVyLCAiJXMgKCVkJSUpIC0gJXMiLCB0aXRsZSwgcHJvZ3Jlc3MsIEFQUF9O QU1FKTsKKyAgICBlbHNlCisgICAgICAgIGVpbmFfc3RyYnVmX2FwcGVuZF9wcmludGYoYnVmZmVy LCAiJXMgLSAlcyIsIHRpdGxlLCBBUFBfTkFNRSk7CisKKyAgICBlY29yZV9ldmFzX3RpdGxlX3Nl dChlZSwgZWluYV9zdHJidWZfc3RyaW5nX2dldChidWZmZXIpKTsKKyAgICBlaW5hX3N0cmJ1Zl9m cmVlKGJ1ZmZlcik7Cit9CisKK3N0YXRpYyB2b2lkCiBvbl90aXRsZV9jaGFuZ2VkKHZvaWQgKnVz ZXJfZGF0YSwgRXZhc19PYmplY3QgKndlYnZpZXcsIHZvaWQgKmV2ZW50X2luZm8pCiB7CiAgICAg TWluaUJyb3dzZXIgKmFwcCA9IChNaW5pQnJvd3NlciAqKXVzZXJfZGF0YTsKICAgICBjb25zdCBj aGFyICp0aXRsZSA9IChjb25zdCBjaGFyICopZXZlbnRfaW5mbzsKIAotICAgIGVjb3JlX2V2YXNf dGl0bGVfc2V0KGFwcC0+ZWUsIHRpdGxlKTsKKyAgICB0aXRsZV9zZXQoYXBwLT5lZSwgdGl0bGUs IDEwMCk7Cit9CisKK3N0YXRpYyB2b2lkCitvbl9wcm9ncmVzcyh2b2lkICp1c2VyX2RhdGEsIEV2 YXNfT2JqZWN0ICp3ZWJ2aWV3LCB2b2lkICpldmVudF9pbmZvKQoreworICAgIE1pbmlCcm93c2Vy ICphcHAgPSAoTWluaUJyb3dzZXIgKil1c2VyX2RhdGE7CisgICAgZG91YmxlIHByb2dyZXNzID0g Kihkb3VibGUgKilldmVudF9pbmZvOworCisgICAgdGl0bGVfc2V0KGFwcC0+ZWUsIGV3a192aWV3 X3RpdGxlX2dldChhcHAtPmJyb3dzZXIpLCBwcm9ncmVzcyAqIDEwMCk7CiB9CiAKIHN0YXRpYyBN aW5pQnJvd3NlciAqYnJvd3NlckNyZWF0ZShjb25zdCBjaGFyICp1cmwpCkBAIC0xMDEsNyArMTMx LDcgQEAgc3RhdGljIE1pbmlCcm93c2VyICpicm93c2VyQ3JlYXRlKGNvbnN0IGNoYXIgKnVybCkK IAogICAgIGFwcC0+ZWUgPSBlY29yZV9ldmFzX25ldygwLCAwLCAwLCBERUZBVUxUX1dJRFRILCBE RUZBVUxUX0hFSUdIVCwgMCk7CiAKLSAgICBlY29yZV9ldmFzX3RpdGxlX3NldChhcHAtPmVlLCAi RUZMIE1pbmlCcm93c2VyIik7CisgICAgZWNvcmVfZXZhc190aXRsZV9zZXQoYXBwLT5lZSwgQVBQ X05BTUUpOwogICAgIGVjb3JlX2V2YXNfY2FsbGJhY2tfcmVzaXplX3NldChhcHAtPmVlLCBvbl9l Y29yZV9ldmFzX3Jlc2l6ZSk7CiAgICAgZWNvcmVfZXZhc19ib3JkZXJsZXNzX3NldChhcHAtPmVl LCAwKTsKICAgICBlY29yZV9ldmFzX3Nob3coYXBwLT5lZSk7CkBAIC0xMjEsNiArMTUxLDcgQEAg c3RhdGljIE1pbmlCcm93c2VyICpicm93c2VyQ3JlYXRlKGNvbnN0IGNoYXIgKnVybCkKICAgICBh cHAtPmJyb3dzZXIgPSBld2tfdmlld19hZGQoYXBwLT5ldmFzKTsKICAgICBldmFzX29iamVjdF9u YW1lX3NldChhcHAtPmJyb3dzZXIsICJicm93c2VyIik7CiAKKyAgICBldmFzX29iamVjdF9zbWFy dF9jYWxsYmFja19hZGQoYXBwLT5icm93c2VyLCAibG9hZCxwcm9ncmVzcyIsIG9uX3Byb2dyZXNz LCBhcHApOwogICAgIGV2YXNfb2JqZWN0X3NtYXJ0X2NhbGxiYWNrX2FkZChhcHAtPmJyb3dzZXIs ICJ0aXRsZSxjaGFuZ2VkIiwgb25fdGl0bGVfY2hhbmdlZCwgYXBwKTsKIAogICAgIGV2YXNfb2Jq ZWN0X2V2ZW50X2NhbGxiYWNrX2FkZChhcHAtPmJyb3dzZXIsIEVWQVNfQ0FMTEJBQ0tfS0VZX0RP V04sIG9uX2tleV9kb3duLCBhcHApOwo=