27624 2009-07-23 13:51:37 -0700 WebCore/page/DragController.cpp does not conform to style standards 2009-07-24 00:45:05 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 1 mifenton abarth abarth manyoso oldest_to_newest 134238 0 mifenton 2009-07-23 13:51:37 -0700 cpplint reports a number of valid style fixes that should be made to WebCore/page/DragController.cpp. 134239 1 33367 mifenton 2009-07-23 13:53:57 -0700 Created attachment 33367 Style patch for DragController.cpp 134378 2 33367 eric 2009-07-23 23:11:03 -0700 Comment on attachment 33367 Style patch for DragController.cpp LGTM. 134400 3 abarth 2009-07-23 23:51:19 -0700 Will land. 134430 4 abarth 2009-07-24 00:45:05 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/page/DragController.cpp Committed r46330 M WebCore/ChangeLog M WebCore/page/DragController.cpp r46330 = 2def5eb97e3e997525f1470d8055acf4c7a7ea19 (trunk) No changes between current HEAD and refs/remotes/trunk Resetting to the latest refs/remotes/trunk http://trac.webkit.org/changeset/46330 33367 2009-07-23 13:53:57 -0700 2009-07-23 23:11:03 -0700 Style patch for DragController.cpp DragControllerPatch.diff text/plain 22794 mifenton ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YjMxMzA2Ni4uZDU5YzhmYSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzNSBAQAorMjAwOS0wNy0yMyAgTWlrZSBGZW50b24g IDxtaWtlLmZlbnRvbkB0b3JjaG1vYmlsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgVXBkYXRlIFdlYkNvcmUvcGFnZS9ET01UaW1lci5jcHAv aCB0byBjb25mb3JtIHRvIFdlYktpdAorICAgICAgICBTdHlsZSBHdWlkZWxpbmVzIGFzIGlkZW50 aWZpZWQgYnkgY3BwbGludC5weS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTI3NjI0CisKKyAgICAgICAgKiBwYWdlL0RyYWdDb250cm9sbGVyLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkRyYWdDb250cm9sbGVyOjp+RHJhZ0NvbnRyb2xsZXIpOgorICAg ICAgICAoV2ViQ29yZTo6ZG9jdW1lbnRGcmFnbWVudEZyb21EcmFnRGF0YSk6CisgICAgICAgIChX ZWJDb3JlOjpEcmFnQ29udHJvbGxlcjo6ZHJhZ0VuZGVkKToKKyAgICAgICAgKFdlYkNvcmU6OkRy YWdDb250cm9sbGVyOjpkcmFnRW50ZXJlZCk6CisgICAgICAgIChXZWJDb3JlOjpEcmFnQ29udHJv bGxlcjo6ZHJhZ0V4aXRlZCk6CisgICAgICAgIChXZWJDb3JlOjpEcmFnQ29udHJvbGxlcjo6ZHJh Z1VwZGF0ZWQpOgorICAgICAgICAoV2ViQ29yZTo6RHJhZ0NvbnRyb2xsZXI6OnBlcmZvcm1EcmFn KToKKyAgICAgICAgKFdlYkNvcmU6OmFzRmlsZUlucHV0KToKKyAgICAgICAgKFdlYkNvcmU6OkRy YWdDb250cm9sbGVyOjp0cnlEb2N1bWVudERyYWcpOgorICAgICAgICAoV2ViQ29yZTo6RHJhZ0Nv bnRyb2xsZXI6OmRlbGVnYXRlRHJhZ1NvdXJjZUFjdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpE cmFnQ29udHJvbGxlcjo6Y29uY2x1ZGVFZGl0RHJhZyk6CisgICAgICAgIChXZWJDb3JlOjpEcmFn Q29udHJvbGxlcjo6Y2FuUHJvY2Vzc0RyYWcpOgorICAgICAgICAoV2ViQ29yZTo6RHJhZ0NvbnRy b2xsZXI6OnRyeURIVE1MRHJhZyk6CisgICAgICAgIChXZWJDb3JlOjpEcmFnQ29udHJvbGxlcjo6 bWF5U3RhcnREcmFnQXRFdmVudExvY2F0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OmdldENhY2hl ZEltYWdlKToKKyAgICAgICAgKFdlYkNvcmU6OmdldEltYWdlKToKKyAgICAgICAgKFdlYkNvcmU6 OnByZXBhcmVDbGlwYm9hcmRGb3JJbWFnZURyYWcpOgorICAgICAgICAoV2ViQ29yZTo6ZHJhZ0xv Y0ZvckRIVE1MRHJhZyk6CisgICAgICAgIChXZWJDb3JlOjpEcmFnQ29udHJvbGxlcjo6c3RhcnRE cmFnKToKKyAgICAgICAgKFdlYkNvcmU6OkRyYWdDb250cm9sbGVyOjpkb0ltYWdlRHJhZyk6Cisg ICAgICAgIChXZWJDb3JlOjpEcmFnQ29udHJvbGxlcjo6ZG9TeXN0ZW1EcmFnKToKKyAgICAgICAg KFdlYkNvcmU6OkRyYWdDb250cm9sbGVyOjpwbGFjZURyYWdDYXJldCk6CisKIDIwMDktMDctMjMg IFhhbiBMb3BleiAgPHhsb3BlekBpZ2FsaWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE1h cmsgUm93ZS4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGFnZS9EcmFnQ29udHJvbGxlci5jcHAgYi9X ZWJDb3JlL3BhZ2UvRHJhZ0NvbnRyb2xsZXIuY3BwCmluZGV4IDJmZTVkOTcuLjY0Y2IyMTIgMTAw NjQ0Ci0tLSBhL1dlYkNvcmUvcGFnZS9EcmFnQ29udHJvbGxlci5jcHAKKysrIGIvV2ViQ29yZS9w YWdlL0RyYWdDb250cm9sbGVyLmNwcApAQCAtNzIsNyArNzIsNyBAQCBzdGF0aWMgUGxhdGZvcm1N b3VzZUV2ZW50IGNyZWF0ZU1vdXNlRXZlbnQoRHJhZ0RhdGEqIGRyYWdEYXRhKQogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgTGVmdEJ1dHRvbiwgTW91c2VFdmVudE1vdmVkLCAwLCBmYWxz ZSwgZmFsc2UsIGZhbHNlLCBmYWxzZSwgY3VycmVudFRpbWUoKSk7CiAKIH0KLSAgICAKKwogRHJh Z0NvbnRyb2xsZXI6OkRyYWdDb250cm9sbGVyKFBhZ2UqIHBhZ2UsIERyYWdDbGllbnQqIGNsaWVu dCkKICAgICA6IG1fcGFnZShwYWdlKQogICAgICwgbV9jbGllbnQoY2xpZW50KQpAQCAtODUsMTIg Kzg1LDEyIEBAIERyYWdDb250cm9sbGVyOjpEcmFnQ29udHJvbGxlcihQYWdlKiBwYWdlLCBEcmFn Q2xpZW50KiBjbGllbnQpCiAgICAgLCBtX3NvdXJjZURyYWdPcGVyYXRpb24oRHJhZ09wZXJhdGlv bk5vbmUpCiB7CiB9Ci0gICAgCisKIERyYWdDb250cm9sbGVyOjp+RHJhZ0NvbnRyb2xsZXIoKQot eyAgIAorewogICAgIG1fY2xpZW50LT5kcmFnQ29udHJvbGxlckRlc3Ryb3llZCgpOwogfQotICAg IAorCiBzdGF0aWMgUGFzc1JlZlB0cjxEb2N1bWVudEZyYWdtZW50PiBkb2N1bWVudEZyYWdtZW50 RnJvbURyYWdEYXRhKERyYWdEYXRhKiBkcmFnRGF0YSwgUmVmUHRyPFJhbmdlPiBjb250ZXh0LAog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYm9vbCBhbGxvd1BsYWlu VGV4dCwgYm9vbCYgY2hvc2VQbGFpblRleHQpCiB7CkBAIC0xMjIsNyArMTIyLDcgQEAgc3RhdGlj IFBhc3NSZWZQdHI8RG9jdW1lbnRGcmFnbWVudD4gZG9jdW1lbnRGcmFnbWVudEZyb21EcmFnRGF0 YShEcmFnRGF0YSogZHJhZ0QKICAgICAgICAgY2hvc2VQbGFpblRleHQgPSB0cnVlOwogICAgICAg ICByZXR1cm4gY3JlYXRlRnJhZ21lbnRGcm9tVGV4dChjb250ZXh0LmdldCgpLCBkcmFnRGF0YS0+ YXNQbGFpblRleHQoKSkuZ2V0KCk7CiAgICAgfQotICAgIAorCiAgICAgcmV0dXJuIDA7CiB9CiAK QEAgLTE0MCwyMCArMTQwLDIwIEBAIHZvaWQgRHJhZ0NvbnRyb2xsZXI6OmNhbmNlbERyYWcoKQog dm9pZCBEcmFnQ29udHJvbGxlcjo6ZHJhZ0VuZGVkKCkKIHsKICAgICBtX2RyYWdJbml0aWF0b3Ig PSAwOwotICAgIG1fZGlkSW5pdGlhdGVEcmFnID0gZmFsc2U7IAotICAgIG1fcGFnZS0+ZHJhZ0Nh cmV0Q29udHJvbGxlcigpLT5jbGVhcigpOyAKLX0gICAgCisgICAgbV9kaWRJbml0aWF0ZURyYWcg PSBmYWxzZTsKKyAgICBtX3BhZ2UtPmRyYWdDYXJldENvbnRyb2xsZXIoKS0+Y2xlYXIoKTsKK30K IAotRHJhZ09wZXJhdGlvbiBEcmFnQ29udHJvbGxlcjo6ZHJhZ0VudGVyZWQoRHJhZ0RhdGEqIGRy YWdEYXRhKSAKK0RyYWdPcGVyYXRpb24gRHJhZ0NvbnRyb2xsZXI6OmRyYWdFbnRlcmVkKERyYWdE YXRhKiBkcmFnRGF0YSkKIHsKICAgICByZXR1cm4gZHJhZ0VudGVyZWRPclVwZGF0ZWQoZHJhZ0Rh dGEpOwogfQotICAgIAotdm9pZCBEcmFnQ29udHJvbGxlcjo6ZHJhZ0V4aXRlZChEcmFnRGF0YSog ZHJhZ0RhdGEpIAoteyAgIAorCit2b2lkIERyYWdDb250cm9sbGVyOjpkcmFnRXhpdGVkKERyYWdE YXRhKiBkcmFnRGF0YSkKK3sKICAgICBBU1NFUlQoZHJhZ0RhdGEpOwogICAgIEZyYW1lKiBtYWlu RnJhbWUgPSBtX3BhZ2UtPm1haW5GcmFtZSgpOwotICAgIAorCiAgICAgaWYgKFJlZlB0cjxGcmFt ZVZpZXc+IHYgPSBtYWluRnJhbWUtPnZpZXcoKSkgewogICAgICAgICBDbGlwYm9hcmRBY2Nlc3NQ b2xpY3kgcG9saWN5ID0gKCFtX2RvY3VtZW50VW5kZXJNb3VzZSB8fCBtX2RvY3VtZW50VW5kZXJN b3VzZS0+c2VjdXJpdHlPcmlnaW4oKS0+aXNMb2NhbCgpKSA/IENsaXBib2FyZFJlYWRhYmxlIDog Q2xpcGJvYXJkVHlwZXNSZWFkYWJsZTsKICAgICAgICAgUmVmUHRyPENsaXBib2FyZD4gY2xpcGJv YXJkID0gZHJhZ0RhdGEtPmNyZWF0ZUNsaXBib2FyZChwb2xpY3kpOwpAQCAtMTY0LDE0ICsxNjQs MTMgQEAgdm9pZCBEcmFnQ29udHJvbGxlcjo6ZHJhZ0V4aXRlZChEcmFnRGF0YSogZHJhZ0RhdGEp CiAgICAgbW91c2VNb3ZlZEludG9Eb2N1bWVudCgwKTsKIH0KIAotICAgIAotRHJhZ09wZXJhdGlv biBEcmFnQ29udHJvbGxlcjo6ZHJhZ1VwZGF0ZWQoRHJhZ0RhdGEqIGRyYWdEYXRhKSAKK0RyYWdP cGVyYXRpb24gRHJhZ0NvbnRyb2xsZXI6OmRyYWdVcGRhdGVkKERyYWdEYXRhKiBkcmFnRGF0YSkK IHsKICAgICByZXR1cm4gZHJhZ0VudGVyZWRPclVwZGF0ZWQoZHJhZ0RhdGEpOwogfQotICAgIAor CiBib29sIERyYWdDb250cm9sbGVyOjpwZXJmb3JtRHJhZyhEcmFnRGF0YSogZHJhZ0RhdGEpCi17 ICAgCit7CiAgICAgQVNTRVJUKGRyYWdEYXRhKTsKICAgICBtX2RvY3VtZW50VW5kZXJNb3VzZSA9 IG1fcGFnZS0+bWFpbkZyYW1lKCktPmRvY3VtZW50QXRQb2ludChkcmFnRGF0YS0+Y2xpZW50UG9z aXRpb24oKSk7CiAgICAgaWYgKG1faXNIYW5kbGluZ0RyYWcpIHsKQEAgLTE4NywxMyArMTg2LDEz IEBAIGJvb2wgRHJhZ0NvbnRyb2xsZXI6OnBlcmZvcm1EcmFnKERyYWdEYXRhKiBkcmFnRGF0YSkK ICAgICAgICAgfQogICAgICAgICBtX2RvY3VtZW50VW5kZXJNb3VzZSA9IDA7CiAgICAgICAgIHJl dHVybiB0cnVlOwotICAgIH0gCi0gICAgCisgICAgfQorCiAgICAgaWYgKChtX2RyYWdEZXN0aW5h dGlvbkFjdGlvbiAmIERyYWdEZXN0aW5hdGlvbkFjdGlvbkVkaXQpICYmIGNvbmNsdWRlRWRpdERy YWcoZHJhZ0RhdGEpKSB7CiAgICAgICAgIG1fZG9jdW1lbnRVbmRlck1vdXNlID0gMDsKICAgICAg ICAgcmV0dXJuIHRydWU7CiAgICAgfQotICAgIAorCiAgICAgbV9kb2N1bWVudFVuZGVyTW91c2Ug PSAwOwogCiAgICAgaWYgKG9wZXJhdGlvbkZvckxvYWQoZHJhZ0RhdGEpID09IERyYWdPcGVyYXRp b25Ob25lKQpAQCAtMjM3LDMwICsyMzYsMzAgQEAgRHJhZ09wZXJhdGlvbiBEcmFnQ29udHJvbGxl cjo6ZHJhZ0VudGVyZWRPclVwZGF0ZWQoRHJhZ0RhdGEqIGRyYWdEYXRhKQogc3RhdGljIEhUTUxJ bnB1dEVsZW1lbnQqIGFzRmlsZUlucHV0KE5vZGUqIG5vZGUpCiB7CiAgICAgQVNTRVJUKG5vZGUp OwotICAgIAorCiAgICAgLy8gVGhlIGJ1dHRvbiBmb3IgYSBGSUxFIGlucHV0IGlzIGEgc3ViIGVs ZW1lbnQgd2l0aCBubyBzZXQgaW5wdXQgdHlwZQogICAgIC8vIEluIG9yZGVyIHRvIGdldCBhcm91 bmQgdGhpcyBwcm9ibGVtIHdlIGFzc3VtZSBhbnkgbm9uLUZJTEUgaW5wdXQgZWxlbWVudAogICAg IC8vIGlzIHRoaXMgaW50ZXJuYWwgYnV0dG9uLCBhbmQgdHJ5IHF1ZXJ5aW5nIHRoZSBzaGFkb3cg cGFyZW50IG5vZGUuCiAgICAgaWYgKG5vZGUtPmhhc1RhZ05hbWUoSFRNTE5hbWVzOjppbnB1dFRh ZykgJiYgbm9kZS0+aXNTaGFkb3dOb2RlKCkgJiYgc3RhdGljX2Nhc3Q8SFRNTElucHV0RWxlbWVu dCo+KG5vZGUpLT5pbnB1dFR5cGUoKSAhPSBIVE1MSW5wdXRFbGVtZW50OjpGSUxFKQogICAgICAg bm9kZSA9IG5vZGUtPnNoYWRvd1BhcmVudE5vZGUoKTsKLSAgICAKKwogICAgIGlmICghbm9kZSB8 fCAhbm9kZS0+aGFzVGFnTmFtZShIVE1MTmFtZXM6OmlucHV0VGFnKSkKICAgICAgICAgcmV0dXJu IDA7Ci0gICAgCisKICAgICBIVE1MSW5wdXRFbGVtZW50KiBpbnB1dEVsZW0gPSBzdGF0aWNfY2Fz dDxIVE1MSW5wdXRFbGVtZW50Kj4obm9kZSk7CiAgICAgaWYgKGlucHV0RWxlbS0+aW5wdXRUeXBl KCkgPT0gSFRNTElucHV0RWxlbWVudDo6RklMRSkKICAgICAgICAgcmV0dXJuIGlucHV0RWxlbTsK LSAgICAKKwogICAgIHJldHVybiAwOwogfQotICAgIAorCiBib29sIERyYWdDb250cm9sbGVyOjp0 cnlEb2N1bWVudERyYWcoRHJhZ0RhdGEqIGRyYWdEYXRhLCBEcmFnRGVzdGluYXRpb25BY3Rpb24g YWN0aW9uTWFzaywgRHJhZ09wZXJhdGlvbiYgb3BlcmF0aW9uKQogewogICAgIEFTU0VSVChkcmFn RGF0YSk7Ci0gICAgCisKICAgICBpZiAoIW1fZG9jdW1lbnRVbmRlck1vdXNlKQogICAgICAgICBy ZXR1cm4gZmFsc2U7Ci0gICAgCisKICAgICBtX2lzSGFuZGxpbmdEcmFnID0gZmFsc2U7CiAgICAg aWYgKGFjdGlvbk1hc2sgJiBEcmFnRGVzdGluYXRpb25BY3Rpb25ESFRNTCkgewogICAgICAgICBt X2lzSGFuZGxpbmdEcmFnID0gdHJ5REhUTUxEcmFnKGRyYWdEYXRhLCBvcGVyYXRpb24pOwpAQCAt Mjg5LDcgKzI4OCw3IEBAIGJvb2wgRHJhZ0NvbnRyb2xsZXI6OnRyeURvY3VtZW50RHJhZyhEcmFn RGF0YSogZHJhZ0RhdGEsIERyYWdEZXN0aW5hdGlvbkFjdGlvbiBhCiAgICAgICAgICAgICBvcGVy YXRpb24gPSBEcmFnT3BlcmF0aW9uR2VuZXJpYzsKICAgICAgICAgICAgIHJldHVybiB0cnVlOwog ICAgICAgICB9Ci0gICAgICAgIAorCiAgICAgICAgIEludFBvaW50IGRyYWdQb3MgPSBkcmFnRGF0 YS0+Y2xpZW50UG9zaXRpb24oKTsKICAgICAgICAgSW50UG9pbnQgcG9pbnQgPSBmcmFtZVZpZXct PndpbmRvd1RvQ29udGVudHMoZHJhZ1Bvcyk7CiAgICAgICAgIEVsZW1lbnQqIGVsZW1lbnQgPSBt X2RvY3VtZW50VW5kZXJNb3VzZS0+ZWxlbWVudEZyb21Qb2ludChwb2ludC54KCksIHBvaW50Lnko KSk7CkBAIC0zMDcsMTEgKzMwNiwxMSBAQCBib29sIERyYWdDb250cm9sbGVyOjp0cnlEb2N1bWVu dERyYWcoRHJhZ0RhdGEqIGRyYWdEYXRhLCBEcmFnRGVzdGluYXRpb25BY3Rpb24gYQogfQogCiBE cmFnU291cmNlQWN0aW9uIERyYWdDb250cm9sbGVyOjpkZWxlZ2F0ZURyYWdTb3VyY2VBY3Rpb24o Y29uc3QgSW50UG9pbnQmIHdpbmRvd1BvaW50KQoteyAgCit7CiAgICAgbV9kcmFnU291cmNlQWN0 aW9uID0gbV9jbGllbnQtPmRyYWdTb3VyY2VBY3Rpb25NYXNrRm9yUG9pbnQod2luZG93UG9pbnQp OwogICAgIHJldHVybiBtX2RyYWdTb3VyY2VBY3Rpb247CiB9Ci0gICAgCisKIERyYWdPcGVyYXRp b24gRHJhZ0NvbnRyb2xsZXI6Om9wZXJhdGlvbkZvckxvYWQoRHJhZ0RhdGEqIGRyYWdEYXRhKQog ewogICAgIEFTU0VSVChkcmFnRGF0YSk7CkBAIC0zMzYsMTUgKzMzNSwxNSBAQCBib29sIERyYWdD b250cm9sbGVyOjpjb25jbHVkZUVkaXREcmFnKERyYWdEYXRhKiBkcmFnRGF0YSkKIHsKICAgICBB U1NFUlQoZHJhZ0RhdGEpOwogICAgIEFTU0VSVCghbV9pc0hhbmRsaW5nRHJhZyk7Ci0gICAgCisK ICAgICBpZiAoIW1fZG9jdW1lbnRVbmRlck1vdXNlKQogICAgICAgICByZXR1cm4gZmFsc2U7Ci0g ICAgCisKICAgICBJbnRQb2ludCBwb2ludCA9IG1fZG9jdW1lbnRVbmRlck1vdXNlLT52aWV3KCkt PndpbmRvd1RvQ29udGVudHMoZHJhZ0RhdGEtPmNsaWVudFBvc2l0aW9uKCkpOwogICAgIEVsZW1l bnQqIGVsZW1lbnQgPSAgbV9kb2N1bWVudFVuZGVyTW91c2UtPmVsZW1lbnRGcm9tUG9pbnQocG9p bnQueCgpLCBwb2ludC55KCkpOwogICAgIEFTU0VSVChlbGVtZW50KTsKICAgICBGcmFtZSogaW5u ZXJGcmFtZSA9IGVsZW1lbnQtPm93bmVyRG9jdW1lbnQoKS0+ZnJhbWUoKTsKLSAgICBBU1NFUlQo aW5uZXJGcmFtZSk7ICAgIAorICAgIEFTU0VSVChpbm5lckZyYW1lKTsKIAogICAgIGlmIChkcmFn RGF0YS0+Y29udGFpbnNDb2xvcigpKSB7CiAgICAgICAgIENvbG9yIGNvbG9yID0gZHJhZ0RhdGEt PmFzQ29sb3IoKTsKQEAgLTM2MiwzMiArMzYxLDMyIEBAIGJvb2wgRHJhZ0NvbnRyb2xsZXI6OmNv bmNsdWRlRWRpdERyYWcoRHJhZ0RhdGEqIGRyYWdEYXRhKQogICAgICAgICBpbm5lckZyYW1lLT5l ZGl0b3IoKS0+YXBwbHlTdHlsZShzdHlsZS5nZXQoKSwgRWRpdEFjdGlvblNldENvbG9yKTsKICAg ICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQotICAgIAorCiAgICAgaWYgKCFtX3BhZ2UtPmRyYWdD b250cm9sbGVyKCktPmNhblByb2Nlc3NEcmFnKGRyYWdEYXRhKSkgewogICAgICAgICBtX3BhZ2Ut PmRyYWdDYXJldENvbnRyb2xsZXIoKS0+Y2xlYXIoKTsKICAgICAgICAgcmV0dXJuIGZhbHNlOwog ICAgIH0KLSAgICAKKwogICAgIGlmIChIVE1MSW5wdXRFbGVtZW50KiBmaWxlSW5wdXQgPSBhc0Zp bGVJbnB1dChlbGVtZW50KSkgewogICAgICAgICBpZiAoIWZpbGVJbnB1dC0+aXNFbmFibGVkRm9y bUNvbnRyb2woKSkKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgCisKICAgICAg ICAgaWYgKCFkcmFnRGF0YS0+Y29udGFpbnNGaWxlcygpKQogICAgICAgICAgICAgcmV0dXJuIGZh bHNlOwotICAgICAgICAKKwogICAgICAgICBWZWN0b3I8U3RyaW5nPiBmaWxlbmFtZXM7CiAgICAg ICAgIGRyYWdEYXRhLT5hc0ZpbGVuYW1lcyhmaWxlbmFtZXMpOwogICAgICAgICBpZiAoZmlsZW5h bWVzLmlzRW1wdHkoKSkKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgCi0gICAg ICAgIC8vIFVnbHkuICBGb3Igc2VjdXJpdHkgbm9uZSBvZiB0aGUgQVBJJ3MgYXZhaWxhYmxlIHRv IHVzIHRvIHNldCB0aGUgaW5wdXQgdmFsdWUgCisKKyAgICAgICAgLy8gVWdseS4gIEZvciBzZWN1 cml0eSBub25lIG9mIHRoZSBBUEkncyBhdmFpbGFibGUgdG8gdXMgdG8gc2V0IHRoZSBpbnB1dCB2 YWx1ZQogICAgICAgICAvLyBvbiBmaWxlIGlucHV0cy4gIEV2ZW4gZm9yY2luZyBhIGNoYW5nZSBp biBIVE1MSW5wdXRFbGVtZW50IGRvZXNuJ3Qgd29yayBhcwogICAgICAgICAvLyBSZW5kZXJGaWxl VXBsb2FkQ29udHJvbCBjbGVhcnMgdGhlIGZpbGUgd2hlbiBkb2luZyB1cGRhdGVGcm9tRWxlbWVu dCgpCiAgICAgICAgIFJlbmRlckZpbGVVcGxvYWRDb250cm9sKiByZW5kZXJlciA9IHN0YXRpY19j YXN0PFJlbmRlckZpbGVVcGxvYWRDb250cm9sKj4oZmlsZUlucHV0LT5yZW5kZXJlcigpKTsKLSAg ICAgICAgCisKICAgICAgICAgaWYgKCFyZW5kZXJlcikKICAgICAgICAgICAgIHJldHVybiBmYWxz ZTsKLSAgICAgICAgCisKICAgICAgICAgcmVuZGVyZXItPnJlY2VpdmVEcm9wcGVkRmlsZXMoZmls ZW5hbWVzKTsKICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQpAQCAtMzk1LDcxICszOTQsNzAg QEAgYm9vbCBEcmFnQ29udHJvbGxlcjo6Y29uY2x1ZGVFZGl0RHJhZyhEcmFnRGF0YSogZHJhZ0Rh dGEpCiAgICAgVmlzaWJsZVNlbGVjdGlvbiBkcmFnQ2FyZXQobV9wYWdlLT5kcmFnQ2FyZXRDb250 cm9sbGVyKCktPnNlbGVjdGlvbigpKTsKICAgICBtX3BhZ2UtPmRyYWdDYXJldENvbnRyb2xsZXIo KS0+Y2xlYXIoKTsKICAgICBSZWZQdHI8UmFuZ2U+IHJhbmdlID0gZHJhZ0NhcmV0LnRvTm9ybWFs aXplZFJhbmdlKCk7Ci0gICAgCisKICAgICAvLyBGb3IgcmFuZ2UgdG8gYmUgbnVsbCBhIFdlYktp dCBjbGllbnQgbXVzdCBoYXZlIGRvbmUgc29tZXRoaW5nIGJhZCB3aGlsZQogICAgIC8vIG1hbnVh bGx5IGNvbnRyb2xsaW5nIGRyYWcgYmVoYXZpb3VyCi0gICAgaWYgKCFyYW5nZSkgIAorICAgIGlm ICghcmFuZ2UpCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICBEb2NMb2FkZXIqIGxvYWRlciA9 IHJhbmdlLT5vd25lckRvY3VtZW50KCktPmRvY0xvYWRlcigpOwogICAgIGxvYWRlci0+c2V0QWxs b3dTdGFsZVJlc291cmNlcyh0cnVlKTsKLSAgICBpZiAoZHJhZ0lzTW92ZShpbm5lckZyYW1lLT5z ZWxlY3Rpb24oKSkgfHwgZHJhZ0NhcmV0LmlzQ29udGVudFJpY2hseUVkaXRhYmxlKCkpIHsgCisg ICAgaWYgKGRyYWdJc01vdmUoaW5uZXJGcmFtZS0+c2VsZWN0aW9uKCkpIHx8IGRyYWdDYXJldC5p c0NvbnRlbnRSaWNobHlFZGl0YWJsZSgpKSB7CiAgICAgICAgIGJvb2wgY2hvc2VQbGFpblRleHQg PSBmYWxzZTsKICAgICAgICAgUmVmUHRyPERvY3VtZW50RnJhZ21lbnQ+IGZyYWdtZW50ID0gZG9j dW1lbnRGcmFnbWVudEZyb21EcmFnRGF0YShkcmFnRGF0YSwgcmFuZ2UsIHRydWUsIGNob3NlUGxh aW5UZXh0KTsKICAgICAgICAgaWYgKCFmcmFnbWVudCB8fCAhaW5uZXJGcmFtZS0+ZWRpdG9yKCkt PnNob3VsZEluc2VydEZyYWdtZW50KGZyYWdtZW50LCByYW5nZSwgRWRpdG9ySW5zZXJ0QWN0aW9u RHJvcHBlZCkpIHsKICAgICAgICAgICAgIGxvYWRlci0+c2V0QWxsb3dTdGFsZVJlc291cmNlcyhm YWxzZSk7CiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAgIH0KLSAgICAgICAgCisK ICAgICAgICAgbV9jbGllbnQtPndpbGxQZXJmb3JtRHJhZ0Rlc3RpbmF0aW9uQWN0aW9uKERyYWdE ZXN0aW5hdGlvbkFjdGlvbkVkaXQsIGRyYWdEYXRhKTsKICAgICAgICAgaWYgKGRyYWdJc01vdmUo aW5uZXJGcmFtZS0+c2VsZWN0aW9uKCkpKSB7Ci0gICAgICAgICAgICBib29sIHNtYXJ0TW92ZSA9 IGlubmVyRnJhbWUtPnNlbGVjdGlvbkdyYW51bGFyaXR5KCkgPT0gV29yZEdyYW51bGFyaXR5IAot ICAgICAgICAgICAgICAgICAgICAgICAgICAmJiBpbm5lckZyYW1lLT5lZGl0b3IoKS0+c21hcnRJ bnNlcnREZWxldGVFbmFibGVkKCkgCisgICAgICAgICAgICBib29sIHNtYXJ0TW92ZSA9IGlubmVy RnJhbWUtPnNlbGVjdGlvbkdyYW51bGFyaXR5KCkgPT0gV29yZEdyYW51bGFyaXR5CisgICAgICAg ICAgICAgICAgICAgICAgICAgICYmIGlubmVyRnJhbWUtPmVkaXRvcigpLT5zbWFydEluc2VydERl bGV0ZUVuYWJsZWQoKQogICAgICAgICAgICAgICAgICAgICAgICAgICAmJiBkcmFnRGF0YS0+Y2Fu U21hcnRSZXBsYWNlKCk7CiAgICAgICAgICAgICBhcHBseUNvbW1hbmQoTW92ZVNlbGVjdGlvbkNv bW1hbmQ6OmNyZWF0ZShmcmFnbWVudCwgZHJhZ0NhcmV0LmJhc2UoKSwgc21hcnRNb3ZlKSk7CiAg ICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICBpZiAoc2V0U2VsZWN0aW9uVG9EcmFnQ2FyZXQo aW5uZXJGcmFtZSwgZHJhZ0NhcmV0LCByYW5nZSwgcG9pbnQpKQotICAgICAgICAgICAgICAgIGFw cGx5Q29tbWFuZChSZXBsYWNlU2VsZWN0aW9uQ29tbWFuZDo6Y3JlYXRlKG1fZG9jdW1lbnRVbmRl ck1vdXNlLCBmcmFnbWVudCwgdHJ1ZSwgZHJhZ0RhdGEtPmNhblNtYXJ0UmVwbGFjZSgpLCBjaG9z ZVBsYWluVGV4dCkpOyAKLSAgICAgICAgfSAgICAKKyAgICAgICAgICAgICAgICBhcHBseUNvbW1h bmQoUmVwbGFjZVNlbGVjdGlvbkNvbW1hbmQ6OmNyZWF0ZShtX2RvY3VtZW50VW5kZXJNb3VzZSwg ZnJhZ21lbnQsIHRydWUsIGRyYWdEYXRhLT5jYW5TbWFydFJlcGxhY2UoKSwgY2hvc2VQbGFpblRl eHQpKTsKKyAgICAgICAgfQogICAgIH0gZWxzZSB7CiAgICAgICAgIFN0cmluZyB0ZXh0ID0gZHJh Z0RhdGEtPmFzUGxhaW5UZXh0KCk7CiAgICAgICAgIGlmICh0ZXh0LmlzRW1wdHkoKSB8fCAhaW5u ZXJGcmFtZS0+ZWRpdG9yKCktPnNob3VsZEluc2VydFRleHQodGV4dCwgcmFuZ2UuZ2V0KCksIEVk aXRvckluc2VydEFjdGlvbkRyb3BwZWQpKSB7CiAgICAgICAgICAgICBsb2FkZXItPnNldEFsbG93 U3RhbGVSZXNvdXJjZXMoZmFsc2UpOwogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAg ICB9Ci0gICAgICAgIAorCiAgICAgICAgIG1fY2xpZW50LT53aWxsUGVyZm9ybURyYWdEZXN0aW5h dGlvbkFjdGlvbihEcmFnRGVzdGluYXRpb25BY3Rpb25FZGl0LCBkcmFnRGF0YSk7CiAgICAgICAg IGlmIChzZXRTZWxlY3Rpb25Ub0RyYWdDYXJldChpbm5lckZyYW1lLCBkcmFnQ2FyZXQsIHJhbmdl LCBwb2ludCkpCi0gICAgICAgICAgICBhcHBseUNvbW1hbmQoUmVwbGFjZVNlbGVjdGlvbkNvbW1h bmQ6OmNyZWF0ZShtX2RvY3VtZW50VW5kZXJNb3VzZSwgY3JlYXRlRnJhZ21lbnRGcm9tVGV4dChy YW5nZS5nZXQoKSwgdGV4dCksIHRydWUsIGZhbHNlLCB0cnVlKSk7IAorICAgICAgICAgICAgYXBw bHlDb21tYW5kKFJlcGxhY2VTZWxlY3Rpb25Db21tYW5kOjpjcmVhdGUobV9kb2N1bWVudFVuZGVy TW91c2UsIGNyZWF0ZUZyYWdtZW50RnJvbVRleHQocmFuZ2UuZ2V0KCksIHRleHQpLCB0cnVlLCBm YWxzZSwgdHJ1ZSkpOwogICAgIH0KICAgICBsb2FkZXItPnNldEFsbG93U3RhbGVSZXNvdXJjZXMo ZmFsc2UpOwogCiAgICAgcmV0dXJuIHRydWU7CiB9Ci0gICAgCi0gICAgCi1ib29sIERyYWdDb250 cm9sbGVyOjpjYW5Qcm9jZXNzRHJhZyhEcmFnRGF0YSogZHJhZ0RhdGEpIAorCitib29sIERyYWdD b250cm9sbGVyOjpjYW5Qcm9jZXNzRHJhZyhEcmFnRGF0YSogZHJhZ0RhdGEpCiB7CiAgICAgQVNT RVJUKGRyYWdEYXRhKTsKIAogICAgIGlmICghZHJhZ0RhdGEtPmNvbnRhaW5zQ29tcGF0aWJsZUNv bnRlbnQoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIAorCiAgICAgSW50UG9pbnQgcG9p bnQgPSBtX3BhZ2UtPm1haW5GcmFtZSgpLT52aWV3KCktPndpbmRvd1RvQ29udGVudHMoZHJhZ0Rh dGEtPmNsaWVudFBvc2l0aW9uKCkpOwogICAgIEhpdFRlc3RSZXN1bHQgcmVzdWx0ID0gSGl0VGVz dFJlc3VsdChwb2ludCk7CiAgICAgaWYgKCFtX3BhZ2UtPm1haW5GcmFtZSgpLT5jb250ZW50UmVu ZGVyZXIoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgcmVzdWx0ID0gbV9wYWdlLT5t YWluRnJhbWUoKS0+ZXZlbnRIYW5kbGVyKCktPmhpdFRlc3RSZXN1bHRBdFBvaW50KHBvaW50LCB0 cnVlKTsKLSAgICAKLSAgICBpZiAoIXJlc3VsdC5pbm5lck5vblNoYXJlZE5vZGUoKSkgCisKKyAg ICBpZiAoIXJlc3VsdC5pbm5lck5vblNoYXJlZE5vZGUoKSkKICAgICAgICAgcmV0dXJuIGZhbHNl OwotICAgIAorCiAgICAgaWYgKGRyYWdEYXRhLT5jb250YWluc0ZpbGVzKCkgJiYgYXNGaWxlSW5w dXQocmVzdWx0LmlubmVyTm9uU2hhcmVkTm9kZSgpKSkKICAgICAgICAgcmV0dXJuIHRydWU7Ci0g ICAgICAgIAorCiAgICAgaWYgKCFyZXN1bHQuaW5uZXJOb25TaGFyZWROb2RlKCktPmlzQ29udGVu dEVkaXRhYmxlKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgCisKICAgICBpZiAo bV9kaWRJbml0aWF0ZURyYWcgJiYgbV9kb2N1bWVudFVuZGVyTW91c2UgPT0gbV9kcmFnSW5pdGlh dG9yICYmIHJlc3VsdC5pc1NlbGVjdGVkKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIApAQCAt NDgyLDcgKzQ4MCw3IEBAIHN0YXRpYyBEcmFnT3BlcmF0aW9uIGRlZmF1bHRPcGVyYXRpb25Gb3JE cmFnKERyYWdPcGVyYXRpb24gc3JjT3BNYXNrKQogfQogCiBib29sIERyYWdDb250cm9sbGVyOjp0 cnlESFRNTERyYWcoRHJhZ0RhdGEqIGRyYWdEYXRhLCBEcmFnT3BlcmF0aW9uJiBvcGVyYXRpb24p Ci17ICAgCit7CiAgICAgQVNTRVJUKGRyYWdEYXRhKTsKICAgICBBU1NFUlQobV9kb2N1bWVudFVu ZGVyTW91c2UpOwogICAgIFJlZlB0cjxGcmFtZT4gbWFpbkZyYW1lID0gbV9wYWdlLT5tYWluRnJh bWUoKTsKQEAgLTUyNSw3ICs1MjMsNyBAQCBib29sIERyYWdDb250cm9sbGVyOjptYXlTdGFydERy YWdBdEV2ZW50TG9jYXRpb24oY29uc3QgRnJhbWUqIGZyYW1lLCBjb25zdCBJbnRQbwogCiAgICAg bW91c2VEb3duVGFyZ2V0ID0gZnJhbWUtPmV2ZW50SGFuZGxlcigpLT5oaXRUZXN0UmVzdWx0QXRQ b2ludChmcmFtZVBvcywgdHJ1ZSk7CiAKLSAgICBpZiAobW91c2VEb3duVGFyZ2V0LmltYWdlKCkg CisgICAgaWYgKG1vdXNlRG93blRhcmdldC5pbWFnZSgpCiAgICAgICAgICYmICFtb3VzZURvd25U YXJnZXQuYWJzb2x1dGVJbWFnZVVSTCgpLmlzRW1wdHkoKQogICAgICAgICAmJiBmcmFtZS0+c2V0 dGluZ3MoKS0+bG9hZHNJbWFnZXNBdXRvbWF0aWNhbGx5KCkKICAgICAgICAgJiYgbV9kcmFnU291 cmNlQWN0aW9uICYgRHJhZ1NvdXJjZUFjdGlvbkltYWdlKQpAQCAtNTQzLDU2ICs1NDEsNTYgQEAg Ym9vbCBEcmFnQ29udHJvbGxlcjo6bWF5U3RhcnREcmFnQXRFdmVudExvY2F0aW9uKGNvbnN0IEZy YW1lKiBmcmFtZSwgY29uc3QgSW50UG8KICAgICByZXR1cm4gZmFsc2U7CiAKIH0KLSAgICAKKwog c3RhdGljIENhY2hlZEltYWdlKiBnZXRDYWNoZWRJbWFnZShFbGVtZW50KiBlbGVtZW50KQogewog ICAgIEFTU0VSVChlbGVtZW50KTsKICAgICBSZW5kZXJPYmplY3QqIHJlbmRlcmVyID0gZWxlbWVu dC0+cmVuZGVyZXIoKTsKLSAgICBpZiAoIXJlbmRlcmVyIHx8ICFyZW5kZXJlci0+aXNJbWFnZSgp KSAKKyAgICBpZiAoIXJlbmRlcmVyIHx8ICFyZW5kZXJlci0+aXNJbWFnZSgpKQogICAgICAgICBy ZXR1cm4gMDsKICAgICBSZW5kZXJJbWFnZSogaW1hZ2UgPSB0b1JlbmRlckltYWdlKHJlbmRlcmVy KTsKICAgICByZXR1cm4gaW1hZ2UtPmNhY2hlZEltYWdlKCk7CiB9Ci0gICAgCisKIHN0YXRpYyBJ bWFnZSogZ2V0SW1hZ2UoRWxlbWVudCogZWxlbWVudCkKIHsKICAgICBBU1NFUlQoZWxlbWVudCk7 CiAgICAgUmVuZGVyT2JqZWN0KiByZW5kZXJlciA9IGVsZW1lbnQtPnJlbmRlcmVyKCk7Ci0gICAg aWYgKCFyZW5kZXJlciB8fCAhcmVuZGVyZXItPmlzSW1hZ2UoKSkgCisgICAgaWYgKCFyZW5kZXJl ciB8fCAhcmVuZGVyZXItPmlzSW1hZ2UoKSkKICAgICAgICAgcmV0dXJuIDA7Ci0gICAgCisKICAg ICBSZW5kZXJJbWFnZSogaW1hZ2UgPSB0b1JlbmRlckltYWdlKHJlbmRlcmVyKTsKICAgICBpZiAo aW1hZ2UtPmNhY2hlZEltYWdlKCkgJiYgIWltYWdlLT5jYWNoZWRJbWFnZSgpLT5lcnJvck9jY3Vy cmVkKCkpCiAgICAgICAgIHJldHVybiBpbWFnZS0+Y2FjaGVkSW1hZ2UoKS0+aW1hZ2UoKTsKICAg ICByZXR1cm4gMDsKIH0KLSAgICAKKwogc3RhdGljIHZvaWQgcHJlcGFyZUNsaXBib2FyZEZvcklt YWdlRHJhZyhGcmFtZSogc3JjLCBDbGlwYm9hcmQqIGNsaXBib2FyZCwgRWxlbWVudCogbm9kZSwg Y29uc3QgS1VSTCYgbGlua1VSTCwgY29uc3QgS1VSTCYgaW1hZ2VVUkwsIGNvbnN0IFN0cmluZyYg bGFiZWwpCiB7CiAgICAgUmVmUHRyPFJhbmdlPiByYW5nZSA9IHNyYy0+ZG9jdW1lbnQoKS0+Y3Jl YXRlUmFuZ2UoKTsKICAgICBFeGNlcHRpb25Db2RlIGVjID0gMDsKICAgICByYW5nZS0+c2VsZWN0 Tm9kZShub2RlLCBlYyk7Ci0gICAgQVNTRVJUKGVjID09IDApOwotICAgIHNyYy0+c2VsZWN0aW9u KCktPnNldFNlbGVjdGlvbihWaXNpYmxlU2VsZWN0aW9uKHJhbmdlLmdldCgpLCBET1dOU1RSRUFN KSk7ICAgICAgICAgICAKKyAgICBBU1NFUlQoIWVjKTsKKyAgICBzcmMtPnNlbGVjdGlvbigpLT5z ZXRTZWxlY3Rpb24oVmlzaWJsZVNlbGVjdGlvbihyYW5nZS5nZXQoKSwgRE9XTlNUUkVBTSkpOwog ICAgIGNsaXBib2FyZC0+ZGVjbGFyZUFuZFdyaXRlRHJhZ0ltYWdlKG5vZGUsICFsaW5rVVJMLmlz RW1wdHkoKSA/IGxpbmtVUkwgOiBpbWFnZVVSTCwgbGFiZWwsIHNyYyk7CiB9Ci0gICAgCisKIHN0 YXRpYyBJbnRQb2ludCBkcmFnTG9jRm9yREhUTUxEcmFnKGNvbnN0IEludFBvaW50JiBtb3VzZURy YWdnZWRQb2ludCwgY29uc3QgSW50UG9pbnQmIGRyYWdPcmlnaW4sIGNvbnN0IEludFBvaW50JiBk cmFnSW1hZ2VPZmZzZXQsIGJvb2wgaXNMaW5rSW1hZ2UpCiB7CiAgICAgLy8gZHJhZ0ltYWdlT2Zm c2V0IGlzIHRoZSBjdXJzb3IgcG9zaXRpb24gcmVsYXRpdmUgdG8gdGhlIGxvd2VyLWxlZnQgY29y bmVyIG9mIHRoZSBpbWFnZS4KLSNpZiBQTEFURk9STShNQUMpIAotICAgIC8vIFdlIGFkZCBpbiB0 aGUgWSBkaW1lbnNpb24gYmVjYXVzZSB3ZSBhcmUgYSBmbGlwcGVkIHZpZXcsIHNvIGFkZGluZyBt b3ZlcyB0aGUgaW1hZ2UgZG93bi4gCisjaWYgUExBVEZPUk0oTUFDKQorICAgIC8vIFdlIGFkZCBp biB0aGUgWSBkaW1lbnNpb24gYmVjYXVzZSB3ZSBhcmUgYSBmbGlwcGVkIHZpZXcsIHNvIGFkZGlu ZyBtb3ZlcyB0aGUgaW1hZ2UgZG93bi4KICAgICBjb25zdCBpbnQgeU9mZnNldCA9IGRyYWdJbWFn ZU9mZnNldC55KCk7CiAjZWxzZQogICAgIGNvbnN0IGludCB5T2Zmc2V0ID0gLWRyYWdJbWFnZU9m ZnNldC55KCk7CiAjZW5kaWYKLSAgICAKKwogICAgIGlmIChpc0xpbmtJbWFnZSkKICAgICAgICAg cmV0dXJuIEludFBvaW50KG1vdXNlRHJhZ2dlZFBvaW50LngoKSAtIGRyYWdJbWFnZU9mZnNldC54 KCksIG1vdXNlRHJhZ2dlZFBvaW50LnkoKSArIHlPZmZzZXQpOwotICAgIAorCiAgICAgcmV0dXJu IEludFBvaW50KGRyYWdPcmlnaW4ueCgpIC0gZHJhZ0ltYWdlT2Zmc2V0LngoKSwgZHJhZ09yaWdp bi55KCkgKyB5T2Zmc2V0KTsKIH0KLSAgICAKKwogc3RhdGljIEludFBvaW50IGRyYWdMb2NGb3JT ZWxlY3Rpb25EcmFnKEZyYW1lKiBzcmMpCiB7CiAgICAgSW50UmVjdCBkcmFnZ2luZ1JlY3QgPSBl bmNsb3NpbmdJbnRSZWN0KHNyYy0+c2VsZWN0aW9uQm91bmRzKCkpOwpAQCAtNjA3LDYzICs2MDUs NjMgQEAgc3RhdGljIEludFBvaW50IGRyYWdMb2NGb3JTZWxlY3Rpb25EcmFnKEZyYW1lKiBzcmMp CiAjZW5kaWYKICAgICByZXR1cm4gSW50UG9pbnQoeHBvcywgeXBvcyk7CiB9Ci0gICAgCisKIGJv b2wgRHJhZ0NvbnRyb2xsZXI6OnN0YXJ0RHJhZyhGcmFtZSogc3JjLCBDbGlwYm9hcmQqIGNsaXBi b2FyZCwgRHJhZ09wZXJhdGlvbiBzcmNPcCwgY29uc3QgUGxhdGZvcm1Nb3VzZUV2ZW50JiBkcmFn RXZlbnQsIGNvbnN0IEludFBvaW50JiBkcmFnT3JpZ2luLCBib29sIGlzREhUTUxEcmFnKQoteyAg ICAKK3sKICAgICBBU1NFUlQoc3JjKTsKICAgICBBU1NFUlQoY2xpcGJvYXJkKTsKLSAgICAKKwog ICAgIGlmICghc3JjLT52aWV3KCkgfHwgIXNyYy0+Y29udGVudFJlbmRlcmVyKCkpCiAgICAgICAg IHJldHVybiBmYWxzZTsKLSAgICAKKwogICAgIEhpdFRlc3RSZXN1bHQgZHJhZ1NvdXJjZSA9IEhp dFRlc3RSZXN1bHQoZHJhZ09yaWdpbik7CiAgICAgZHJhZ1NvdXJjZSA9IHNyYy0+ZXZlbnRIYW5k bGVyKCktPmhpdFRlc3RSZXN1bHRBdFBvaW50KGRyYWdPcmlnaW4sIHRydWUpOwogICAgIEtVUkwg bGlua1VSTCA9IGRyYWdTb3VyY2UuYWJzb2x1dGVMaW5rVVJMKCk7CiAgICAgS1VSTCBpbWFnZVVS TCA9IGRyYWdTb3VyY2UuYWJzb2x1dGVJbWFnZVVSTCgpOwogICAgIGJvb2wgaXNTZWxlY3RlZCA9 IGRyYWdTb3VyY2UuaXNTZWxlY3RlZCgpOwotICAgIAorCiAgICAgSW50UG9pbnQgbW91c2VEcmFn Z2VkUG9pbnQgPSBzcmMtPnZpZXcoKS0+d2luZG93VG9Db250ZW50cyhkcmFnRXZlbnQucG9zKCkp OwotICAgIAorCiAgICAgbV9kcmFnZ2luZ0ltYWdlVVJMID0gS1VSTCgpOwogICAgIG1fc291cmNl RHJhZ09wZXJhdGlvbiA9IHNyY09wOwotICAgIAorCiAgICAgRHJhZ0ltYWdlUmVmIGRyYWdJbWFn ZSA9IDA7CiAgICAgSW50UG9pbnQgZHJhZ0xvYygwLCAwKTsKICAgICBJbnRQb2ludCBkcmFnSW1h Z2VPZmZzZXQoMCwgMCk7Ci0gICAgCi0gICAgaWYgKGlzREhUTUxEcmFnKSAKKworICAgIGlmIChp c0RIVE1MRHJhZykKICAgICAgICAgZHJhZ0ltYWdlID0gY2xpcGJvYXJkLT5jcmVhdGVEcmFnSW1h Z2UoZHJhZ0ltYWdlT2Zmc2V0KTsKLSAgICAKKwogICAgIC8vIFdlIGFsbG93IERIVE1ML0pTIHRv IHNldCB0aGUgZHJhZyBpbWFnZSwgZXZlbiBpZiBpdHMgYSBsaW5rLCBpbWFnZSBvciB0ZXh0IHdl J3JlIGRyYWdnaW5nLgogICAgIC8vIFRoaXMgaXMgaW4gdGhlIHNwaXJpdCBvZiB0aGUgSUUgQVBJ LCB3aGljaCBhbGxvd3Mgb3ZlcnJpZGluZyBvZiBwYXN0ZWJvYXJkIGRhdGEgYW5kIERyYWdPcC4K ICAgICBpZiAoZHJhZ0ltYWdlKSB7CiAgICAgICAgIGRyYWdMb2MgPSBkcmFnTG9jRm9yREhUTUxE cmFnKG1vdXNlRHJhZ2dlZFBvaW50LCBkcmFnT3JpZ2luLCBkcmFnSW1hZ2VPZmZzZXQsICFsaW5r VVJMLmlzRW1wdHkoKSk7CiAgICAgICAgIG1fZHJhZ09mZnNldCA9IGRyYWdJbWFnZU9mZnNldDsK ICAgICB9Ci0gICAgCisKICAgICBib29sIHN0YXJ0ZWREcmFnID0gdHJ1ZTsgLy8gb3B0aW1pc20g LSB3ZSBhbG1vc3QgYWx3YXlzIG1hbmFnZSB0byBzdGFydCB0aGUgZHJhZwotICAgIAorCiAgICAg Tm9kZSogbm9kZSA9IGRyYWdTb3VyY2UuaW5uZXJOb25TaGFyZWROb2RlKCk7Ci0gICAgCisKICAg ICBJbWFnZSogaW1hZ2UgPSBnZXRJbWFnZShzdGF0aWNfY2FzdDxFbGVtZW50Kj4obm9kZSkpOwog ICAgIGlmICghaW1hZ2VVUkwuaXNFbXB0eSgpICYmIG5vZGUgJiYgbm9kZS0+aXNFbGVtZW50Tm9k ZSgpICYmIGltYWdlCiAgICAgICAgICAgICAmJiAobV9kcmFnU291cmNlQWN0aW9uICYgRHJhZ1Nv dXJjZUFjdGlvbkltYWdlKSkgewotICAgICAgICAvLyBXZSBzaG91bGRuJ3QgYmUgc3RhcnRpbmcg YSBkcmFnIGZvciBhbiBpbWFnZSB0aGF0IGNhbid0IHByb3ZpZGUgYW4gZXh0ZW5zaW9uLiAKKyAg ICAgICAgLy8gV2Ugc2hvdWxkbid0IGJlIHN0YXJ0aW5nIGEgZHJhZyBmb3IgYW4gaW1hZ2UgdGhh dCBjYW4ndCBwcm92aWRlIGFuIGV4dGVuc2lvbi4KICAgICAgICAgLy8gVGhpcyBpcyBhbiBlYXJs eSBkZXRlY3Rpb24gZm9yIHByb2JsZW1zIGVuY291bnRlcmVkIGxhdGVyIHVwb24gZHJvcC4KICAg ICAgICAgQVNTRVJUKCFpbWFnZS0+ZmlsZW5hbWVFeHRlbnNpb24oKS5pc0VtcHR5KCkpOwogICAg ICAgICBFbGVtZW50KiBlbGVtZW50ID0gc3RhdGljX2Nhc3Q8RWxlbWVudCo+KG5vZGUpOwogICAg ICAgICBpZiAoIWNsaXBib2FyZC0+aGFzRGF0YSgpKSB7Ci0gICAgICAgICAgICBtX2RyYWdnaW5n SW1hZ2VVUkwgPSBpbWFnZVVSTDsgCisgICAgICAgICAgICBtX2RyYWdnaW5nSW1hZ2VVUkwgPSBp bWFnZVVSTDsKICAgICAgICAgICAgIHByZXBhcmVDbGlwYm9hcmRGb3JJbWFnZURyYWcoc3JjLCBj bGlwYm9hcmQsIGVsZW1lbnQsIGxpbmtVUkwsIGltYWdlVVJMLCBkcmFnU291cmNlLmFsdERpc3Bs YXlTdHJpbmcoKSk7CiAgICAgICAgIH0KLSAgICAgICAgCisKICAgICAgICAgbV9jbGllbnQtPndp bGxQZXJmb3JtRHJhZ1NvdXJjZUFjdGlvbihEcmFnU291cmNlQWN0aW9uSW1hZ2UsIGRyYWdPcmln aW4sIGNsaXBib2FyZCk7Ci0gICAgICAgIAorCiAgICAgICAgIGlmICghZHJhZ0ltYWdlKSB7CiAg ICAgICAgICAgICBJbnRSZWN0IGltYWdlUmVjdCA9IGRyYWdTb3VyY2UuaW1hZ2VSZWN0KCk7CiAg ICAgICAgICAgICBpbWFnZVJlY3Quc2V0TG9jYXRpb24obV9wYWdlLT5tYWluRnJhbWUoKS0+dmll dygpLT53aW5kb3dUb0NvbnRlbnRzKHNyYy0+dmlldygpLT5jb250ZW50c1RvV2luZG93KGltYWdl UmVjdC5sb2NhdGlvbigpKSkpOwogICAgICAgICAgICAgZG9JbWFnZURyYWcoZWxlbWVudCwgZHJh Z09yaWdpbiwgZHJhZ1NvdXJjZS5pbWFnZVJlY3QoKSwgY2xpcGJvYXJkLCBzcmMsIG1fZHJhZ09m ZnNldCk7Ci0gICAgICAgIH0gZWxzZSAKKyAgICAgICAgfSBlbHNlCiAgICAgICAgICAgICAvLyBE SFRNTCBkZWZpbmVkIGRyYWcgaW1hZ2UKICAgICAgICAgICAgIGRvU3lzdGVtRHJhZyhkcmFnSW1h Z2UsIGRyYWdMb2MsIGRyYWdPcmlnaW4sIGNsaXBib2FyZCwgc3JjLCBmYWxzZSk7CiAKQEAgLTY4 OSwxMiArNjg3LDEyIEBAIGJvb2wgRHJhZ0NvbnRyb2xsZXI6OnN0YXJ0RHJhZyhGcmFtZSogc3Jj LCBDbGlwYm9hcmQqIGNsaXBib2FyZCwgRHJhZ09wZXJhdGlvbiBzCiAgICAgICAgICAgICBJbnRT aXplIHNpemUgPSBkcmFnSW1hZ2VTaXplKGRyYWdJbWFnZSk7CiAgICAgICAgICAgICBtX2RyYWdP ZmZzZXQgPSBJbnRQb2ludCgtc2l6ZS53aWR0aCgpIC8gMiwgLUxpbmtEcmFnQm9yZGVySW5zZXQp OwogICAgICAgICAgICAgZHJhZ0xvYyA9IEludFBvaW50KG1vdXNlRHJhZ2dlZFBvaW50LngoKSAr IG1fZHJhZ09mZnNldC54KCksIG1vdXNlRHJhZ2dlZFBvaW50LnkoKSArIG1fZHJhZ09mZnNldC55 KCkpOwotICAgICAgICB9IAorICAgICAgICB9CiAgICAgICAgIGRvU3lzdGVtRHJhZyhkcmFnSW1h Z2UsIGRyYWdMb2MsIG1vdXNlRHJhZ2dlZFBvaW50LCBjbGlwYm9hcmQsIHNyYywgdHJ1ZSk7CiAg ICAgfSBlbHNlIGlmIChpc1NlbGVjdGVkICYmIChtX2RyYWdTb3VyY2VBY3Rpb24gJiBEcmFnU291 cmNlQWN0aW9uU2VsZWN0aW9uKSkgewogICAgICAgICBSZWZQdHI8UmFuZ2U+IHNlbGVjdGlvblJh bmdlID0gc3JjLT5zZWxlY3Rpb24oKS0+dG9Ob3JtYWxpemVkUmFuZ2UoKTsKICAgICAgICAgQVNT RVJUKHNlbGVjdGlvblJhbmdlKTsKLSAgICAgICAgaWYgKCFjbGlwYm9hcmQtPmhhc0RhdGEoKSkg CisgICAgICAgIGlmICghY2xpcGJvYXJkLT5oYXNEYXRhKCkpCiAgICAgICAgICAgICBjbGlwYm9h cmQtPndyaXRlUmFuZ2Uoc2VsZWN0aW9uUmFuZ2UuZ2V0KCksIHNyYyk7CiAgICAgICAgIG1fY2xp ZW50LT53aWxsUGVyZm9ybURyYWdTb3VyY2VBY3Rpb24oRHJhZ1NvdXJjZUFjdGlvblNlbGVjdGlv biwgZHJhZ09yaWdpbiwgY2xpcGJvYXJkKTsKICAgICAgICAgaWYgKCFkcmFnSW1hZ2UpIHsKQEAg LTcxMiw3ICs3MTAsNyBAQCBib29sIERyYWdDb250cm9sbGVyOjpzdGFydERyYWcoRnJhbWUqIHNy YywgQ2xpcGJvYXJkKiBjbGlwYm9hcmQsIERyYWdPcGVyYXRpb24gcwogICAgICAgICAvLyB1bmRl ciB0aGUgbW91c2Vkb3duIHBvaW50LCBzbyBsaW5rVVJMLCBpbWFnZVVSTCBhbmQgaXNTZWxlY3Rl ZCBhcmUgYWxsIGZhbHNlL2VtcHR5LgogICAgICAgICBzdGFydGVkRHJhZyA9IGZhbHNlOwogICAg IH0KLSAgICAKKwogICAgIGlmIChkcmFnSW1hZ2UpCiAgICAgICAgIGRlbGV0ZURyYWdJbWFnZShk cmFnSW1hZ2UpOwogICAgIHJldHVybiBzdGFydGVkRHJhZzsKQEAgLTcyMywxNyArNzIxLDE3IEBA IHZvaWQgRHJhZ0NvbnRyb2xsZXI6OmRvSW1hZ2VEcmFnKEVsZW1lbnQqIGVsZW1lbnQsIGNvbnN0 IEludFBvaW50JiBkcmFnT3JpZ2luLCBjCiAgICAgSW50UG9pbnQgbW91c2VEb3duUG9pbnQgPSBk cmFnT3JpZ2luOwogICAgIERyYWdJbWFnZVJlZiBkcmFnSW1hZ2U7CiAgICAgSW50UG9pbnQgb3Jp Z2luOwotICAgIAorCiAgICAgSW1hZ2UqIGltYWdlID0gZ2V0SW1hZ2UoZWxlbWVudCk7CiAgICAg aWYgKGltYWdlICYmIGltYWdlLT5zaXplKCkuaGVpZ2h0KCkgKiBpbWFnZS0+c2l6ZSgpLndpZHRo KCkgPD0gTWF4T3JpZ2luYWxJbWFnZUFyZWEKICAgICAgICAgJiYgKGRyYWdJbWFnZSA9IGNyZWF0 ZURyYWdJbWFnZUZyb21JbWFnZShpbWFnZSkpKSB7CiAgICAgICAgIEludFNpemUgb3JpZ2luYWxT aXplID0gcmVjdC5zaXplKCk7CiAgICAgICAgIG9yaWdpbiA9IHJlY3QubG9jYXRpb24oKTsKLSAg ICAgICAgCisKICAgICAgICAgZHJhZ0ltYWdlID0gZml0RHJhZ0ltYWdlVG9NYXhTaXplKGRyYWdJ bWFnZSwgcmVjdC5zaXplKCksIG1heERyYWdJbWFnZVNpemUoKSk7CiAgICAgICAgIGRyYWdJbWFn ZSA9IGRpc3NvbHZlRHJhZ0ltYWdlVG9GcmFjdGlvbihkcmFnSW1hZ2UsIERyYWdJbWFnZUFscGhh KTsKICAgICAgICAgSW50U2l6ZSBuZXdTaXplID0gZHJhZ0ltYWdlU2l6ZShkcmFnSW1hZ2UpOwot ICAgICAgICAKKwogICAgICAgICAvLyBQcm9wZXJseSBvcmllbnQgdGhlIGRyYWcgaW1hZ2UgYW5k IG9yaWVudCBpdCBkaWZmZXJlbnRseSBpZiBpdCdzIHNtYWxsZXIgdGhhbiB0aGUgb3JpZ2luYWwK ICAgICAgICAgZmxvYXQgc2NhbGUgPSBuZXdTaXplLndpZHRoKCkgLyAoZmxvYXQpb3JpZ2luYWxT aXplLndpZHRoKCk7CiAgICAgICAgIGZsb2F0IGR4ID0gb3JpZ2luLngoKSAtIG1vdXNlRG93blBv aW50LngoKTsKQEAgLTc1MSwxNCArNzQ5LDE0IEBAIHZvaWQgRHJhZ0NvbnRyb2xsZXI6OmRvSW1h Z2VEcmFnKEVsZW1lbnQqIGVsZW1lbnQsIGNvbnN0IEludFBvaW50JiBkcmFnT3JpZ2luLCBjCiAg ICAgICAgIGlmIChkcmFnSW1hZ2UpCiAgICAgICAgICAgICBvcmlnaW4gPSBJbnRQb2ludChEcmFn SWNvblJpZ2h0SW5zZXQgLSBkcmFnSW1hZ2VTaXplKGRyYWdJbWFnZSkud2lkdGgoKSwgRHJhZ0lj b25Cb3R0b21JbnNldCk7CiAgICAgfQotICAgIAorCiAgICAgZHJhZ0ltYWdlT2Zmc2V0LnNldFgo bW91c2VEb3duUG9pbnQueCgpICsgb3JpZ2luLngoKSk7CiAgICAgZHJhZ0ltYWdlT2Zmc2V0LnNl dFkobW91c2VEb3duUG9pbnQueSgpICsgb3JpZ2luLnkoKSk7CiAgICAgZG9TeXN0ZW1EcmFnKGRy YWdJbWFnZSwgZHJhZ0ltYWdlT2Zmc2V0LCBkcmFnT3JpZ2luLCBjbGlwYm9hcmQsIGZyYW1lLCBm YWxzZSk7Ci0gICAgCisKICAgICBkZWxldGVEcmFnSW1hZ2UoZHJhZ0ltYWdlKTsKIH0KLSAgICAK Kwogdm9pZCBEcmFnQ29udHJvbGxlcjo6ZG9TeXN0ZW1EcmFnKERyYWdJbWFnZVJlZiBpbWFnZSwg Y29uc3QgSW50UG9pbnQmIGRyYWdMb2MsIGNvbnN0IEludFBvaW50JiBldmVudFBvcywgQ2xpcGJv YXJkKiBjbGlwYm9hcmQsIEZyYW1lKiBmcmFtZSwgYm9vbCBmb3JMaW5rKQogewogICAgIG1fZGlk SW5pdGlhdGVEcmFnID0gdHJ1ZTsKQEAgLTc2OCwxMCArNzY2LDEwIEBAIHZvaWQgRHJhZ0NvbnRy b2xsZXI6OmRvU3lzdGVtRHJhZyhEcmFnSW1hZ2VSZWYgaW1hZ2UsIGNvbnN0IEludFBvaW50JiBk cmFnTG9jLCBjCiAgICAgUmVmUHRyPEZyYW1lVmlldz4gdmlld1Byb3RlY3RvciA9IGZyYW1lUHJv dGVjdG9yLT52aWV3KCk7CiAgICAgbV9jbGllbnQtPnN0YXJ0RHJhZyhpbWFnZSwgdmlld1Byb3Rl Y3Rvci0+d2luZG93VG9Db250ZW50cyhmcmFtZS0+dmlldygpLT5jb250ZW50c1RvV2luZG93KGRy YWdMb2MpKSwKICAgICAgICAgdmlld1Byb3RlY3Rvci0+d2luZG93VG9Db250ZW50cyhmcmFtZS0+ dmlldygpLT5jb250ZW50c1RvV2luZG93KGV2ZW50UG9zKSksIGNsaXBib2FyZCwgZnJhbWVQcm90 ZWN0b3IuZ2V0KCksIGZvckxpbmspOwotICAgIAorCiAgICAgY2xlYW51cEFmdGVyU3lzdGVtRHJh ZygpOwogfQotICAgIAorCiAvLyBNYW51YWwgZHJhZyBjYXJldCBtYW5pcHVsYXRpb24KIHZvaWQg RHJhZ0NvbnRyb2xsZXI6OnBsYWNlRHJhZ0NhcmV0KGNvbnN0IEludFBvaW50JiB3aW5kb3dQb2lu dCkKIHsKQEAgLTc4Myw4ICs3ODEsOCBAQCB2b2lkIERyYWdDb250cm9sbGVyOjpwbGFjZURyYWdD YXJldChjb25zdCBJbnRQb2ludCYgd2luZG93UG9pbnQpCiAgICAgaWYgKCFmcmFtZVZpZXcpCiAg ICAgICAgIHJldHVybjsKICAgICBJbnRQb2ludCBmcmFtZVBvaW50ID0gZnJhbWVWaWV3LT53aW5k b3dUb0NvbnRlbnRzKHdpbmRvd1BvaW50KTsKLSAgICBWaXNpYmxlU2VsZWN0aW9uIGRyYWdDYXJl dChmcmFtZS0+dmlzaWJsZVBvc2l0aW9uRm9yUG9pbnQoZnJhbWVQb2ludCkpOyAgCisgICAgVmlz aWJsZVNlbGVjdGlvbiBkcmFnQ2FyZXQoZnJhbWUtPnZpc2libGVQb3NpdGlvbkZvclBvaW50KGZy YW1lUG9pbnQpKTsKICAgICBtX3BhZ2UtPmRyYWdDYXJldENvbnRyb2xsZXIoKS0+c2V0U2VsZWN0 aW9uKGRyYWdDYXJldCk7CiB9Ci0gICAgCisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK