38911 2010-05-11 08:42:41 -0700 [Qt] Patch to locate Java plugin DLL on Windows via its Registry... 2010-11-18 11:09:13 -0800 1 1 1 Unclassified WebKit Plug-ins 528+ (Nightly build) PC All RESOLVED FIXED Qt P2 Enhancement --- 33044 0 adawit webkit-unassigned abarth ademar andersca ap aroben commit-queue eric hausmann jam jhoneycutt kenneth webkit.review.bot oldest_to_newest 223937 0 adawit 2010-05-11 08:42:41 -0700 The following patch was split out from bug 33044 to make it easier to review on its own. Besides minor clean ups, this is the exact code from afformentioned bug report. 223961 1 55711 adawit 2010-05-11 09:43:24 -0700 Created attachment 55711 Patch to locate Windows Java plugin DLL via registry... 224582 2 55841 adawit 2010-05-12 07:10:34 -0700 Created attachment 55841 Locate Java plugin dll via the Windows Registry... Corrected the entry in WebCore/ChangLog... 225803 3 kenneth 2010-05-14 07:36:59 -0700 Adam, can you look at the Windows part of this patch, or indicate a reviewer? 225821 4 aroben 2010-05-14 08:00:23 -0700 Safari comes with its own Java plug-in. I don't think we'd want to use any other Java plug-in. Jon Honeycutt and Anders Carlsson are the right people to look at this. 225902 5 adawit 2010-05-14 10:18:06 -0700 (In reply to comment #4) > Safari comes with its own Java plug-in. I don't think we'd want to use any other > Java plug-in. I can #ifdef the patch to make it only apply to QtWebKit in case others, e.g. chrome, do the similar things as Safari. That way everyone that needs this has to opt-in and activate it for their own port ? 227200 6 hausmann 2010-05-18 02:09:09 -0700 (In reply to comment #5) > (In reply to comment #4) > > Safari comes with its own Java plug-in. I don't think we'd want to use any other > > Java plug-in. > > I can #ifdef the patch to make it only apply to QtWebKit in case others, e.g. chrome, do the similar things as Safari. That way everyone that needs this has to opt-in and activate it for their own port ? Sounds like a good idea, just wrap the call to the function in #if PLATFORM(QT). 227393 7 56391 adawit 2010-05-18 11:21:19 -0700 Created attachment 56391 Locate Java plugin dll via the Windows Registry (Update III) Wrapped the call to "addJavaPluginDirectory" from "defaultPluginDirectories" with #if PLATFORM(QT)... 228868 8 webkit.review.bot 2010-05-21 05:25:58 -0700 Attachment 56391 did not build on win: Build output: http://webkit-commit-queue.appspot.com/results/2291375 263048 9 56391 abarth 2010-08-10 23:00:15 -0700 Comment on attachment 56391 Locate Java plugin dll via the Windows Registry (Update III) The windows failure scares me. Probably best to land by hand. 266443 10 adawit 2010-08-18 16:21:56 -0700 (In reply to comment #9) > (From update of attachment 56391 [details]) > The windows failure scares me. Probably best to land by hand. The problem with the Windows build failure is that the log produced is worthless. It does not tell you anything so you cannot even begin to evaluate why it failed and provide a fix if necessary... 268354 11 65219 adawit 2010-08-24 00:11:28 -0700 Created attachment 65219 Locate Java plugin dll via the Windows Registry (Update IV) Let us see if it compiles fine on Windows this time around... 269378 12 56391 eric 2010-08-25 11:18:07 -0700 Comment on attachment 56391 Locate Java plugin dll via the Windows Registry (Update III) Cleared Simon Hausmann's review+ from obsolete attachment 56391 so that this bug does not appear in http://webkit.org/pending-commit. 270501 13 65219 hausmann 2010-08-27 08:12:29 -0700 Comment on attachment 65219 Locate Java plugin dll via the Windows Registry (Update IV) r=me 270580 14 65219 commit-queue 2010-08-27 10:35:53 -0700 Comment on attachment 65219 Locate Java plugin dll via the Windows Registry (Update IV) Clearing flags on attachment: 65219 Committed r66234: <http://trac.webkit.org/changeset/66234> 270581 15 commit-queue 2010-08-27 10:35:59 -0700 All reviewed patches have been landed. Closing bug. 270598 16 webkit.review.bot 2010-08-27 11:11:17 -0700 http://trac.webkit.org/changeset/66234 might have broken Qt Linux Release The following changes are on the blame list: http://trac.webkit.org/changeset/66233 http://trac.webkit.org/changeset/66234 306861 17 ademar 2010-11-09 10:23:17 -0800 Blocking QtWebKit 2.1 on this. See https://bugs.webkit.org/show_bug.cgi?id=33044#c30 for more information. 310977 18 ademar 2010-11-18 11:09:04 -0800 Revision r66234 cherry-picked into qtwebkit-2.1 with commit 8c6f4ae <http://gitorious.org/webkit/qtwebkit/commit/8c6f4ae> 55711 2010-05-11 09:43:24 -0700 2010-05-12 07:10:34 -0700 Patch to locate Windows Java plugin DLL via registry... webkit_locate_windows_java_plugin_dll_path.patch text/plain 4380 adawit ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MjNkZDQ4Yy4uNGVkOTdkNyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMC0wNS0xMCAgRGF3aXQgQWxlbWF5 ZWh1ICA8YWRhd2l0QGtkZS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQWRkIGNvZGUgdG8gbG9jYXRlIHRoZSBKYXZhIFBsdWctaW4gRExMIG9u IFdpbmRvd3MgdmlhIHRoZSByZWdpc3RyeS4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mzg5MTEKKworICAgICAgICAqIHBsdWdpbnMvUGx1Z2luUGFj a2FnZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQbHVnaW5QYWNrYWdlOjppbml0aWFsaXplQnJv d3NlckZ1bmNzKToKKyAgICAgICAgKiBwbHVnaW5zL25wYXBpLmNwcDoKKyAgICAgICAgKE5QTl9H ZXRWYWx1ZUZvclVSTCk6CisgICAgICAgIChOUE5fU2V0VmFsdWVGb3JVUkwpOgorICAgICAgICAo TlBOX0dldEF1dGhlbnRpY2F0aW9uSW5mbyk6CisKIDIwMTAtMDUtMDYgIExhc3psbyBHb21ib3Mg IDxsYXN6bG8uMS5nb21ib3NAbm9raWEuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIGJ1aWxk IGZpeCBXaW5DRSBmb3IgUXRXZWJLaXQuCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsdWdpbnMvd2lu L1BsdWdpbkRhdGFiYXNlV2luLmNwcCBiL1dlYkNvcmUvcGx1Z2lucy93aW4vUGx1Z2luRGF0YWJh c2VXaW4uY3BwCmluZGV4IDcxYmNkYjUuLjUwYTMxYzggMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGx1 Z2lucy93aW4vUGx1Z2luRGF0YWJhc2VXaW4uY3BwCisrKyBiL1dlYkNvcmUvcGx1Z2lucy93aW4v UGx1Z2luRGF0YWJhc2VXaW4uY3BwCkBAIC0zNzEsNiArMzcxLDY2IEBAIHN0YXRpYyBpbmxpbmUg dm9pZCBhZGRNYWNyb21lZGlhUGx1Z2luRGlyZWN0b3JpZXMoVmVjdG9yPFN0cmluZz4mIGRpcmVj dG9yaWVzKQogI2VuZGlmCiB9CiAKK3N0YXRpYyBpbmxpbmUgdm9pZCBhZGRKYXZhUGx1Z2luRGly ZWN0b3J5KFZlY3RvcjxTdHJpbmc+JiBkaXJlY3RvcmllcykKK3sKKyAgICBIS0VZIGtleTsKKyAg ICBIUkVTVUxUIHJlc3VsdCA9IFJlZ09wZW5LZXlFeChIS0VZX0xPQ0FMX01BQ0hJTkUsIFRFWFQo IlNvZnR3YXJlXFxKYXZhU29mdFxcSmF2YSBQbHVnLWluIiksIDAsIEtFWV9SRUFELCAma2V5KTsK KyAgICBpZiAocmVzdWx0ICE9IEVSUk9SX1NVQ0NFU1MpCisgICAgICAgIHJldHVybjsKKworICAg IFdDSEFSIG5hbWVbMTI4XTsKKyAgICBGSUxFVElNRSBsYXN0TW9kaWZpZWQ7CisKKyAgICBWZWN0 b3I8aW50PiBsYXRlc3RKYXZhVmVyc2lvbjsKKyAgICBTdHJpbmcgbGF0ZXN0SmF2YVZlcnNpb25T dHJpbmc7CisKKyAgICBMT0coUGx1Z2lucywgIlBsdWdpbkRhdGFiYXNlV2luOjphZGRKYXZhUGx1 Z2luRGlyZWN0b3J5IC0gY2hlY2tpbmcgSmF2YSBQbHVnaW4gdmVyc2lvbnMiKTsKKworICAgIC8v IEVudW1lcmF0ZSBzdWJrZXlzCisgICAgZm9yIChpbnQgaSA9IDA7OyBpKyspIHsKKyAgICAgICAg RFdPUkQgbmFtZUxlbiA9IHNpemVvZihuYW1lKSAvIHNpemVvZihXQ0hBUik7CisgICAgICAgIHJl c3VsdCA9IFJlZ0VudW1LZXlFeFcoa2V5LCBpLCBuYW1lLCAmbmFtZUxlbiwgMCwgMCwgMCwgJmxh c3RNb2RpZmllZCk7CisKKyAgICAgICAgaWYgKHJlc3VsdCAhPSBFUlJPUl9TVUNDRVNTKQorICAg ICAgICAgICAgYnJlYWs7CisKKyAgICAgICAgVmVjdG9yPGludD4gamF2YVZlcnNpb24gPSBwYXJz ZVZlcnNpb25TdHJpbmcoU3RyaW5nKG5hbWUsIG5hbWVMZW4pKTsKKyAgICAgICAgaWYgKGNvbXBh cmVWZXJzaW9ucyhqYXZhVmVyc2lvbiwgbGF0ZXN0SmF2YVZlcnNpb24pKSB7CisgICAgICAgICAg ICBsYXRlc3RKYXZhVmVyc2lvbiA9IGphdmFWZXJzaW9uOworICAgICAgICAgICAgbGF0ZXN0SmF2 YVZlcnNpb25TdHJpbmcgPSBTdHJpbmcobmFtZSwgbmFtZUxlbik7CisgICAgICAgICAgICBMT0co UGx1Z2lucywgIlBsdWdpbkRhdGFiYXNlV2luOjphZGRKYXZhUGx1Z2luRGlyZWN0b3J5IC0gc2V0 dGluZyBsYXRlc3QgSmF2YSBQbHVnaW4gdmVyc2lvbiB0byAlcyIsIGxhdGVzdEphdmFWZXJzaW9u U3RyaW5nKTsKKyAgICAgICAgfQorICAgIH0KKworICAgIGlmIChsYXRlc3RKYXZhVmVyc2lvblN0 cmluZy5pc0VtcHR5KCkpCisgICAgICAgIExPRyhQbHVnaW5zLCAiUGx1Z2luRGF0YWJhc2VXaW46 OmFkZEphdmFQbHVnaW5EaXJlY3RvcnkgLSBFUlJPUjogZmFpbGVkIHRvIGZpbmQgSmF2YSB2ZXJz aW9uISEhIik7CisgICAgZWxzZSB7CisgICAgICAgIERXT1JEIHR5cGU7CisgICAgICAgIFdDSEFS IGphdmFJbnN0YWxsUGF0aFN0cltfTUFYX1BBVEhdOworICAgICAgICBEV09SRCBqYXZhSW5zdGFs bFBhdGhTaXplID0gc2l6ZW9mKGphdmFJbnN0YWxsUGF0aFN0cik7CisgICAgICAgIERXT1JEIHVz ZU5ld1BsdWdpblZhbHVlOworICAgICAgICBEV09SRCB1c2VOZXdQbHVnaW5TaXplOworCisgICAg ICAgIFN0cmluZyBqYXZhUGx1Z2luS2V5UGF0aCA9ICJTb2Z0d2FyZVxcSmF2YVNvZnRcXEphdmEg UGx1Zy1pblxcIiArIGxhdGVzdEphdmFWZXJzaW9uU3RyaW5nOworICAgICAgICByZXN1bHQgPSBT SEdldFZhbHVlKEhLRVlfTE9DQUxfTUFDSElORSwgamF2YVBsdWdpbktleVBhdGguY2hhcmFjdGVy c1dpdGhOdWxsVGVybWluYXRpb24oKSwgVEVYVCgiVXNlTmV3SmF2YVBsdWdpbiIpLCAmdHlwZSwg KExQVk9JRCkmdXNlTmV3UGx1Z2luVmFsdWUsICZ1c2VOZXdQbHVnaW5TaXplKTsKKyAgICAgICAg aWYgKHJlc3VsdCA9PSBFUlJPUl9TVUNDRVNTKSB7CisgICAgICAgICAgICBpZiAodXNlTmV3UGx1 Z2luVmFsdWUgPT0gMSkgeworICAgICAgICAgICAgICAgIHJlc3VsdCA9IFNIR2V0VmFsdWUoSEtF WV9MT0NBTF9NQUNISU5FLCBqYXZhUGx1Z2luS2V5UGF0aC5jaGFyYWN0ZXJzV2l0aE51bGxUZXJt aW5hdGlvbigpLCBURVhUKCJKYXZhSG9tZSIpLCAmdHlwZSwgKExQQllURSlqYXZhSW5zdGFsbFBh dGhTdHIsICZqYXZhSW5zdGFsbFBhdGhTaXplKTsKKyAgICAgICAgICAgICAgICBpZiAocmVzdWx0 ID09IEVSUk9SX1NVQ0NFU1MpIHsKKyAgICAgICAgICAgICAgICAgICAgU3RyaW5nIGphdmFQbHVn aW5EaXJlY3RvcnkgPSBTdHJpbmcoamF2YUluc3RhbGxQYXRoU3RyLCBqYXZhSW5zdGFsbFBhdGhT aXplIC8gc2l6ZW9mKFdDSEFSKSAtIDEpICsgIlxcYmluXFxuZXdfcGx1Z2luIjsKKyAgICAgICAg ICAgICAgICAgICAgZGlyZWN0b3JpZXMuYXBwZW5kKGphdmFQbHVnaW5EaXJlY3RvcnkpOworICAg ICAgICAgICAgICAgICAgICBMT0coUGx1Z2lucywgIlBsdWdpbkRhdGFiYXNlV2luOjphZGRKYXZh UGx1Z2luRGlyZWN0b3J5IC0gYWRkaW5nIEphdmEgcGx1Z2luIGRpcmVjdG9yeTogJXMiLCBqYXZh UGx1Z2luRGlyZWN0b3J5KTsKKyAgICAgICAgICAgICAgICB9IGVsc2UKKyAgICAgICAgICAgICAg ICAgICAgTE9HKFBsdWdpbnMsICJQbHVnaW5EYXRhYmFzZVdpbjo6YWRkSmF2YVBsdWdpbkRpcmVj dG9yeSAtIEVSUk9SOiBmYWlsZWQgdG8gcmVhZCBKYXZhSG9tZSB2YWx1ZSAoICVkICkiLCByZXN1 bHQpOworICAgICAgICAgICAgfSBlbHNlCisgICAgICAgICAgICAgICAgTE9HKFBsdWdpbnMsICJQ bHVnaW5EYXRhYmFzZVdpbjo6YWRkSmF2YVBsdWdpbkRpcmVjdG9yeSAtIEVSUk9SOiBmYWlsZWQg dG8gZmluZCBhICduZXcnIEphdmEgUGx1Z2luIik7CisgICAgICAgIH0gZWxzZQorICAgICAgICAg ICAgTE9HKFBsdWdpbnMsICJQbHVnaW5EYXRhYmFzZVdpbjo6YWRkSmF2YVBsdWdpbkRpcmVjdG9y eSAtIEVSUk9SOiBmYWlsZWQgdG8gcmVhZCAnVXNlTmV3SmF2YVBsdWdpbicgdmFsdWUgKCAlZCAp IiwgcmVzdWx0KTsKKyAgICB9CisKKyAgICBSZWdDbG9zZUtleShrZXkpOworfQorCiBWZWN0b3I8 U3RyaW5nPiBQbHVnaW5EYXRhYmFzZTo6ZGVmYXVsdFBsdWdpbkRpcmVjdG9yaWVzKCkKIHsKICAg ICBWZWN0b3I8U3RyaW5nPiBkaXJlY3RvcmllczsKQEAgLTM4Myw2ICs0NDMsNyBAQCBWZWN0b3I8 U3RyaW5nPiBQbHVnaW5EYXRhYmFzZTo6ZGVmYXVsdFBsdWdpbkRpcmVjdG9yaWVzKCkKICAgICBh ZGRNb3ppbGxhUGx1Z2luRGlyZWN0b3JpZXMoZGlyZWN0b3JpZXMpOwogICAgIGFkZFdpbmRvd3NN ZWRpYVBsYXllclBsdWdpbkRpcmVjdG9yeShkaXJlY3Rvcmllcyk7CiAgICAgYWRkTWFjcm9tZWRp YVBsdWdpbkRpcmVjdG9yaWVzKGRpcmVjdG9yaWVzKTsKKyAgICBhZGRKYXZhUGx1Z2luRGlyZWN0 b3J5KGRpcmVjdG9yaWVzKTsKIAogICAgIHJldHVybiBkaXJlY3RvcmllczsKIH0K 55841 2010-05-12 07:10:34 -0700 2010-05-18 11:21:19 -0700 Locate Java plugin dll via the Windows Registry... webkit_locate_windows_java_plugin_dll_path_2.patch text/plain 4284 adawit ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NzZiNGVmZi4uY2RlMzFhYyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxMC0wNS0xMiAgRGF3aXQgQWxlbWF5 ZWh1ICA8YWRhd2l0QGtkZS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQWRkIGNvZGUgdG8gbG9jYXRlIHRoZSBKYXZhIFBsdWctaW4gRExMIG9u IFdpbmRvd3MgdmlhIHRoZSByZWdpc3RyeS4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mzg5MTEKKworICAgICAgICAqIHBsdWdpbnMvd2luL1BsdWdp bkRhdGFiYXNlV2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmFkZEphdmFQbHVnaW5EaXJlY3Rv cnkpOgorICAgICAgICAoV2ViQ29yZTo6UGx1Z2luRGF0YWJhc2U6OmRlZmF1bHRQbHVnaW5EaXJl Y3Rvcmllcyk6CisKIDIwMTAtMDQtMjkgIEphbWVzIFJvYmluc29uICA8amFtZXNyQGNocm9taXVt Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBGcmFzZXIuCmRpZmYgLS1naXQgYS9X ZWJDb3JlL3BsdWdpbnMvd2luL1BsdWdpbkRhdGFiYXNlV2luLmNwcCBiL1dlYkNvcmUvcGx1Z2lu cy93aW4vUGx1Z2luRGF0YWJhc2VXaW4uY3BwCmluZGV4IDcxYmNkYjUuLjUwYTMxYzggMTAwNjQ0 Ci0tLSBhL1dlYkNvcmUvcGx1Z2lucy93aW4vUGx1Z2luRGF0YWJhc2VXaW4uY3BwCisrKyBiL1dl YkNvcmUvcGx1Z2lucy93aW4vUGx1Z2luRGF0YWJhc2VXaW4uY3BwCkBAIC0zNzEsNiArMzcxLDY2 IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBhZGRNYWNyb21lZGlhUGx1Z2luRGlyZWN0b3JpZXMoVmVj dG9yPFN0cmluZz4mIGRpcmVjdG9yaWVzKQogI2VuZGlmCiB9CiAKK3N0YXRpYyBpbmxpbmUgdm9p ZCBhZGRKYXZhUGx1Z2luRGlyZWN0b3J5KFZlY3RvcjxTdHJpbmc+JiBkaXJlY3RvcmllcykKK3sK KyAgICBIS0VZIGtleTsKKyAgICBIUkVTVUxUIHJlc3VsdCA9IFJlZ09wZW5LZXlFeChIS0VZX0xP Q0FMX01BQ0hJTkUsIFRFWFQoIlNvZnR3YXJlXFxKYXZhU29mdFxcSmF2YSBQbHVnLWluIiksIDAs IEtFWV9SRUFELCAma2V5KTsKKyAgICBpZiAocmVzdWx0ICE9IEVSUk9SX1NVQ0NFU1MpCisgICAg ICAgIHJldHVybjsKKworICAgIFdDSEFSIG5hbWVbMTI4XTsKKyAgICBGSUxFVElNRSBsYXN0TW9k aWZpZWQ7CisKKyAgICBWZWN0b3I8aW50PiBsYXRlc3RKYXZhVmVyc2lvbjsKKyAgICBTdHJpbmcg bGF0ZXN0SmF2YVZlcnNpb25TdHJpbmc7CisKKyAgICBMT0coUGx1Z2lucywgIlBsdWdpbkRhdGFi YXNlV2luOjphZGRKYXZhUGx1Z2luRGlyZWN0b3J5IC0gY2hlY2tpbmcgSmF2YSBQbHVnaW4gdmVy c2lvbnMiKTsKKworICAgIC8vIEVudW1lcmF0ZSBzdWJrZXlzCisgICAgZm9yIChpbnQgaSA9IDA7 OyBpKyspIHsKKyAgICAgICAgRFdPUkQgbmFtZUxlbiA9IHNpemVvZihuYW1lKSAvIHNpemVvZihX Q0hBUik7CisgICAgICAgIHJlc3VsdCA9IFJlZ0VudW1LZXlFeFcoa2V5LCBpLCBuYW1lLCAmbmFt ZUxlbiwgMCwgMCwgMCwgJmxhc3RNb2RpZmllZCk7CisKKyAgICAgICAgaWYgKHJlc3VsdCAhPSBF UlJPUl9TVUNDRVNTKQorICAgICAgICAgICAgYnJlYWs7CisKKyAgICAgICAgVmVjdG9yPGludD4g amF2YVZlcnNpb24gPSBwYXJzZVZlcnNpb25TdHJpbmcoU3RyaW5nKG5hbWUsIG5hbWVMZW4pKTsK KyAgICAgICAgaWYgKGNvbXBhcmVWZXJzaW9ucyhqYXZhVmVyc2lvbiwgbGF0ZXN0SmF2YVZlcnNp b24pKSB7CisgICAgICAgICAgICBsYXRlc3RKYXZhVmVyc2lvbiA9IGphdmFWZXJzaW9uOworICAg ICAgICAgICAgbGF0ZXN0SmF2YVZlcnNpb25TdHJpbmcgPSBTdHJpbmcobmFtZSwgbmFtZUxlbik7 CisgICAgICAgICAgICBMT0coUGx1Z2lucywgIlBsdWdpbkRhdGFiYXNlV2luOjphZGRKYXZhUGx1 Z2luRGlyZWN0b3J5IC0gc2V0dGluZyBsYXRlc3QgSmF2YSBQbHVnaW4gdmVyc2lvbiB0byAlcyIs IGxhdGVzdEphdmFWZXJzaW9uU3RyaW5nKTsKKyAgICAgICAgfQorICAgIH0KKworICAgIGlmIChs YXRlc3RKYXZhVmVyc2lvblN0cmluZy5pc0VtcHR5KCkpCisgICAgICAgIExPRyhQbHVnaW5zLCAi UGx1Z2luRGF0YWJhc2VXaW46OmFkZEphdmFQbHVnaW5EaXJlY3RvcnkgLSBFUlJPUjogZmFpbGVk IHRvIGZpbmQgSmF2YSB2ZXJzaW9uISEhIik7CisgICAgZWxzZSB7CisgICAgICAgIERXT1JEIHR5 cGU7CisgICAgICAgIFdDSEFSIGphdmFJbnN0YWxsUGF0aFN0cltfTUFYX1BBVEhdOworICAgICAg ICBEV09SRCBqYXZhSW5zdGFsbFBhdGhTaXplID0gc2l6ZW9mKGphdmFJbnN0YWxsUGF0aFN0cik7 CisgICAgICAgIERXT1JEIHVzZU5ld1BsdWdpblZhbHVlOworICAgICAgICBEV09SRCB1c2VOZXdQ bHVnaW5TaXplOworCisgICAgICAgIFN0cmluZyBqYXZhUGx1Z2luS2V5UGF0aCA9ICJTb2Z0d2Fy ZVxcSmF2YVNvZnRcXEphdmEgUGx1Zy1pblxcIiArIGxhdGVzdEphdmFWZXJzaW9uU3RyaW5nOwor ICAgICAgICByZXN1bHQgPSBTSEdldFZhbHVlKEhLRVlfTE9DQUxfTUFDSElORSwgamF2YVBsdWdp bktleVBhdGguY2hhcmFjdGVyc1dpdGhOdWxsVGVybWluYXRpb24oKSwgVEVYVCgiVXNlTmV3SmF2 YVBsdWdpbiIpLCAmdHlwZSwgKExQVk9JRCkmdXNlTmV3UGx1Z2luVmFsdWUsICZ1c2VOZXdQbHVn aW5TaXplKTsKKyAgICAgICAgaWYgKHJlc3VsdCA9PSBFUlJPUl9TVUNDRVNTKSB7CisgICAgICAg ICAgICBpZiAodXNlTmV3UGx1Z2luVmFsdWUgPT0gMSkgeworICAgICAgICAgICAgICAgIHJlc3Vs dCA9IFNIR2V0VmFsdWUoSEtFWV9MT0NBTF9NQUNISU5FLCBqYXZhUGx1Z2luS2V5UGF0aC5jaGFy YWN0ZXJzV2l0aE51bGxUZXJtaW5hdGlvbigpLCBURVhUKCJKYXZhSG9tZSIpLCAmdHlwZSwgKExQ QllURSlqYXZhSW5zdGFsbFBhdGhTdHIsICZqYXZhSW5zdGFsbFBhdGhTaXplKTsKKyAgICAgICAg ICAgICAgICBpZiAocmVzdWx0ID09IEVSUk9SX1NVQ0NFU1MpIHsKKyAgICAgICAgICAgICAgICAg ICAgU3RyaW5nIGphdmFQbHVnaW5EaXJlY3RvcnkgPSBTdHJpbmcoamF2YUluc3RhbGxQYXRoU3Ry LCBqYXZhSW5zdGFsbFBhdGhTaXplIC8gc2l6ZW9mKFdDSEFSKSAtIDEpICsgIlxcYmluXFxuZXdf cGx1Z2luIjsKKyAgICAgICAgICAgICAgICAgICAgZGlyZWN0b3JpZXMuYXBwZW5kKGphdmFQbHVn aW5EaXJlY3RvcnkpOworICAgICAgICAgICAgICAgICAgICBMT0coUGx1Z2lucywgIlBsdWdpbkRh dGFiYXNlV2luOjphZGRKYXZhUGx1Z2luRGlyZWN0b3J5IC0gYWRkaW5nIEphdmEgcGx1Z2luIGRp cmVjdG9yeTogJXMiLCBqYXZhUGx1Z2luRGlyZWN0b3J5KTsKKyAgICAgICAgICAgICAgICB9IGVs c2UKKyAgICAgICAgICAgICAgICAgICAgTE9HKFBsdWdpbnMsICJQbHVnaW5EYXRhYmFzZVdpbjo6 YWRkSmF2YVBsdWdpbkRpcmVjdG9yeSAtIEVSUk9SOiBmYWlsZWQgdG8gcmVhZCBKYXZhSG9tZSB2 YWx1ZSAoICVkICkiLCByZXN1bHQpOworICAgICAgICAgICAgfSBlbHNlCisgICAgICAgICAgICAg ICAgTE9HKFBsdWdpbnMsICJQbHVnaW5EYXRhYmFzZVdpbjo6YWRkSmF2YVBsdWdpbkRpcmVjdG9y eSAtIEVSUk9SOiBmYWlsZWQgdG8gZmluZCBhICduZXcnIEphdmEgUGx1Z2luIik7CisgICAgICAg IH0gZWxzZQorICAgICAgICAgICAgTE9HKFBsdWdpbnMsICJQbHVnaW5EYXRhYmFzZVdpbjo6YWRk SmF2YVBsdWdpbkRpcmVjdG9yeSAtIEVSUk9SOiBmYWlsZWQgdG8gcmVhZCAnVXNlTmV3SmF2YVBs dWdpbicgdmFsdWUgKCAlZCApIiwgcmVzdWx0KTsKKyAgICB9CisKKyAgICBSZWdDbG9zZUtleShr ZXkpOworfQorCiBWZWN0b3I8U3RyaW5nPiBQbHVnaW5EYXRhYmFzZTo6ZGVmYXVsdFBsdWdpbkRp cmVjdG9yaWVzKCkKIHsKICAgICBWZWN0b3I8U3RyaW5nPiBkaXJlY3RvcmllczsKQEAgLTM4Myw2 ICs0NDMsNyBAQCBWZWN0b3I8U3RyaW5nPiBQbHVnaW5EYXRhYmFzZTo6ZGVmYXVsdFBsdWdpbkRp cmVjdG9yaWVzKCkKICAgICBhZGRNb3ppbGxhUGx1Z2luRGlyZWN0b3JpZXMoZGlyZWN0b3JpZXMp OwogICAgIGFkZFdpbmRvd3NNZWRpYVBsYXllclBsdWdpbkRpcmVjdG9yeShkaXJlY3Rvcmllcyk7 CiAgICAgYWRkTWFjcm9tZWRpYVBsdWdpbkRpcmVjdG9yaWVzKGRpcmVjdG9yaWVzKTsKKyAgICBh ZGRKYXZhUGx1Z2luRGlyZWN0b3J5KGRpcmVjdG9yaWVzKTsKIAogICAgIHJldHVybiBkaXJlY3Rv cmllczsKIH0K 56391 2010-05-18 11:21:19 -0700 2010-08-25 11:18:07 -0700 Locate Java plugin dll via the Windows Registry (Update III) webkit_locate_windows_java_plugin_dll_path_3.patch text/plain 4344 adawit ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YWM1YzM4OC4uZTdjYzJlOSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxMC0wNS0xOCAgRGF3aXQgQWxlbWF5 ZWh1ICA8YWRhd2l0QGtkZS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQWRkIGNvZGUgdG8gbG9jYXRlIHRoZSBKYXZhIFBsdWctaW4gRExMIG9u IFdpbmRvd3MgdmlhIHRoZSByZWdpc3RyeS4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mzg5MTEKKworICAgICAgICAqIHBsdWdpbnMvd2luL1BsdWdp bkRhdGFiYXNlV2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmFkZEphdmFQbHVnaW5EaXJlY3Rv cnkpOgorICAgICAgICAoV2ViQ29yZTo6UGx1Z2luRGF0YWJhc2U6OmRlZmF1bHRQbHVnaW5EaXJl Y3Rvcmllcyk6CisKIDIwMTAtMDUtMTQgIE5vYW0gUm9zZW50aGFsICA8bm9hbS5yb3NlbnRoYWxA bm9raWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFu c2VuLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbHVnaW5zL3dpbi9QbHVnaW5EYXRhYmFzZVdpbi5j cHAgYi9XZWJDb3JlL3BsdWdpbnMvd2luL1BsdWdpbkRhdGFiYXNlV2luLmNwcAppbmRleCA3MWJj ZGI1Li5hYjRiMTU0IDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsdWdpbnMvd2luL1BsdWdpbkRhdGFi YXNlV2luLmNwcAorKysgYi9XZWJDb3JlL3BsdWdpbnMvd2luL1BsdWdpbkRhdGFiYXNlV2luLmNw cApAQCAtMzcxLDYgKzM3MSw2NiBAQCBzdGF0aWMgaW5saW5lIHZvaWQgYWRkTWFjcm9tZWRpYVBs dWdpbkRpcmVjdG9yaWVzKFZlY3RvcjxTdHJpbmc+JiBkaXJlY3RvcmllcykKICNlbmRpZgogfQog CitzdGF0aWMgaW5saW5lIHZvaWQgYWRkSmF2YVBsdWdpbkRpcmVjdG9yeShWZWN0b3I8U3RyaW5n PiYgZGlyZWN0b3JpZXMpCit7CisgICAgSEtFWSBrZXk7CisgICAgSFJFU1VMVCByZXN1bHQgPSBS ZWdPcGVuS2V5RXgoSEtFWV9MT0NBTF9NQUNISU5FLCBURVhUKCJTb2Z0d2FyZVxcSmF2YVNvZnRc XEphdmEgUGx1Zy1pbiIpLCAwLCBLRVlfUkVBRCwgJmtleSk7CisgICAgaWYgKHJlc3VsdCAhPSBF UlJPUl9TVUNDRVNTKQorICAgICAgICByZXR1cm47CisKKyAgICBXQ0hBUiBuYW1lWzEyOF07Cisg ICAgRklMRVRJTUUgbGFzdE1vZGlmaWVkOworCisgICAgVmVjdG9yPGludD4gbGF0ZXN0SmF2YVZl cnNpb247CisgICAgU3RyaW5nIGxhdGVzdEphdmFWZXJzaW9uU3RyaW5nOworCisgICAgTE9HKFBs dWdpbnMsICJQbHVnaW5EYXRhYmFzZVdpbjo6YWRkSmF2YVBsdWdpbkRpcmVjdG9yeSAtIGNoZWNr aW5nIEphdmEgUGx1Z2luIHZlcnNpb25zIik7CisKKyAgICAvLyBFbnVtZXJhdGUgc3Via2V5cwor ICAgIGZvciAoaW50IGkgPSAwOzsgaSsrKSB7CisgICAgICAgIERXT1JEIG5hbWVMZW4gPSBzaXpl b2YobmFtZSkgLyBzaXplb2YoV0NIQVIpOworICAgICAgICByZXN1bHQgPSBSZWdFbnVtS2V5RXhX KGtleSwgaSwgbmFtZSwgJm5hbWVMZW4sIDAsIDAsIDAsICZsYXN0TW9kaWZpZWQpOworCisgICAg ICAgIGlmIChyZXN1bHQgIT0gRVJST1JfU1VDQ0VTUykKKyAgICAgICAgICAgIGJyZWFrOworCisg ICAgICAgIFZlY3RvcjxpbnQ+IGphdmFWZXJzaW9uID0gcGFyc2VWZXJzaW9uU3RyaW5nKFN0cmlu ZyhuYW1lLCBuYW1lTGVuKSk7CisgICAgICAgIGlmIChjb21wYXJlVmVyc2lvbnMoamF2YVZlcnNp b24sIGxhdGVzdEphdmFWZXJzaW9uKSkgeworICAgICAgICAgICAgbGF0ZXN0SmF2YVZlcnNpb24g PSBqYXZhVmVyc2lvbjsKKyAgICAgICAgICAgIGxhdGVzdEphdmFWZXJzaW9uU3RyaW5nID0gU3Ry aW5nKG5hbWUsIG5hbWVMZW4pOworICAgICAgICAgICAgTE9HKFBsdWdpbnMsICJQbHVnaW5EYXRh YmFzZVdpbjo6YWRkSmF2YVBsdWdpbkRpcmVjdG9yeSAtIHNldHRpbmcgbGF0ZXN0IEphdmEgUGx1 Z2luIHZlcnNpb24gdG8gJXMiLCBsYXRlc3RKYXZhVmVyc2lvblN0cmluZyk7CisgICAgICAgIH0K KyAgICB9CisKKyAgICBpZiAobGF0ZXN0SmF2YVZlcnNpb25TdHJpbmcuaXNFbXB0eSgpKQorICAg ICAgICBMT0coUGx1Z2lucywgIlBsdWdpbkRhdGFiYXNlV2luOjphZGRKYXZhUGx1Z2luRGlyZWN0 b3J5IC0gRVJST1I6IGZhaWxlZCB0byBmaW5kIEphdmEgdmVyc2lvbiEhISIpOworICAgIGVsc2Ug eworICAgICAgICBEV09SRCB0eXBlOworICAgICAgICBXQ0hBUiBqYXZhSW5zdGFsbFBhdGhTdHJb X01BWF9QQVRIXTsKKyAgICAgICAgRFdPUkQgamF2YUluc3RhbGxQYXRoU2l6ZSA9IHNpemVvZihq YXZhSW5zdGFsbFBhdGhTdHIpOworICAgICAgICBEV09SRCB1c2VOZXdQbHVnaW5WYWx1ZTsKKyAg ICAgICAgRFdPUkQgdXNlTmV3UGx1Z2luU2l6ZTsKKworICAgICAgICBTdHJpbmcgamF2YVBsdWdp bktleVBhdGggPSAiU29mdHdhcmVcXEphdmFTb2Z0XFxKYXZhIFBsdWctaW5cXCIgKyBsYXRlc3RK YXZhVmVyc2lvblN0cmluZzsKKyAgICAgICAgcmVzdWx0ID0gU0hHZXRWYWx1ZShIS0VZX0xPQ0FM X01BQ0hJTkUsIGphdmFQbHVnaW5LZXlQYXRoLmNoYXJhY3RlcnNXaXRoTnVsbFRlcm1pbmF0aW9u KCksIFRFWFQoIlVzZU5ld0phdmFQbHVnaW4iKSwgJnR5cGUsIChMUFZPSUQpJnVzZU5ld1BsdWdp blZhbHVlLCAmdXNlTmV3UGx1Z2luU2l6ZSk7CisgICAgICAgIGlmIChyZXN1bHQgPT0gRVJST1Jf U1VDQ0VTUykgeworICAgICAgICAgICAgaWYgKHVzZU5ld1BsdWdpblZhbHVlID09IDEpIHsKKyAg ICAgICAgICAgICAgICByZXN1bHQgPSBTSEdldFZhbHVlKEhLRVlfTE9DQUxfTUFDSElORSwgamF2 YVBsdWdpbktleVBhdGguY2hhcmFjdGVyc1dpdGhOdWxsVGVybWluYXRpb24oKSwgVEVYVCgiSmF2 YUhvbWUiKSwgJnR5cGUsIChMUEJZVEUpamF2YUluc3RhbGxQYXRoU3RyLCAmamF2YUluc3RhbGxQ YXRoU2l6ZSk7CisgICAgICAgICAgICAgICAgaWYgKHJlc3VsdCA9PSBFUlJPUl9TVUNDRVNTKSB7 CisgICAgICAgICAgICAgICAgICAgIFN0cmluZyBqYXZhUGx1Z2luRGlyZWN0b3J5ID0gU3RyaW5n KGphdmFJbnN0YWxsUGF0aFN0ciwgamF2YUluc3RhbGxQYXRoU2l6ZSAvIHNpemVvZihXQ0hBUikg LSAxKSArICJcXGJpblxcbmV3X3BsdWdpbiI7CisgICAgICAgICAgICAgICAgICAgIGRpcmVjdG9y aWVzLmFwcGVuZChqYXZhUGx1Z2luRGlyZWN0b3J5KTsKKyAgICAgICAgICAgICAgICAgICAgTE9H KFBsdWdpbnMsICJQbHVnaW5EYXRhYmFzZVdpbjo6YWRkSmF2YVBsdWdpbkRpcmVjdG9yeSAtIGFk ZGluZyBKYXZhIHBsdWdpbiBkaXJlY3Rvcnk6ICVzIiwgamF2YVBsdWdpbkRpcmVjdG9yeSk7Cisg ICAgICAgICAgICAgICAgfSBlbHNlCisgICAgICAgICAgICAgICAgICAgIExPRyhQbHVnaW5zLCAi UGx1Z2luRGF0YWJhc2VXaW46OmFkZEphdmFQbHVnaW5EaXJlY3RvcnkgLSBFUlJPUjogZmFpbGVk IHRvIHJlYWQgSmF2YUhvbWUgdmFsdWUgKCAlZCApIiwgcmVzdWx0KTsKKyAgICAgICAgICAgIH0g ZWxzZQorICAgICAgICAgICAgICAgIExPRyhQbHVnaW5zLCAiUGx1Z2luRGF0YWJhc2VXaW46OmFk ZEphdmFQbHVnaW5EaXJlY3RvcnkgLSBFUlJPUjogZmFpbGVkIHRvIGZpbmQgYSAnbmV3JyBKYXZh IFBsdWdpbiIpOworICAgICAgICB9IGVsc2UKKyAgICAgICAgICAgIExPRyhQbHVnaW5zLCAiUGx1 Z2luRGF0YWJhc2VXaW46OmFkZEphdmFQbHVnaW5EaXJlY3RvcnkgLSBFUlJPUjogZmFpbGVkIHRv IHJlYWQgJ1VzZU5ld0phdmFQbHVnaW4nIHZhbHVlICggJWQgKSIsIHJlc3VsdCk7CisgICAgfQor CisgICAgUmVnQ2xvc2VLZXkoa2V5KTsKK30KKwogVmVjdG9yPFN0cmluZz4gUGx1Z2luRGF0YWJh c2U6OmRlZmF1bHRQbHVnaW5EaXJlY3RvcmllcygpCiB7CiAgICAgVmVjdG9yPFN0cmluZz4gZGly ZWN0b3JpZXM7CkBAIC0zODMsNiArNDQzLDEwIEBAIFZlY3RvcjxTdHJpbmc+IFBsdWdpbkRhdGFi YXNlOjpkZWZhdWx0UGx1Z2luRGlyZWN0b3JpZXMoKQogICAgIGFkZE1vemlsbGFQbHVnaW5EaXJl Y3RvcmllcyhkaXJlY3Rvcmllcyk7CiAgICAgYWRkV2luZG93c01lZGlhUGxheWVyUGx1Z2luRGly ZWN0b3J5KGRpcmVjdG9yaWVzKTsKICAgICBhZGRNYWNyb21lZGlhUGx1Z2luRGlyZWN0b3JpZXMo ZGlyZWN0b3JpZXMpOworICAgIAorI2lmIFBMQVRGT1JNKFFUKSAgICAKKyAgICBhZGRKYXZhUGx1 Z2luRGlyZWN0b3J5KGRpcmVjdG9yaWVzKTsKKyNlbmRpZiAgICAKIAogICAgIHJldHVybiBkaXJl Y3RvcmllczsKIH0K 65219 2010-08-24 00:11:28 -0700 2010-08-27 10:35:53 -0700 Locate Java plugin dll via the Windows Registry (Update IV) locate_java_plugin_dll_path_on_windows_2.patch text/plain 3517 adawit ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NjQ2ZjYxMS4uMDU3NGM1MyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMC0wOC0yMyAgRGF3aXQgQWxlbWF5 ZWh1ICA8YWRhd2l0QGtkZS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgW1F0XSBTZWFyY2ggdGhlIFdpbmRvd3MgcmVnaXN0cnkgZm9yIHRoZSBs b2NhdGlvbiBvZiB0aGUgSmF2YSBwbHVnaW4gRExMLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mzg5MTEKKworICAgICAgICBUaGlzIGNoYW5nZSwgaW4g YWRkaXRpb24gdG8gdGhlIG9uZXMgMzQ1MzkgYW5kIDM4OTExLCBpcyBuZWVkZWQgdG8KKyAgICAg ICAgbWFrZSBKYXZhIGFwcGxldCB3b3JrIGluIFF0V2ViS2l0IG9uIHRoZSBXaW5kb3dzIHBsYXRm b3JtLgorCisgICAgICAgICogcGx1Z2lucy93aW4vUGx1Z2luRGF0YWJhc2VXaW4uY3BwOgorICAg ICAgICAoV2ViQ29yZTo6YWRkSmF2YVBsdWdpbkRpcmVjdG9yeSk6CisgICAgICAgIChXZWJDb3Jl OjpQbHVnaW5EYXRhYmFzZTo6ZGVmYXVsdFBsdWdpbkRpcmVjdG9yaWVzKToKKwogMjAxMC0wOC0y MyAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IEVyaWMgU2VpZGVsLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbHVnaW5zL3dpbi9QbHVnaW5EYXRh YmFzZVdpbi5jcHAgYi9XZWJDb3JlL3BsdWdpbnMvd2luL1BsdWdpbkRhdGFiYXNlV2luLmNwcApp bmRleCA1ZDg2MTE3Li42Y2JjZGM4IDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsdWdpbnMvd2luL1Bs dWdpbkRhdGFiYXNlV2luLmNwcAorKysgYi9XZWJDb3JlL3BsdWdpbnMvd2luL1BsdWdpbkRhdGFi YXNlV2luLmNwcApAQCAtMzMyLDYgKzMzMiw1NiBAQCBzdGF0aWMgaW5saW5lIHZvaWQgYWRkQWRv YmVBY3JvYmF0UGx1Z2luRGlyZWN0b3J5KFZlY3RvcjxTdHJpbmc+JiBkaXJlY3RvcmllcykKICAg ICBSZWdDbG9zZUtleShrZXkpOwogfQogCitzdGF0aWMgaW5saW5lIHZvaWQgYWRkSmF2YVBsdWdp bkRpcmVjdG9yeShWZWN0b3I8U3RyaW5nPiYgZGlyZWN0b3JpZXMpCit7CisgICAgSEtFWSBrZXk7 CisgICAgSFJFU1VMVCByZXN1bHQgPSBSZWdPcGVuS2V5RXgoSEtFWV9MT0NBTF9NQUNISU5FLCBU RVhUKCJTb2Z0d2FyZVxcSmF2YVNvZnRcXEphdmEgUGx1Zy1pbiIpLCAwLCBLRVlfUkVBRCwgJmtl eSk7CisgICAgaWYgKHJlc3VsdCAhPSBFUlJPUl9TVUNDRVNTKQorICAgICAgICByZXR1cm47CisK KyAgICBXQ0hBUiBuYW1lWzEyOF07CisgICAgRklMRVRJTUUgbGFzdE1vZGlmaWVkOworCisgICAg VmVjdG9yPGludD4gbGF0ZXN0SmF2YVZlcnNpb247CisgICAgU3RyaW5nIGxhdGVzdEphdmFWZXJz aW9uU3RyaW5nOworCisgICAgLy8gRW51bWVyYXRlIHN1YmtleXMKKyAgICBmb3IgKGludCBpID0g MDs7IGkrKykgeworICAgICAgICBEV09SRCBuYW1lTGVuID0gc2l6ZW9mKG5hbWUpIC8gc2l6ZW9m KFdDSEFSKTsKKyAgICAgICAgcmVzdWx0ID0gUmVnRW51bUtleUV4VyhrZXksIGksIG5hbWUsICZu YW1lTGVuLCAwLCAwLCAwLCAmbGFzdE1vZGlmaWVkKTsKKworICAgICAgICBpZiAocmVzdWx0ICE9 IEVSUk9SX1NVQ0NFU1MpCisgICAgICAgICAgICBicmVhazsKKworICAgICAgICBWZWN0b3I8aW50 PiBqYXZhVmVyc2lvbiA9IHBhcnNlVmVyc2lvblN0cmluZyhTdHJpbmcobmFtZSwgbmFtZUxlbikp OworICAgICAgICBpZiAoY29tcGFyZVZlcnNpb25zKGphdmFWZXJzaW9uLCBsYXRlc3RKYXZhVmVy c2lvbikpIHsKKyAgICAgICAgICAgIGxhdGVzdEphdmFWZXJzaW9uID0gamF2YVZlcnNpb247Cisg ICAgICAgICAgICBsYXRlc3RKYXZhVmVyc2lvblN0cmluZyA9IFN0cmluZyhuYW1lLCBuYW1lTGVu KTsKKyAgICAgICAgfQorICAgIH0KKworICAgIGlmICghbGF0ZXN0SmF2YVZlcnNpb25TdHJpbmcu aXNFbXB0eSgpKSB7CisgICAgICAgIERXT1JEIHR5cGU7CisgICAgICAgIFdDSEFSIGphdmFJbnN0 YWxsUGF0aFN0cltfTUFYX1BBVEhdOworICAgICAgICBEV09SRCBqYXZhSW5zdGFsbFBhdGhTaXpl ID0gc2l6ZW9mKGphdmFJbnN0YWxsUGF0aFN0cik7CisgICAgICAgIERXT1JEIHVzZU5ld1BsdWdp blZhbHVlOworICAgICAgICBEV09SRCB1c2VOZXdQbHVnaW5TaXplOworCisgICAgICAgIFN0cmlu ZyBqYXZhUGx1Z2luS2V5UGF0aCA9ICJTb2Z0d2FyZVxcSmF2YVNvZnRcXEphdmEgUGx1Zy1pblxc IiArIGxhdGVzdEphdmFWZXJzaW9uU3RyaW5nOworICAgICAgICByZXN1bHQgPSBTSEdldFZhbHVl KEhLRVlfTE9DQUxfTUFDSElORSwgamF2YVBsdWdpbktleVBhdGguY2hhcmFjdGVyc1dpdGhOdWxs VGVybWluYXRpb24oKSwgVEVYVCgiVXNlTmV3SmF2YVBsdWdpbiIpLCAmdHlwZSwgKExQVk9JRCkm dXNlTmV3UGx1Z2luVmFsdWUsICZ1c2VOZXdQbHVnaW5TaXplKTsKKworICAgICAgICBpZiAocmVz dWx0ID09IEVSUk9SX1NVQ0NFU1MgJiYgdXNlTmV3UGx1Z2luVmFsdWUgPT0gMSkgeworICAgICAg ICAgICAgcmVzdWx0ID0gU0hHZXRWYWx1ZShIS0VZX0xPQ0FMX01BQ0hJTkUsIGphdmFQbHVnaW5L ZXlQYXRoLmNoYXJhY3RlcnNXaXRoTnVsbFRlcm1pbmF0aW9uKCksIFRFWFQoIkphdmFIb21lIiks ICZ0eXBlLCAoTFBCWVRFKWphdmFJbnN0YWxsUGF0aFN0ciwgJmphdmFJbnN0YWxsUGF0aFNpemUp OworICAgICAgICAgICAgaWYgKHJlc3VsdCA9PSBFUlJPUl9TVUNDRVNTKSB7CisgICAgICAgICAg ICAgICAgU3RyaW5nIGphdmFQbHVnaW5EaXJlY3RvcnkgPSBTdHJpbmcoamF2YUluc3RhbGxQYXRo U3RyLCBqYXZhSW5zdGFsbFBhdGhTaXplIC8gc2l6ZW9mKFdDSEFSKSAtIDEpICsgIlxcYmluXFxu ZXdfcGx1Z2luIjsKKyAgICAgICAgICAgICAgICBkaXJlY3Rvcmllcy5hcHBlbmQoamF2YVBsdWdp bkRpcmVjdG9yeSk7CisgICAgICAgICAgICB9CisgICAgICAgIH0KKyAgICB9CisKKyAgICBSZWdD bG9zZUtleShrZXkpOworfQorCiBzdGF0aWMgaW5saW5lIFN0cmluZyBzYWZhcmlQbHVnaW5zRGly ZWN0b3J5KCkKIHsKICAgICBXQ0hBUiBtb2R1bGVGaWxlTmFtZVN0cltfTUFYX1BBVEhdOwpAQCAt Mzg1LDYgKzQzNSw5IEBAIFZlY3RvcjxTdHJpbmc+IFBsdWdpbkRhdGFiYXNlOjpkZWZhdWx0UGx1 Z2luRGlyZWN0b3JpZXMoKQogICAgIGFkZE1vemlsbGFQbHVnaW5EaXJlY3RvcmllcyhkaXJlY3Rv cmllcyk7CiAgICAgYWRkV2luZG93c01lZGlhUGxheWVyUGx1Z2luRGlyZWN0b3J5KGRpcmVjdG9y aWVzKTsKICAgICBhZGRNYWNyb21lZGlhUGx1Z2luRGlyZWN0b3JpZXMoZGlyZWN0b3JpZXMpOwor I2lmIFBMQVRGT1JNKFFUKQorICAgIGFkZEphdmFQbHVnaW5EaXJlY3RvcnkoZGlyZWN0b3JpZXMp OworI2VuZGlmCiAKICAgICByZXR1cm4gZGlyZWN0b3JpZXM7CiB9Cg==