28178 2009-08-11 09:44:46 -0700 WINCE PORT: implement MediaPlayerProxy 2009-08-12 09:42:54 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Other Other RESOLVED FIXED P2 Normal --- 27511 0 yong.li.webkit webkit-unassigned eric haizhang manyoso staikos oldest_to_newest 138993 0 yong.li.webkit 2009-08-11 09:44:46 -0700 separated from bug 27511 138995 1 34569 yong.li.webkit 2009-08-11 09:49:08 -0700 Created attachment 34569 The patch with more coding style modification including George's suggestions. explicit Vector::clear() on local Vector objects are removed because they are not necessary. 139366 2 34569 eric 2009-08-12 09:42:51 -0700 Comment on attachment 34569 The patch Clearing flags on attachment: 34569 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog A WebCore/platform/graphics/wince/MediaPlayerPrivateWince.h A WebCore/platform/graphics/wince/MediaPlayerProxy.cpp A WebCore/platform/graphics/wince/MediaPlayerProxy.h Committed r47115 M WebCore/ChangeLog A WebCore/platform/graphics/wince/MediaPlayerProxy.cpp A WebCore/platform/graphics/wince/MediaPlayerPrivateWince.h A WebCore/platform/graphics/wince/MediaPlayerProxy.h r47115 = cad9e667af33d4301c670e5813e15a31752f9f45 (trunk) No changes between current HEAD and refs/remotes/trunk Resetting to the latest refs/remotes/trunk http://trac.webkit.org/changeset/47115 139367 3 eric 2009-08-12 09:42:54 -0700 All reviewed patches have been landed. Closing bug. 34569 2009-08-11 09:49:08 -0700 2009-08-12 09:42:51 -0700 The patch 28178.patch text/plain 11961 yong.li.webkit ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZjAyNTVjMy4uNDg0N2FhMCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAwOS0wOC0wOCAgQ3J5c3RhbCBaaGFu ZyA8Y3J5c3RhbC56aGFuZ0B0b3JjaG1vYmlsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV0lOQ0UgUE9SVDogTWVkaWFQbGF5ZXJQcm94eSBh bmQgTWVkaWFQbGF5ZXJQcml2YXRlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yODE3OAorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvd2luY2Uv TWVkaWFQbGF5ZXJQcml2YXRlV2luY2UuaDogQWRkZWQuCisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3Mvd2luY2UvTWVkaWFQbGF5ZXJQcm94eS5jcHA6IEFkZGVkLgorICAgICAgICAqIHBsYXRm b3JtL2dyYXBoaWNzL3dpbmNlL01lZGlhUGxheWVyUHJveHkuaDogQWRkZWQuCisKIDIwMDktMDgt MTEgIFNpbW9uIEhhdXNtYW5uICA8c2ltb24uaGF1c21hbm5Abm9raWEuY29tPgogCiAgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoYnVpbGQgZml4KS4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3Mvd2luY2UvTWVkaWFQbGF5ZXJQcml2YXRlV2luY2UuaCBiL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3Mvd2luY2UvTWVkaWFQbGF5ZXJQcml2YXRlV2luY2UuaApuZXcgZmls ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5mZjM4YWRhCi0tLSAvZGV2L251bGwKKysrIGIv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW5jZS9NZWRpYVBsYXllclByaXZhdGVXaW5jZS5o CkBAIC0wLDAgKzEsMTI5IEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDA3LCAyMDA4LCAyMDA5 IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAwOSBU b3JjaCBNb2JpbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0 aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAor ICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2lu ZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJj ZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhp cyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqIDIu IFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUg Y29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUg Zm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBv dGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorICoKKyAqIFRI SVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgQ09NUFVURVIsIElOQy4gYGBBUyBJUycn IEFORCBBTlkKKyAqIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJV VCBOT1QgTElNSVRFRCBUTywgVEhFCisgKiBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRB QklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJFIERJU0NM QUlNRUQuICBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBDT01QVVRFUiwgSU5DLiBPUgorICogQ09O VFJJQlVUT1JTIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUws IFNQRUNJQUwsCisgKiBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVE SU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCisgKiBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdP T0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IKKyAqIFBST0ZJVFM7IE9SIEJV U0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkKKyAq IE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1Ig VE9SVAorICogKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBB TlkgV0FZIE9VVCBPRiBUSEUgVVNFCisgKiBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklT RUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLiAKKyAqLworCisjaWZuZGVmIE1l ZGlhUGxheWVyUHJpdmF0ZVdpbmNlX2gKKyNkZWZpbmUgTWVkaWFQbGF5ZXJQcml2YXRlV2luY2Vf aAorCisjaWYgRU5BQkxFKFZJREVPKQorCisjaW5jbHVkZSAiTWVkaWFQbGF5ZXJQcml2YXRlLmgi CisjaW5jbHVkZSAiVGltZXIuaCIKKyNpbmNsdWRlIDx3dGYvT3duUHRyLmg+CisKK25hbWVzcGFj ZSBXZWJDb3JlIHsKKworICAgIGNsYXNzIEdyYXBoaWNzQ29udGV4dDsKKyAgICBjbGFzcyBJbnRT aXplOworICAgIGNsYXNzIEludFJlY3Q7CisgICAgY2xhc3MgU3RyaW5nOworCisgICAgY2xhc3Mg TWVkaWFQbGF5ZXJQcml2YXRlIDogcHVibGljIE1lZGlhUGxheWVyUHJpdmF0ZUludGVyZmFjZSB7 CisgICAgcHVibGljOgorICAgICAgICBzdGF0aWMgdm9pZCByZWdpc3Rlck1lZGlhRW5naW5lKE1l ZGlhRW5naW5lUmVnaXN0cmFyKTsKKworICAgICAgICB+TWVkaWFQbGF5ZXJQcml2YXRlKCk7CisK KyAgICAgICAgSW50U2l6ZSBuYXR1cmFsU2l6ZSgpIGNvbnN0OworICAgICAgICBib29sIGhhc1Zp ZGVvKCkgY29uc3Q7CisKKyAgICAgICAgdm9pZCBsb2FkKGNvbnN0IFN0cmluZyYgdXJsKTsKKyAg ICAgICAgdm9pZCBjYW5jZWxMb2FkKCk7CisKKyAgICAgICAgdm9pZCBwbGF5KCk7CisgICAgICAg IHZvaWQgcGF1c2UoKTsKKworICAgICAgICBib29sIHBhdXNlZCgpIGNvbnN0OworICAgICAgICBi b29sIHNlZWtpbmcoKSBjb25zdDsKKworICAgICAgICBmbG9hdCBkdXJhdGlvbigpIGNvbnN0Owor ICAgICAgICBmbG9hdCBjdXJyZW50VGltZSgpIGNvbnN0OworICAgICAgICB2b2lkIHNlZWsoZmxv YXQgdGltZSk7CisgICAgICAgIHZvaWQgc2V0RW5kVGltZShmbG9hdCk7CisKKyAgICAgICAgdm9p ZCBzZXRSYXRlKGZsb2F0KTsKKyAgICAgICAgdm9pZCBzZXRWb2x1bWUoZmxvYXQpOworCisgICAg ICAgIGludCBkYXRhUmF0ZSgpIGNvbnN0OworCisgICAgICAgIE1lZGlhUGxheWVyOjpOZXR3b3Jr U3RhdGUgbmV0d29ya1N0YXRlKCkgY29uc3QgeyByZXR1cm4gbV9uZXR3b3JrU3RhdGU7IH0KKyAg ICAgICAgTWVkaWFQbGF5ZXI6OlJlYWR5U3RhdGUgcmVhZHlTdGF0ZSgpIGNvbnN0IHsgcmV0dXJu IG1fcmVhZHlTdGF0ZTsgfQorCisgICAgICAgIGZsb2F0IG1heFRpbWVCdWZmZXJlZCgpIGNvbnN0 OworICAgICAgICBmbG9hdCBtYXhUaW1lU2Vla2FibGUoKSBjb25zdDsKKyAgICAgICAgdW5zaWdu ZWQgYnl0ZXNMb2FkZWQoKSBjb25zdDsKKyAgICAgICAgYm9vbCB0b3RhbEJ5dGVzS25vd24oKSBj b25zdDsKKyAgICAgICAgdW5zaWduZWQgdG90YWxCeXRlcygpIGNvbnN0OworCisgICAgICAgIHZv aWQgc2V0VmlzaWJsZShib29sKTsKKyAgICAgICAgdm9pZCBzZXRTaXplKGNvbnN0IEludFNpemUm KTsKKworICAgICAgICB2b2lkIGxvYWRTdGF0ZUNoYW5nZWQoKTsKKyAgICAgICAgdm9pZCBkaWRF bmQoKTsKKworICAgICAgICB2b2lkIHBhaW50KEdyYXBoaWNzQ29udGV4dCosIGNvbnN0IEludFJl Y3QmKTsKKworICAgIHByaXZhdGU6CisgICAgICAgIE1lZGlhUGxheWVyUHJpdmF0ZShNZWRpYVBs YXllciopOworCisgICAgICAgIHZvaWQgdXBkYXRlU3RhdGVzKCk7CisgICAgICAgIHZvaWQgZG9T ZWVrKCk7CisgICAgICAgIHZvaWQgY2FuY2VsU2VlaygpOworICAgICAgICB2b2lkIHNlZWtUaW1l ckZpcmVkKFRpbWVyPE1lZGlhUGxheWVyUHJpdmF0ZT4qKTsKKyAgICAgICAgZmxvYXQgbWF4VGlt ZUxvYWRlZCgpIGNvbnN0OworICAgICAgICB2b2lkIHNhd1Vuc3VwcG9ydGVkVHJhY2tzKCk7Cisj aWYgRU5BQkxFKFBMVUdJTl9QUk9YWV9GT1JfVklERU8pCisgICAgICAgIHZvaWQgc2V0TWVkaWFQ bGF5ZXJQcm94eShXZWJNZWRpYVBsYXllclByb3h5Kik7CisgICAgICAgIHZvaWQgc2V0UG9zdGVy KGNvbnN0IFN0cmluZyYgdXJsKTsKKyAgICAgICAgdm9pZCBkZWxpdmVyTm90aWZpY2F0aW9uKE1l ZGlhUGxheWVyUHJveHlOb3RpZmljYXRpb25UeXBlKTsKKyNlbmRpZgorCisgICAgICAgIC8vIGVu Z2luZSBzdXBwb3J0CisgICAgICAgIHN0YXRpYyBNZWRpYVBsYXllclByaXZhdGVJbnRlcmZhY2Uq IGNyZWF0ZShNZWRpYVBsYXllciopOworICAgICAgICBzdGF0aWMgdm9pZCBnZXRTdXBwb3J0ZWRU eXBlcyhIYXNoU2V0PFN0cmluZz4mIHR5cGVzKTsKKyAgICAgICAgc3RhdGljIE1lZGlhUGxheWVy OjpTdXBwb3J0c1R5cGUgc3VwcG9ydHNUeXBlKGNvbnN0IFN0cmluZyYgdHlwZSwgY29uc3QgU3Ry aW5nJiBjb2RlY3MpOworICAgICAgICBzdGF0aWMgYm9vbCBpc0F2YWlsYWJsZSgpOworCisgICAg ICAgIE1lZGlhUGxheWVyKiBtX3BsYXllcjsKKyAgICAgICAgZmxvYXQgbV9zZWVrVG87CisgICAg ICAgIGZsb2F0IG1fZW5kVGltZTsKKyAgICAgICAgVGltZXI8TWVkaWFQbGF5ZXJQcml2YXRlPiBt X3NlZWtUaW1lcjsKKyAgICAgICAgTWVkaWFQbGF5ZXI6Ok5ldHdvcmtTdGF0ZSBtX25ldHdvcmtT dGF0ZTsKKyAgICAgICAgTWVkaWFQbGF5ZXI6OlJlYWR5U3RhdGUgbV9yZWFkeVN0YXRlOworICAg ICAgICB1bnNpZ25lZCBtX2VuYWJsZWRUcmFja0NvdW50OworICAgICAgICB1bnNpZ25lZCBtX3Rv dGFsVHJhY2tDb3VudDsKKyAgICAgICAgYm9vbCBtX2hhc1Vuc3VwcG9ydGVkVHJhY2tzOworICAg ICAgICBib29sIG1fc3RhcnRlZFBsYXlpbmc7CisgICAgICAgIGJvb2wgbV9pc1N0cmVhbWluZzsK KyNpZiBFTkFCTEUoUExVR0lOX1BST1hZX0ZPUl9WSURFTykKKyAgICAgICAgV2ViTWVkaWFQbGF5 ZXJQcm94eSogbV9wcm94eTsKKyNlbmRpZgorICAgIH07CisKK30KKworI2VuZGlmCisKKyNlbmRp ZgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW5jZS9NZWRpYVBsYXll clByb3h5LmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luY2UvTWVkaWFQbGF5ZXJQ cm94eS5jcHAKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uOTY3M2QxOAotLS0g L2Rldi9udWxsCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luY2UvTWVkaWFQbGF5 ZXJQcm94eS5jcHAKQEAgLTAsMCArMSwxNDUgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMDkg VG9yY2ggTW9iaWxlLCBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKgorICogIFRoaXMgbGli cmFyeSBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IKKyAq ICBtb2RpZnkgaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgTGlicmFyeSBHZW5lcmFsIFB1 YmxpYworICogIExpY2Vuc2UgYXMgcHVibGlzaGVkIGJ5IHRoZSBGcmVlIFNvZnR3YXJlIEZvdW5k YXRpb247IGVpdGhlcgorICogIHZlcnNpb24gMiBvZiB0aGUgTGljZW5zZSwgb3IgKGF0IHlvdXIg b3B0aW9uKSBhbnkgbGF0ZXIgdmVyc2lvbi4KKyAqCisgKiAgVGhpcyBsaWJyYXJ5IGlzIGRpc3Ry aWJ1dGVkIGluIHRoZSBob3BlIHRoYXQgaXQgd2lsbCBiZSB1c2VmdWwsCisgKiAgYnV0IFdJVEhP VVQgQU5ZIFdBUlJBTlRZOyB3aXRob3V0IGV2ZW4gdGhlIGltcGxpZWQgd2FycmFudHkgb2YKKyAq ICBNRVJDSEFOVEFCSUxJVFkgb3IgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBVUlBPU0UuICBT ZWUgdGhlIEdOVQorICogIExpYnJhcnkgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSBmb3IgbW9yZSBk ZXRhaWxzLgorICoKKyAqICBZb3Ugc2hvdWxkIGhhdmUgcmVjZWl2ZWQgYSBjb3B5IG9mIHRoZSBH TlUgTGlicmFyeSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlCisgKiAgYWxvbmcgd2l0aCB0aGlzIGxp YnJhcnk7IHNlZSB0aGUgZmlsZSBDT1BZSU5HLkxJQi4gIElmIG5vdCwgd3JpdGUgdG8KKyAqICB0 aGUgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uLCBJbmMuLCA1MSBGcmFua2xpbiBTdHJlZXQsIEZp ZnRoIEZsb29yLAorICogIEJvc3RvbiwgTUEgMDIxMTAtMTMwMSwgVVNBLgorICovCisKKyNpZiBF TkFCTEUoVklERU8pCisKKyNpbmNsdWRlICJjb25maWcuaCIKKyNpbmNsdWRlICJNZWRpYVBsYXll clByb3h5LmgiCisKKyNpbmNsdWRlICJjX2NsYXNzLmgiCisjaW5jbHVkZSAiY19pbnN0YW5jZS5o IgorI2luY2x1ZGUgImNfcnVudGltZS5oIgorI2luY2x1ZGUgIkRvY3VtZW50TG9hZGVyLmgiCisj aW5jbHVkZSAiSFRNTFBsdWdJbkVsZW1lbnQuaCIKKyNpbmNsdWRlICJIVE1MVmlkZW9FbGVtZW50 LmgiCisjaW5jbHVkZSAiSlNET01CaW5kaW5nLmgiCisjaW5jbHVkZSAiSlNQbHVnaW5FbGVtZW50 RnVuY3Rpb25zLmgiCisjaW5jbHVkZSAiTWVkaWFQbGF5ZXIuaCIKKyNpbmNsdWRlICJOb2RlLmgi CisjaW5jbHVkZSAibnBydW50aW1lX2ltcGwuaCIKKyNpbmNsdWRlICJQbGF0Zm9ybVN0cmluZy5o IgorI2luY2x1ZGUgIlBsdWdpblZpZXcuaCIKKyNpbmNsdWRlICJSZW5kZXJQYXJ0T2JqZWN0Lmgi CisjaW5jbHVkZSAiUmVuZGVyV2lkZ2V0LmgiCisjaW5jbHVkZSAicnVudGltZS5oIgorI2luY2x1 ZGUgPHJ1bnRpbWUvSWRlbnRpZmllci5oPgorI2luY2x1ZGUgIldpZGdldC5oIgorCit1c2luZyBu YW1lc3BhY2UgSlNDOworCituYW1lc3BhY2UgV2ViQ29yZSB7CisKK3VzaW5nIG5hbWVzcGFjZSBC aW5kaW5nczsKK3VzaW5nIG5hbWVzcGFjZSBIVE1MTmFtZXM7CisKK1dlYk1lZGlhUGxheWVyUHJv eHk6OldlYk1lZGlhUGxheWVyUHJveHkoTWVkaWFQbGF5ZXIqIHBsYXllcikKKyAgICA6IG1fbWVk aWFQbGF5ZXIocGxheWVyKQorICAgICwgbV9pbml0KGZhbHNlKQorICAgICwgbV9oYXNTZW50UmVz cG9uc2VUb1BsdWdpbihmYWxzZSkKK3sKKyAgICBpZiAoIW1faW5pdCkKKyAgICAgICAgaW5pdEVu Z2luZSgpOworfQorCitXZWJNZWRpYVBsYXllclByb3h5Ojp+V2ViTWVkaWFQbGF5ZXJQcm94eSgp Cit7CisgICAgbV9pbnN0YW5jZS5yZWxlYXNlKCk7Cit9CisKK1NjcmlwdEluc3RhbmNlIFdlYk1l ZGlhUGxheWVyUHJveHk6OnBsdWdpbkluc3RhbmNlKCkKK3sKKyAgICBpZiAoIW1faW5zdGFuY2Up IHsKKyAgICAgICAgUmVuZGVyT2JqZWN0KiByID0gZWxlbWVudCgpLT5yZW5kZXJlcigpOworICAg ICAgICBpZiAoIXIgfHwgIXItPmlzV2lkZ2V0KCkpCisgICAgICAgICAgICByZXR1cm4gMDsKKwor ICAgICAgICBGcmFtZSogZnJhbWUgPSBlbGVtZW50KCktPmRvY3VtZW50KCktPmZyYW1lKCk7CisK KyAgICAgICAgUmVuZGVyV2lkZ2V0KiByZW5kZXJXaWRnZXQgPSBzdGF0aWNfY2FzdDxSZW5kZXJX aWRnZXQqPihlbGVtZW50KCktPnJlbmRlcmVyKCkpOworICAgICAgICBpZiAocmVuZGVyV2lkZ2V0 ICYmIHJlbmRlcldpZGdldC0+d2lkZ2V0KCkpCisgICAgICAgICAgICBtX2luc3RhbmNlID0gZnJh bWUtPnNjcmlwdCgpLT5jcmVhdGVTY3JpcHRJbnN0YW5jZUZvcldpZGdldChyZW5kZXJXaWRnZXQt PndpZGdldCgpKTsKKyAgICB9CisKKyAgICByZXR1cm4gbV9pbnN0YW5jZTsKK30KKwordm9pZCBX ZWJNZWRpYVBsYXllclByb3h5Ojpsb2FkKGNvbnN0IFN0cmluZyYgdXJsKQoreworICAgIGlmICgh bV9pbml0KQorICAgICAgICBpbml0RW5naW5lKCk7CisgICAgaWYgKG1faW5pdCkKKyAgICAgICAg aW52b2tlTWV0aG9kKCJwbGF5Iik7Cit9CisKK3ZvaWQgV2ViTWVkaWFQbGF5ZXJQcm94eTo6aW5p dEVuZ2luZSgpCit7CisgICAgSFRNTE1lZGlhRWxlbWVudCogZWxlbWVudCA9IHN0YXRpY19jYXN0 PEhUTUxNZWRpYUVsZW1lbnQqPihtX21lZGlhUGxheWVyLT5tZWRpYVBsYXllckNsaWVudCgpKTsK KyAgICBTdHJpbmcgdXJsID0gZWxlbWVudC0+aW5pdGlhbFVSTCgpOworCisgICAgaWYgKHVybC5p c0VtcHR5KCkpCisgICAgICAgIHJldHVybjsKKworICAgIEZyYW1lKiBmcmFtZSA9IGVsZW1lbnQt PmRvY3VtZW50KCktPmZyYW1lKCk7CisgICAgVmVjdG9yPFN0cmluZz4gcGFyYW1OYW1lczsKKyAg ICBWZWN0b3I8U3RyaW5nPiBwYXJhbVZhbHVlczsKKyAgICBTdHJpbmcgc2VydmljZVR5cGU7CisK KyAgICAvLyBhZGQgYWxsIGF0dHJpYnV0ZXMgc2V0IG9uIHRoZSBlbWJlZCBvYmplY3QKKyAgICBp ZiAoTmFtZWROb2RlTWFwKiBhdHRyaWJ1dGVzID0gZWxlbWVudC0+YXR0cmlidXRlcygpKSB7Cisg ICAgICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBhdHRyaWJ1dGVzLT5sZW5ndGgoKTsgKytp KSB7CisgICAgICAgICAgICBBdHRyaWJ1dGUqIGl0ID0gYXR0cmlidXRlcy0+YXR0cmlidXRlSXRl bShpKTsKKyAgICAgICAgICAgIHBhcmFtTmFtZXMuYXBwZW5kKGl0LT5uYW1lKCkubG9jYWxOYW1l KCkuc3RyaW5nKCkpOworICAgICAgICAgICAgcGFyYW1WYWx1ZXMuYXBwZW5kKGl0LT52YWx1ZSgp LnN0cmluZygpKTsKKyAgICAgICAgfQorICAgIH0KKyAgICBzZXJ2aWNlVHlwZSA9ICJhcHBsaWNh dGlvbi94LW1wbGF5ZXIyIjsKKyAgICBmcmFtZS0+bG9hZGVyKCktPnJlcXVlc3RPYmplY3Qoc3Rh dGljX2Nhc3Q8UmVuZGVyUGFydE9iamVjdCo+KGVsZW1lbnQtPnJlbmRlcmVyKCkpLCB1cmwsIG51 bGxBdG9tLCBzZXJ2aWNlVHlwZSwgcGFyYW1OYW1lcywgcGFyYW1WYWx1ZXMpOworICAgIG1faW5p dCA9IHRydWU7CisKK30KKworSFRNTE1lZGlhRWxlbWVudCogV2ViTWVkaWFQbGF5ZXJQcm94eTo6 ZWxlbWVudCgpCit7CisgICAgcmV0dXJuIHN0YXRpY19jYXN0PEhUTUxNZWRpYUVsZW1lbnQqPiht X21lZGlhUGxheWVyLT5tZWRpYVBsYXllckNsaWVudCgpKTsKKworfQorCit2b2lkIFdlYk1lZGlh UGxheWVyUHJveHk6Omludm9rZU1ldGhvZChjb25zdCBTdHJpbmcmIG1ldGhvZE5hbWUpCit7Cisg ICAgRnJhbWUqIGZyYW1lID0gZWxlbWVudCgpLT5kb2N1bWVudCgpLT5mcmFtZSgpOworICAgIFJv b3RPYmplY3QgKnJvb3QgPSBmcmFtZS0+c2NyaXB0KCktPmJpbmRpbmdSb290T2JqZWN0KCk7Cisg ICAgaWYgKCFyb290KQorICAgICAgICByZXR1cm47CisgICAgRXhlY1N0YXRlICpleGVjID0gcm9v dC0+Z2xvYmFsT2JqZWN0KCktPmdsb2JhbEV4ZWMoKTsKKyAgICBJbnN0YW5jZSogaW5zdGFuY2Ug PSBwbHVnaW5JbnN0YW5jZSgpLmdldCgpOworICAgIGlmICghaW5zdGFuY2UpCisgICAgICAgIHJl dHVybjsKKworICAgIGluc3RhbmNlLT5iZWdpbigpOworICAgIENsYXNzICphQ2xhc3MgPSBpbnN0 YW5jZS0+Z2V0Q2xhc3MoKTsKKyAgICBJZGVudGlmaWVyIGlkZW4oZXhlYywgbWV0aG9kTmFtZSk7 CisgICAgTWV0aG9kTGlzdCBtZXRob2RMaXN0ID0gYUNsYXNzLT5tZXRob2RzTmFtZWQoaWRlbiwg aW5zdGFuY2UpOworICAgIEFyZ0xpc3QgYXJnczsKKyAgICBpbnN0YW5jZS0+aW52b2tlTWV0aG9k KGV4ZWMsIG1ldGhvZExpc3QgLCBhcmdzKTsKKyAgICBpbnN0YW5jZS0+ZW5kKCk7Cit9CisKK30K KworI2VuZGlmCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbmNlL01l ZGlhUGxheWVyUHJveHkuaCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luY2UvTWVkaWFQ bGF5ZXJQcm94eS5oCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjA1ZjliMjEK LS0tIC9kZXYvbnVsbAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbmNlL01lZGlh UGxheWVyUHJveHkuaApAQCAtMCwwICsxLDcwIEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDA5 IFRvcmNoIE1vYmlsZSwgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAqICBUaGlzIGxp YnJhcnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yCisg KiAgbW9kaWZ5IGl0IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIExpYnJhcnkgR2VuZXJhbCBQ dWJsaWMKKyAqICBMaWNlbnNlIGFzIHB1Ymxpc2hlZCBieSB0aGUgRnJlZSBTb2Z0d2FyZSBGb3Vu ZGF0aW9uOyBlaXRoZXIKKyAqICB2ZXJzaW9uIDIgb2YgdGhlIExpY2Vuc2UsIG9yIChhdCB5b3Vy IG9wdGlvbikgYW55IGxhdGVyIHZlcnNpb24uCisgKgorICogIFRoaXMgbGlicmFyeSBpcyBkaXN0 cmlidXRlZCBpbiB0aGUgaG9wZSB0aGF0IGl0IHdpbGwgYmUgdXNlZnVsLAorICogIGJ1dCBXSVRI T1VUIEFOWSBXQVJSQU5UWTsgd2l0aG91dCBldmVuIHRoZSBpbXBsaWVkIHdhcnJhbnR5IG9mCisg KiAgTUVSQ0hBTlRBQklMSVRZIG9yIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUiBQVVJQT1NFLiAg U2VlIHRoZSBHTlUKKyAqICBMaWJyYXJ5IEdlbmVyYWwgUHVibGljIExpY2Vuc2UgZm9yIG1vcmUg ZGV0YWlscy4KKyAqCisgKiAgWW91IHNob3VsZCBoYXZlIHJlY2VpdmVkIGEgY29weSBvZiB0aGUg R05VIExpYnJhcnkgR2VuZXJhbCBQdWJsaWMgTGljZW5zZQorICogIGFsb25nIHdpdGggdGhpcyBs aWJyYXJ5OyBzZWUgdGhlIGZpbGUgQ09QWUlORy5MSUIuICBJZiBub3QsIHdyaXRlIHRvCisgKiAg dGhlIEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbiwgSW5jLiwgNTEgRnJhbmtsaW4gU3RyZWV0LCBG aWZ0aCBGbG9vciwKKyAqICBCb3N0b24sIE1BIDAyMTEwLTEzMDEsIFVTQS4KKyAqLworCisKKyNp Zm5kZWYgTWVkaWFQbGF5ZXJQcm94eV9oCisjZGVmaW5lIE1lZGlhUGxheWVyUHJveHlfaAorCisj aWYgRU5BQkxFKFZJREVPKQorCisjaW5jbHVkZSAiU2NyaXB0SW5zdGFuY2UuaCIKKworbmFtZXNw YWNlIFdlYkNvcmUgeworCisgICAgY2xhc3MgSW50UmVjdDsKKyAgICBjbGFzcyBJbnRTaXplOwor ICAgIGNsYXNzIFN0cmluZzsKKyAgICBjbGFzcyBNZWRpYVBsYXllcjsKKyAgICBjbGFzcyBQbHVn aW5WaWV3OworICAgIGNsYXNzIEhUTUxNZWRpYUVsZW1lbnQ7CisKKyAgICBlbnVtIE1lZGlhUGxh eWVyUHJveHlOb3RpZmljYXRpb25UeXBlIHsKKyAgICAgICAgTWVkaWFQbGF5ZXJOb3RpZmljYXRp b25QbGF5UGF1c2VCdXR0b25QcmVzc2VkLAorICAgICAgICBJZGxlLAorICAgICAgICBMb2FkaW5n LAorICAgICAgICBMb2FkZWQsCisgICAgICAgIEZvcm1hdEVycm9yLAorICAgICAgICBOZXR3b3Jr RXJyb3IsCisgICAgICAgIERlY29kZUVycm9yCisgICAgfTsKKworICAgIGNsYXNzIFdlYk1lZGlh UGxheWVyUHJveHkgeworICAgIHB1YmxpYzoKKyAgICAgICAgV2ViTWVkaWFQbGF5ZXJQcm94eShN ZWRpYVBsYXllciogcGxheWVyKTsKKyAgICAgICAgfldlYk1lZGlhUGxheWVyUHJveHkoKTsKKwor ICAgICAgICBNZWRpYVBsYXllciogbWVkaWFQbGF5ZXIoKSB7cmV0dXJuIG1fbWVkaWFQbGF5ZXI7 fQorICAgICAgICB2b2lkIGluaXRFbmdpbmUoKTsKKyAgICAgICAgdm9pZCBsb2FkKGNvbnN0IFN0 cmluZyYgdXJsKTsKKyAgICAgICAgSFRNTE1lZGlhRWxlbWVudCogZWxlbWVudCgpOworICAgICAg ICB2b2lkIGludm9rZU1ldGhvZChjb25zdCBTdHJpbmcmIG1ldGhvZE5hbWUpOworICAgICAgICBT Y3JpcHRJbnN0YW5jZSBwbHVnaW5JbnN0YW5jZSgpOworCisgICAgcHJpdmF0ZToKKyAgICAgICAg TWVkaWFQbGF5ZXIqIG1fbWVkaWFQbGF5ZXI7CisgICAgICAgIGJvb2wgbV9pbml0OworICAgICAg ICBXZWJDb3JlOjpQbHVnaW5WaWV3KiBtX3BsdWdpblZpZXc7CisgICAgICAgIGJvb2wgbV9oYXNT ZW50UmVzcG9uc2VUb1BsdWdpbjsKKyAgICAgICAgU2NyaXB0SW5zdGFuY2UgbV9pbnN0YW5jZTsK KyAgICB9OworCit9CisjZW5kaWYgLy8gRU5BQkxFKFZJREVPKQorCisjZW5kaWYK