3657 2005-06-22 17:26:15 -0700 GroundWork: Moving some functions from khtml->jsc following kjs TOT 2005-07-03 16:22:36 -0700 1 1 1 Unclassified WebKit JavaScriptCore 412 Mac OS X 10.4 VERIFIED FIXED P3 Normal --- 3250 1 eric eric oldest_to_newest 12870 0 eric 2005-06-22 17:26:15 -0700 This patch provides a necessary move of a couple functions and #defines from kjs_binding.h to JavaScriptCore/lookup.h to follow a move that kjs made several months ago. This move is necessary to allow things such a kdom to compile cleanly on top of JSC. 12871 1 2560 eric 2005-06-22 17:28:24 -0700 Created attachment 2560 Simple patch which moves a few functions from khtml to jsc 12877 2 2560 darin 2005-06-22 19:43:00 -0700 Comment on attachment 2560 Simple patch which moves a few functions from khtml to jsc Looks fine. r=me 13807 3 joost 2005-07-03 08:14:00 -0700 Eric, could you verify this one? 2560 2005-06-22 17:28:24 -0700 2005-06-22 19:43:00 -0700 Simple patch which moves a few functions from khtml to jsc jsc_move.patch text/plain 11117 eric SW5kZXg6IC4vSmF2YVNjcmlwdENvcmUva2pzL2xvb2t1cC5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6 IC9jdnMvcm9vdC9KYXZhU2NyaXB0Q29yZS9ranMvbG9va3VwLmgsdgpyZXRyaWV2aW5nIHJldmlz aW9uIDEuOQpkaWZmIC1wIC11IC1yMS45IC4vSmF2YVNjcmlwdENvcmUva2pzL2xvb2t1cC5oCi0t LSAuL0phdmFTY3JpcHRDb3JlL2tqcy9sb29rdXAuaAkyMDA1LzAxLzIxIDAxOjIyOjA4CTEuOQor KysgLi9KYXZhU2NyaXB0Q29yZS9ranMvbG9va3VwLmgJMjAwNS8wNi8yMyAwMDoyNDo1MwpAQCAt MjMsNiArMjMsNyBAQAogI2lmbmRlZiBfS0pTTE9PS1VQX0hfCiAjZGVmaW5lIF9LSlNMT09LVVBf SF8KIAorI2luY2x1ZGUgImludGVycHJldGVyLmgiCiAjaW5jbHVkZSAiaWRlbnRpZmllci5oIgog I2luY2x1ZGUgIm9iamVjdC5oIgogI2luY2x1ZGUgPHN0ZGlvLmg+CkBAIC0yMzksNiArMjQwLDEw NCBAQCBuYW1lc3BhY2UgS0pTIHsKICAgICBlbHNlCiAgICAgICB0aGlzT2JqLT5wdXRWYWx1ZVBy b3BlcnR5KGV4ZWMsIGVudHJ5LT52YWx1ZSwgdmFsdWUsIGF0dHIpOwogICB9CisgIAorICAvKioK KyAgICogVGhpcyB0ZW1wbGF0ZSBtZXRob2QgcmV0cmlldmVzIG9yIGNyZWF0ZSBhbiBvYmplY3Qg dGhhdCBpcyB1bmlxdWUKKyAgICogKGZvciBhIGdpdmVuIGludGVycHJldGVyKSBUaGUgZmlyc3Qg dGltZSB0aGlzIGlzIGNhbGxlZCAoZm9yIGEgZ2l2ZW4KKyAgICogcHJvcGVydHkgbmFtZSksIHRo ZSBPYmplY3Qgd2lsbCBiZSBjb25zdHJ1Y3RlZCwgYW5kIHNldCBhcyBhIHByb3BlcnR5CisgICAq IG9mIHRoZSBpbnRlcnByZXRlcidzIGdsb2JhbCBvYmplY3QuIExhdGVyIGNhbGxzIHdpbGwgc2lt cGx5IHJldHJpZXZlCisgICAqIHRoYXQgY2FjaGVkIG9iamVjdC4gTm90ZSB0aGF0IHRoZSBvYmpl Y3QgY29uc3RydWN0b3IgbXVzdCB0YWtlIDEgYXJndW1lbnQsIGV4ZWMuCisgICAqLworICB0ZW1w bGF0ZSA8Y2xhc3MgQ2xhc3NDdG9yPgorICBpbmxpbmUgT2JqZWN0SW1wICpjYWNoZUdsb2JhbE9i amVjdChFeGVjU3RhdGUgKmV4ZWMsIGNvbnN0IElkZW50aWZpZXIgJnByb3BlcnR5TmFtZSkKKyAg eworICAgIE9iamVjdEltcCAqZ2xvYmFsT2JqZWN0ID0gc3RhdGljX2Nhc3Q8T2JqZWN0SW1wICo+ KGV4ZWMtPmxleGljYWxJbnRlcnByZXRlcigpLT5nbG9iYWxPYmplY3QoKS5pbXAoKSk7CisgICAg VmFsdWVJbXAgKm9iaiA9IGdsb2JhbE9iamVjdC0+Z2V0RGlyZWN0KHByb3BlcnR5TmFtZSk7Cisg ICAgaWYgKG9iaikgeworICAgICAgYXNzZXJ0KG9iai0+aXNPYmplY3QoKSk7CisgICAgICByZXR1 cm4gc3RhdGljX2Nhc3Q8T2JqZWN0SW1wICo+KG9iaik7CisgICAgfQorICAgIE9iamVjdEltcCAq bmV3T2JqZWN0ID0gbmV3IENsYXNzQ3RvcihleGVjKTsKKyAgICBnbG9iYWxPYmplY3QtPnB1dChl eGVjLCBwcm9wZXJ0eU5hbWUsIFZhbHVlKG5ld09iamVjdCksIEludGVybmFsKTsKKyAgICByZXR1 cm4gbmV3T2JqZWN0OworICB9CisKKyAgLyoqCisgICAqIEhlbHBlcnMgdG8gZGVmaW5lIHByb3Rv dHlwZSBvYmplY3RzIChlYWNoIG9mIHdoaWNoIHNpbXBseSBpbXBsZW1lbnRzCisgICAqIHRoZSBm dW5jdGlvbnMgZm9yIGEgdHlwZSBvZiBvYmplY3RzKS4KKyAgICogU29ycnkgZm9yIHRoaXMgbm90 IGJlaW5nIHZlcnkgcmVhZGFibGUsIGJ1dCBpdCBhY3R1YWxseSBzYXZlcyBtdWNoIGNvcHktbi1w YXN0ZS4KKyAgICogUGFyZW50UHJvdG8gaXMgbm90IG91ciBiYXNlIGNsYXNzLCBpdCdzIHRoZSBv YmplY3Qgd2UgdXNlIGFzIGZhbGxiYWNrLgorICAgKiBUaGUgcmVhc29uIGZvciB0aGlzIGlzIHRo YXQgdGhlcmUgc2hvdWxkIG9ubHkgYmUgT05FIERPTU5vZGUuaGFzQXR0cmlidXRlcyAoZS5nLiks CisgICAqIG5vdCBvbmUgaW4gZWFjaCBkZXJpdmVkIGNsYXNzLiBTbyB3ZSBsaW5rIHRoZSAodW5p cXVlKSBwcm90b3R5cGVzIGJldHdlZW4gdGhlbS4KKyAgICoKKyAgICogVXNpbmcgdGhvc2UgbWFj cm9zIGlzIHZlcnkgc2ltcGxlOiBkZWZpbmUgdGhlIGhhc2h0YWJsZSAoZS5nLiAiRE9NTm9kZVBy b3RvVGFibGUiKSwgdGhlbgorICAgKiBERUZJTkVfUFJPVE9UWVBFKCJET01Ob2RlIixET01Ob2Rl UHJvdG8pCisgICAqIElNUExFTUVOVF9QUk9UT0ZVTkMoRE9NTm9kZVByb3RvRnVuYykKKyAgICog SU1QTEVNRU5UX1BST1RPVFlQRShET01Ob2RlUHJvdG8sRE9NTm9kZVByb3RvRnVuYykKKyAgICog YW5kIHVzZSBET01Ob2RlUHJvdG86OnNlbGYoZXhlYykgYXMgcHJvdG90eXBlIGluIHRoZSBET01O b2RlIGNvbnN0cnVjdG9yLgorICAgKiBJZiB0aGUgcHJvdG90eXBlIGhhcyBhICJwYXJlbnQgcHJv dG90eXBlIiwgZS5nLiBET01FbGVtZW50UHJvdG8gZmFsbHMgYmFjayBvbiBET01Ob2RlUHJvdG8s CisgICAqIHRoZW4gdGhlIGxhc3QgbGluZSB3aWxsIHVzZSBJTVBMRU1FTlRfUFJPVE9UWVBFX1dJ VEhfUEFSRU5ULCB3aXRoIERPTU5vZGVQcm90byBhcyBsYXN0IGFyZ3VtZW50LgorICAgKi8KKyNk ZWZpbmUgREVGSU5FX1BST1RPVFlQRShDbGFzc05hbWUsQ2xhc3NQcm90bykgXAorICBjbGFzcyBD bGFzc1Byb3RvIDogcHVibGljIE9iamVjdEltcCB7IFwKKyAgICBmcmllbmQgT2JqZWN0SW1wICpj YWNoZUdsb2JhbE9iamVjdDxDbGFzc1Byb3RvPihFeGVjU3RhdGUgKmV4ZWMsIGNvbnN0IElkZW50 aWZpZXIgJnByb3BlcnR5TmFtZSk7IFwKKyAgcHVibGljOiBcCisgICAgc3RhdGljIE9iamVjdElt cCAqc2VsZihFeGVjU3RhdGUgKmV4ZWMpIFwKKyAgICB7IFwKKyAgICAgIHJldHVybiBjYWNoZUds b2JhbE9iamVjdDxDbGFzc1Byb3RvPiggZXhlYywgIltbIiBDbGFzc05hbWUgIi5wcm90b3R5cGVd XSIgKTsgXAorICAgIH0gXAorICBwcm90ZWN0ZWQ6IFwKKyAgICBDbGFzc1Byb3RvKCBFeGVjU3Rh dGUgKmV4ZWMgKSBcCisgICAgICA6IE9iamVjdEltcCggZXhlYy0+bGV4aWNhbEludGVycHJldGVy KCktPmJ1aWx0aW5PYmplY3RQcm90b3R5cGUoKSApIHt9IFwKKyAgICBcCisgIHB1YmxpYzogXAor ICAgIHZpcnR1YWwgY29uc3QgQ2xhc3NJbmZvICpjbGFzc0luZm8oKSBjb25zdCB7IHJldHVybiAm aW5mbzsgfSBcCisgICAgc3RhdGljIGNvbnN0IENsYXNzSW5mbyBpbmZvOyBcCisgICAgVmFsdWUg Z2V0KEV4ZWNTdGF0ZSAqZXhlYywgY29uc3QgSWRlbnRpZmllciAmcHJvcGVydHlOYW1lKSBjb25z dDsgXAorICAgIGJvb2wgaGFzUHJvcGVydHkoRXhlY1N0YXRlICpleGVjLCBjb25zdCBJZGVudGlm aWVyICZwcm9wZXJ0eU5hbWUpIGNvbnN0OyBcCisgIH07IFwKKyAgY29uc3QgQ2xhc3NJbmZvIENs YXNzUHJvdG86OmluZm8gPSB7IENsYXNzTmFtZSwgMCwgJkNsYXNzUHJvdG8jI1RhYmxlLCAwIH07 CisKKyNkZWZpbmUgSU1QTEVNRU5UX1BST1RPVFlQRShDbGFzc1Byb3RvLENsYXNzRnVuYykgXAor ICAgIFZhbHVlIENsYXNzUHJvdG86OmdldChFeGVjU3RhdGUgKmV4ZWMsIGNvbnN0IElkZW50aWZp ZXIgJnByb3BlcnR5TmFtZSkgY29uc3QgXAorICAgIHsgXAorICAgICAgLypmcHJpbnRmKCBzdGRl cnIsICIlc1Byb3RvOjpnZXQoJXMpIFtpbiBtYWNybywgbm8gcGFyZW50XVxuIiwgaW5mby5jbGFz c05hbWUsIHByb3BlcnR5TmFtZS5hc2NpaSgpKTsqLyBcCisgICAgICByZXR1cm4gbG9va3VwR2V0 RnVuY3Rpb248Q2xhc3NGdW5jLE9iamVjdEltcD4oZXhlYywgcHJvcGVydHlOYW1lLCAmQ2xhc3NQ cm90byMjVGFibGUsIHRoaXMgKTsgXAorICAgIH0gXAorICAgIGJvb2wgQ2xhc3NQcm90bzo6aGFz UHJvcGVydHkoRXhlY1N0YXRlICpleGVjLCBjb25zdCBJZGVudGlmaWVyICZwcm9wZXJ0eU5hbWUp IGNvbnN0IFwKKyAgICB7IC8qc3R1cGlkIGJ1dCB3ZSBuZWVkIHRoaXMgdG8gaGF2ZSBhIGNvbW1v biBtYWNybyBmb3IgdGhlIGRlY2xhcmF0aW9uKi8gXAorICAgICAgcmV0dXJuIE9iamVjdEltcDo6 aGFzUHJvcGVydHkoZXhlYywgcHJvcGVydHlOYW1lKTsgXAorICAgIH0KKworI2RlZmluZSBJTVBM RU1FTlRfUFJPVE9UWVBFX1dJVEhfUEFSRU5UKENsYXNzUHJvdG8sQ2xhc3NGdW5jLFBhcmVudFBy b3RvKSAgXAorICAgIFZhbHVlIENsYXNzUHJvdG86OmdldChFeGVjU3RhdGUgKmV4ZWMsIGNvbnN0 IElkZW50aWZpZXIgJnByb3BlcnR5TmFtZSkgY29uc3QgXAorICAgIHsgXAorICAgICAgLypmcHJp bnRmKCBzdGRlcnIsICIlc1Byb3RvOjpnZXQoJXMpIFtpbiBtYWNyb11cbiIsIGluZm8uY2xhc3NO YW1lLCBwcm9wZXJ0eU5hbWUuYXNjaWkoKSk7Ki8gXAorICAgICAgVmFsdWUgdmFsID0gbG9va3Vw R2V0RnVuY3Rpb248Q2xhc3NGdW5jLE9iamVjdEltcD4oZXhlYywgcHJvcGVydHlOYW1lLCAmQ2xh c3NQcm90byMjVGFibGUsIHRoaXMgKTsgXAorICAgICAgaWYgKCB2YWwudHlwZSgpICE9IFVuZGVm aW5lZFR5cGUgKSByZXR1cm4gdmFsOyBcCisgICAgICAvKiBOb3QgZm91bmQgLT4gZm9yd2FyZCBy ZXF1ZXN0IHRvICJwYXJlbnQiIHByb3RvdHlwZSAqLyBcCisgICAgICByZXR1cm4gUGFyZW50UHJv dG86OnNlbGYoZXhlYyktPmdldCggZXhlYywgcHJvcGVydHlOYW1lICk7IFwKKyAgICB9IFwKKyAg ICBib29sIENsYXNzUHJvdG86Omhhc1Byb3BlcnR5KEV4ZWNTdGF0ZSAqZXhlYywgY29uc3QgSWRl bnRpZmllciAmcHJvcGVydHlOYW1lKSBjb25zdCBcCisgICAgeyBcCisgICAgICBpZiAoT2JqZWN0 SW1wOjpoYXNQcm9wZXJ0eShleGVjLCBwcm9wZXJ0eU5hbWUpKSBcCisgICAgICAgIHJldHVybiB0 cnVlOyBcCisgICAgICByZXR1cm4gUGFyZW50UHJvdG86OnNlbGYoZXhlYyktPmhhc1Byb3BlcnR5 KGV4ZWMsIHByb3BlcnR5TmFtZSk7IFwKKyAgICB9CisKKyNkZWZpbmUgSU1QTEVNRU5UX1BST1RP RlVOQyhDbGFzc0Z1bmMpIFwKKyAgY2xhc3MgQ2xhc3NGdW5jIDogcHVibGljIERPTUZ1bmN0aW9u IHsgXAorICBwdWJsaWM6IFwKKyAgICBDbGFzc0Z1bmMoRXhlY1N0YXRlICpleGVjLCBpbnQgaSwg aW50IGxlbikgXAorICAgICAgIDogRE9NRnVuY3Rpb24oIC8qcHJvdG8/ICovICksIGlkKGkpIHsg XAorICAgICAgIFZhbHVlIHByb3RlY3QodGhpcyk7IFwKKyAgICAgICBwdXQoZXhlYyxsZW5ndGhQ cm9wZXJ0eU5hbWUsTnVtYmVyKGxlbiksRG9udERlbGV0ZXxSZWFkT25seXxEb250RW51bSk7IFwK KyAgICB9IFwKKyAgICAvKiogWW91IG5lZWQgdG8gaW1wbGVtZW50IHRoYXQgb25lICovIFwKKyAg ICB2aXJ0dWFsIFZhbHVlIHRyeUNhbGwoRXhlY1N0YXRlICpleGVjLCBPYmplY3QgJnRoaXNPYmos IGNvbnN0IExpc3QgJmFyZ3MpOyBcCisgIHByaXZhdGU6IFwKKyAgICBpbnQgaWQ7IFwKKyAgfTsK IAogICAvKgogICAgKiBMaXN0IG9mIHRoaW5ncyB0byBkbyB3aGVuIHBvcnRpbmcgYW4gb2JqZWN0 aW1wIHRvIHRoZSAnc3RhdGljIGhhc2h0YWJsZScgbWVjaGFuaXNtOgpJbmRleDogLi9XZWJDb3Jl L0ZvcndhcmRpbmdIZWFkZXJzL3FpbnRkaWN0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2N2cy9y b290L1dlYkNvcmUvRm9yd2FyZGluZ0hlYWRlcnMvcWludGRpY3QuaCx2CnJldHJpZXZpbmcgcmV2 aXNpb24gMS4xCmRpZmYgLXAgLXUgLXIxLjEgLi9XZWJDb3JlL0ZvcndhcmRpbmdIZWFkZXJzL3Fp bnRkaWN0LmgKLS0tIC4vV2ViQ29yZS9Gb3J3YXJkaW5nSGVhZGVycy9xaW50ZGljdC5oCTIwMDIv MTAvMjQgMjA6Mjg6MTEJMS4xCisrKyAuL1dlYkNvcmUvRm9yd2FyZGluZ0hlYWRlcnMvcWludGRp Y3QuaAkyMDA1LzA2LzIzIDAwOjI1OjMwCkBAIC0wLDAgKzEsMiBAQAorI2ltcG9ydCA8S1dRSW50 RGljdC5oPgorCkluZGV4OiAuL1dlYkNvcmUva2h0bWwvZWNtYS9ranNfYmluZGluZy5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KUkNTIGZpbGU6IC9jdnMvcm9vdC9XZWJDb3JlL2todG1sL2VjbWEva2pzX2JpbmRpbmcu aCx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS4yNwpkaWZmIC1wIC11IC1yMS4yNyAuL1dlYkNvcmUv a2h0bWwvZWNtYS9ranNfYmluZGluZy5oCi0tLSAuL1dlYkNvcmUva2h0bWwvZWNtYS9ranNfYmlu ZGluZy5oCTIwMDUvMDYvMjIgMDA6NDg6NDQJMS4yNworKysgLi9XZWJDb3JlL2todG1sL2VjbWEv a2pzX2JpbmRpbmcuaAkyMDA1LzA2LzIzIDAwOjI1OjM3CkBAIC0yNTksMTA0ICsyNTksNiBAQCBu YW1lc3BhY2UgS0pTIHsKICAgICAgIHRoaXNPYmotPnB1dFZhbHVlKGV4ZWMsIGVudHJ5LT52YWx1 ZSwgdmFsdWUsIGF0dHIpOwogICB9CiAKLSAgLyoqCi0gICAqIFRoaXMgdGVtcGxhdGUgbWV0aG9k IHJldHJpZXZlcyBvciBjcmVhdGUgYW4gb2JqZWN0IHRoYXQgaXMgdW5pcXVlCi0gICAqIChmb3Ig YSBnaXZlbiBpbnRlcnByZXRlcikgVGhlIGZpcnN0IHRpbWUgdGhpcyBpcyBjYWxsZWQgKGZvciBh IGdpdmVuCi0gICAqIHByb3BlcnR5IG5hbWUpLCB0aGUgT2JqZWN0IHdpbGwgYmUgY29uc3RydWN0 ZWQsIGFuZCBzZXQgYXMgYSBwcm9wZXJ0eQotICAgKiBvZiB0aGUgaW50ZXJwcmV0ZXIncyBnbG9i YWwgb2JqZWN0LiBMYXRlciBjYWxscyB3aWxsIHNpbXBseSByZXRyaWV2ZQotICAgKiB0aGF0IGNh Y2hlZCBvYmplY3QuIE5vdGUgdGhhdCB0aGUgb2JqZWN0IGNvbnN0cnVjdG9yIG11c3QgdGFrZSAx IGFyZ3VtZW50LCBleGVjLgotICAgKi8KLSAgdGVtcGxhdGUgPGNsYXNzIENsYXNzQ3Rvcj4KLSAg aW5saW5lIE9iamVjdEltcCAqY2FjaGVHbG9iYWxPYmplY3QoRXhlY1N0YXRlICpleGVjLCBjb25z dCBJZGVudGlmaWVyICZwcm9wZXJ0eU5hbWUpCi0gIHsKLSAgICBPYmplY3RJbXAgKmdsb2JhbE9i amVjdCA9IHN0YXRpY19jYXN0PE9iamVjdEltcCAqPihleGVjLT5sZXhpY2FsSW50ZXJwcmV0ZXIo KS0+Z2xvYmFsT2JqZWN0KCkuaW1wKCkpOwotICAgIFZhbHVlSW1wICpvYmogPSBnbG9iYWxPYmpl Y3QtPmdldERpcmVjdChwcm9wZXJ0eU5hbWUpOwotICAgIGlmIChvYmopIHsKLSAgICAgIGFzc2Vy dChvYmotPmlzT2JqZWN0KCkpOwotICAgICAgcmV0dXJuIHN0YXRpY19jYXN0PE9iamVjdEltcCAq PihvYmopOwotICAgIH0KLSAgICBPYmplY3RJbXAgKm5ld09iamVjdCA9IG5ldyBDbGFzc0N0b3Io ZXhlYyk7Ci0gICAgZ2xvYmFsT2JqZWN0LT5wdXQoZXhlYywgcHJvcGVydHlOYW1lLCBWYWx1ZShu ZXdPYmplY3QpLCBJbnRlcm5hbCk7Ci0gICAgcmV0dXJuIG5ld09iamVjdDsKLSAgfQotCi0gIC8q KgotICAgKiBIZWxwZXJzIHRvIGRlZmluZSBwcm90b3R5cGUgb2JqZWN0cyAoZWFjaCBvZiB3aGlj aCBzaW1wbHkgaW1wbGVtZW50cwotICAgKiB0aGUgZnVuY3Rpb25zIGZvciBhIHR5cGUgb2Ygb2Jq ZWN0cykuCi0gICAqIFNvcnJ5IGZvciB0aGlzIG5vdCBiZWluZyB2ZXJ5IHJlYWRhYmxlLCBidXQg aXQgYWN0dWFsbHkgc2F2ZXMgbXVjaCBjb3B5LW4tcGFzdGUuCi0gICAqIFBhcmVudFByb3RvIGlz IG5vdCBvdXIgYmFzZSBjbGFzcywgaXQncyB0aGUgb2JqZWN0IHdlIHVzZSBhcyBmYWxsYmFjay4K LSAgICogVGhlIHJlYXNvbiBmb3IgdGhpcyBpcyB0aGF0IHRoZXJlIHNob3VsZCBvbmx5IGJlIE9O RSBET01Ob2RlLmhhc0F0dHJpYnV0ZXMgKGUuZy4pLAotICAgKiBub3Qgb25lIGluIGVhY2ggZGVy aXZlZCBjbGFzcy4gU28gd2UgbGluayB0aGUgKHVuaXF1ZSkgcHJvdG90eXBlcyBiZXR3ZWVuIHRo ZW0uCi0gICAqCi0gICAqIFVzaW5nIHRob3NlIG1hY3JvcyBpcyB2ZXJ5IHNpbXBsZTogZGVmaW5l IHRoZSBoYXNodGFibGUgKGUuZy4gIkRPTU5vZGVQcm90b1RhYmxlIiksIHRoZW4KLSAgICogREVG SU5FX1BST1RPVFlQRSgiRE9NTm9kZSIsRE9NTm9kZVByb3RvKQotICAgKiBJTVBMRU1FTlRfUFJP VE9GVU5DKERPTU5vZGVQcm90b0Z1bmMpCi0gICAqIElNUExFTUVOVF9QUk9UT1RZUEUoRE9NTm9k ZVByb3RvLERPTU5vZGVQcm90b0Z1bmMpCi0gICAqIGFuZCB1c2UgRE9NTm9kZVByb3RvOjpzZWxm KGV4ZWMpIGFzIHByb3RvdHlwZSBpbiB0aGUgRE9NTm9kZSBjb25zdHJ1Y3Rvci4KLSAgICogSWYg dGhlIHByb3RvdHlwZSBoYXMgYSAicGFyZW50IHByb3RvdHlwZSIsIGUuZy4gRE9NRWxlbWVudFBy b3RvIGZhbGxzIGJhY2sgb24gRE9NTm9kZVByb3RvLAotICAgKiB0aGVuIHRoZSBsYXN0IGxpbmUg d2lsbCB1c2UgSU1QTEVNRU5UX1BST1RPVFlQRV9XSVRIX1BBUkVOVCwgd2l0aCBET01Ob2RlUHJv dG8gYXMgbGFzdCBhcmd1bWVudC4KLSAgICovCi0jZGVmaW5lIERFRklORV9QUk9UT1RZUEUoQ2xh c3NOYW1lLENsYXNzUHJvdG8pIFwKLSAgY2xhc3MgQ2xhc3NQcm90byA6IHB1YmxpYyBPYmplY3RJ bXAgeyBcCi0gICAgZnJpZW5kIE9iamVjdEltcCAqY2FjaGVHbG9iYWxPYmplY3Q8Q2xhc3NQcm90 bz4oRXhlY1N0YXRlICpleGVjLCBjb25zdCBJZGVudGlmaWVyICZwcm9wZXJ0eU5hbWUpOyBcCi0g IHB1YmxpYzogXAotICAgIHN0YXRpYyBPYmplY3RJbXAgKnNlbGYoRXhlY1N0YXRlICpleGVjKSBc Ci0gICAgeyBcCi0gICAgICByZXR1cm4gY2FjaGVHbG9iYWxPYmplY3Q8Q2xhc3NQcm90bz4oIGV4 ZWMsICJbWyIgQ2xhc3NOYW1lICIucHJvdG90eXBlXV0iICk7IFwKLSAgICB9IFwKLSAgcHJvdGVj dGVkOiBcCi0gICAgQ2xhc3NQcm90byggRXhlY1N0YXRlICpleGVjICkgXAotICAgICAgOiBPYmpl Y3RJbXAoIGV4ZWMtPmxleGljYWxJbnRlcnByZXRlcigpLT5idWlsdGluT2JqZWN0UHJvdG90eXBl KCkgKSB7fSBcCi0gICAgXAotICBwdWJsaWM6IFwKLSAgICB2aXJ0dWFsIGNvbnN0IENsYXNzSW5m byAqY2xhc3NJbmZvKCkgY29uc3QgeyByZXR1cm4gJmluZm87IH0gXAotICAgIHN0YXRpYyBjb25z dCBDbGFzc0luZm8gaW5mbzsgXAotICAgIFZhbHVlIGdldChFeGVjU3RhdGUgKmV4ZWMsIGNvbnN0 IElkZW50aWZpZXIgJnByb3BlcnR5TmFtZSkgY29uc3Q7IFwKLSAgICBib29sIGhhc1Byb3BlcnR5 KEV4ZWNTdGF0ZSAqZXhlYywgY29uc3QgSWRlbnRpZmllciAmcHJvcGVydHlOYW1lKSBjb25zdDsg XAotICB9OyBcCi0gIGNvbnN0IENsYXNzSW5mbyBDbGFzc1Byb3RvOjppbmZvID0geyBDbGFzc05h bWUsIDAsICZDbGFzc1Byb3RvIyNUYWJsZSwgMCB9OwotCi0jZGVmaW5lIElNUExFTUVOVF9QUk9U T1RZUEUoQ2xhc3NQcm90byxDbGFzc0Z1bmMpIFwKLSAgICBWYWx1ZSBDbGFzc1Byb3RvOjpnZXQo RXhlY1N0YXRlICpleGVjLCBjb25zdCBJZGVudGlmaWVyICZwcm9wZXJ0eU5hbWUpIGNvbnN0IFwK LSAgICB7IFwKLSAgICAgIC8qZnByaW50Ziggc3RkZXJyLCAiJXNQcm90bzo6Z2V0KCVzKSBbaW4g bWFjcm8sIG5vIHBhcmVudF1cbiIsIGluZm8uY2xhc3NOYW1lLCBwcm9wZXJ0eU5hbWUuYXNjaWko KSk7Ki8gXAotICAgICAgcmV0dXJuIGxvb2t1cEdldEZ1bmN0aW9uPENsYXNzRnVuYyxPYmplY3RJ bXA+KGV4ZWMsIHByb3BlcnR5TmFtZSwgJkNsYXNzUHJvdG8jI1RhYmxlLCB0aGlzICk7IFwKLSAg ICB9IFwKLSAgICBib29sIENsYXNzUHJvdG86Omhhc1Byb3BlcnR5KEV4ZWNTdGF0ZSAqZXhlYywg Y29uc3QgSWRlbnRpZmllciAmcHJvcGVydHlOYW1lKSBjb25zdCBcCi0gICAgeyAvKnN0dXBpZCBi dXQgd2UgbmVlZCB0aGlzIHRvIGhhdmUgYSBjb21tb24gbWFjcm8gZm9yIHRoZSBkZWNsYXJhdGlv biovIFwKLSAgICAgIHJldHVybiBPYmplY3RJbXA6Omhhc1Byb3BlcnR5KGV4ZWMsIHByb3BlcnR5 TmFtZSk7IFwKLSAgICB9Ci0KLSNkZWZpbmUgSU1QTEVNRU5UX1BST1RPVFlQRV9XSVRIX1BBUkVO VChDbGFzc1Byb3RvLENsYXNzRnVuYyxQYXJlbnRQcm90bykgIFwKLSAgICBWYWx1ZSBDbGFzc1By b3RvOjpnZXQoRXhlY1N0YXRlICpleGVjLCBjb25zdCBJZGVudGlmaWVyICZwcm9wZXJ0eU5hbWUp IGNvbnN0IFwKLSAgICB7IFwKLSAgICAgIC8qZnByaW50Ziggc3RkZXJyLCAiJXNQcm90bzo6Z2V0 KCVzKSBbaW4gbWFjcm9dXG4iLCBpbmZvLmNsYXNzTmFtZSwgcHJvcGVydHlOYW1lLmFzY2lpKCkp OyovIFwKLSAgICAgIFZhbHVlIHZhbCA9IGxvb2t1cEdldEZ1bmN0aW9uPENsYXNzRnVuYyxPYmpl Y3RJbXA+KGV4ZWMsIHByb3BlcnR5TmFtZSwgJkNsYXNzUHJvdG8jI1RhYmxlLCB0aGlzICk7IFwK LSAgICAgIGlmICggdmFsLnR5cGUoKSAhPSBVbmRlZmluZWRUeXBlICkgcmV0dXJuIHZhbDsgXAot ICAgICAgLyogTm90IGZvdW5kIC0+IGZvcndhcmQgcmVxdWVzdCB0byAicGFyZW50IiBwcm90b3R5 cGUgKi8gXAotICAgICAgcmV0dXJuIFBhcmVudFByb3RvOjpzZWxmKGV4ZWMpLT5nZXQoIGV4ZWMs IHByb3BlcnR5TmFtZSApOyBcCi0gICAgfSBcCi0gICAgYm9vbCBDbGFzc1Byb3RvOjpoYXNQcm9w ZXJ0eShFeGVjU3RhdGUgKmV4ZWMsIGNvbnN0IElkZW50aWZpZXIgJnByb3BlcnR5TmFtZSkgY29u c3QgXAotICAgIHsgXAotICAgICAgaWYgKE9iamVjdEltcDo6aGFzUHJvcGVydHkoZXhlYywgcHJv cGVydHlOYW1lKSkgXAotICAgICAgICByZXR1cm4gdHJ1ZTsgXAotICAgICAgcmV0dXJuIFBhcmVu dFByb3RvOjpzZWxmKGV4ZWMpLT5oYXNQcm9wZXJ0eShleGVjLCBwcm9wZXJ0eU5hbWUpOyBcCi0g ICAgfQotCi0jZGVmaW5lIElNUExFTUVOVF9QUk9UT0ZVTkMoQ2xhc3NGdW5jKSBcCi0gIGNsYXNz IENsYXNzRnVuYyA6IHB1YmxpYyBET01GdW5jdGlvbiB7IFwKLSAgcHVibGljOiBcCi0gICAgQ2xh c3NGdW5jKEV4ZWNTdGF0ZSAqZXhlYywgaW50IGksIGludCBsZW4pIFwKLSAgICAgICA6IERPTUZ1 bmN0aW9uKCAvKnByb3RvPyAqLyApLCBpZChpKSB7IFwKLSAgICAgICBWYWx1ZSBwcm90ZWN0KHRo aXMpOyBcCi0gICAgICAgcHV0KGV4ZWMsbGVuZ3RoUHJvcGVydHlOYW1lLE51bWJlcihsZW4pLERv bnREZWxldGV8UmVhZE9ubHl8RG9udEVudW0pOyBcCi0gICAgfSBcCi0gICAgLyoqIFlvdSBuZWVk IHRvIGltcGxlbWVudCB0aGF0IG9uZSAqLyBcCi0gICAgdmlydHVhbCBWYWx1ZSB0cnlDYWxsKEV4 ZWNTdGF0ZSAqZXhlYywgT2JqZWN0ICZ0aGlzT2JqLCBjb25zdCBMaXN0ICZhcmdzKTsgXAotICBw cml2YXRlOiBcCi0gICAgaW50IGlkOyBcCi0gIH07Ci0KIH0gLy8gbmFtZXNwYWNlCiAKICNlbmRp Zgo=