58169 2011-04-08 15:54:53 -0700 Make the drag operations be different functions 2011-04-08 16:00:36 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 382614 0 andersca 2011-04-08 15:54:53 -0700 Make the drag operations be different functions 382617 1 88889 andersca 2011-04-08 15:56:07 -0700 Created attachment 88889 Patch 382622 2 88889 aroben 2011-04-08 15:57:44 -0700 Comment on attachment 88889 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=88889&action=review > Source/WebKit2/UIProcess/WebPageProxy.h:699 > + void performDragControllerAction(DragControllerAction, WebCore::DragData*, const String& = String()); I guess this doesn't need a default value anymore. It would be nice to name the last parameter in this function and the new ones you added. The signature is a bit mysterious without it. 382627 3 andersca 2011-04-08 16:00:36 -0700 Committed r83354: <http://trac.webkit.org/changeset/83354> 88889 2011-04-08 15:56:07 -0700 2011-04-08 15:57:44 -0700 Patch bug-58169-20110408155606.patch text/plain 8520 andersca SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDgzMzUyKQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzAgQEAKKzIwMTEtMDQtMDggIEFuZGVycyBD YXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBNYWtlIHRoZSBkcmFnIG9wZXJhdGlvbnMgYmUgZGlmZmVy ZW50IGZ1bmN0aW9ucworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NTgxNjkKKworICAgICAgICBTaW5jZSB3ZSB3YW50IHBlcmZvcm1EcmFnIHRvIHRha2Ug YSBzYW5kYm94IGV4dGVuc2lvbiwgc2VwYXJhdGUgdGhlIGZvdXIKKyAgICAgICAgZHJhZyBvcGVy YXRpb25zIG91dCBpbnRvIGRpZmZlcmVudCBmdW5jdGlvbnMuIE5vIGZ1bmN0aW9uYWxpdHkgY2hh bmdlLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tOgorICAgICAgICAo LVtXS1ZpZXcgZHJhZ2dpbmdFbnRlcmVkOl0pOgorICAgICAgICAoLVtXS1ZpZXcgZHJhZ2dpbmdV cGRhdGVkOl0pOgorICAgICAgICAoLVtXS1ZpZXcgZHJhZ2dpbmdFeGl0ZWQ6XSk6CisgICAgICAg ICgtW1dLVmlldyBwZXJmb3JtRHJhZ09wZXJhdGlvbjpdKToKKyAgICAgICAgKiBVSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkcmFnRW50 ZXJlZCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZHJhZ1VwZGF0ZWQpOgorICAg ICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRyYWdFeGl0ZWQpOgorICAgICAgICAoV2ViS2l0 OjpXZWJQYWdlUHJveHk6OnBlcmZvcm1EcmFnKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFn ZVByb3h5Lmg6CisgICAgICAgICogVUlQcm9jZXNzL3dpbi9XZWJWaWV3LmNwcDoKKyAgICAgICAg KFdlYktpdDo6V2ViVmlldzo6RHJhZ0VudGVyKToKKyAgICAgICAgKFdlYktpdDo6V2ViVmlldzo6 RHJhZ092ZXIpOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3OjpEcmFnTGVhdmUpOgorICAgICAg ICAoV2ViS2l0OjpXZWJWaWV3OjpEcm9wKToKKwogMjAxMS0wNC0wOCAgQW5kZXJzIENhcmxzc29u ICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFkYW0gUm9iZW4u CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAkocmV2aXNp b24gODMzMTYpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAko d29ya2luZyBjb3B5KQpAQCAtNjk4LDYgKzY5OCwyNiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6c2V0 QWN0dWFsVmlzaWJsZUNvbnRlCiB9CiAjZW5kaWYKIAordm9pZCBXZWJQYWdlUHJveHk6OmRyYWdF bnRlcmVkKFdlYkNvcmU6OkRyYWdEYXRhKiBkcmFnRGF0YSwgY29uc3QgU3RyaW5nJiBkcmFnU3Rv cmFnZU5hbWUpCit7CisgICAgcGVyZm9ybURyYWdDb250cm9sbGVyQWN0aW9uKERyYWdDb250cm9s bGVyQWN0aW9uRW50ZXJlZCwgZHJhZ0RhdGEsIGRyYWdTdG9yYWdlTmFtZSk7Cit9CisKK3ZvaWQg V2ViUGFnZVByb3h5OjpkcmFnVXBkYXRlZChXZWJDb3JlOjpEcmFnRGF0YSogZHJhZ0RhdGEsIGNv bnN0IFN0cmluZyYgZHJhZ1N0b3JhZ2VOYW1lKQoreworICAgIHBlcmZvcm1EcmFnQ29udHJvbGxl ckFjdGlvbihEcmFnQ29udHJvbGxlckFjdGlvblVwZGF0ZWQsIGRyYWdEYXRhLCBkcmFnU3RvcmFn ZU5hbWUpOworfQorCit2b2lkIFdlYlBhZ2VQcm94eTo6ZHJhZ0V4aXRlZChXZWJDb3JlOjpEcmFn RGF0YSogZHJhZ0RhdGEsIGNvbnN0IFN0cmluZyYgZHJhZ1N0b3JhZ2VOYW1lKQoreworICAgIHBl cmZvcm1EcmFnQ29udHJvbGxlckFjdGlvbihEcmFnQ29udHJvbGxlckFjdGlvbkV4aXRlZCwgZHJh Z0RhdGEsIGRyYWdTdG9yYWdlTmFtZSk7Cit9CisKK3ZvaWQgV2ViUGFnZVByb3h5OjpwZXJmb3Jt RHJhZyhXZWJDb3JlOjpEcmFnRGF0YSogZHJhZ0RhdGEsIGNvbnN0IFN0cmluZyYgZHJhZ1N0b3Jh Z2VOYW1lKQoreworICAgIHBlcmZvcm1EcmFnQ29udHJvbGxlckFjdGlvbihEcmFnQ29udHJvbGxl ckFjdGlvblBlcmZvcm1EcmFnLCBkcmFnRGF0YSwgZHJhZ1N0b3JhZ2VOYW1lKTsKK30KKwogdm9p ZCBXZWJQYWdlUHJveHk6OnBlcmZvcm1EcmFnQ29udHJvbGxlckFjdGlvbihEcmFnQ29udHJvbGxl ckFjdGlvbiBhY3Rpb24sIFdlYkNvcmU6OkRyYWdEYXRhKiBkcmFnRGF0YSwgY29uc3QgU3RyaW5n JiBkcmFnU3RvcmFnZU5hbWUpCiB7CiAgICAgaWYgKCFpc1ZhbGlkKCkpCkluZGV4OiBTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCShyZXZpc2lvbiA4MzMxNikKKysrIFNvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAkod29ya2luZyBjb3B5KQpAQCAtMzgx LDcgKzM4MSwxMSBAQCBwdWJsaWM6CiAgICAgdm9pZCBiYWNrRm9yd2FyZFJlbW92ZWRJdGVtKHVp bnQ2NF90IGl0ZW1JRCk7CiAKICAgICAvLyBEcmFnIGFuZCBkcm9wIHN1cHBvcnQuCi0gICAgdm9p ZCBwZXJmb3JtRHJhZ0NvbnRyb2xsZXJBY3Rpb24oRHJhZ0NvbnRyb2xsZXJBY3Rpb24sIFdlYkNv cmU6OkRyYWdEYXRhKiwgY29uc3QgU3RyaW5nJiA9IFN0cmluZygpKTsKKyAgICB2b2lkIGRyYWdF bnRlcmVkKFdlYkNvcmU6OkRyYWdEYXRhKiwgY29uc3QgU3RyaW5nJiA9IFN0cmluZygpKTsKKyAg ICB2b2lkIGRyYWdVcGRhdGVkKFdlYkNvcmU6OkRyYWdEYXRhKiwgY29uc3QgU3RyaW5nJiA9IFN0 cmluZygpKTsKKyAgICB2b2lkIGRyYWdFeGl0ZWQoV2ViQ29yZTo6RHJhZ0RhdGEqLCBjb25zdCBT dHJpbmcmID0gU3RyaW5nKCkpOworICAgIHZvaWQgcGVyZm9ybURyYWcoV2ViQ29yZTo6RHJhZ0Rh dGEqLCBjb25zdCBTdHJpbmcmID0gU3RyaW5nKCkpOworCiAgICAgdm9pZCBkaWRQZXJmb3JtRHJh Z0NvbnRyb2xsZXJBY3Rpb24odWludDY0X3QgcmVzdWx0T3BlcmF0aW9uKTsKICAgICB2b2lkIGRy YWdFbmRlZChjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYgY2xpZW50UG9zaXRpb24sIGNvbnN0IFdl YkNvcmU6OkludFBvaW50JiBnbG9iYWxQb3NpdGlvbiwgdWludDY0X3Qgb3BlcmF0aW9uKTsKICNp ZiBQTEFURk9STShNQUMpCkBAIC02OTIsNiArNjk2LDggQEAgcHJpdmF0ZToKIAogICAgIHZvaWQg Y2xlYXJMb2FkRGVwZW5kZW50Q2FsbGJhY2tzKCk7CiAKKyAgICB2b2lkIHBlcmZvcm1EcmFnQ29u dHJvbGxlckFjdGlvbihEcmFnQ29udHJvbGxlckFjdGlvbiwgV2ViQ29yZTo6RHJhZ0RhdGEqLCBj b25zdCBTdHJpbmcmID0gU3RyaW5nKCkpOworCiAgICAgUGFnZUNsaWVudCogbV9wYWdlQ2xpZW50 OwogICAgIFdlYkxvYWRlckNsaWVudCBtX2xvYWRlckNsaWVudDsKICAgICBXZWJQb2xpY3lDbGll bnQgbV9wb2xpY3lDbGllbnQ7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21h Yy9XS1ZpZXcubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9t YWMvV0tWaWV3Lm1tCShyZXZpc2lvbiA4MzMxNikKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvbWFjL1dLVmlldy5tbQkod29ya2luZyBjb3B5KQpAQCAtMTQ0Niw3ICsxNDQ2LDcgQEAg LSAoTlNEcmFnT3BlcmF0aW9uKWRyYWdnaW5nRW50ZXJlZDooaWQgPAogICAgIERyYWdEYXRhIGRy YWdEYXRhKGRyYWdnaW5nSW5mbywgY2xpZW50LCBnbG9iYWwsIHN0YXRpY19jYXN0PERyYWdPcGVy YXRpb24+KFtkcmFnZ2luZ0luZm8gZHJhZ2dpbmdTb3VyY2VPcGVyYXRpb25NYXNrXSksIFtzZWxm IGFwcGxpY2F0aW9uRmxhZ3M6ZHJhZ2dpbmdJbmZvXSk7CiAKICAgICBfZGF0YS0+X3BhZ2UtPnJl c2V0RHJhZ09wZXJhdGlvbigpOwotICAgIF9kYXRhLT5fcGFnZS0+cGVyZm9ybURyYWdDb250cm9s bGVyQWN0aW9uKERyYWdDb250cm9sbGVyQWN0aW9uRW50ZXJlZCwgJmRyYWdEYXRhLCBbW2RyYWdn aW5nSW5mbyBkcmFnZ2luZ1Bhc3RlYm9hcmRdIG5hbWVdKTsKKyAgICBfZGF0YS0+X3BhZ2UtPmRy YWdFbnRlcmVkKCZkcmFnRGF0YSwgW1tkcmFnZ2luZ0luZm8gZHJhZ2dpbmdQYXN0ZWJvYXJkXSBu YW1lXSk7CiAgICAgcmV0dXJuIE5TRHJhZ09wZXJhdGlvbkNvcHk7CiB9CiAKQEAgLTE0NTUsNyAr MTQ1NSw3IEBAIC0gKE5TRHJhZ09wZXJhdGlvbilkcmFnZ2luZ1VwZGF0ZWQ6KGlkIDwKICAgICBJ bnRQb2ludCBjbGllbnQoW3NlbGYgY29udmVydFBvaW50OltkcmFnZ2luZ0luZm8gZHJhZ2dpbmdM b2NhdGlvbl0gZnJvbVZpZXc6bmlsXSk7CiAgICAgSW50UG9pbnQgZ2xvYmFsKGdsb2JhbFBvaW50 KFtkcmFnZ2luZ0luZm8gZHJhZ2dpbmdMb2NhdGlvbl0sIFtzZWxmIHdpbmRvd10pKTsKICAgICBE cmFnRGF0YSBkcmFnRGF0YShkcmFnZ2luZ0luZm8sIGNsaWVudCwgZ2xvYmFsLCBzdGF0aWNfY2Fz dDxEcmFnT3BlcmF0aW9uPihbZHJhZ2dpbmdJbmZvIGRyYWdnaW5nU291cmNlT3BlcmF0aW9uTWFz a10pLCBbc2VsZiBhcHBsaWNhdGlvbkZsYWdzOmRyYWdnaW5nSW5mb10pOwotICAgIF9kYXRhLT5f cGFnZS0+cGVyZm9ybURyYWdDb250cm9sbGVyQWN0aW9uKERyYWdDb250cm9sbGVyQWN0aW9uVXBk YXRlZCwgJmRyYWdEYXRhLCBbW2RyYWdnaW5nSW5mbyBkcmFnZ2luZ1Bhc3RlYm9hcmRdIG5hbWVd KTsKKyAgICBfZGF0YS0+X3BhZ2UtPmRyYWdVcGRhdGVkKCZkcmFnRGF0YSwgW1tkcmFnZ2luZ0lu Zm8gZHJhZ2dpbmdQYXN0ZWJvYXJkXSBuYW1lXSk7CiAgICAgcmV0dXJuIF9kYXRhLT5fcGFnZS0+ ZHJhZ09wZXJhdGlvbigpOwogfQogCkBAIC0xNDY0LDcgKzE0NjQsNyBAQCAtICh2b2lkKWRyYWdn aW5nRXhpdGVkOihpZCA8TlNEcmFnZ2luZ0luCiAgICAgSW50UG9pbnQgY2xpZW50KFtzZWxmIGNv bnZlcnRQb2ludDpbZHJhZ2dpbmdJbmZvIGRyYWdnaW5nTG9jYXRpb25dIGZyb21WaWV3Om5pbF0p OwogICAgIEludFBvaW50IGdsb2JhbChnbG9iYWxQb2ludChbZHJhZ2dpbmdJbmZvIGRyYWdnaW5n TG9jYXRpb25dLCBbc2VsZiB3aW5kb3ddKSk7CiAgICAgRHJhZ0RhdGEgZHJhZ0RhdGEoZHJhZ2dp bmdJbmZvLCBjbGllbnQsIGdsb2JhbCwgc3RhdGljX2Nhc3Q8RHJhZ09wZXJhdGlvbj4oW2RyYWdn aW5nSW5mbyBkcmFnZ2luZ1NvdXJjZU9wZXJhdGlvbk1hc2tdKSwgW3NlbGYgYXBwbGljYXRpb25G bGFnczpkcmFnZ2luZ0luZm9dKTsKLSAgICBfZGF0YS0+X3BhZ2UtPnBlcmZvcm1EcmFnQ29udHJv bGxlckFjdGlvbihEcmFnQ29udHJvbGxlckFjdGlvbkV4aXRlZCwgJmRyYWdEYXRhLCBbW2RyYWdn aW5nSW5mbyBkcmFnZ2luZ1Bhc3RlYm9hcmRdIG5hbWVdKTsKKyAgICBfZGF0YS0+X3BhZ2UtPmRy YWdFeGl0ZWQoJmRyYWdEYXRhLCBbW2RyYWdnaW5nSW5mbyBkcmFnZ2luZ1Bhc3RlYm9hcmRdIG5h bWVdKTsKICAgICBfZGF0YS0+X3BhZ2UtPnJlc2V0RHJhZ09wZXJhdGlvbigpOwogfQogCkBAIC0x NDc4LDcgKzE0NzgsNyBAQCAtIChCT09MKXBlcmZvcm1EcmFnT3BlcmF0aW9uOihpZCA8TlNEcmFn CiAgICAgSW50UG9pbnQgY2xpZW50KFtzZWxmIGNvbnZlcnRQb2ludDpbZHJhZ2dpbmdJbmZvIGRy YWdnaW5nTG9jYXRpb25dIGZyb21WaWV3Om5pbF0pOwogICAgIEludFBvaW50IGdsb2JhbChnbG9i YWxQb2ludChbZHJhZ2dpbmdJbmZvIGRyYWdnaW5nTG9jYXRpb25dLCBbc2VsZiB3aW5kb3ddKSk7 CiAgICAgRHJhZ0RhdGEgZHJhZ0RhdGEoZHJhZ2dpbmdJbmZvLCBjbGllbnQsIGdsb2JhbCwgc3Rh dGljX2Nhc3Q8RHJhZ09wZXJhdGlvbj4oW2RyYWdnaW5nSW5mbyBkcmFnZ2luZ1NvdXJjZU9wZXJh dGlvbk1hc2tdKSwgW3NlbGYgYXBwbGljYXRpb25GbGFnczpkcmFnZ2luZ0luZm9dKTsKLSAgICBf ZGF0YS0+X3BhZ2UtPnBlcmZvcm1EcmFnQ29udHJvbGxlckFjdGlvbihEcmFnQ29udHJvbGxlckFj dGlvblBlcmZvcm1EcmFnLCAmZHJhZ0RhdGEsIFtbZHJhZ2dpbmdJbmZvIGRyYWdnaW5nUGFzdGVi b2FyZF0gbmFtZV0pOworICAgIF9kYXRhLT5fcGFnZS0+cGVyZm9ybURyYWcoJmRyYWdEYXRhLCBb W2RyYWdnaW5nSW5mbyBkcmFnZ2luZ1Bhc3RlYm9hcmRdIG5hbWVdKTsKICAgICByZXR1cm4gWUVT OwogfQogCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mvd2luL1dlYlZpZXcuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy93aW4vV2ViVmlldy5jcHAJKHJl dmlzaW9uIDgzMzE2KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3dpbi9XZWJWaWV3LmNw cAkod29ya2luZyBjb3B5KQpAQCAtMTU1Nyw3ICsxNTU3LDcgQEAgSFJFU1VMVCBTVERNRVRIT0RD QUxMVFlQRSBXZWJWaWV3OjpEcmFnRQogICAgIFBPSU5UTCBsb2NhbHB0ID0gcHQ7CiAgICAgOjpT Y3JlZW5Ub0NsaWVudChtX3dpbmRvdywgKExQUE9JTlQpJmxvY2FscHQpOwogICAgIERyYWdEYXRh IGRhdGEocERhdGFPYmplY3QsIEludFBvaW50KGxvY2FscHQueCwgbG9jYWxwdC55KSwgSW50UG9p bnQocHQueCwgcHQueSksIGtleVN0YXRlVG9EcmFnT3BlcmF0aW9uKGdyZktleVN0YXRlKSk7Ci0g ICAgbV9wYWdlLT5wZXJmb3JtRHJhZ0NvbnRyb2xsZXJBY3Rpb24oRHJhZ0NvbnRyb2xsZXJBY3Rp b25FbnRlcmVkLCAmZGF0YSk7CisgICAgbV9wYWdlLT5kcmFnRW50ZXJlZCgmZGF0YSk7CiAgICAg KnBkd0VmZmVjdCA9IGRyYWdPcGVyYXRpb25Ub0RyYWdDdXJzb3IobV9wYWdlLT5kcmFnT3BlcmF0 aW9uKCkpOwogCiAgICAgbV9sYXN0RHJvcEVmZmVjdCA9ICpwZHdFZmZlY3Q7CkBAIC0xNTc1LDcg KzE1NzUsNyBAQCBIUkVTVUxUIFNURE1FVEhPRENBTExUWVBFIFdlYlZpZXc6OkRyYWdPCiAgICAg ICAgIFBPSU5UTCBsb2NhbHB0ID0gcHQ7CiAgICAgICAgIDo6U2NyZWVuVG9DbGllbnQobV93aW5k b3csIChMUFBPSU5UKSZsb2NhbHB0KTsKICAgICAgICAgRHJhZ0RhdGEgZGF0YShtX2RyYWdEYXRh LmdldCgpLCBJbnRQb2ludChsb2NhbHB0LngsIGxvY2FscHQueSksIEludFBvaW50KHB0LngsIHB0 LnkpLCBrZXlTdGF0ZVRvRHJhZ09wZXJhdGlvbihncmZLZXlTdGF0ZSkpOwotICAgICAgICBtX3Bh Z2UtPnBlcmZvcm1EcmFnQ29udHJvbGxlckFjdGlvbihEcmFnQ29udHJvbGxlckFjdGlvblVwZGF0 ZWQsICZkYXRhKTsKKyAgICAgICAgbV9wYWdlLT5kcmFnVXBkYXRlZCgmZGF0YSk7CiAgICAgICAg ICpwZHdFZmZlY3QgPSBkcmFnT3BlcmF0aW9uVG9EcmFnQ3Vyc29yKG1fcGFnZS0+ZHJhZ09wZXJh dGlvbigpKTsKICAgICB9IGVsc2UKICAgICAgICAgKnBkd0VmZmVjdCA9IERST1BFRkZFQ1RfTk9O RTsKQEAgLTE1OTEsNyArMTU5MSw3IEBAIEhSRVNVTFQgU1RETUVUSE9EQ0FMTFRZUEUgV2ViVmll dzo6RHJhZ0wKIAogICAgIGlmIChtX2RyYWdEYXRhKSB7CiAgICAgICAgIERyYWdEYXRhIGRhdGEo bV9kcmFnRGF0YS5nZXQoKSwgSW50UG9pbnQoKSwgSW50UG9pbnQoKSwgRHJhZ09wZXJhdGlvbk5v bmUpOwotICAgICAgICBtX3BhZ2UtPnBlcmZvcm1EcmFnQ29udHJvbGxlckFjdGlvbihEcmFnQ29u dHJvbGxlckFjdGlvbkV4aXRlZCwgJmRhdGEpOworICAgICAgICBtX3BhZ2UtPmRyYWdFeGl0ZWQo JmRhdGEpOwogICAgICAgICBtX2RyYWdEYXRhID0gMDsKICAgICAgICAgbV9wYWdlLT5yZXNldERy YWdPcGVyYXRpb24oKTsKICAgICB9CkBAIC0xNjA4LDcgKzE2MDgsNyBAQCBIUkVTVUxUIFNURE1F VEhPRENBTExUWVBFIFdlYlZpZXc6OkRyb3AoCiAgICAgUE9JTlRMIGxvY2FscHQgPSBwdDsKICAg ICA6OlNjcmVlblRvQ2xpZW50KG1fd2luZG93LCAoTFBQT0lOVCkmbG9jYWxwdCk7CiAgICAgRHJh Z0RhdGEgZGF0YShwRGF0YU9iamVjdCwgSW50UG9pbnQobG9jYWxwdC54LCBsb2NhbHB0LnkpLCBJ bnRQb2ludChwdC54LCBwdC55KSwga2V5U3RhdGVUb0RyYWdPcGVyYXRpb24oZ3JmS2V5U3RhdGUp KTsKLSAgICBtX3BhZ2UtPnBlcmZvcm1EcmFnQ29udHJvbGxlckFjdGlvbihEcmFnQ29udHJvbGxl ckFjdGlvblBlcmZvcm1EcmFnLCAmZGF0YSk7CisgICAgbV9wYWdlLT5wZXJmb3JtRHJhZygmZGF0 YSk7CiAgICAgcmV0dXJuIFNfT0s7CiB9CiAK