177697 2017-09-29 18:24:45 -0700 Expose more WKPreferences SPI to match C SPI 2017-10-02 10:36:29 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen darin mitz webkit-bug-importer oldest_to_newest 1354813 0 achristensen 2017-09-29 18:24:45 -0700 Expose more WKPreferences SPI to match C SPI 1354814 1 322261 achristensen 2017-09-29 18:25:20 -0700 Created attachment 322261 Patch 1355256 2 achristensen 2017-10-02 09:50:24 -0700 http://trac.webkit.org/r222711 1355258 3 webkit-bug-importer 2017-10-02 09:51:30 -0700 <rdar://problem/34768813> 1355262 4 322261 mitz 2017-10-02 09:59:09 -0700 Comment on attachment 322261 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=322261&action=review > Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm:669 > +- (BOOL)_javaEnabledForLocalFiles > +{ > + return _preferences->pluginsEnabled(); > +} Is this correct? I’d expect the underlying function to be something about Java for local files. 1355264 5 achristensen 2017-10-02 10:02:41 -0700 Not only are you correct, but also my SPI version of _plugInsEnabled is not needed because we have public API for that. Will fix. 1355274 6 achristensen 2017-10-02 10:13:34 -0700 http://trac.webkit.org/r222715 1355295 7 achristensen 2017-10-02 10:36:29 -0700 https://trac.webkit.org/changeset/222718/webkit 322261 2017-09-29 18:25:20 -0700 2017-09-30 16:50:48 -0700 Patch bug-177697-20170929182520.patch text/plain 14852 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMjI2NzUpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDcwIEBACisyMDE3LTA5LTI5ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgRXhwb3NlIG1vcmUg V0tQcmVmZXJlbmNlcyBTUEkgdG8gbWF0Y2ggQyBTUEkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3NzY5NworICAgICAgICA8cmRhcjovL3Byb2JsZW0v MjQxMTA1NTY+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLUHJlZmVyZW5jZXMubW06CisgICAgICAgICgtW1dL UHJlZmVyZW5jZXMgX3NldEphdmFFbmFibGVkRm9yTG9jYWxGaWxlczpdKToKKyAgICAgICAgKC1b V0tQcmVmZXJlbmNlcyBfamF2YUVuYWJsZWRGb3JMb2NhbEZpbGVzXSk6CisgICAgICAgICgtW1dL UHJlZmVyZW5jZXMgX3NldENhbnZhc1VzZXNBY2NlbGVyYXRlZERyYXdpbmc6XSk6CisgICAgICAg ICgtW1dLUHJlZmVyZW5jZXMgX2NhbnZhc1VzZXNBY2NlbGVyYXRlZERyYXdpbmddKToKKyAgICAg ICAgKC1bV0tQcmVmZXJlbmNlcyBfc2V0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ0VuYWJsZWQ6XSk6 CisgICAgICAgICgtW1dLUHJlZmVyZW5jZXMgX2FjY2VsZXJhdGVkQ29tcG9zaXRpbmdFbmFibGVk XSk6CisgICAgICAgICgtW1dLUHJlZmVyZW5jZXMgX3NldERlZmF1bHRUZXh0RW5jb2RpbmdOYW1l Ol0pOgorICAgICAgICAoLVtXS1ByZWZlcmVuY2VzIF9kZWZhdWx0VGV4dEVuY29kaW5nTmFtZV0p OgorICAgICAgICAoLVtXS1ByZWZlcmVuY2VzIF9zZXROZWVkc1NpdGVTcGVjaWZpY1F1aXJrczpd KToKKyAgICAgICAgKC1bV0tQcmVmZXJlbmNlcyBfbmVlZHNTaXRlU3BlY2lmaWNRdWlya3NdKToK KyAgICAgICAgKC1bV0tQcmVmZXJlbmNlcyBfc2V0QXV0aG9yQW5kVXNlclN0eWxlc0VuYWJsZWQ6 XSk6CisgICAgICAgICgtW1dLUHJlZmVyZW5jZXMgX2F1dGhvckFuZFVzZXJTdHlsZXNFbmFibGVk XSk6CisgICAgICAgICgtW1dLUHJlZmVyZW5jZXMgX3NldERPTVRpbWVyc1Rocm90dGxpbmdFbmFi bGVkOl0pOgorICAgICAgICAoLVtXS1ByZWZlcmVuY2VzIF9kb21UaW1lcnNUaHJvdHRsaW5nRW5h YmxlZF0pOgorICAgICAgICAoLVtXS1ByZWZlcmVuY2VzIF9zZXRXZWJBcmNoaXZlRGVidWdNb2Rl RW5hYmxlZDpdKToKKyAgICAgICAgKC1bV0tQcmVmZXJlbmNlcyBfd2ViQXJjaGl2ZURlYnVnTW9k ZUVuYWJsZWRdKToKKyAgICAgICAgKC1bV0tQcmVmZXJlbmNlcyBfc2V0TG9jYWxGaWxlQ29udGVu dFNuaWZmaW5nRW5hYmxlZDpdKToKKyAgICAgICAgKC1bV0tQcmVmZXJlbmNlcyBfbG9jYWxGaWxl Q29udGVudFNuaWZmaW5nRW5hYmxlZF0pOgorICAgICAgICAoLVtXS1ByZWZlcmVuY2VzIF9zZXRV c2VzUGFnZUNhY2hlOl0pOgorICAgICAgICAoLVtXS1ByZWZlcmVuY2VzIF91c2VzUGFnZUNhY2hl XSk6CisgICAgICAgICgtW1dLUHJlZmVyZW5jZXMgX3NldFBhZ2VDYWNoZVN1cHBvcnRzUGx1Z2lu czpdKToKKyAgICAgICAgKC1bV0tQcmVmZXJlbmNlcyBfcGFnZUNhY2hlU3VwcG9ydHNQbHVnaW5z XSk6CisgICAgICAgICgtW1dLUHJlZmVyZW5jZXMgX3NldFNob3VsZFByaW50QmFja2dyb3VuZHM6 XSk6CisgICAgICAgICgtW1dLUHJlZmVyZW5jZXMgX3Nob3VsZFByaW50QmFja2dyb3VuZHNdKToK KyAgICAgICAgKC1bV0tQcmVmZXJlbmNlcyBfc2V0V2ViU2VjdXJpdHlFbmFibGVkOl0pOgorICAg ICAgICAoLVtXS1ByZWZlcmVuY2VzIF93ZWJTZWN1cml0eUVuYWJsZWRdKToKKyAgICAgICAgKC1b V0tQcmVmZXJlbmNlcyBfc2V0VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVUkxzQWxsb3dlZDpdKToK KyAgICAgICAgKC1bV0tQcmVmZXJlbmNlcyBfdW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVUkxzQWxs b3dlZF0pOgorICAgICAgICAoLVtXS1ByZWZlcmVuY2VzIF9zZXRBVkZvdW5kYXRpb25FbmFibGVk Ol0pOgorICAgICAgICAoLVtXS1ByZWZlcmVuY2VzIF9hdkZvdW5kYXRpb25FbmFibGVkXSk6Cisg ICAgICAgICgtW1dLUHJlZmVyZW5jZXMgX3NldFN1cHByZXNzZXNJbmNyZW1lbnRhbFJlbmRlcmlu ZzpdKToKKyAgICAgICAgKC1bV0tQcmVmZXJlbmNlcyBfc3VwcHJlc3Nlc0luY3JlbWVudGFsUmVu ZGVyaW5nXSk6CisgICAgICAgICgtW1dLUHJlZmVyZW5jZXMgX3NldEFzeW5jaHJvbm91c1BsdWdp bkluaXRpYWxpemF0aW9uRW5hYmxlZDpdKToKKyAgICAgICAgKC1bV0tQcmVmZXJlbmNlcyBfYXN5 bmNocm9ub3VzUGx1Z2luSW5pdGlhbGl6YXRpb25FbmFibGVkXSk6CisgICAgICAgICgtW1dLUHJl ZmVyZW5jZXMgX3NldEFydGlmaWNpYWxQbHVnaW5Jbml0aWFsaXphdGlvbkRlbGF5RW5hYmxlZDpd KToKKyAgICAgICAgKC1bV0tQcmVmZXJlbmNlcyBfYXJ0aWZpY2lhbFBsdWdpbkluaXRpYWxpemF0 aW9uRGVsYXlFbmFibGVkXSk6CisgICAgICAgICgtW1dLUHJlZmVyZW5jZXMgX3NldENvb2tpZUVu YWJsZWQ6XSk6CisgICAgICAgICgtW1dLUHJlZmVyZW5jZXMgX2Nvb2tpZUVuYWJsZWRdKToKKyAg ICAgICAgKC1bV0tQcmVmZXJlbmNlcyBfc2V0UGx1Z0luU25hcHNob3R0aW5nRW5hYmxlZDpdKToK KyAgICAgICAgKC1bV0tQcmVmZXJlbmNlcyBfcGx1Z0luU25hcHNob3R0aW5nRW5hYmxlZF0pOgor ICAgICAgICAoLVtXS1ByZWZlcmVuY2VzIF9zZXRRVEtpdEVuYWJsZWQ6XSk6CisgICAgICAgICgt W1dLUHJlZmVyZW5jZXMgX3F0S2l0RW5hYmxlZF0pOgorICAgICAgICAoLVtXS1ByZWZlcmVuY2Vz IF9zZXRTdWJwaXhlbENTU09NRWxlbWVudE1ldHJpY3NFbmFibGVkOl0pOgorICAgICAgICAoLVtX S1ByZWZlcmVuY2VzIF9zdWJwaXhlbENTU09NRWxlbWVudE1ldHJpY3NFbmFibGVkXSk6CisgICAg ICAgICgtW1dLUHJlZmVyZW5jZXMgX3NldE1lZGlhU291cmNlRW5hYmxlZDpdKToKKyAgICAgICAg KC1bV0tQcmVmZXJlbmNlcyBfbWVkaWFTb3VyY2VFbmFibGVkXSk6CisgICAgICAgICgtW1dLUHJl ZmVyZW5jZXMgX3NldFZpZXdHZXN0dXJlRGVidWdnaW5nRW5hYmxlZDpdKToKKyAgICAgICAgKC1b V0tQcmVmZXJlbmNlcyBfdmlld0dlc3R1cmVEZWJ1Z2dpbmdFbmFibGVkXSk6CisgICAgICAgICgt W1dLUHJlZmVyZW5jZXMgX3NldENTU0FuaW1hdGlvblRyaWdnZXJzRW5hYmxlZDpdKToKKyAgICAg ICAgKC1bV0tQcmVmZXJlbmNlcyBfY3NzQW5pbWF0aW9uVHJpZ2dlcnNFbmFibGVkXSk6CisgICAg ICAgICgtW1dLUHJlZmVyZW5jZXMgX3NldFN0YW5kYXJkRm9udEZhbWlseTpdKToKKyAgICAgICAg KC1bV0tQcmVmZXJlbmNlcyBfc3RhbmRhcmRGb250RmFtaWx5XSk6CisgICAgICAgICgtW1dLUHJl ZmVyZW5jZXMgX3NldE5vdGlmaWNhdGlvbnNFbmFibGVkOl0pOgorICAgICAgICAoLVtXS1ByZWZl cmVuY2VzIF9ub3RpZmljYXRpb25zRW5hYmxlZF0pOgorICAgICAgICAoLVtXS1ByZWZlcmVuY2Vz IF9zZXRCYWNrc3BhY2VLZXlOYXZpZ2F0aW9uRW5hYmxlZDpdKToKKyAgICAgICAgKC1bV0tQcmVm ZXJlbmNlcyBfYmFja3NwYWNlS2V5TmF2aWdhdGlvbkVuYWJsZWRdKToKKyAgICAgICAgKiBVSVBy b2Nlc3MvQVBJL0NvY29hL1dLUHJlZmVyZW5jZXNQcml2YXRlLmg6CisKIDIwMTctMDktMjkgIEFs ZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBSRUdS RVNTSU9OOiBBU1NFUlRJT04gRkFJTEVEOiBtX3Byb3Zpc2lvbmFsVVJMLmlzRW1wdHkoKSBpbiBX ZWJLaXQ6OkZyYW1lTG9hZFN0YXRlOjpkaWRTdGFydFByb3Zpc2lvbmFsTG9hZApJbmRleDogU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLUHJlZmVyZW5jZXMubW0KPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLUHJlZmVyZW5jZXMubW0J KHJldmlzaW9uIDIyMjY3MikKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9X S1ByZWZlcmVuY2VzLm1tCSh3b3JraW5nIGNvcHkpCkBAIC02NTgsNiArNjU4LDI4NiBAQCAtIChC T09MKV9wbHVnSW5zRW5hYmxlZAogICAgIHJldHVybiBfcHJlZmVyZW5jZXMtPnBsdWdpbnNFbmFi bGVkKCk7CiB9CiAKKy0gKHZvaWQpX3NldEphdmFFbmFibGVkRm9yTG9jYWxGaWxlczooQk9PTCll bmFibGVkCit7CisgICAgX3ByZWZlcmVuY2VzLT5zZXRKYXZhRW5hYmxlZEZvckxvY2FsRmlsZXMo ZW5hYmxlZCk7Cit9CisKKy0gKEJPT0wpX2phdmFFbmFibGVkRm9yTG9jYWxGaWxlcworeworICAg IHJldHVybiBfcHJlZmVyZW5jZXMtPnBsdWdpbnNFbmFibGVkKCk7Cit9CisKKy0gKHZvaWQpX3Nl dENhbnZhc1VzZXNBY2NlbGVyYXRlZERyYXdpbmc6KEJPT0wpZW5hYmxlZAoreworICAgIF9wcmVm ZXJlbmNlcy0+c2V0Q2FudmFzVXNlc0FjY2VsZXJhdGVkRHJhd2luZyhlbmFibGVkKTsKK30KKwor LSAoQk9PTClfY2FudmFzVXNlc0FjY2VsZXJhdGVkRHJhd2luZworeworICAgIHJldHVybiBfcHJl ZmVyZW5jZXMtPmNhbnZhc1VzZXNBY2NlbGVyYXRlZERyYXdpbmcoKTsKK30KKworLSAodm9pZClf c2V0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ0VuYWJsZWQ6KEJPT0wpZW5hYmxlZAoreworICAgIF9w cmVmZXJlbmNlcy0+c2V0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ0VuYWJsZWQoZW5hYmxlZCk7Cit9 CisKKy0gKEJPT0wpX2FjY2VsZXJhdGVkQ29tcG9zaXRpbmdFbmFibGVkCit7CisgICAgcmV0dXJu IF9wcmVmZXJlbmNlcy0+YWNjZWxlcmF0ZWRDb21wb3NpdGluZ0VuYWJsZWQoKTsKK30KKworLSAo dm9pZClfc2V0RGVmYXVsdFRleHRFbmNvZGluZ05hbWU6KE5TU3RyaW5nICopbmFtZQoreworICAg IF9wcmVmZXJlbmNlcy0+c2V0RGVmYXVsdFRleHRFbmNvZGluZ05hbWUobmFtZSk7Cit9CisKKy0g KE5TU3RyaW5nICopX2RlZmF1bHRUZXh0RW5jb2RpbmdOYW1lCit7CisgICAgcmV0dXJuIF9wcmVm ZXJlbmNlcy0+ZGVmYXVsdFRleHRFbmNvZGluZ05hbWUoKTsKK30KKworLSAodm9pZClfc2V0TmVl ZHNTaXRlU3BlY2lmaWNRdWlya3M6KEJPT0wpZW5hYmxlZAoreworICAgIF9wcmVmZXJlbmNlcy0+ c2V0TmVlZHNTaXRlU3BlY2lmaWNRdWlya3MoZW5hYmxlZCk7Cit9CisKKy0gKEJPT0wpX25lZWRz U2l0ZVNwZWNpZmljUXVpcmtzCit7CisgICAgcmV0dXJuIF9wcmVmZXJlbmNlcy0+bmVlZHNTaXRl U3BlY2lmaWNRdWlya3MoKTsKK30KKworLSAodm9pZClfc2V0QXV0aG9yQW5kVXNlclN0eWxlc0Vu YWJsZWQ6KEJPT0wpZW5hYmxlZAoreworICAgIF9wcmVmZXJlbmNlcy0+c2V0QXV0aG9yQW5kVXNl clN0eWxlc0VuYWJsZWQoZW5hYmxlZCk7Cit9CisKKy0gKEJPT0wpX2F1dGhvckFuZFVzZXJTdHls ZXNFbmFibGVkCit7CisgICAgcmV0dXJuIF9wcmVmZXJlbmNlcy0+YXV0aG9yQW5kVXNlclN0eWxl c0VuYWJsZWQoKTsKK30KKworLSAodm9pZClfc2V0RE9NVGltZXJzVGhyb3R0bGluZ0VuYWJsZWQ6 KEJPT0wpZW5hYmxlZAoreworICAgIF9wcmVmZXJlbmNlcy0+c2V0RE9NVGltZXJzVGhyb3R0bGlu Z0VuYWJsZWQoZW5hYmxlZCk7Cit9CisKKy0gKEJPT0wpX2RvbVRpbWVyc1Rocm90dGxpbmdFbmFi bGVkCit7CisgICAgcmV0dXJuIF9wcmVmZXJlbmNlcy0+ZG9tVGltZXJzVGhyb3R0bGluZ0VuYWJs ZWQoKTsKK30KKworLSAodm9pZClfc2V0V2ViQXJjaGl2ZURlYnVnTW9kZUVuYWJsZWQ6KEJPT0wp ZW5hYmxlZAoreworICAgIF9wcmVmZXJlbmNlcy0+c2V0V2ViQXJjaGl2ZURlYnVnTW9kZUVuYWJs ZWQoZW5hYmxlZCk7Cit9CisKKy0gKEJPT0wpX3dlYkFyY2hpdmVEZWJ1Z01vZGVFbmFibGVkCit7 CisgICAgcmV0dXJuIF9wcmVmZXJlbmNlcy0+d2ViQXJjaGl2ZURlYnVnTW9kZUVuYWJsZWQoKTsK K30KKworLSAodm9pZClfc2V0TG9jYWxGaWxlQ29udGVudFNuaWZmaW5nRW5hYmxlZDooQk9PTCll bmFibGVkCit7CisgICAgX3ByZWZlcmVuY2VzLT5zZXRMb2NhbEZpbGVDb250ZW50U25pZmZpbmdF bmFibGVkKGVuYWJsZWQpOworfQorCistIChCT09MKV9sb2NhbEZpbGVDb250ZW50U25pZmZpbmdF bmFibGVkCit7CisgICAgcmV0dXJuIF9wcmVmZXJlbmNlcy0+bG9jYWxGaWxlQ29udGVudFNuaWZm aW5nRW5hYmxlZCgpOworfQorCistICh2b2lkKV9zZXRVc2VzUGFnZUNhY2hlOihCT09MKWVuYWJs ZWQKK3sKKyAgICBfcHJlZmVyZW5jZXMtPnNldFVzZXNQYWdlQ2FjaGUoZW5hYmxlZCk7Cit9CisK Ky0gKEJPT0wpX3VzZXNQYWdlQ2FjaGUKK3sKKyAgICByZXR1cm4gX3ByZWZlcmVuY2VzLT51c2Vz UGFnZUNhY2hlKCk7Cit9CisKKy0gKHZvaWQpX3NldFBhZ2VDYWNoZVN1cHBvcnRzUGx1Z2luczoo Qk9PTCllbmFibGVkCit7CisgICAgX3ByZWZlcmVuY2VzLT5zZXRQYWdlQ2FjaGVTdXBwb3J0c1Bs dWdpbnMoZW5hYmxlZCk7Cit9CisKKy0gKEJPT0wpX3BhZ2VDYWNoZVN1cHBvcnRzUGx1Z2lucwor eworICAgIHJldHVybiBfcHJlZmVyZW5jZXMtPnBhZ2VDYWNoZVN1cHBvcnRzUGx1Z2lucygpOwor fQorCistICh2b2lkKV9zZXRTaG91bGRQcmludEJhY2tncm91bmRzOihCT09MKWVuYWJsZWQKK3sK KyAgICBfcHJlZmVyZW5jZXMtPnNldFNob3VsZFByaW50QmFja2dyb3VuZHMoZW5hYmxlZCk7Cit9 CisKKy0gKEJPT0wpX3Nob3VsZFByaW50QmFja2dyb3VuZHMKK3sKKyAgICByZXR1cm4gX3ByZWZl cmVuY2VzLT5zaG91bGRQcmludEJhY2tncm91bmRzKCk7Cit9CisKKy0gKHZvaWQpX3NldFdlYlNl Y3VyaXR5RW5hYmxlZDooQk9PTCllbmFibGVkCit7CisgICAgX3ByZWZlcmVuY2VzLT5zZXRXZWJT ZWN1cml0eUVuYWJsZWQoZW5hYmxlZCk7Cit9CisKKy0gKEJPT0wpX3dlYlNlY3VyaXR5RW5hYmxl ZAoreworICAgIHJldHVybiBfcHJlZmVyZW5jZXMtPndlYlNlY3VyaXR5RW5hYmxlZCgpOworfQor CistICh2b2lkKV9zZXRVbml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVSTHNBbGxvd2VkOihCT09MKWVu YWJsZWQKK3sKKyAgICBfcHJlZmVyZW5jZXMtPnNldEFsbG93VW5pdmVyc2FsQWNjZXNzRnJvbUZp bGVVUkxzKGVuYWJsZWQpOworfQorCistIChCT09MKV91bml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVS THNBbGxvd2VkCit7CisgICAgcmV0dXJuIF9wcmVmZXJlbmNlcy0+YWxsb3dVbml2ZXJzYWxBY2Nl c3NGcm9tRmlsZVVSTHMoKTsKK30KKworLSAodm9pZClfc2V0QVZGb3VuZGF0aW9uRW5hYmxlZDoo Qk9PTCllbmFibGVkCit7CisgICAgX3ByZWZlcmVuY2VzLT5zZXRBVkZvdW5kYXRpb25FbmFibGVk KGVuYWJsZWQpOworfQorCistIChCT09MKV9hdkZvdW5kYXRpb25FbmFibGVkCit7CisgICAgcmV0 dXJuIF9wcmVmZXJlbmNlcy0+aXNBVkZvdW5kYXRpb25FbmFibGVkKCk7Cit9CisKKy0gKHZvaWQp X3NldFN1cHByZXNzZXNJbmNyZW1lbnRhbFJlbmRlcmluZzooQk9PTCllbmFibGVkCit7CisgICAg X3ByZWZlcmVuY2VzLT5zZXRTdXBwcmVzc2VzSW5jcmVtZW50YWxSZW5kZXJpbmcoZW5hYmxlZCk7 Cit9CisKKy0gKEJPT0wpX3N1cHByZXNzZXNJbmNyZW1lbnRhbFJlbmRlcmluZworeworICAgIHJl dHVybiBfcHJlZmVyZW5jZXMtPnN1cHByZXNzZXNJbmNyZW1lbnRhbFJlbmRlcmluZygpOworfQor CistICh2b2lkKV9zZXRBc3luY2hyb25vdXNQbHVnaW5Jbml0aWFsaXphdGlvbkVuYWJsZWQ6KEJP T0wpZW5hYmxlZAoreworICAgIF9wcmVmZXJlbmNlcy0+c2V0QXN5bmNocm9ub3VzUGx1Z2luSW5p dGlhbGl6YXRpb25FbmFibGVkKGVuYWJsZWQpOworfQorCistIChCT09MKV9hc3luY2hyb25vdXNQ bHVnaW5Jbml0aWFsaXphdGlvbkVuYWJsZWQKK3sKKyAgICByZXR1cm4gX3ByZWZlcmVuY2VzLT5h c3luY2hyb25vdXNQbHVnaW5Jbml0aWFsaXphdGlvbkVuYWJsZWQoKTsKK30KKworLSAodm9pZClf c2V0QXJ0aWZpY2lhbFBsdWdpbkluaXRpYWxpemF0aW9uRGVsYXlFbmFibGVkOihCT09MKWVuYWJs ZWQKK3sKKyAgICBfcHJlZmVyZW5jZXMtPnNldEFydGlmaWNpYWxQbHVnaW5Jbml0aWFsaXphdGlv bkRlbGF5RW5hYmxlZChlbmFibGVkKTsKK30KKworLSAoQk9PTClfYXJ0aWZpY2lhbFBsdWdpbklu aXRpYWxpemF0aW9uRGVsYXlFbmFibGVkCit7CisgICAgcmV0dXJuIF9wcmVmZXJlbmNlcy0+YXJ0 aWZpY2lhbFBsdWdpbkluaXRpYWxpemF0aW9uRGVsYXlFbmFibGVkKCk7Cit9CisKKy0gKHZvaWQp X3NldENvb2tpZUVuYWJsZWQ6KEJPT0wpZW5hYmxlZAoreworICAgIF9wcmVmZXJlbmNlcy0+c2V0 Q29va2llRW5hYmxlZChlbmFibGVkKTsKK30KKworLSAoQk9PTClfY29va2llRW5hYmxlZAorewor ICAgIHJldHVybiBfcHJlZmVyZW5jZXMtPmNvb2tpZUVuYWJsZWQoKTsKK30KKworLSAodm9pZClf c2V0UGx1Z0luU25hcHNob3R0aW5nRW5hYmxlZDooQk9PTCllbmFibGVkCit7CisgICAgX3ByZWZl cmVuY2VzLT5zZXRQbHVnSW5TbmFwc2hvdHRpbmdFbmFibGVkKGVuYWJsZWQpOworfQorCistIChC T09MKV9wbHVnSW5TbmFwc2hvdHRpbmdFbmFibGVkCit7CisgICAgcmV0dXJuIF9wcmVmZXJlbmNl cy0+cGx1Z0luU25hcHNob3R0aW5nRW5hYmxlZCgpOworfQorCistICh2b2lkKV9zZXRRVEtpdEVu YWJsZWQ6KEJPT0wpZW5hYmxlZAoreworICAgIF9wcmVmZXJlbmNlcy0+c2V0UVRLaXRFbmFibGVk KGVuYWJsZWQpOworfQorCistIChCT09MKV9xdEtpdEVuYWJsZWQKK3sKKyAgICByZXR1cm4gX3By ZWZlcmVuY2VzLT5pc1FUS2l0RW5hYmxlZCgpOworfQorCistICh2b2lkKV9zZXRTdWJwaXhlbENT U09NRWxlbWVudE1ldHJpY3NFbmFibGVkOihCT09MKWVuYWJsZWQKK3sKKyAgICBfcHJlZmVyZW5j ZXMtPnNldFN1YnBpeGVsQ1NTT01FbGVtZW50TWV0cmljc0VuYWJsZWQoZW5hYmxlZCk7Cit9CisK Ky0gKEJPT0wpX3N1YnBpeGVsQ1NTT01FbGVtZW50TWV0cmljc0VuYWJsZWQKK3sKKyAgICByZXR1 cm4gX3ByZWZlcmVuY2VzLT5zdWJwaXhlbENTU09NRWxlbWVudE1ldHJpY3NFbmFibGVkKCk7Cit9 CisKKy0gKHZvaWQpX3NldE1lZGlhU291cmNlRW5hYmxlZDooQk9PTCllbmFibGVkCit7CisgICAg X3ByZWZlcmVuY2VzLT5zZXRNZWRpYVNvdXJjZUVuYWJsZWQoZW5hYmxlZCk7Cit9CisKKy0gKEJP T0wpX21lZGlhU291cmNlRW5hYmxlZAoreworICAgIHJldHVybiBfcHJlZmVyZW5jZXMtPm1lZGlh U291cmNlRW5hYmxlZCgpOworfQorCistICh2b2lkKV9zZXRWaWV3R2VzdHVyZURlYnVnZ2luZ0Vu YWJsZWQ6KEJPT0wpZW5hYmxlZAoreworICAgIF9wcmVmZXJlbmNlcy0+c2V0Vmlld0dlc3R1cmVE ZWJ1Z2dpbmdFbmFibGVkKGVuYWJsZWQpOworfQorCistIChCT09MKV92aWV3R2VzdHVyZURlYnVn Z2luZ0VuYWJsZWQKK3sKKyAgICByZXR1cm4gX3ByZWZlcmVuY2VzLT52aWV3R2VzdHVyZURlYnVn Z2luZ0VuYWJsZWQoKTsKK30KKworLSAodm9pZClfc2V0Q1NTQW5pbWF0aW9uVHJpZ2dlcnNFbmFi bGVkOihCT09MKWVuYWJsZWQKK3sKKyAgICBfcHJlZmVyZW5jZXMtPnNldENTU0FuaW1hdGlvblRy aWdnZXJzRW5hYmxlZChlbmFibGVkKTsKK30KKworLSAoQk9PTClfY3NzQW5pbWF0aW9uVHJpZ2dl cnNFbmFibGVkCit7CisgICAgcmV0dXJuIF9wcmVmZXJlbmNlcy0+Y3NzQW5pbWF0aW9uVHJpZ2dl cnNFbmFibGVkKCk7Cit9CisKKy0gKHZvaWQpX3NldFN0YW5kYXJkRm9udEZhbWlseTooTlNTdHJp bmcgKilmYW1pbHkKK3sKKyAgICBfcHJlZmVyZW5jZXMtPnNldFN0YW5kYXJkRm9udEZhbWlseShm YW1pbHkpOworfQorCistIChOU1N0cmluZyAqKV9zdGFuZGFyZEZvbnRGYW1pbHkKK3sKKyAgICBy ZXR1cm4gX3ByZWZlcmVuY2VzLT5zdGFuZGFyZEZvbnRGYW1pbHkoKTsKK30KKworLSAodm9pZClf c2V0Tm90aWZpY2F0aW9uc0VuYWJsZWQ6KEJPT0wpZW5hYmxlZAoreworICAgIF9wcmVmZXJlbmNl cy0+c2V0Tm90aWZpY2F0aW9uc0VuYWJsZWQoZW5hYmxlZCk7Cit9CisKKy0gKEJPT0wpX25vdGlm aWNhdGlvbnNFbmFibGVkCit7CisgICAgcmV0dXJuIF9wcmVmZXJlbmNlcy0+bm90aWZpY2F0aW9u c0VuYWJsZWQoKTsKK30KKworLSAodm9pZClfc2V0QmFja3NwYWNlS2V5TmF2aWdhdGlvbkVuYWJs ZWQ6KEJPT0wpZW5hYmxlZAoreworICAgIF9wcmVmZXJlbmNlcy0+c2V0QmFja3NwYWNlS2V5TmF2 aWdhdGlvbkVuYWJsZWQoZW5hYmxlZCk7Cit9CisKKy0gKEJPT0wpX2JhY2tzcGFjZUtleU5hdmln YXRpb25FbmFibGVkCit7CisgICAgcmV0dXJuIF9wcmVmZXJlbmNlcy0+YmFja3NwYWNlS2V5TmF2 aWdhdGlvbkVuYWJsZWQoKTsKK30KKwogLSAodm9pZClfc2V0V2ViR0xFbmFibGVkOihCT09MKWVu YWJsZWQKIHsKICAgICBfcHJlZmVyZW5jZXMtPnNldFdlYkdMRW5hYmxlZChlbmFibGVkKTsKSW5k ZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1ByZWZlcmVuY2VzUHJpdmF0 ZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1By ZWZlcmVuY2VzUHJpdmF0ZS5oCShyZXZpc2lvbiAyMjI2NzIpCisrKyBTb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvQ29jb2EvV0tQcmVmZXJlbmNlc1ByaXZhdGUuaAkod29ya2luZyBjb3B5KQpA QCAtMTIxLDYgKzEyMSwzNCBAQCB0eXBlZGVmIE5TX09QVElPTlMoTlNVSW50ZWdlciwgX1dLSmF2 YVNjCiAjaWYgIVRBUkdFVF9PU19JUEhPTkUKIEBwcm9wZXJ0eSAobm9uYXRvbWljLCBzZXR0ZXI9 X3NldFBsdWdJbnNFbmFibGVkOikgQk9PTCBfcGx1Z0luc0VuYWJsZWQgV0tfQVBJX0FWQUlMQUJM RShtYWNvc3goV0tfTUFDX1RCQSkpOwogQHByb3BlcnR5IChub25hdG9taWMsIHNldHRlcj1fc2V0 V2ViR0xFbmFibGVkOikgQk9PTCBfd2ViR0xFbmFibGVkIFdLX0FQSV9BVkFJTEFCTEUobWFjb3N4 KFdLX01BQ19UQkEpKTsKK0Bwcm9wZXJ0eSAobm9uYXRvbWljLCBzZXR0ZXI9X3NldEphdmFFbmFi bGVkRm9yTG9jYWxGaWxlczopIEJPT0wgX2phdmFFbmFibGVkRm9yTG9jYWxGaWxlcyBXS19BUElf QVZBSUxBQkxFKG1hY29zeChXS19NQUNfVEJBKSk7CitAcHJvcGVydHkgKG5vbmF0b21pYywgc2V0 dGVyPV9zZXRDYW52YXNVc2VzQWNjZWxlcmF0ZWREcmF3aW5nOikgQk9PTCBfY2FudmFzVXNlc0Fj Y2VsZXJhdGVkRHJhd2luZyBXS19BUElfQVZBSUxBQkxFKG1hY29zeChXS19NQUNfVEJBKSk7CitA cHJvcGVydHkgKG5vbmF0b21pYywgc2V0dGVyPV9zZXRBY2NlbGVyYXRlZENvbXBvc2l0aW5nRW5h YmxlZDopIEJPT0wgX2FjY2VsZXJhdGVkQ29tcG9zaXRpbmdFbmFibGVkIFdLX0FQSV9BVkFJTEFC TEUobWFjb3N4KFdLX01BQ19UQkEpKTsKK0Bwcm9wZXJ0eSAobm9uYXRvbWljLCBzZXR0ZXI9X3Nl dERlZmF1bHRUZXh0RW5jb2RpbmdOYW1lOikgTlNTdHJpbmcgKl9kZWZhdWx0VGV4dEVuY29kaW5n TmFtZSBXS19BUElfQVZBSUxBQkxFKG1hY29zeChXS19NQUNfVEJBKSk7CitAcHJvcGVydHkgKG5v bmF0b21pYywgc2V0dGVyPV9zZXROZWVkc1NpdGVTcGVjaWZpY1F1aXJrczopIEJPT0wgX25lZWRz U2l0ZVNwZWNpZmljUXVpcmtzIFdLX0FQSV9BVkFJTEFCTEUobWFjb3N4KFdLX01BQ19UQkEpKTsK K0Bwcm9wZXJ0eSAobm9uYXRvbWljLCBzZXR0ZXI9X3NldEF1dGhvckFuZFVzZXJTdHlsZXNFbmFi bGVkOikgQk9PTCBfYXV0aG9yQW5kVXNlclN0eWxlc0VuYWJsZWQgV0tfQVBJX0FWQUlMQUJMRSht YWNvc3goV0tfTUFDX1RCQSkpOworQHByb3BlcnR5IChub25hdG9taWMsIHNldHRlcj1fc2V0RE9N VGltZXJzVGhyb3R0bGluZ0VuYWJsZWQ6KSBCT09MIF9kb21UaW1lcnNUaHJvdHRsaW5nRW5hYmxl ZCBXS19BUElfQVZBSUxBQkxFKG1hY29zeChXS19NQUNfVEJBKSk7CitAcHJvcGVydHkgKG5vbmF0 b21pYywgc2V0dGVyPV9zZXRXZWJBcmNoaXZlRGVidWdNb2RlRW5hYmxlZDopIEJPT0wgX3dlYkFy Y2hpdmVEZWJ1Z01vZGVFbmFibGVkIFdLX0FQSV9BVkFJTEFCTEUobWFjb3N4KFdLX01BQ19UQkEp KTsKK0Bwcm9wZXJ0eSAobm9uYXRvbWljLCBzZXR0ZXI9X3NldExvY2FsRmlsZUNvbnRlbnRTbmlm ZmluZ0VuYWJsZWQ6KSBCT09MIF9sb2NhbEZpbGVDb250ZW50U25pZmZpbmdFbmFibGVkIFdLX0FQ SV9BVkFJTEFCTEUobWFjb3N4KFdLX01BQ19UQkEpKTsKK0Bwcm9wZXJ0eSAobm9uYXRvbWljLCBz ZXR0ZXI9X3NldFVzZXNQYWdlQ2FjaGU6KSBCT09MIF91c2VzUGFnZUNhY2hlIFdLX0FQSV9BVkFJ TEFCTEUobWFjb3N4KFdLX01BQ19UQkEpKTsKK0Bwcm9wZXJ0eSAobm9uYXRvbWljLCBzZXR0ZXI9 X3NldFBhZ2VDYWNoZVN1cHBvcnRzUGx1Z2luczopIEJPT0wgX3BhZ2VDYWNoZVN1cHBvcnRzUGx1 Z2lucyBXS19BUElfQVZBSUxBQkxFKG1hY29zeChXS19NQUNfVEJBKSk7CitAcHJvcGVydHkgKG5v bmF0b21pYywgc2V0dGVyPV9zZXRTaG91bGRQcmludEJhY2tncm91bmRzOikgQk9PTCBfc2hvdWxk UHJpbnRCYWNrZ3JvdW5kcyBXS19BUElfQVZBSUxBQkxFKG1hY29zeChXS19NQUNfVEJBKSk7CitA cHJvcGVydHkgKG5vbmF0b21pYywgc2V0dGVyPV9zZXRXZWJTZWN1cml0eUVuYWJsZWQ6KSBCT09M IF93ZWJTZWN1cml0eUVuYWJsZWQgV0tfQVBJX0FWQUlMQUJMRShtYWNvc3goV0tfTUFDX1RCQSkp OworQHByb3BlcnR5IChub25hdG9taWMsIHNldHRlcj1fc2V0VW5pdmVyc2FsQWNjZXNzRnJvbUZp bGVVUkxzQWxsb3dlZDopIEJPT0wgX3VuaXZlcnNhbEFjY2Vzc0Zyb21GaWxlVVJMc0FsbG93ZWQg V0tfQVBJX0FWQUlMQUJMRShtYWNvc3goV0tfTUFDX1RCQSkpOworQHByb3BlcnR5IChub25hdG9t aWMsIHNldHRlcj1fc2V0QVZGb3VuZGF0aW9uRW5hYmxlZDopIEJPT0wgX2F2Rm91bmRhdGlvbkVu YWJsZWQgV0tfQVBJX0FWQUlMQUJMRShtYWNvc3goV0tfTUFDX1RCQSkpOworQHByb3BlcnR5IChu b25hdG9taWMsIHNldHRlcj1fc2V0U3VwcHJlc3Nlc0luY3JlbWVudGFsUmVuZGVyaW5nOikgQk9P TCBfc3VwcHJlc3Nlc0luY3JlbWVudGFsUmVuZGVyaW5nIFdLX0FQSV9BVkFJTEFCTEUobWFjb3N4 KFdLX01BQ19UQkEpKTsKK0Bwcm9wZXJ0eSAobm9uYXRvbWljLCBzZXR0ZXI9X3NldEFzeW5jaHJv bm91c1BsdWdpbkluaXRpYWxpemF0aW9uRW5hYmxlZDopIEJPT0wgX2FzeW5jaHJvbm91c1BsdWdp bkluaXRpYWxpemF0aW9uRW5hYmxlZCBXS19BUElfQVZBSUxBQkxFKG1hY29zeChXS19NQUNfVEJB KSk7CitAcHJvcGVydHkgKG5vbmF0b21pYywgc2V0dGVyPV9zZXRBcnRpZmljaWFsUGx1Z2luSW5p dGlhbGl6YXRpb25EZWxheUVuYWJsZWQ6KSBCT09MIF9hcnRpZmljaWFsUGx1Z2luSW5pdGlhbGl6 YXRpb25EZWxheUVuYWJsZWQgV0tfQVBJX0FWQUlMQUJMRShtYWNvc3goV0tfTUFDX1RCQSkpOwor QHByb3BlcnR5IChub25hdG9taWMsIHNldHRlcj1fc2V0Q29va2llRW5hYmxlZDopIEJPT0wgX2Nv b2tpZUVuYWJsZWQgV0tfQVBJX0FWQUlMQUJMRShtYWNvc3goV0tfTUFDX1RCQSkpOworQHByb3Bl cnR5IChub25hdG9taWMsIHNldHRlcj1fc2V0UGx1Z0luU25hcHNob3R0aW5nRW5hYmxlZDopIEJP T0wgX3BsdWdJblNuYXBzaG90dGluZ0VuYWJsZWQgV0tfQVBJX0FWQUlMQUJMRShtYWNvc3goV0tf TUFDX1RCQSkpOworQHByb3BlcnR5IChub25hdG9taWMsIHNldHRlcj1fc2V0UVRLaXRFbmFibGVk OikgQk9PTCBfcXRLaXRFbmFibGVkIFdLX0FQSV9BVkFJTEFCTEUobWFjb3N4KFdLX01BQ19UQkEp KTsKK0Bwcm9wZXJ0eSAobm9uYXRvbWljLCBzZXR0ZXI9X3NldFN1YnBpeGVsQ1NTT01FbGVtZW50 TWV0cmljc0VuYWJsZWQ6KSBCT09MIF9zdWJwaXhlbENTU09NRWxlbWVudE1ldHJpY3NFbmFibGVk IFdLX0FQSV9BVkFJTEFCTEUobWFjb3N4KFdLX01BQ19UQkEpKTsKK0Bwcm9wZXJ0eSAobm9uYXRv bWljLCBzZXR0ZXI9X3NldE1lZGlhU291cmNlRW5hYmxlZDopIEJPT0wgX21lZGlhU291cmNlRW5h YmxlZCBXS19BUElfQVZBSUxBQkxFKG1hY29zeChXS19NQUNfVEJBKSk7CitAcHJvcGVydHkgKG5v bmF0b21pYywgc2V0dGVyPV9zZXRWaWV3R2VzdHVyZURlYnVnZ2luZ0VuYWJsZWQ6KSBCT09MIF92 aWV3R2VzdHVyZURlYnVnZ2luZ0VuYWJsZWQgV0tfQVBJX0FWQUlMQUJMRShtYWNvc3goV0tfTUFD X1RCQSkpOworQHByb3BlcnR5IChub25hdG9taWMsIHNldHRlcj1fc2V0Q1NTQW5pbWF0aW9uVHJp Z2dlcnNFbmFibGVkOikgQk9PTCBfY3NzQW5pbWF0aW9uVHJpZ2dlcnNFbmFibGVkIFdLX0FQSV9B VkFJTEFCTEUobWFjb3N4KFdLX01BQ19UQkEpKTsKK0Bwcm9wZXJ0eSAobm9uYXRvbWljLCBzZXR0 ZXI9X3NldFN0YW5kYXJkRm9udEZhbWlseTopIE5TU3RyaW5nICpfc3RhbmRhcmRGb250RmFtaWx5 IFdLX0FQSV9BVkFJTEFCTEUobWFjb3N4KFdLX01BQ19UQkEpKTsKK0Bwcm9wZXJ0eSAobm9uYXRv bWljLCBzZXR0ZXI9X3NldE5vdGlmaWNhdGlvbnNFbmFibGVkOikgQk9PTCBfbm90aWZpY2F0aW9u c0VuYWJsZWQgV0tfQVBJX0FWQUlMQUJMRShtYWNvc3goV0tfTUFDX1RCQSkpOworQHByb3BlcnR5 IChub25hdG9taWMsIHNldHRlcj1fc2V0QmFja3NwYWNlS2V5TmF2aWdhdGlvbkVuYWJsZWQ6KSBC T09MIF9iYWNrc3BhY2VLZXlOYXZpZ2F0aW9uRW5hYmxlZCBXS19BUElfQVZBSUxBQkxFKG1hY29z eChXS19NQUNfVEJBKSk7CiAjZW5kaWYKIAogQGVuZAo=