37385 2010-04-10 05:11:03 -0700 [Haiku] Use all the new system cursors in CursorHaiku.cpp 2010-04-13 06:36:36 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Other Other RESOLVED FIXED P2 Normal --- 0 superstippi webkit-unassigned commit-queue levin oldest_to_newest 211134 0 superstippi 2010-04-10 05:11:03 -0700 I've recently added all sorts of system cursors for Haiku, this patch adds support for them in the WebKit port. The definitions for PlatformCursor and PlatformCursorHandle had to be changed for convenience in other parts of the port. 211135 1 53037 superstippi 2010-04-10 05:12:43 -0700 Created attachment 53037 [Haiku] Use all the new system cursors 211192 2 53037 eric 2010-04-10 15:08:38 -0700 Comment on attachment 53037 [Haiku] Use all the new system cursors Seems either a helper function, or adding some new constructor to Cursor would be cleaner than " Cursor(BCursor(" every time. 211407 3 53097 superstippi 2010-04-11 13:01:52 -0700 Created attachment 53097 [Haiku] Use all the new system cursors Revised patch with helper function to create Cursors from BCursorIDs. 211873 4 53097 levin 2010-04-12 23:37:06 -0700 Comment on attachment 53097 [Haiku] Use all the new system cursors > Index: WebCore/ChangeLog > +2010-04-11 Stephan Aßmus <superstippi@gmx.de> > + > + Reviewed by NOBODY (OOPS!). > + > + [Haiku] Use all the new system cursors available in recent Haiku revisions. > + <https://bugs.webkit.org/show_bug.cgi?id=37385> > + > + Covered by existing tests. > + > + * platform/Cursor.h: > + - Added necessary include. > + - Changed definitions of PlatformCursor and PlatformCursorHandle. It is clear that you did this but why you did it is unclear. This results in an ifdef in Cursor.h (to change the return type of impl()) where all other ports have been able to avoid it. r- due to new ifdef which changes the return type of impl(). 211900 5 53232 superstippi 2010-04-13 01:53:55 -0700 Created attachment 53232 [Haiku] Use all the new system cursors Revised patch, Cursor now keeps a pointer to a BCursor again. Cursor.h needs to changes at all anymore. Also fixed the coding style on the names for static variables, somehow I was under the impression I read this in the style guide document, but I was mistaken. 211918 6 53232 commit-queue 2010-04-13 06:36:31 -0700 Comment on attachment 53232 [Haiku] Use all the new system cursors Clearing flags on attachment: 53232 Committed r57512: <http://trac.webkit.org/changeset/57512> 211919 7 commit-queue 2010-04-13 06:36:36 -0700 All reviewed patches have been landed. Closing bug. 53037 2010-04-10 05:12:43 -0700 2010-04-11 13:01:52 -0700 [Haiku] Use all the new system cursors CursorHaiku.diff text/plain 10911 superstippi SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NzQxNykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsNTggQEAKKzIwMTAtMDQtMTAgIFN0ZXBoYW4gQcOfbXVzICA8c3VwZXJzdGlwcGlA Z214LmRlPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFtIYWlrdV0gVXNlIGFsbCB0aGUgbmV3IHN5c3RlbSBjdXJzb3JzIGF2YWlsYWJsZSBpbiByZWNl bnQgSGFpa3UgcmV2aXNpb25zLgorICAgICAgICA8aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTM3Mzg1PgorCisgICAgICAgIENvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMu CisKKyAgICAgICAgKiBwbGF0Zm9ybS9DdXJzb3IuaDoKKyAgICAgICAgICAgIC0gQWRkZWQgbmVj ZXNzYXJ5IGluY2x1ZGUuCisgICAgICAgICAgICAtIENoYW5nZWQgZGVmaW5pdGlvbnMgb2YgUGxh dGZvcm1DdXJzb3IgYW5kIFBsYXRmb3JtQ3Vyc29ySGFuZGxlLgorICAgICAgICAoV2ViQ29yZTo6 Q3Vyc29yOjpDdXJzb3IpOgorICAgICAgICAgICAgLSBEZWZhdWx0IGNvbnN0cnVjdG9yIG5lZWRz IGRlZmF1bHQgc3lzdGVtIGN1cnNvciBpbml0LgorICAgICAgICAoV2ViQ29yZTo6Q3Vyc29yOjpp bXBsKToKKyAgICAgICAgICAgIC0gTXVjaCBtb3JlIGNvbnZlbmllbnQgb24gSGFpa3UgdG8gcmV0 dXJuIGEgY29uc3QgcG9pbnRlciB0byB0aGUKKyAgICAgICAgICAgICAgQkN1cnNvciBpbnN0YW5j ZS4KKyAgICAgICAgKiBwbGF0Zm9ybS9oYWlrdS9DdXJzb3JIYWlrdS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpDdXJzb3I6OkN1cnNvcik6CisgICAgICAgIChXZWJDb3JlOjpwb2ludGVyQ3Vyc29y KToKKyAgICAgICAgKFdlYkNvcmU6Om1vdmVDdXJzb3IpOgorICAgICAgICAoV2ViQ29yZTo6Y3Jv c3NDdXJzb3IpOgorICAgICAgICAoV2ViQ29yZTo6aGFuZEN1cnNvcik6CisgICAgICAgIChXZWJD b3JlOjppQmVhbUN1cnNvcik6CisgICAgICAgIChXZWJDb3JlOjp3YWl0Q3Vyc29yKToKKyAgICAg ICAgKFdlYkNvcmU6OmhlbHBDdXJzb3IpOgorICAgICAgICAoV2ViQ29yZTo6ZWFzdFJlc2l6ZUN1 cnNvcik6CisgICAgICAgIChXZWJDb3JlOjpub3J0aFJlc2l6ZUN1cnNvcik6CisgICAgICAgIChX ZWJDb3JlOjpub3J0aEVhc3RSZXNpemVDdXJzb3IpOgorICAgICAgICAoV2ViQ29yZTo6bm9ydGhX ZXN0UmVzaXplQ3Vyc29yKToKKyAgICAgICAgKFdlYkNvcmU6OnNvdXRoUmVzaXplQ3Vyc29yKToK KyAgICAgICAgKFdlYkNvcmU6OnNvdXRoRWFzdFJlc2l6ZUN1cnNvcik6CisgICAgICAgIChXZWJD b3JlOjpzb3V0aFdlc3RSZXNpemVDdXJzb3IpOgorICAgICAgICAoV2ViQ29yZTo6d2VzdFJlc2l6 ZUN1cnNvcik6CisgICAgICAgIChXZWJDb3JlOjpub3J0aFNvdXRoUmVzaXplQ3Vyc29yKToKKyAg ICAgICAgKFdlYkNvcmU6OmVhc3RXZXN0UmVzaXplQ3Vyc29yKToKKyAgICAgICAgKFdlYkNvcmU6 Om5vcnRoRWFzdFNvdXRoV2VzdFJlc2l6ZUN1cnNvcik6CisgICAgICAgIChXZWJDb3JlOjpub3J0 aFdlc3RTb3V0aEVhc3RSZXNpemVDdXJzb3IpOgorICAgICAgICAoV2ViQ29yZTo6Y29sdW1uUmVz aXplQ3Vyc29yKToKKyAgICAgICAgKFdlYkNvcmU6OnJvd1Jlc2l6ZUN1cnNvcik6CisgICAgICAg IChXZWJDb3JlOjp2ZXJ0aWNhbFRleHRDdXJzb3IpOgorICAgICAgICAoV2ViQ29yZTo6Y2VsbEN1 cnNvcik6CisgICAgICAgIChXZWJDb3JlOjpjb250ZXh0TWVudUN1cnNvcik6CisgICAgICAgIChX ZWJDb3JlOjpub0Ryb3BDdXJzb3IpOgorICAgICAgICAoV2ViQ29yZTo6Y29weUN1cnNvcik6Cisg ICAgICAgIChXZWJDb3JlOjpwcm9ncmVzc0N1cnNvcik6CisgICAgICAgIChXZWJDb3JlOjphbGlh c0N1cnNvcik6CisgICAgICAgIChXZWJDb3JlOjpub25lQ3Vyc29yKToKKyAgICAgICAgKFdlYkNv cmU6Om5vdEFsbG93ZWRDdXJzb3IpOgorICAgICAgICAoV2ViQ29yZTo6em9vbUluQ3Vyc29yKToK KyAgICAgICAgKFdlYkNvcmU6Onpvb21PdXRDdXJzb3IpOgorICAgICAgICAoV2ViQ29yZTo6Z3Jh YkN1cnNvcik6CisgICAgICAgIChXZWJDb3JlOjpncmFiYmluZ0N1cnNvcik6CisgICAgICAgICAg ICAtIFVzZSB0aGUgbmV3IHN5c3RlbSBjdXJzb3JzLgorCiAyMDEwLTA0LTEwICBMYXN6bG8gR29t Ym9zICA8bGFzemxvLjEuZ29tYm9zQG5va2lhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBL ZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbi4KSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vQ3Vyc29y LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9DdXJzb3IuaAkocmV2aXNpb24gNTcy NzQpCisrKyBXZWJDb3JlL3BsYXRmb3JtL0N1cnNvci5oCSh3b3JraW5nIGNvcHkpCkBAIC0yMCw3 ICsyMCw3IEBACiAgKiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIg Q0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZCiAgKiBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09O VFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKICAqIChJTkNMVURJTkcgTkVHTElHRU5D RSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQotICogT0Yg VEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNI IERBTUFHRS4gCisgKiBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBP U1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogICovCiAKICNpZm5kZWYgQ3Vyc29yX2gKQEAgLTM5 LDYgKzM5LDcgQEAgdHlwZWRlZiBzdHJ1Y3QgX0dka0N1cnNvciBHZGtDdXJzb3I7CiAjZWxpZiBQ TEFURk9STShDSFJPTUlVTSkKICNpbmNsdWRlICJQbGF0Zm9ybUN1cnNvci5oIgogI2VsaWYgUExB VEZPUk0oSEFJS1UpCisjaW5jbHVkZSA8YXBwL0FwcERlZnMuaD4KICNpbmNsdWRlIDxhcHAvQ3Vy c29yLmg+CiAjZW5kaWYKIApAQCAtOTUsOCArOTYsOCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAg ICAgLy8gU2VlIFBsYXRmb3JtQ3Vyc29yLmgKICAgICB0eXBlZGVmIHZvaWQqIFBsYXRmb3JtQ3Vy c29ySGFuZGxlOwogI2VsaWYgUExBVEZPUk0oSEFJS1UpCi0gICAgdHlwZWRlZiBCQ3Vyc29yKiBQ bGF0Zm9ybUN1cnNvcjsKLSAgICB0eXBlZGVmIEJDdXJzb3IqIFBsYXRmb3JtQ3Vyc29ySGFuZGxl OworICAgIHR5cGVkZWYgQkN1cnNvciBQbGF0Zm9ybUN1cnNvcjsKKyAgICB0eXBlZGVmIGNvbnN0 IEJDdXJzb3IqIFBsYXRmb3JtQ3Vyc29ySGFuZGxlOwogI2Vsc2UKICAgICB0eXBlZGVmIHZvaWQq IFBsYXRmb3JtQ3Vyc29yOwogICAgIHR5cGVkZWYgdm9pZCogUGxhdGZvcm1DdXJzb3JIYW5kbGU7 CkBAIC0xMDUsNyArMTA2LDkgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgIGNsYXNzIEN1cnNv ciB7CiAgICAgcHVibGljOgogICAgICAgICBDdXJzb3IoKQotI2lmICFQTEFURk9STShRVCkgJiYg IVBMQVRGT1JNKEVGTCkKKyNpZiBQTEFURk9STShIQUlLVSkKKyAgICAgICAgOiBtX2ltcGwoKkJf Q1VSU09SX1NZU1RFTV9ERUZBVUxUKQorI2VsaWYgIVBMQVRGT1JNKFFUKSAmJiAhUExBVEZPUk0o RUZMKQogICAgICAgICA6IG1faW1wbCgwKQogI2VuZGlmCiAgICAgICAgIHsgfQpAQCAtMTE2LDcg KzExOSwxMSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIEN1cnNvciYgb3BlcmF0b3I9 KGNvbnN0IEN1cnNvciYpOwogCiAgICAgICAgIEN1cnNvcihQbGF0Zm9ybUN1cnNvcik7CisjaWYg UExBVEZPUk0oSEFJS1UpCisgICAgICAgIFBsYXRmb3JtQ3Vyc29ySGFuZGxlIGltcGwoKSBjb25z dCB7IHJldHVybiAmbV9pbXBsOyB9CisjZWxzZQogICAgICAgICBQbGF0Zm9ybUN1cnNvciBpbXBs KCkgY29uc3QgeyByZXR1cm4gbV9pbXBsOyB9CisjZW5kaWYKIAogICAgICBwcml2YXRlOgogICAg ICAgICBQbGF0Zm9ybUN1cnNvciBtX2ltcGw7CkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2hhaWt1 L0N1cnNvckhhaWt1LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2hhaWt1L0N1 cnNvckhhaWt1LmNwcAkocmV2aXNpb24gNTcyNzQpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2hhaWt1 L0N1cnNvckhhaWt1LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDYgQEAKIC8qCiAgKiBD b3B5cmlnaHQgKEMpIDIwMDcgUnlhbiBMZWF2ZW5nb29kIDxsZWF2ZW5nb29kQGdtYWlsLmNvbT4K KyAqIENvcHlyaWdodCAoQykgMjAxMCBTdGVwaGFuIEHDn211cyA8c3VwZXJzdGlwcGlAZ214LmRl PgogICoKICAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgpAQCAtMzAsOSArMzEsNiBAQAogCiAj aW5jbHVkZSAiTm90SW1wbGVtZW50ZWQuaCIKIAotI2luY2x1ZGUgPGFwcC9BcHBEZWZzLmg+Ci0K LQogbmFtZXNwYWNlIFdlYkNvcmUgewogCiBDdXJzb3I6OkN1cnNvcihQbGF0Zm9ybUN1cnNvciBj dXJzb3IpCkBAIC01MCw2ICs0OCw3IEBAIEN1cnNvcjo6fkN1cnNvcigpCiB9CiAKIEN1cnNvcjo6 Q3Vyc29yKEltYWdlKiwgY29uc3QgSW50UG9pbnQmKQorICAgIDogbV9pbXBsKCpCX0NVUlNPUl9T WVNURU1fREVGQVVMVCkKIHsKICAgICBub3RJbXBsZW1lbnRlZCgpOwogfQpAQCAtNjAsMTc3ICs1 OSwyMDQgQEAgQ3Vyc29yJiBDdXJzb3I6Om9wZXJhdG9yPShjb25zdCBDdXJzb3ImIAogICAgIHJl dHVybiAqdGhpczsKIH0KIAotc3RhdGljIEN1cnNvciBnbG9iYWxDdXJzb3IgPSBjb25zdF9jYXN0 PEJDdXJzb3IqPihCX0NVUlNPUl9TWVNURU1fREVGQVVMVCk7Ci1zdGF0aWMgQ3Vyc29yIGliZWFt Q3Vyc29yID0gY29uc3RfY2FzdDxCQ3Vyc29yKj4oQl9DVVJTT1JfSV9CRUFNKTsKLQogY29uc3Qg Q3Vyc29yJiBwb2ludGVyQ3Vyc29yKCkKIHsKLSAgICByZXR1cm4gZ2xvYmFsQ3Vyc29yOworICAg IHN0YXRpYyBDdXJzb3Igc0N1cnNvclN5c3RlbURlZmF1bHQoKkJfQ1VSU09SX1NZU1RFTV9ERUZB VUxUKTsKKyAgICByZXR1cm4gc0N1cnNvclN5c3RlbURlZmF1bHQ7CiB9CiAKIGNvbnN0IEN1cnNv ciYgbW92ZUN1cnNvcigpCiB7Ci0gICAgcmV0dXJuIGdsb2JhbEN1cnNvcjsKKyAgICBzdGF0aWMg Q3Vyc29yIHNDdXJzb3JNb3ZlID0gQ3Vyc29yKEJDdXJzb3IoQl9DVVJTT1JfSURfTU9WRSkpOwor ICAgIHJldHVybiBzQ3Vyc29yTW92ZTsKIH0KIAogY29uc3QgQ3Vyc29yJiBjcm9zc0N1cnNvcigp CiB7Ci0gICAgcmV0dXJuIGdsb2JhbEN1cnNvcjsKKyAgICBzdGF0aWMgQ3Vyc29yIHNDdXJzb3JD cm9zc0hhaXIgPSBDdXJzb3IoQkN1cnNvcihCX0NVUlNPUl9JRF9DUk9TU19IQUlSKSk7CisgICAg cmV0dXJuIHNDdXJzb3JDcm9zc0hhaXI7CiB9CiAKIGNvbnN0IEN1cnNvciYgaGFuZEN1cnNvcigp CiB7Ci0gICAgcmV0dXJuIGdsb2JhbEN1cnNvcjsKKyAgICBzdGF0aWMgQ3Vyc29yIHNDdXJzb3JG b2xsb3dMaW5rID0gQ3Vyc29yKEJDdXJzb3IoQl9DVVJTT1JfSURfRk9MTE9XX0xJTkspKTsKKyAg ICByZXR1cm4gc0N1cnNvckZvbGxvd0xpbms7CiB9CiAKIGNvbnN0IEN1cnNvciYgaUJlYW1DdXJz b3IoKQogewotICAgIHJldHVybiBpYmVhbUN1cnNvcjsKKyAgICBzdGF0aWMgQ3Vyc29yIHNDdXJz b3JJQmVhbSgqQl9DVVJTT1JfSV9CRUFNKTsKKyAgICByZXR1cm4gc0N1cnNvcklCZWFtOwogfQog CiBjb25zdCBDdXJzb3ImIHdhaXRDdXJzb3IoKQogewotICAgIHJldHVybiBnbG9iYWxDdXJzb3I7 CisgICAgc3RhdGljIEN1cnNvciBzQ3Vyc29yUHJvZ3Jlc3MgPSBDdXJzb3IoQkN1cnNvcihCX0NV UlNPUl9JRF9QUk9HUkVTUykpOworICAgIHJldHVybiBzQ3Vyc29yUHJvZ3Jlc3M7CiB9CiAKIGNv bnN0IEN1cnNvciYgaGVscEN1cnNvcigpCiB7Ci0gICAgcmV0dXJuIGdsb2JhbEN1cnNvcjsKKyAg ICBzdGF0aWMgQ3Vyc29yIHNDdXJzb3JIZWxwID0gQ3Vyc29yKEJDdXJzb3IoQl9DVVJTT1JfSURf SEVMUCkpOworICAgIHJldHVybiBzQ3Vyc29ySGVscDsKIH0KIAogY29uc3QgQ3Vyc29yJiBlYXN0 UmVzaXplQ3Vyc29yKCkKIHsKLSAgICByZXR1cm4gZ2xvYmFsQ3Vyc29yOworICAgIHN0YXRpYyBD dXJzb3Igc0N1cnNvclJlc2l6ZUVhc3QgPSBDdXJzb3IoQkN1cnNvcihCX0NVUlNPUl9JRF9SRVNJ WkVfRUFTVCkpOworICAgIHJldHVybiBzQ3Vyc29yUmVzaXplRWFzdDsKIH0KIAogY29uc3QgQ3Vy c29yJiBub3J0aFJlc2l6ZUN1cnNvcigpCiB7Ci0gICAgcmV0dXJuIGdsb2JhbEN1cnNvcjsKKyAg ICBzdGF0aWMgQ3Vyc29yIHNDdXJzb3JSZXNpemVOb3J0aCA9IEN1cnNvcihCQ3Vyc29yKEJfQ1VS U09SX0lEX1JFU0laRV9OT1JUSCkpOworICAgIHJldHVybiBzQ3Vyc29yUmVzaXplTm9ydGg7CiB9 CiAKIGNvbnN0IEN1cnNvciYgbm9ydGhFYXN0UmVzaXplQ3Vyc29yKCkKIHsKLSAgICByZXR1cm4g Z2xvYmFsQ3Vyc29yOworICAgIHN0YXRpYyBDdXJzb3Igc0N1cnNvclJlc2l6ZU5vcnRoRWFzdCA9 IEN1cnNvcihCQ3Vyc29yKEJfQ1VSU09SX0lEX1JFU0laRV9OT1JUSF9FQVNUKSk7CisgICAgcmV0 dXJuIHNDdXJzb3JSZXNpemVOb3J0aEVhc3Q7CiB9CiAKIGNvbnN0IEN1cnNvciYgbm9ydGhXZXN0 UmVzaXplQ3Vyc29yKCkKIHsKLSAgICByZXR1cm4gZ2xvYmFsQ3Vyc29yOworICAgIHN0YXRpYyBD dXJzb3Igc0N1cnNvclJlc2l6ZU5vcnRoV2VzdCA9IEN1cnNvcihCQ3Vyc29yKEJfQ1VSU09SX0lE X1JFU0laRV9OT1JUSF9XRVNUKSk7CisgICAgcmV0dXJuIHNDdXJzb3JSZXNpemVOb3J0aFdlc3Q7 CiB9CiAKIGNvbnN0IEN1cnNvciYgc291dGhSZXNpemVDdXJzb3IoKQogewotICAgIHJldHVybiBn bG9iYWxDdXJzb3I7CisgICAgc3RhdGljIEN1cnNvciBzQ3Vyc29yUmVzaXplU291dGggPSBDdXJz b3IoQkN1cnNvcihCX0NVUlNPUl9JRF9SRVNJWkVfU09VVEgpKTsKKyAgICByZXR1cm4gc0N1cnNv clJlc2l6ZVNvdXRoOwogfQogCiBjb25zdCBDdXJzb3ImIHNvdXRoRWFzdFJlc2l6ZUN1cnNvcigp CiB7Ci0gICAgcmV0dXJuIGdsb2JhbEN1cnNvcjsKKyAgICBzdGF0aWMgQ3Vyc29yIHNDdXJzb3JS ZXNpemVTb3V0aEVhc3QgPSBDdXJzb3IoQkN1cnNvcihCX0NVUlNPUl9JRF9SRVNJWkVfU09VVEhf RUFTVCkpOworICAgIHJldHVybiBzQ3Vyc29yUmVzaXplU291dGhFYXN0OwogfQogCiBjb25zdCBD dXJzb3ImIHNvdXRoV2VzdFJlc2l6ZUN1cnNvcigpCiB7Ci0gICAgcmV0dXJuIGdsb2JhbEN1cnNv cjsKKyAgICBzdGF0aWMgQ3Vyc29yIHNDdXJzb3JSZXNpemVTb3V0aFdlc3QgPSBDdXJzb3IoQkN1 cnNvcihCX0NVUlNPUl9JRF9SRVNJWkVfU09VVEhfV0VTVCkpOworICAgIHJldHVybiBzQ3Vyc29y UmVzaXplU291dGhXZXN0OwogfQogCiBjb25zdCBDdXJzb3ImIHdlc3RSZXNpemVDdXJzb3IoKQog ewotICAgIHJldHVybiBnbG9iYWxDdXJzb3I7CisgICAgc3RhdGljIEN1cnNvciBzQ3Vyc29yUmVz aXplV2VzdCA9IEN1cnNvcihCQ3Vyc29yKEJfQ1VSU09SX0lEX1JFU0laRV9XRVNUKSk7CisgICAg cmV0dXJuIHNDdXJzb3JSZXNpemVXZXN0OwogfQogCiBjb25zdCBDdXJzb3ImIG5vcnRoU291dGhS ZXNpemVDdXJzb3IoKQogewotICAgIHJldHVybiBnbG9iYWxDdXJzb3I7CisgICAgc3RhdGljIEN1 cnNvciBzQ3Vyc29yUmVzaXplTm9ydGhTb3V0aCA9IEN1cnNvcihCQ3Vyc29yKEJfQ1VSU09SX0lE X1JFU0laRV9OT1JUSF9TT1VUSCkpOworICAgIHJldHVybiBzQ3Vyc29yUmVzaXplTm9ydGhTb3V0 aDsKIH0KIAogY29uc3QgQ3Vyc29yJiBlYXN0V2VzdFJlc2l6ZUN1cnNvcigpCiB7Ci0gICAgcmV0 dXJuIGdsb2JhbEN1cnNvcjsKKyAgICBzdGF0aWMgQ3Vyc29yIHNDdXJzb3JSZXNpemVFYXN0V2Vz dCA9IEN1cnNvcihCQ3Vyc29yKEJfQ1VSU09SX0lEX1JFU0laRV9FQVNUX1dFU1QpKTsKKyAgICBy ZXR1cm4gc0N1cnNvclJlc2l6ZUVhc3RXZXN0OwogfQogCiBjb25zdCBDdXJzb3ImIG5vcnRoRWFz dFNvdXRoV2VzdFJlc2l6ZUN1cnNvcigpCiB7Ci0gICAgcmV0dXJuIGdsb2JhbEN1cnNvcjsKKyAg ICBzdGF0aWMgQ3Vyc29yIHNDdXJzb3JSZXNpemVOb3J0aEVhc3RTb3V0aFdlc3QgPSBDdXJzb3Io QkN1cnNvcihCX0NVUlNPUl9JRF9SRVNJWkVfTk9SVEhfRUFTVF9TT1VUSF9XRVNUKSk7CisgICAg cmV0dXJuIHNDdXJzb3JSZXNpemVOb3J0aEVhc3RTb3V0aFdlc3Q7CiB9CiAKIGNvbnN0IEN1cnNv ciYgbm9ydGhXZXN0U291dGhFYXN0UmVzaXplQ3Vyc29yKCkKIHsKLSAgICByZXR1cm4gZ2xvYmFs Q3Vyc29yOworICAgIHN0YXRpYyBDdXJzb3Igc0N1cnNvclJlc2l6ZU5vcnRoV2VzdFNvdXRoRWFz dCA9IEN1cnNvcihCQ3Vyc29yKEJfQ1VSU09SX0lEX1JFU0laRV9OT1JUSF9XRVNUX1NPVVRIX0VB U1QpKTsKKyAgICByZXR1cm4gc0N1cnNvclJlc2l6ZU5vcnRoV2VzdFNvdXRoRWFzdDsKIH0KIAog Y29uc3QgQ3Vyc29yJiBjb2x1bW5SZXNpemVDdXJzb3IoKQogewotICAgIHJldHVybiBnbG9iYWxD dXJzb3I7CisgICAgcmV0dXJuIGVhc3RXZXN0UmVzaXplQ3Vyc29yKCk7CiB9CiAKIGNvbnN0IEN1 cnNvciYgcm93UmVzaXplQ3Vyc29yKCkKIHsKLSAgICByZXR1cm4gZ2xvYmFsQ3Vyc29yOworICAg IHJldHVybiBub3J0aFNvdXRoUmVzaXplQ3Vyc29yKCk7CiB9CiAKIGNvbnN0IEN1cnNvciYgdmVy dGljYWxUZXh0Q3Vyc29yKCkKIHsKLSAgICByZXR1cm4gZ2xvYmFsQ3Vyc29yOworICAgIHN0YXRp YyBDdXJzb3Igc0N1cnNvcklCZWFtSG9yaXpvbnRhbCA9IEN1cnNvcihCQ3Vyc29yKEJfQ1VSU09S X0lEX0lfQkVBTV9IT1JJWk9OVEFMKSk7CisgICAgcmV0dXJuIHNDdXJzb3JJQmVhbUhvcml6b250 YWw7CiB9CiAKIGNvbnN0IEN1cnNvciYgY2VsbEN1cnNvcigpCiB7Ci0gICAgcmV0dXJuIGdsb2Jh bEN1cnNvcjsKKyAgICByZXR1cm4gcG9pbnRlckN1cnNvcigpOwogfQogCiBjb25zdCBDdXJzb3Im IGNvbnRleHRNZW51Q3Vyc29yKCkKIHsKLSAgICByZXR1cm4gZ2xvYmFsQ3Vyc29yOworICAgIHN0 YXRpYyBDdXJzb3Igc0N1cnNvckNvbnRleHRNZW51ID0gQ3Vyc29yKEJDdXJzb3IoQl9DVVJTT1Jf SURfQ09OVEVYVF9NRU5VKSk7CisgICAgcmV0dXJuIHNDdXJzb3JDb250ZXh0TWVudTsKIH0KIAog Y29uc3QgQ3Vyc29yJiBub0Ryb3BDdXJzb3IoKQogewotICAgIHJldHVybiBnbG9iYWxDdXJzb3I7 CisgICAgc3RhdGljIEN1cnNvciBzQ3Vyc29yTm90QWxsb3dlZCA9IEN1cnNvcihCQ3Vyc29yKEJf Q1VSU09SX0lEX05PVF9BTExPV0VEKSk7CisgICAgcmV0dXJuIHNDdXJzb3JOb3RBbGxvd2VkOwog fQogCiBjb25zdCBDdXJzb3ImIGNvcHlDdXJzb3IoKQogewotICAgIHJldHVybiBnbG9iYWxDdXJz b3I7CisgICAgc3RhdGljIEN1cnNvciBzQ3Vyc29yQ29weSA9IEN1cnNvcihCQ3Vyc29yKEJfQ1VS U09SX0lEX0NPUFkpKTsKKyAgICByZXR1cm4gc0N1cnNvckNvcHk7CiB9CiAKIGNvbnN0IEN1cnNv ciYgcHJvZ3Jlc3NDdXJzb3IoKQogewotICAgIHJldHVybiBnbG9iYWxDdXJzb3I7CisgICAgc3Rh dGljIEN1cnNvciBzQ3Vyc29yUHJvZ3Jlc3MgPSBDdXJzb3IoQkN1cnNvcihCX0NVUlNPUl9JRF9Q Uk9HUkVTUykpOworICAgIHJldHVybiBzQ3Vyc29yUHJvZ3Jlc3M7CiB9CiAKIGNvbnN0IEN1cnNv ciYgYWxpYXNDdXJzb3IoKQogewotICAgIHJldHVybiBnbG9iYWxDdXJzb3I7CisgICAgcmV0dXJu IGhhbmRDdXJzb3IoKTsKIH0KIAogY29uc3QgQ3Vyc29yJiBub25lQ3Vyc29yKCkKIHsKLSAgICBy ZXR1cm4gZ2xvYmFsQ3Vyc29yOworICAgIHN0YXRpYyBDdXJzb3Igc0N1cnNvck5vQ3Vyc29yID0g Q3Vyc29yKEJDdXJzb3IoQl9DVVJTT1JfSURfTk9fQ1VSU09SKSk7CisgICAgcmV0dXJuIHNDdXJz b3JOb0N1cnNvcjsKIH0KIAogY29uc3QgQ3Vyc29yJiBub3RBbGxvd2VkQ3Vyc29yKCkKIHsKLSAg ICByZXR1cm4gZ2xvYmFsQ3Vyc29yOworICAgIHN0YXRpYyBDdXJzb3Igc0N1cnNvck5vdEFsbG93 ZWQgPSBDdXJzb3IoQkN1cnNvcihCX0NVUlNPUl9JRF9OT1RfQUxMT1dFRCkpOworICAgIHJldHVy biBzQ3Vyc29yTm90QWxsb3dlZDsKIH0KIAogY29uc3QgQ3Vyc29yJiB6b29tSW5DdXJzb3IoKQog ewotICAgIHJldHVybiBnbG9iYWxDdXJzb3I7CisgICAgc3RhdGljIEN1cnNvciBzQ3Vyc29yWm9v bUluID0gQ3Vyc29yKEJDdXJzb3IoQl9DVVJTT1JfSURfWk9PTV9JTikpOworICAgIHJldHVybiBz Q3Vyc29yWm9vbUluOwogfQogCiBjb25zdCBDdXJzb3ImIHpvb21PdXRDdXJzb3IoKQogewotICAg IHJldHVybiBnbG9iYWxDdXJzb3I7CisgICAgc3RhdGljIEN1cnNvciBzQ3Vyc29yWm9vbU91dCA9 IEN1cnNvcihCQ3Vyc29yKEJfQ1VSU09SX0lEX1pPT01fT1VUKSk7CisgICAgcmV0dXJuIHNDdXJz b3Jab29tT3V0OwogfQogCiBjb25zdCBDdXJzb3ImIGdyYWJDdXJzb3IoKQogewotICAgIHJldHVy biBnbG9iYWxDdXJzb3I7CisgICAgc3RhdGljIEN1cnNvciBzQ3Vyc29yR3JhYiA9IEN1cnNvcihC Q3Vyc29yKEJfQ1VSU09SX0lEX0dSQUIpKTsKKyAgICByZXR1cm4gc0N1cnNvckdyYWI7CiB9CiAK IGNvbnN0IEN1cnNvciYgZ3JhYmJpbmdDdXJzb3IoKQogewotICAgIHJldHVybiBnbG9iYWxDdXJz b3I7CisgICAgc3RhdGljIEN1cnNvciBzQ3Vyc29yR3JhYmJpbmcgPSBDdXJzb3IoQkN1cnNvcihC X0NVUlNPUl9JRF9HUkFCQklORykpOworICAgIHJldHVybiBzQ3Vyc29yR3JhYmJpbmc7CiB9CiAK IH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK 53097 2010-04-11 13:01:52 -0700 2010-04-13 01:53:55 -0700 [Haiku] Use all the new system cursors CursorHaiku.diff text/plain 11109 superstippi SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NzQ1MykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsNjAgQEAKKzIwMTAtMDQtMTEgIFN0ZXBoYW4gQcOfbXVzICA8c3VwZXJzdGlwcGlA Z214LmRlPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFtIYWlrdV0gVXNlIGFsbCB0aGUgbmV3IHN5c3RlbSBjdXJzb3JzIGF2YWlsYWJsZSBpbiByZWNl bnQgSGFpa3UgcmV2aXNpb25zLgorICAgICAgICA8aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTM3Mzg1PgorCisgICAgICAgIENvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMu CisKKyAgICAgICAgKiBwbGF0Zm9ybS9DdXJzb3IuaDoKKyAgICAgICAgICAgIC0gQWRkZWQgbmVj ZXNzYXJ5IGluY2x1ZGUuCisgICAgICAgICAgICAtIENoYW5nZWQgZGVmaW5pdGlvbnMgb2YgUGxh dGZvcm1DdXJzb3IgYW5kIFBsYXRmb3JtQ3Vyc29ySGFuZGxlLgorICAgICAgICAoV2ViQ29yZTo6 Q3Vyc29yOjpDdXJzb3IpOgorICAgICAgICAgICAgLSBEZWZhdWx0IGNvbnN0cnVjdG9yIG5lZWRz IGRlZmF1bHQgc3lzdGVtIGN1cnNvciBpbml0LgorICAgICAgICAoV2ViQ29yZTo6Q3Vyc29yOjpp bXBsKToKKyAgICAgICAgICAgIC0gTXVjaCBtb3JlIGNvbnZlbmllbnQgb24gSGFpa3UgdG8gcmV0 dXJuIGEgY29uc3QgcG9pbnRlciB0byB0aGUKKyAgICAgICAgICAgICAgQkN1cnNvciBpbnN0YW5j ZS4KKyAgICAgICAgKiBwbGF0Zm9ybS9oYWlrdS9DdXJzb3JIYWlrdS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpDdXJzb3I6OkN1cnNvcik6CisgICAgICAgIChXZWJDb3JlOjpjcmVhdGVDdXJzb3JC eUlEKToKKyAgICAgICAgICAgIC0gaGVscGVyIGZ1bmN0aW9uCisgICAgICAgIChXZWJDb3JlOjpw b2ludGVyQ3Vyc29yKToKKyAgICAgICAgKFdlYkNvcmU6Om1vdmVDdXJzb3IpOgorICAgICAgICAo V2ViQ29yZTo6Y3Jvc3NDdXJzb3IpOgorICAgICAgICAoV2ViQ29yZTo6aGFuZEN1cnNvcik6Cisg ICAgICAgIChXZWJDb3JlOjppQmVhbUN1cnNvcik6CisgICAgICAgIChXZWJDb3JlOjp3YWl0Q3Vy c29yKToKKyAgICAgICAgKFdlYkNvcmU6OmhlbHBDdXJzb3IpOgorICAgICAgICAoV2ViQ29yZTo6 ZWFzdFJlc2l6ZUN1cnNvcik6CisgICAgICAgIChXZWJDb3JlOjpub3J0aFJlc2l6ZUN1cnNvcik6 CisgICAgICAgIChXZWJDb3JlOjpub3J0aEVhc3RSZXNpemVDdXJzb3IpOgorICAgICAgICAoV2Vi Q29yZTo6bm9ydGhXZXN0UmVzaXplQ3Vyc29yKToKKyAgICAgICAgKFdlYkNvcmU6OnNvdXRoUmVz aXplQ3Vyc29yKToKKyAgICAgICAgKFdlYkNvcmU6OnNvdXRoRWFzdFJlc2l6ZUN1cnNvcik6Cisg ICAgICAgIChXZWJDb3JlOjpzb3V0aFdlc3RSZXNpemVDdXJzb3IpOgorICAgICAgICAoV2ViQ29y ZTo6d2VzdFJlc2l6ZUN1cnNvcik6CisgICAgICAgIChXZWJDb3JlOjpub3J0aFNvdXRoUmVzaXpl Q3Vyc29yKToKKyAgICAgICAgKFdlYkNvcmU6OmVhc3RXZXN0UmVzaXplQ3Vyc29yKToKKyAgICAg ICAgKFdlYkNvcmU6Om5vcnRoRWFzdFNvdXRoV2VzdFJlc2l6ZUN1cnNvcik6CisgICAgICAgIChX ZWJDb3JlOjpub3J0aFdlc3RTb3V0aEVhc3RSZXNpemVDdXJzb3IpOgorICAgICAgICAoV2ViQ29y ZTo6Y29sdW1uUmVzaXplQ3Vyc29yKToKKyAgICAgICAgKFdlYkNvcmU6OnJvd1Jlc2l6ZUN1cnNv cik6CisgICAgICAgIChXZWJDb3JlOjp2ZXJ0aWNhbFRleHRDdXJzb3IpOgorICAgICAgICAoV2Vi Q29yZTo6Y2VsbEN1cnNvcik6CisgICAgICAgIChXZWJDb3JlOjpjb250ZXh0TWVudUN1cnNvcik6 CisgICAgICAgIChXZWJDb3JlOjpub0Ryb3BDdXJzb3IpOgorICAgICAgICAoV2ViQ29yZTo6Y29w eUN1cnNvcik6CisgICAgICAgIChXZWJDb3JlOjpwcm9ncmVzc0N1cnNvcik6CisgICAgICAgIChX ZWJDb3JlOjphbGlhc0N1cnNvcik6CisgICAgICAgIChXZWJDb3JlOjpub25lQ3Vyc29yKToKKyAg ICAgICAgKFdlYkNvcmU6Om5vdEFsbG93ZWRDdXJzb3IpOgorICAgICAgICAoV2ViQ29yZTo6em9v bUluQ3Vyc29yKToKKyAgICAgICAgKFdlYkNvcmU6Onpvb21PdXRDdXJzb3IpOgorICAgICAgICAo V2ViQ29yZTo6Z3JhYkN1cnNvcik6CisgICAgICAgIChXZWJDb3JlOjpncmFiYmluZ0N1cnNvcik6 CisgICAgICAgICAgICAtIFVzZSB0aGUgbmV3IHN5c3RlbSBjdXJzb3JzLgorCiAyMDEwLTA0LTEw ICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZC4g IFJlbmFtZSBtX2ZvcmNlU2FuZGJveEZsYWdzIHRvIG1fZm9yY2VkU2FuZG94RmxhZ3MsIGFzCklu ZGV4OiBXZWJDb3JlL3BsYXRmb3JtL0N1cnNvci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxh dGZvcm0vQ3Vyc29yLmgJKHJldmlzaW9uIDU3Mjc0KQorKysgV2ViQ29yZS9wbGF0Zm9ybS9DdXJz b3IuaAkod29ya2luZyBjb3B5KQpAQCAtMjAsNyArMjAsNyBAQAogICogUFJPRklUUzsgT1IgQlVT SU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWQogICog T0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBU T1JUCiAgKiAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFO WSBXQVkgT1VUIE9GIFRIRSBVU0UKLSAqIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNF RCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuIAorICogT0YgVEhJUyBTT0ZUV0FS RSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KICAq LwogCiAjaWZuZGVmIEN1cnNvcl9oCkBAIC0zOSw2ICszOSw3IEBAIHR5cGVkZWYgc3RydWN0IF9H ZGtDdXJzb3IgR2RrQ3Vyc29yOwogI2VsaWYgUExBVEZPUk0oQ0hST01JVU0pCiAjaW5jbHVkZSAi UGxhdGZvcm1DdXJzb3IuaCIKICNlbGlmIFBMQVRGT1JNKEhBSUtVKQorI2luY2x1ZGUgPGFwcC9B cHBEZWZzLmg+CiAjaW5jbHVkZSA8YXBwL0N1cnNvci5oPgogI2VuZGlmCiAKQEAgLTk1LDggKzk2 LDggQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgIC8vIFNlZSBQbGF0Zm9ybUN1cnNvci5oCiAg ICAgdHlwZWRlZiB2b2lkKiBQbGF0Zm9ybUN1cnNvckhhbmRsZTsKICNlbGlmIFBMQVRGT1JNKEhB SUtVKQotICAgIHR5cGVkZWYgQkN1cnNvciogUGxhdGZvcm1DdXJzb3I7Ci0gICAgdHlwZWRlZiBC Q3Vyc29yKiBQbGF0Zm9ybUN1cnNvckhhbmRsZTsKKyAgICB0eXBlZGVmIEJDdXJzb3IgUGxhdGZv cm1DdXJzb3I7CisgICAgdHlwZWRlZiBjb25zdCBCQ3Vyc29yKiBQbGF0Zm9ybUN1cnNvckhhbmRs ZTsKICNlbHNlCiAgICAgdHlwZWRlZiB2b2lkKiBQbGF0Zm9ybUN1cnNvcjsKICAgICB0eXBlZGVm IHZvaWQqIFBsYXRmb3JtQ3Vyc29ySGFuZGxlOwpAQCAtMTA1LDcgKzEwNiw5IEBAIG5hbWVzcGFj ZSBXZWJDb3JlIHsKICAgICBjbGFzcyBDdXJzb3IgewogICAgIHB1YmxpYzoKICAgICAgICAgQ3Vy c29yKCkKLSNpZiAhUExBVEZPUk0oUVQpICYmICFQTEFURk9STShFRkwpCisjaWYgUExBVEZPUk0o SEFJS1UpCisgICAgICAgIDogbV9pbXBsKCpCX0NVUlNPUl9TWVNURU1fREVGQVVMVCkKKyNlbGlm ICFQTEFURk9STShRVCkgJiYgIVBMQVRGT1JNKEVGTCkKICAgICAgICAgOiBtX2ltcGwoMCkKICNl bmRpZgogICAgICAgICB7IH0KQEAgLTExNiw3ICsxMTksMTEgQEAgbmFtZXNwYWNlIFdlYkNvcmUg ewogICAgICAgICBDdXJzb3ImIG9wZXJhdG9yPShjb25zdCBDdXJzb3ImKTsKIAogICAgICAgICBD dXJzb3IoUGxhdGZvcm1DdXJzb3IpOworI2lmIFBMQVRGT1JNKEhBSUtVKQorICAgICAgICBQbGF0 Zm9ybUN1cnNvckhhbmRsZSBpbXBsKCkgY29uc3QgeyByZXR1cm4gJm1faW1wbDsgfQorI2Vsc2UK ICAgICAgICAgUGxhdGZvcm1DdXJzb3IgaW1wbCgpIGNvbnN0IHsgcmV0dXJuIG1faW1wbDsgfQor I2VuZGlmCiAKICAgICAgcHJpdmF0ZToKICAgICAgICAgUGxhdGZvcm1DdXJzb3IgbV9pbXBsOwpJ bmRleDogV2ViQ29yZS9wbGF0Zm9ybS9oYWlrdS9DdXJzb3JIYWlrdS5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViQ29yZS9wbGF0Zm9ybS9oYWlrdS9DdXJzb3JIYWlrdS5jcHAJKHJldmlzaW9uIDU3Mjc0 KQorKysgV2ViQ29yZS9wbGF0Zm9ybS9oYWlrdS9DdXJzb3JIYWlrdS5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTEsNSArMSw2IEBACiAvKgogICogQ29weXJpZ2h0IChDKSAyMDA3IFJ5YW4gTGVhdmVu Z29vZCA8bGVhdmVuZ29vZEBnbWFpbC5jb20+CisgKiBDb3B5cmlnaHQgKEMpIDIwMTAgU3RlcGhh biBBw59tdXMgPHN1cGVyc3RpcHBpQGdteC5kZT4KICAqCiAgKiBBbGwgcmlnaHRzIHJlc2VydmVk LgogICoKQEAgLTMwLDkgKzMxLDYgQEAKIAogI2luY2x1ZGUgIk5vdEltcGxlbWVudGVkLmgiCiAK LSNpbmNsdWRlIDxhcHAvQXBwRGVmcy5oPgotCi0KIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogQ3Vy c29yOjpDdXJzb3IoUGxhdGZvcm1DdXJzb3IgY3Vyc29yKQpAQCAtNTAsNiArNDgsNyBAQCBDdXJz b3I6On5DdXJzb3IoKQogfQogCiBDdXJzb3I6OkN1cnNvcihJbWFnZSosIGNvbnN0IEludFBvaW50 JikKKyAgICA6IG1faW1wbCgqQl9DVVJTT1JfU1lTVEVNX0RFRkFVTFQpCiB7CiAgICAgbm90SW1w bGVtZW50ZWQoKTsKIH0KQEAgLTYwLDE3NyArNTksMjA5IEBAIEN1cnNvciYgQ3Vyc29yOjpvcGVy YXRvcj0oY29uc3QgQ3Vyc29yJiAKICAgICByZXR1cm4gKnRoaXM7CiB9CiAKLXN0YXRpYyBDdXJz b3IgZ2xvYmFsQ3Vyc29yID0gY29uc3RfY2FzdDxCQ3Vyc29yKj4oQl9DVVJTT1JfU1lTVEVNX0RF RkFVTFQpOwotc3RhdGljIEN1cnNvciBpYmVhbUN1cnNvciA9IGNvbnN0X2Nhc3Q8QkN1cnNvcio+ KEJfQ1VSU09SX0lfQkVBTSk7CitzdGF0aWMgQ3Vyc29yIGNyZWF0ZUN1cnNvckJ5SUQoQkN1cnNv cklEIGlkKQoreworICAgIHJldHVybiBDdXJzb3IoQkN1cnNvcihpZCkpOworfQogCiBjb25zdCBD dXJzb3ImIHBvaW50ZXJDdXJzb3IoKQogewotICAgIHJldHVybiBnbG9iYWxDdXJzb3I7CisgICAg c3RhdGljIEN1cnNvciBzQ3Vyc29yU3lzdGVtRGVmYXVsdCgqQl9DVVJTT1JfU1lTVEVNX0RFRkFV TFQpOworICAgIHJldHVybiBzQ3Vyc29yU3lzdGVtRGVmYXVsdDsKIH0KIAogY29uc3QgQ3Vyc29y JiBtb3ZlQ3Vyc29yKCkKIHsKLSAgICByZXR1cm4gZ2xvYmFsQ3Vyc29yOworICAgIHN0YXRpYyBD dXJzb3Igc0N1cnNvck1vdmUgPSBjcmVhdGVDdXJzb3JCeUlEKEJfQ1VSU09SX0lEX01PVkUpOwor ICAgIHJldHVybiBzQ3Vyc29yTW92ZTsKIH0KIAogY29uc3QgQ3Vyc29yJiBjcm9zc0N1cnNvcigp CiB7Ci0gICAgcmV0dXJuIGdsb2JhbEN1cnNvcjsKKyAgICBzdGF0aWMgQ3Vyc29yIHNDdXJzb3JD cm9zc0hhaXIgPSBjcmVhdGVDdXJzb3JCeUlEKEJfQ1VSU09SX0lEX0NST1NTX0hBSVIpOworICAg IHJldHVybiBzQ3Vyc29yQ3Jvc3NIYWlyOwogfQogCiBjb25zdCBDdXJzb3ImIGhhbmRDdXJzb3Io KQogewotICAgIHJldHVybiBnbG9iYWxDdXJzb3I7CisgICAgc3RhdGljIEN1cnNvciBzQ3Vyc29y Rm9sbG93TGluayA9IGNyZWF0ZUN1cnNvckJ5SUQoQl9DVVJTT1JfSURfRk9MTE9XX0xJTkspOwor ICAgIHJldHVybiBzQ3Vyc29yRm9sbG93TGluazsKIH0KIAogY29uc3QgQ3Vyc29yJiBpQmVhbUN1 cnNvcigpCiB7Ci0gICAgcmV0dXJuIGliZWFtQ3Vyc29yOworICAgIHN0YXRpYyBDdXJzb3Igc0N1 cnNvcklCZWFtKCpCX0NVUlNPUl9JX0JFQU0pOworICAgIHJldHVybiBzQ3Vyc29ySUJlYW07CiB9 CiAKIGNvbnN0IEN1cnNvciYgd2FpdEN1cnNvcigpCiB7Ci0gICAgcmV0dXJuIGdsb2JhbEN1cnNv cjsKKyAgICBzdGF0aWMgQ3Vyc29yIHNDdXJzb3JQcm9ncmVzcyA9IGNyZWF0ZUN1cnNvckJ5SUQo Ql9DVVJTT1JfSURfUFJPR1JFU1MpOworICAgIHJldHVybiBzQ3Vyc29yUHJvZ3Jlc3M7CiB9CiAK IGNvbnN0IEN1cnNvciYgaGVscEN1cnNvcigpCiB7Ci0gICAgcmV0dXJuIGdsb2JhbEN1cnNvcjsK KyAgICBzdGF0aWMgQ3Vyc29yIHNDdXJzb3JIZWxwID0gY3JlYXRlQ3Vyc29yQnlJRChCX0NVUlNP Ul9JRF9IRUxQKTsKKyAgICByZXR1cm4gc0N1cnNvckhlbHA7CiB9CiAKIGNvbnN0IEN1cnNvciYg ZWFzdFJlc2l6ZUN1cnNvcigpCiB7Ci0gICAgcmV0dXJuIGdsb2JhbEN1cnNvcjsKKyAgICBzdGF0 aWMgQ3Vyc29yIHNDdXJzb3JSZXNpemVFYXN0ID0gY3JlYXRlQ3Vyc29yQnlJRChCX0NVUlNPUl9J RF9SRVNJWkVfRUFTVCk7CisgICAgcmV0dXJuIHNDdXJzb3JSZXNpemVFYXN0OwogfQogCiBjb25z dCBDdXJzb3ImIG5vcnRoUmVzaXplQ3Vyc29yKCkKIHsKLSAgICByZXR1cm4gZ2xvYmFsQ3Vyc29y OworICAgIHN0YXRpYyBDdXJzb3Igc0N1cnNvclJlc2l6ZU5vcnRoID0gY3JlYXRlQ3Vyc29yQnlJ RChCX0NVUlNPUl9JRF9SRVNJWkVfTk9SVEgpOworICAgIHJldHVybiBzQ3Vyc29yUmVzaXplTm9y dGg7CiB9CiAKIGNvbnN0IEN1cnNvciYgbm9ydGhFYXN0UmVzaXplQ3Vyc29yKCkKIHsKLSAgICBy ZXR1cm4gZ2xvYmFsQ3Vyc29yOworICAgIHN0YXRpYyBDdXJzb3Igc0N1cnNvclJlc2l6ZU5vcnRo RWFzdCA9IGNyZWF0ZUN1cnNvckJ5SUQoQl9DVVJTT1JfSURfUkVTSVpFX05PUlRIX0VBU1QpOwor ICAgIHJldHVybiBzQ3Vyc29yUmVzaXplTm9ydGhFYXN0OwogfQogCiBjb25zdCBDdXJzb3ImIG5v cnRoV2VzdFJlc2l6ZUN1cnNvcigpCiB7Ci0gICAgcmV0dXJuIGdsb2JhbEN1cnNvcjsKKyAgICBz dGF0aWMgQ3Vyc29yIHNDdXJzb3JSZXNpemVOb3J0aFdlc3QgPSBjcmVhdGVDdXJzb3JCeUlEKEJf Q1VSU09SX0lEX1JFU0laRV9OT1JUSF9XRVNUKTsKKyAgICByZXR1cm4gc0N1cnNvclJlc2l6ZU5v cnRoV2VzdDsKIH0KIAogY29uc3QgQ3Vyc29yJiBzb3V0aFJlc2l6ZUN1cnNvcigpCiB7Ci0gICAg cmV0dXJuIGdsb2JhbEN1cnNvcjsKKyAgICBzdGF0aWMgQ3Vyc29yIHNDdXJzb3JSZXNpemVTb3V0 aCA9IGNyZWF0ZUN1cnNvckJ5SUQoQl9DVVJTT1JfSURfUkVTSVpFX1NPVVRIKTsKKyAgICByZXR1 cm4gc0N1cnNvclJlc2l6ZVNvdXRoOwogfQogCiBjb25zdCBDdXJzb3ImIHNvdXRoRWFzdFJlc2l6 ZUN1cnNvcigpCiB7Ci0gICAgcmV0dXJuIGdsb2JhbEN1cnNvcjsKKyAgICBzdGF0aWMgQ3Vyc29y IHNDdXJzb3JSZXNpemVTb3V0aEVhc3QgPSBjcmVhdGVDdXJzb3JCeUlEKEJfQ1VSU09SX0lEX1JF U0laRV9TT1VUSF9FQVNUKTsKKyAgICByZXR1cm4gc0N1cnNvclJlc2l6ZVNvdXRoRWFzdDsKIH0K IAogY29uc3QgQ3Vyc29yJiBzb3V0aFdlc3RSZXNpemVDdXJzb3IoKQogewotICAgIHJldHVybiBn bG9iYWxDdXJzb3I7CisgICAgc3RhdGljIEN1cnNvciBzQ3Vyc29yUmVzaXplU291dGhXZXN0ID0g Y3JlYXRlQ3Vyc29yQnlJRChCX0NVUlNPUl9JRF9SRVNJWkVfU09VVEhfV0VTVCk7CisgICAgcmV0 dXJuIHNDdXJzb3JSZXNpemVTb3V0aFdlc3Q7CiB9CiAKIGNvbnN0IEN1cnNvciYgd2VzdFJlc2l6 ZUN1cnNvcigpCiB7Ci0gICAgcmV0dXJuIGdsb2JhbEN1cnNvcjsKKyAgICBzdGF0aWMgQ3Vyc29y IHNDdXJzb3JSZXNpemVXZXN0ID0gY3JlYXRlQ3Vyc29yQnlJRChCX0NVUlNPUl9JRF9SRVNJWkVf V0VTVCk7CisgICAgcmV0dXJuIHNDdXJzb3JSZXNpemVXZXN0OwogfQogCiBjb25zdCBDdXJzb3Im IG5vcnRoU291dGhSZXNpemVDdXJzb3IoKQogewotICAgIHJldHVybiBnbG9iYWxDdXJzb3I7Cisg ICAgc3RhdGljIEN1cnNvciBzQ3Vyc29yUmVzaXplTm9ydGhTb3V0aCA9IGNyZWF0ZUN1cnNvckJ5 SUQoQl9DVVJTT1JfSURfUkVTSVpFX05PUlRIX1NPVVRIKTsKKyAgICByZXR1cm4gc0N1cnNvclJl c2l6ZU5vcnRoU291dGg7CiB9CiAKIGNvbnN0IEN1cnNvciYgZWFzdFdlc3RSZXNpemVDdXJzb3Io KQogewotICAgIHJldHVybiBnbG9iYWxDdXJzb3I7CisgICAgc3RhdGljIEN1cnNvciBzQ3Vyc29y UmVzaXplRWFzdFdlc3QgPSBjcmVhdGVDdXJzb3JCeUlEKEJfQ1VSU09SX0lEX1JFU0laRV9FQVNU X1dFU1QpOworICAgIHJldHVybiBzQ3Vyc29yUmVzaXplRWFzdFdlc3Q7CiB9CiAKIGNvbnN0IEN1 cnNvciYgbm9ydGhFYXN0U291dGhXZXN0UmVzaXplQ3Vyc29yKCkKIHsKLSAgICByZXR1cm4gZ2xv YmFsQ3Vyc29yOworICAgIHN0YXRpYyBDdXJzb3Igc0N1cnNvclJlc2l6ZU5vcnRoRWFzdFNvdXRo V2VzdCA9IGNyZWF0ZUN1cnNvckJ5SUQoQl9DVVJTT1JfSURfUkVTSVpFX05PUlRIX0VBU1RfU09V VEhfV0VTVCk7CisgICAgcmV0dXJuIHNDdXJzb3JSZXNpemVOb3J0aEVhc3RTb3V0aFdlc3Q7CiB9 CiAKIGNvbnN0IEN1cnNvciYgbm9ydGhXZXN0U291dGhFYXN0UmVzaXplQ3Vyc29yKCkKIHsKLSAg ICByZXR1cm4gZ2xvYmFsQ3Vyc29yOworICAgIHN0YXRpYyBDdXJzb3Igc0N1cnNvclJlc2l6ZU5v cnRoV2VzdFNvdXRoRWFzdCA9IGNyZWF0ZUN1cnNvckJ5SUQoQl9DVVJTT1JfSURfUkVTSVpFX05P UlRIX1dFU1RfU09VVEhfRUFTVCk7CisgICAgcmV0dXJuIHNDdXJzb3JSZXNpemVOb3J0aFdlc3RT b3V0aEVhc3Q7CiB9CiAKIGNvbnN0IEN1cnNvciYgY29sdW1uUmVzaXplQ3Vyc29yKCkKIHsKLSAg ICByZXR1cm4gZ2xvYmFsQ3Vyc29yOworICAgIHJldHVybiBlYXN0V2VzdFJlc2l6ZUN1cnNvcigp OwogfQogCiBjb25zdCBDdXJzb3ImIHJvd1Jlc2l6ZUN1cnNvcigpCiB7Ci0gICAgcmV0dXJuIGds b2JhbEN1cnNvcjsKKyAgICByZXR1cm4gbm9ydGhTb3V0aFJlc2l6ZUN1cnNvcigpOwogfQogCiBj b25zdCBDdXJzb3ImIHZlcnRpY2FsVGV4dEN1cnNvcigpCiB7Ci0gICAgcmV0dXJuIGdsb2JhbEN1 cnNvcjsKKyAgICBzdGF0aWMgQ3Vyc29yIHNDdXJzb3JJQmVhbUhvcml6b250YWwgPSBjcmVhdGVD dXJzb3JCeUlEKEJfQ1VSU09SX0lEX0lfQkVBTV9IT1JJWk9OVEFMKTsKKyAgICByZXR1cm4gc0N1 cnNvcklCZWFtSG9yaXpvbnRhbDsKIH0KIAogY29uc3QgQ3Vyc29yJiBjZWxsQ3Vyc29yKCkKIHsK LSAgICByZXR1cm4gZ2xvYmFsQ3Vyc29yOworICAgIHJldHVybiBwb2ludGVyQ3Vyc29yKCk7CiB9 CiAKIGNvbnN0IEN1cnNvciYgY29udGV4dE1lbnVDdXJzb3IoKQogewotICAgIHJldHVybiBnbG9i YWxDdXJzb3I7CisgICAgc3RhdGljIEN1cnNvciBzQ3Vyc29yQ29udGV4dE1lbnUgPSBjcmVhdGVD dXJzb3JCeUlEKEJfQ1VSU09SX0lEX0NPTlRFWFRfTUVOVSk7CisgICAgcmV0dXJuIHNDdXJzb3JD b250ZXh0TWVudTsKIH0KIAogY29uc3QgQ3Vyc29yJiBub0Ryb3BDdXJzb3IoKQogewotICAgIHJl dHVybiBnbG9iYWxDdXJzb3I7CisgICAgc3RhdGljIEN1cnNvciBzQ3Vyc29yTm90QWxsb3dlZCA9 IGNyZWF0ZUN1cnNvckJ5SUQoQl9DVVJTT1JfSURfTk9UX0FMTE9XRUQpOworICAgIHJldHVybiBz Q3Vyc29yTm90QWxsb3dlZDsKIH0KIAogY29uc3QgQ3Vyc29yJiBjb3B5Q3Vyc29yKCkKIHsKLSAg ICByZXR1cm4gZ2xvYmFsQ3Vyc29yOworICAgIHN0YXRpYyBDdXJzb3Igc0N1cnNvckNvcHkgPSBj cmVhdGVDdXJzb3JCeUlEKEJfQ1VSU09SX0lEX0NPUFkpOworICAgIHJldHVybiBzQ3Vyc29yQ29w eTsKIH0KIAogY29uc3QgQ3Vyc29yJiBwcm9ncmVzc0N1cnNvcigpCiB7Ci0gICAgcmV0dXJuIGds b2JhbEN1cnNvcjsKKyAgICBzdGF0aWMgQ3Vyc29yIHNDdXJzb3JQcm9ncmVzcyA9IGNyZWF0ZUN1 cnNvckJ5SUQoQl9DVVJTT1JfSURfUFJPR1JFU1MpOworICAgIHJldHVybiBzQ3Vyc29yUHJvZ3Jl c3M7CiB9CiAKIGNvbnN0IEN1cnNvciYgYWxpYXNDdXJzb3IoKQogewotICAgIHJldHVybiBnbG9i YWxDdXJzb3I7CisgICAgcmV0dXJuIGhhbmRDdXJzb3IoKTsKIH0KIAogY29uc3QgQ3Vyc29yJiBu b25lQ3Vyc29yKCkKIHsKLSAgICByZXR1cm4gZ2xvYmFsQ3Vyc29yOworICAgIHN0YXRpYyBDdXJz b3Igc0N1cnNvck5vQ3Vyc29yID0gY3JlYXRlQ3Vyc29yQnlJRChCX0NVUlNPUl9JRF9OT19DVVJT T1IpOworICAgIHJldHVybiBzQ3Vyc29yTm9DdXJzb3I7CiB9CiAKIGNvbnN0IEN1cnNvciYgbm90 QWxsb3dlZEN1cnNvcigpCiB7Ci0gICAgcmV0dXJuIGdsb2JhbEN1cnNvcjsKKyAgICBzdGF0aWMg Q3Vyc29yIHNDdXJzb3JOb3RBbGxvd2VkID0gY3JlYXRlQ3Vyc29yQnlJRChCX0NVUlNPUl9JRF9O T1RfQUxMT1dFRCk7CisgICAgcmV0dXJuIHNDdXJzb3JOb3RBbGxvd2VkOwogfQogCiBjb25zdCBD dXJzb3ImIHpvb21JbkN1cnNvcigpCiB7Ci0gICAgcmV0dXJuIGdsb2JhbEN1cnNvcjsKKyAgICBz dGF0aWMgQ3Vyc29yIHNDdXJzb3Jab29tSW4gPSBjcmVhdGVDdXJzb3JCeUlEKEJfQ1VSU09SX0lE X1pPT01fSU4pOworICAgIHJldHVybiBzQ3Vyc29yWm9vbUluOwogfQogCiBjb25zdCBDdXJzb3Im IHpvb21PdXRDdXJzb3IoKQogewotICAgIHJldHVybiBnbG9iYWxDdXJzb3I7CisgICAgc3RhdGlj IEN1cnNvciBzQ3Vyc29yWm9vbU91dCA9IGNyZWF0ZUN1cnNvckJ5SUQoQl9DVVJTT1JfSURfWk9P TV9PVVQpOworICAgIHJldHVybiBzQ3Vyc29yWm9vbU91dDsKIH0KIAogY29uc3QgQ3Vyc29yJiBn cmFiQ3Vyc29yKCkKIHsKLSAgICByZXR1cm4gZ2xvYmFsQ3Vyc29yOworICAgIHN0YXRpYyBDdXJz b3Igc0N1cnNvckdyYWIgPSBjcmVhdGVDdXJzb3JCeUlEKEJfQ1VSU09SX0lEX0dSQUIpOworICAg IHJldHVybiBzQ3Vyc29yR3JhYjsKIH0KIAogY29uc3QgQ3Vyc29yJiBncmFiYmluZ0N1cnNvcigp CiB7Ci0gICAgcmV0dXJuIGdsb2JhbEN1cnNvcjsKKyAgICBzdGF0aWMgQ3Vyc29yIHNDdXJzb3JH cmFiYmluZyA9IGNyZWF0ZUN1cnNvckJ5SUQoQl9DVVJTT1JfSURfR1JBQkJJTkcpOworICAgIHJl dHVybiBzQ3Vyc29yR3JhYmJpbmc7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK 53232 2010-04-13 01:53:55 -0700 2010-04-13 06:36:31 -0700 [Haiku] Use all the new system cursors CursorHaiku.diff text/plain 9393 superstippi SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NzUwOCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsNTYgQEAKKzIwMTAtMDQtMTMgIFN0ZXBoYW4gQcOfbXVzICA8c3VwZXJzdGlwcGlA Z214LmRlPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFtIYWlrdV0gVXNlIGFsbCB0aGUgbmV3IHN5c3RlbSBjdXJzb3JzIGF2YWlsYWJsZSBpbiByZWNl bnQgSGFpa3UgcmV2aXNpb25zLgorICAgICAgICA8aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTM3Mzg1PgorCisgICAgICAgIENvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMu CisKKyAgICAgICAgKiBwbGF0Zm9ybS9oYWlrdS9DdXJzb3JIYWlrdS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpDdXJzb3I6OkN1cnNvcik6CisgICAgICAgIChXZWJDb3JlOjpDdXJzb3I6On5DdXJz b3IpOgorICAgICAgICAoV2ViQ29yZTo6Q3Vyc29yOjpvcGVyYXRvcj0pOgorICAgICAgICAgICAg LSBBZGFwdGVkIHRvIG1haW50YWluIGFuIG93bmVkIEJDdXJzb3IgaW5zdGFuY2UuCisgICAgICAg IChXZWJDb3JlOjpjcmVhdGVDdXJzb3JCeUlEKToKKyAgICAgICAgICAgIC0gaGVscGVyIGZ1bmN0 aW9uIHRvIGNyZWF0ZSBhIEN1cnNvciBpbnN0YW5jZSBieSBCQ3Vyc29ySUQgY29uc3RhbnQuCisg ICAgICAgIChXZWJDb3JlOjpwb2ludGVyQ3Vyc29yKToKKyAgICAgICAgICAgIC0gTlVMTCBCQ3Vy c29yIHRyaWdnZXJzIHVzaW5nIHRoZSBzeXN0ZW0gY3Vyc29yLgorICAgICAgICAoV2ViQ29yZTo6 bW92ZUN1cnNvcik6CisgICAgICAgIChXZWJDb3JlOjpjcm9zc0N1cnNvcik6CisgICAgICAgIChX ZWJDb3JlOjpoYW5kQ3Vyc29yKToKKyAgICAgICAgKFdlYkNvcmU6OmlCZWFtQ3Vyc29yKToKKyAg ICAgICAgKFdlYkNvcmU6OndhaXRDdXJzb3IpOgorICAgICAgICAoV2ViQ29yZTo6aGVscEN1cnNv cik6CisgICAgICAgIChXZWJDb3JlOjplYXN0UmVzaXplQ3Vyc29yKToKKyAgICAgICAgKFdlYkNv cmU6Om5vcnRoUmVzaXplQ3Vyc29yKToKKyAgICAgICAgKFdlYkNvcmU6Om5vcnRoRWFzdFJlc2l6 ZUN1cnNvcik6CisgICAgICAgIChXZWJDb3JlOjpub3J0aFdlc3RSZXNpemVDdXJzb3IpOgorICAg ICAgICAoV2ViQ29yZTo6c291dGhSZXNpemVDdXJzb3IpOgorICAgICAgICAoV2ViQ29yZTo6c291 dGhFYXN0UmVzaXplQ3Vyc29yKToKKyAgICAgICAgKFdlYkNvcmU6OnNvdXRoV2VzdFJlc2l6ZUN1 cnNvcik6CisgICAgICAgIChXZWJDb3JlOjp3ZXN0UmVzaXplQ3Vyc29yKToKKyAgICAgICAgKFdl YkNvcmU6Om5vcnRoU291dGhSZXNpemVDdXJzb3IpOgorICAgICAgICAoV2ViQ29yZTo6ZWFzdFdl c3RSZXNpemVDdXJzb3IpOgorICAgICAgICAoV2ViQ29yZTo6bm9ydGhFYXN0U291dGhXZXN0UmVz aXplQ3Vyc29yKToKKyAgICAgICAgKFdlYkNvcmU6Om5vcnRoV2VzdFNvdXRoRWFzdFJlc2l6ZUN1 cnNvcik6CisgICAgICAgIChXZWJDb3JlOjpjb2x1bW5SZXNpemVDdXJzb3IpOgorICAgICAgICAo V2ViQ29yZTo6cm93UmVzaXplQ3Vyc29yKToKKyAgICAgICAgKFdlYkNvcmU6OnZlcnRpY2FsVGV4 dEN1cnNvcik6CisgICAgICAgIChXZWJDb3JlOjpjZWxsQ3Vyc29yKToKKyAgICAgICAgKFdlYkNv cmU6OmNvbnRleHRNZW51Q3Vyc29yKToKKyAgICAgICAgKFdlYkNvcmU6Om5vRHJvcEN1cnNvcik6 CisgICAgICAgIChXZWJDb3JlOjpjb3B5Q3Vyc29yKToKKyAgICAgICAgKFdlYkNvcmU6OnByb2dy ZXNzQ3Vyc29yKToKKyAgICAgICAgKFdlYkNvcmU6OmFsaWFzQ3Vyc29yKToKKyAgICAgICAgKFdl YkNvcmU6Om5vbmVDdXJzb3IpOgorICAgICAgICAoV2ViQ29yZTo6bm90QWxsb3dlZEN1cnNvcik6 CisgICAgICAgIChXZWJDb3JlOjp6b29tSW5DdXJzb3IpOgorICAgICAgICAoV2ViQ29yZTo6em9v bU91dEN1cnNvcik6CisgICAgICAgIChXZWJDb3JlOjpncmFiQ3Vyc29yKToKKyAgICAgICAgKFdl YkNvcmU6OmdyYWJiaW5nQ3Vyc29yKToKKyAgICAgICAgICAgIC0gVXNlIHRoZSBuZXcgc3lzdGVt IGN1cnNvcnMuCisKIDIwMTAtMDQtMTMgIE1pa2hhaWwgTmFnYW5vdiAgPG1uYWdhbm92QGNocm9t aXVtLm9yZz4KIAogICAgICAgICBVbnJldmlld2VkIFF0IGJ1aWxkIGZpeDogYWRkIG5ldyAuaWRs IGZpbGVzIHRvIFdlYkNvcmUucHJpCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2hhaWt1L0N1cnNv ckhhaWt1LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2hhaWt1L0N1cnNvckhh aWt1LmNwcAkocmV2aXNpb24gNTcyNzQpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2hhaWt1L0N1cnNv ckhhaWt1LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDYgQEAKIC8qCiAgKiBDb3B5cmln aHQgKEMpIDIwMDcgUnlhbiBMZWF2ZW5nb29kIDxsZWF2ZW5nb29kQGdtYWlsLmNvbT4KKyAqIENv cHlyaWdodCAoQykgMjAxMCBTdGVwaGFuIEHDn211cyA8c3VwZXJzdGlwcGlAZ214LmRlPgogICoK ICAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgpAQCAtMzAsOSArMzEsNiBAQAogCiAjaW5jbHVk ZSAiTm90SW1wbGVtZW50ZWQuaCIKIAotI2luY2x1ZGUgPGFwcC9BcHBEZWZzLmg+Ci0KLQogbmFt ZXNwYWNlIFdlYkNvcmUgewogCiBDdXJzb3I6OkN1cnNvcihQbGF0Zm9ybUN1cnNvciBjdXJzb3Ip CkBAIC00MSwxOTYgKzM5LDIzMiBAQCBDdXJzb3I6OkN1cnNvcihQbGF0Zm9ybUN1cnNvciBjdXJz b3IpCiB9CiAKIEN1cnNvcjo6Q3Vyc29yKGNvbnN0IEN1cnNvciYgb3RoZXIpCi0gICAgOiBtX2lt cGwob3RoZXIubV9pbXBsKQorICAgIDogbV9pbXBsKDApCiB7CisgICAgKnRoaXMgPSBvdGhlcjsK IH0KIAogQ3Vyc29yOjp+Q3Vyc29yKCkKIHsKKyAgICBkZWxldGUgbV9pbXBsOwogfQogCiBDdXJz b3I6OkN1cnNvcihJbWFnZSosIGNvbnN0IEludFBvaW50JikKKyAgICA6IG1faW1wbCgwKQogewog ICAgIG5vdEltcGxlbWVudGVkKCk7CiB9CiAKIEN1cnNvciYgQ3Vyc29yOjpvcGVyYXRvcj0oY29u c3QgQ3Vyc29yJiBvdGhlcikKIHsKLSAgICBtX2ltcGwgPSBvdGhlci5tX2ltcGw7CisgICAgZGVs ZXRlIG1faW1wbDsKKyAgICBtX2ltcGwgPSBvdGhlci5tX2ltcGwgPyBuZXcgQkN1cnNvcigqb3Ro ZXIubV9pbXBsKSA6IDA7CiAgICAgcmV0dXJuICp0aGlzOwogfQogCi1zdGF0aWMgQ3Vyc29yIGds b2JhbEN1cnNvciA9IGNvbnN0X2Nhc3Q8QkN1cnNvcio+KEJfQ1VSU09SX1NZU1RFTV9ERUZBVUxU KTsKLXN0YXRpYyBDdXJzb3IgaWJlYW1DdXJzb3IgPSBjb25zdF9jYXN0PEJDdXJzb3IqPihCX0NV UlNPUl9JX0JFQU0pOworc3RhdGljIEN1cnNvciBjcmVhdGVDdXJzb3JCeUlEKEJDdXJzb3JJRCBp ZCkKK3sKKyAgICByZXR1cm4gQ3Vyc29yKG5ldyBCQ3Vyc29yKGlkKSk7Cit9CiAKIGNvbnN0IEN1 cnNvciYgcG9pbnRlckN1cnNvcigpCiB7Ci0gICAgcmV0dXJuIGdsb2JhbEN1cnNvcjsKKyAgICBz dGF0aWMgQ3Vyc29yIGN1cnNvclN5c3RlbURlZmF1bHQoMCk7CisgICAgcmV0dXJuIGN1cnNvclN5 c3RlbURlZmF1bHQ7CiB9CiAKIGNvbnN0IEN1cnNvciYgbW92ZUN1cnNvcigpCiB7Ci0gICAgcmV0 dXJuIGdsb2JhbEN1cnNvcjsKKyAgICBzdGF0aWMgQ3Vyc29yIGN1cnNvck1vdmUgPSBjcmVhdGVD dXJzb3JCeUlEKEJfQ1VSU09SX0lEX01PVkUpOworICAgIHJldHVybiBjdXJzb3JNb3ZlOwogfQog CiBjb25zdCBDdXJzb3ImIGNyb3NzQ3Vyc29yKCkKIHsKLSAgICByZXR1cm4gZ2xvYmFsQ3Vyc29y OworICAgIHN0YXRpYyBDdXJzb3IgY3Vyc29yQ3Jvc3NIYWlyID0gY3JlYXRlQ3Vyc29yQnlJRChC X0NVUlNPUl9JRF9DUk9TU19IQUlSKTsKKyAgICByZXR1cm4gY3Vyc29yQ3Jvc3NIYWlyOwogfQog CiBjb25zdCBDdXJzb3ImIGhhbmRDdXJzb3IoKQogewotICAgIHJldHVybiBnbG9iYWxDdXJzb3I7 CisgICAgc3RhdGljIEN1cnNvciBjdXJzb3JGb2xsb3dMaW5rID0gY3JlYXRlQ3Vyc29yQnlJRChC X0NVUlNPUl9JRF9GT0xMT1dfTElOSyk7CisgICAgcmV0dXJuIGN1cnNvckZvbGxvd0xpbms7CiB9 CiAKIGNvbnN0IEN1cnNvciYgaUJlYW1DdXJzb3IoKQogewotICAgIHJldHVybiBpYmVhbUN1cnNv cjsKKyAgICBzdGF0aWMgQ3Vyc29yIGN1cnNvcklCZWFtID0gY3JlYXRlQ3Vyc29yQnlJRChCX0NV UlNPUl9JRF9JX0JFQU0pOworICAgIHJldHVybiBjdXJzb3JJQmVhbTsKIH0KIAogY29uc3QgQ3Vy c29yJiB3YWl0Q3Vyc29yKCkKIHsKLSAgICByZXR1cm4gZ2xvYmFsQ3Vyc29yOworICAgIHN0YXRp YyBDdXJzb3IgY3Vyc29yUHJvZ3Jlc3MgPSBjcmVhdGVDdXJzb3JCeUlEKEJfQ1VSU09SX0lEX1BS T0dSRVNTKTsKKyAgICByZXR1cm4gY3Vyc29yUHJvZ3Jlc3M7CiB9CiAKIGNvbnN0IEN1cnNvciYg aGVscEN1cnNvcigpCiB7Ci0gICAgcmV0dXJuIGdsb2JhbEN1cnNvcjsKKyAgICBzdGF0aWMgQ3Vy c29yIGN1cnNvckhlbHAgPSBjcmVhdGVDdXJzb3JCeUlEKEJfQ1VSU09SX0lEX0hFTFApOworICAg IHJldHVybiBjdXJzb3JIZWxwOwogfQogCiBjb25zdCBDdXJzb3ImIGVhc3RSZXNpemVDdXJzb3Io KQogewotICAgIHJldHVybiBnbG9iYWxDdXJzb3I7CisgICAgc3RhdGljIEN1cnNvciBjdXJzb3JS ZXNpemVFYXN0ID0gY3JlYXRlQ3Vyc29yQnlJRChCX0NVUlNPUl9JRF9SRVNJWkVfRUFTVCk7Cisg ICAgcmV0dXJuIGN1cnNvclJlc2l6ZUVhc3Q7CiB9CiAKIGNvbnN0IEN1cnNvciYgbm9ydGhSZXNp emVDdXJzb3IoKQogewotICAgIHJldHVybiBnbG9iYWxDdXJzb3I7CisgICAgc3RhdGljIEN1cnNv ciBjdXJzb3JSZXNpemVOb3J0aCA9IGNyZWF0ZUN1cnNvckJ5SUQoQl9DVVJTT1JfSURfUkVTSVpF X05PUlRIKTsKKyAgICByZXR1cm4gY3Vyc29yUmVzaXplTm9ydGg7CiB9CiAKIGNvbnN0IEN1cnNv ciYgbm9ydGhFYXN0UmVzaXplQ3Vyc29yKCkKIHsKLSAgICByZXR1cm4gZ2xvYmFsQ3Vyc29yOwor ICAgIHN0YXRpYyBDdXJzb3IgY3Vyc29yUmVzaXplTm9ydGhFYXN0ID0gY3JlYXRlQ3Vyc29yQnlJ RChCX0NVUlNPUl9JRF9SRVNJWkVfTk9SVEhfRUFTVCk7CisgICAgcmV0dXJuIGN1cnNvclJlc2l6 ZU5vcnRoRWFzdDsKIH0KIAogY29uc3QgQ3Vyc29yJiBub3J0aFdlc3RSZXNpemVDdXJzb3IoKQog ewotICAgIHJldHVybiBnbG9iYWxDdXJzb3I7CisgICAgc3RhdGljIEN1cnNvciBjdXJzb3JSZXNp emVOb3J0aFdlc3QgPSBjcmVhdGVDdXJzb3JCeUlEKEJfQ1VSU09SX0lEX1JFU0laRV9OT1JUSF9X RVNUKTsKKyAgICByZXR1cm4gY3Vyc29yUmVzaXplTm9ydGhXZXN0OwogfQogCiBjb25zdCBDdXJz b3ImIHNvdXRoUmVzaXplQ3Vyc29yKCkKIHsKLSAgICByZXR1cm4gZ2xvYmFsQ3Vyc29yOworICAg IHN0YXRpYyBDdXJzb3IgY3Vyc29yUmVzaXplU291dGggPSBjcmVhdGVDdXJzb3JCeUlEKEJfQ1VS U09SX0lEX1JFU0laRV9TT1VUSCk7CisgICAgcmV0dXJuIGN1cnNvclJlc2l6ZVNvdXRoOwogfQog CiBjb25zdCBDdXJzb3ImIHNvdXRoRWFzdFJlc2l6ZUN1cnNvcigpCiB7Ci0gICAgcmV0dXJuIGds b2JhbEN1cnNvcjsKKyAgICBzdGF0aWMgQ3Vyc29yIGN1cnNvclJlc2l6ZVNvdXRoRWFzdCA9IGNy ZWF0ZUN1cnNvckJ5SUQoQl9DVVJTT1JfSURfUkVTSVpFX1NPVVRIX0VBU1QpOworICAgIHJldHVy biBjdXJzb3JSZXNpemVTb3V0aEVhc3Q7CiB9CiAKIGNvbnN0IEN1cnNvciYgc291dGhXZXN0UmVz aXplQ3Vyc29yKCkKIHsKLSAgICByZXR1cm4gZ2xvYmFsQ3Vyc29yOworICAgIHN0YXRpYyBDdXJz b3IgY3Vyc29yUmVzaXplU291dGhXZXN0ID0gY3JlYXRlQ3Vyc29yQnlJRChCX0NVUlNPUl9JRF9S RVNJWkVfU09VVEhfV0VTVCk7CisgICAgcmV0dXJuIGN1cnNvclJlc2l6ZVNvdXRoV2VzdDsKIH0K IAogY29uc3QgQ3Vyc29yJiB3ZXN0UmVzaXplQ3Vyc29yKCkKIHsKLSAgICByZXR1cm4gZ2xvYmFs Q3Vyc29yOworICAgIHN0YXRpYyBDdXJzb3IgY3Vyc29yUmVzaXplV2VzdCA9IGNyZWF0ZUN1cnNv ckJ5SUQoQl9DVVJTT1JfSURfUkVTSVpFX1dFU1QpOworICAgIHJldHVybiBjdXJzb3JSZXNpemVX ZXN0OwogfQogCiBjb25zdCBDdXJzb3ImIG5vcnRoU291dGhSZXNpemVDdXJzb3IoKQogewotICAg IHJldHVybiBnbG9iYWxDdXJzb3I7CisgICAgc3RhdGljIEN1cnNvciBjdXJzb3JSZXNpemVOb3J0 aFNvdXRoID0gY3JlYXRlQ3Vyc29yQnlJRChCX0NVUlNPUl9JRF9SRVNJWkVfTk9SVEhfU09VVEgp OworICAgIHJldHVybiBjdXJzb3JSZXNpemVOb3J0aFNvdXRoOwogfQogCiBjb25zdCBDdXJzb3Im IGVhc3RXZXN0UmVzaXplQ3Vyc29yKCkKIHsKLSAgICByZXR1cm4gZ2xvYmFsQ3Vyc29yOworICAg IHN0YXRpYyBDdXJzb3IgY3Vyc29yUmVzaXplRWFzdFdlc3QgPSBjcmVhdGVDdXJzb3JCeUlEKEJf Q1VSU09SX0lEX1JFU0laRV9FQVNUX1dFU1QpOworICAgIHJldHVybiBjdXJzb3JSZXNpemVFYXN0 V2VzdDsKIH0KIAogY29uc3QgQ3Vyc29yJiBub3J0aEVhc3RTb3V0aFdlc3RSZXNpemVDdXJzb3Io KQogewotICAgIHJldHVybiBnbG9iYWxDdXJzb3I7CisgICAgc3RhdGljIEN1cnNvciBjdXJzb3JS ZXNpemVOb3J0aEVhc3RTb3V0aFdlc3QgPSBjcmVhdGVDdXJzb3JCeUlEKEJfQ1VSU09SX0lEX1JF U0laRV9OT1JUSF9FQVNUX1NPVVRIX1dFU1QpOworICAgIHJldHVybiBjdXJzb3JSZXNpemVOb3J0 aEVhc3RTb3V0aFdlc3Q7CiB9CiAKIGNvbnN0IEN1cnNvciYgbm9ydGhXZXN0U291dGhFYXN0UmVz aXplQ3Vyc29yKCkKIHsKLSAgICByZXR1cm4gZ2xvYmFsQ3Vyc29yOworICAgIHN0YXRpYyBDdXJz b3IgY3Vyc29yUmVzaXplTm9ydGhXZXN0U291dGhFYXN0ID0gY3JlYXRlQ3Vyc29yQnlJRChCX0NV UlNPUl9JRF9SRVNJWkVfTk9SVEhfV0VTVF9TT1VUSF9FQVNUKTsKKyAgICByZXR1cm4gY3Vyc29y UmVzaXplTm9ydGhXZXN0U291dGhFYXN0OwogfQogCiBjb25zdCBDdXJzb3ImIGNvbHVtblJlc2l6 ZUN1cnNvcigpCiB7Ci0gICAgcmV0dXJuIGdsb2JhbEN1cnNvcjsKKyAgICByZXR1cm4gZWFzdFdl c3RSZXNpemVDdXJzb3IoKTsKIH0KIAogY29uc3QgQ3Vyc29yJiByb3dSZXNpemVDdXJzb3IoKQog ewotICAgIHJldHVybiBnbG9iYWxDdXJzb3I7CisgICAgcmV0dXJuIG5vcnRoU291dGhSZXNpemVD dXJzb3IoKTsKIH0KIAogY29uc3QgQ3Vyc29yJiB2ZXJ0aWNhbFRleHRDdXJzb3IoKQogewotICAg IHJldHVybiBnbG9iYWxDdXJzb3I7CisgICAgc3RhdGljIEN1cnNvciBjdXJzb3JJQmVhbUhvcml6 b250YWwgPSBjcmVhdGVDdXJzb3JCeUlEKEJfQ1VSU09SX0lEX0lfQkVBTV9IT1JJWk9OVEFMKTsK KyAgICByZXR1cm4gY3Vyc29ySUJlYW1Ib3Jpem9udGFsOwogfQogCiBjb25zdCBDdXJzb3ImIGNl bGxDdXJzb3IoKQogewotICAgIHJldHVybiBnbG9iYWxDdXJzb3I7CisgICAgcmV0dXJuIHBvaW50 ZXJDdXJzb3IoKTsKIH0KIAogY29uc3QgQ3Vyc29yJiBjb250ZXh0TWVudUN1cnNvcigpCiB7Ci0g ICAgcmV0dXJuIGdsb2JhbEN1cnNvcjsKKyAgICBzdGF0aWMgQ3Vyc29yIGN1cnNvckNvbnRleHRN ZW51ID0gY3JlYXRlQ3Vyc29yQnlJRChCX0NVUlNPUl9JRF9DT05URVhUX01FTlUpOworICAgIHJl dHVybiBjdXJzb3JDb250ZXh0TWVudTsKIH0KIAogY29uc3QgQ3Vyc29yJiBub0Ryb3BDdXJzb3Io KQogewotICAgIHJldHVybiBnbG9iYWxDdXJzb3I7CisgICAgc3RhdGljIEN1cnNvciBjdXJzb3JO b3RBbGxvd2VkID0gY3JlYXRlQ3Vyc29yQnlJRChCX0NVUlNPUl9JRF9OT1RfQUxMT1dFRCk7Cisg ICAgcmV0dXJuIGN1cnNvck5vdEFsbG93ZWQ7CiB9CiAKIGNvbnN0IEN1cnNvciYgY29weUN1cnNv cigpCiB7Ci0gICAgcmV0dXJuIGdsb2JhbEN1cnNvcjsKKyAgICBzdGF0aWMgQ3Vyc29yIGN1cnNv ckNvcHkgPSBjcmVhdGVDdXJzb3JCeUlEKEJfQ1VSU09SX0lEX0NPUFkpOworICAgIHJldHVybiBj dXJzb3JDb3B5OwogfQogCiBjb25zdCBDdXJzb3ImIHByb2dyZXNzQ3Vyc29yKCkKIHsKLSAgICBy ZXR1cm4gZ2xvYmFsQ3Vyc29yOworICAgIHN0YXRpYyBDdXJzb3IgY3Vyc29yUHJvZ3Jlc3MgPSBj cmVhdGVDdXJzb3JCeUlEKEJfQ1VSU09SX0lEX1BST0dSRVNTKTsKKyAgICByZXR1cm4gY3Vyc29y UHJvZ3Jlc3M7CiB9CiAKIGNvbnN0IEN1cnNvciYgYWxpYXNDdXJzb3IoKQogewotICAgIHJldHVy biBnbG9iYWxDdXJzb3I7CisgICAgcmV0dXJuIGhhbmRDdXJzb3IoKTsKIH0KIAogY29uc3QgQ3Vy c29yJiBub25lQ3Vyc29yKCkKIHsKLSAgICByZXR1cm4gZ2xvYmFsQ3Vyc29yOworICAgIHN0YXRp YyBDdXJzb3IgY3Vyc29yTm9DdXJzb3IgPSBjcmVhdGVDdXJzb3JCeUlEKEJfQ1VSU09SX0lEX05P X0NVUlNPUik7CisgICAgcmV0dXJuIGN1cnNvck5vQ3Vyc29yOwogfQogCiBjb25zdCBDdXJzb3Im IG5vdEFsbG93ZWRDdXJzb3IoKQogewotICAgIHJldHVybiBnbG9iYWxDdXJzb3I7CisgICAgc3Rh dGljIEN1cnNvciBjdXJzb3JOb3RBbGxvd2VkID0gY3JlYXRlQ3Vyc29yQnlJRChCX0NVUlNPUl9J RF9OT1RfQUxMT1dFRCk7CisgICAgcmV0dXJuIGN1cnNvck5vdEFsbG93ZWQ7CiB9CiAKIGNvbnN0 IEN1cnNvciYgem9vbUluQ3Vyc29yKCkKIHsKLSAgICByZXR1cm4gZ2xvYmFsQ3Vyc29yOworICAg IHN0YXRpYyBDdXJzb3IgY3Vyc29yWm9vbUluID0gY3JlYXRlQ3Vyc29yQnlJRChCX0NVUlNPUl9J RF9aT09NX0lOKTsKKyAgICByZXR1cm4gY3Vyc29yWm9vbUluOwogfQogCiBjb25zdCBDdXJzb3Im IHpvb21PdXRDdXJzb3IoKQogewotICAgIHJldHVybiBnbG9iYWxDdXJzb3I7CisgICAgc3RhdGlj IEN1cnNvciBjdXJzb3Jab29tT3V0ID0gY3JlYXRlQ3Vyc29yQnlJRChCX0NVUlNPUl9JRF9aT09N X09VVCk7CisgICAgcmV0dXJuIGN1cnNvclpvb21PdXQ7CiB9CiAKIGNvbnN0IEN1cnNvciYgZ3Jh YkN1cnNvcigpCiB7Ci0gICAgcmV0dXJuIGdsb2JhbEN1cnNvcjsKKyAgICBzdGF0aWMgQ3Vyc29y IGN1cnNvckdyYWIgPSBjcmVhdGVDdXJzb3JCeUlEKEJfQ1VSU09SX0lEX0dSQUIpOworICAgIHJl dHVybiBjdXJzb3JHcmFiOwogfQogCiBjb25zdCBDdXJzb3ImIGdyYWJiaW5nQ3Vyc29yKCkKIHsK LSAgICByZXR1cm4gZ2xvYmFsQ3Vyc29yOworICAgIHN0YXRpYyBDdXJzb3IgY3Vyc29yR3JhYmJp bmcgPSBjcmVhdGVDdXJzb3JCeUlEKEJfQ1VSU09SX0lEX0dSQUJCSU5HKTsKKyAgICByZXR1cm4g Y3Vyc29yR3JhYmJpbmc7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK