30175 2009-10-07 10:51:20 -0700 [Win] Windows DRT UIDelegate::doDragDrop does not return OLE drag-and-drop return value 2009-10-08 19:11:09 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC Windows XP RESOLVED FIXED P2 Normal --- 1 dbates dbates aroben eric oldest_to_newest 153115 0 dbates 2009-10-07 10:51:20 -0700 We should have UIDelegate::doDragDrop return the OLE drag-and-drop return value just like the Windows API function it emulates, DoDragDrop <http://msdn.microsoft.com/en-us/library/ms678486%28VS.85%29.aspx>. 153136 1 40808 dbates 2009-10-07 11:43:03 -0700 Created attachment 40808 Patch No test included because it is not possible to test this outside of unit testing. 153140 2 40808 aroben 2009-10-07 11:53:52 -0700 Comment on attachment 40808 Patch > +++ WebKit/win/WebCoreSupport/WebDragClient.cpp (working copy) > @@ -161,11 +161,9 @@ void WebDragClient::startDrag(DragImageR > if (SUCCEEDED(m_webView->uiDelegate(&ui))) { > COMPtr<IWebUIDelegatePrivate> uiPrivate; > if (SUCCEEDED(ui->QueryInterface(IID_IWebUIDelegatePrivate, (void**)&uiPrivate))) > - if (SUCCEEDED(uiPrivate->doDragDrop(m_webView, dataObject.get(), source.get(), okEffect, &effect))) > - return; > - } > - > - DoDragDrop(dataObject.get(), source.get(), okEffect, &effect); > + uiPrivate->doDragDrop(m_webView, dataObject.get(), source.get(), okEffect, &effect); > + } else > + DoDragDrop(dataObject.get(), source.get(), okEffect, &effect); I don't think this change is what we want. This will require that all WebKit clients that support the IWebUIDelegatePrivate interface implement doDragDrop. I think we want to leave this code as it was. > +++ WebKitTools/DumpRenderTree/win/EventSender.h (working copy) > @@ -29,13 +29,15 @@ > #ifndef EventSender_h > #define EventSender_h > > +#include <windows.h> It would be nicer to just forward-declare HRESULT. The rest of the DRT changes look fine. 153149 3 40812 dbates 2009-10-07 12:22:51 -0700 Created attachment 40812 Patch As per Adam's comment, removed changes to WebDragClient::startDrag and in EventSender defined typedef for HRESULT, instead of including <window.h>. 153152 4 40812 aroben 2009-10-07 12:46:11 -0700 Comment on attachment 40812 Patch r=me 153591 5 40812 dbates 2009-10-08 19:11:06 -0700 Comment on attachment 40812 Patch Clearing flags on attachment: 40812 Committed r49336: <http://trac.webkit.org/changeset/49336> 153592 6 dbates 2009-10-08 19:11:09 -0700 All reviewed patches have been landed. Closing bug. 40808 2009-10-07 11:43:03 -0700 2009-10-07 12:22:51 -0700 Patch Bug30175.patch text/plain 6732 dbates SW5kZXg6IFdlYktpdC93aW4vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC93aW4vQ2hh bmdlTG9nCShyZXZpc2lvbiA0OTEzOCkKKysrIFdlYktpdC93aW4vQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMDktMTAtMDcgIERhbmllbCBCYXRlcyAgPGRiYXRl c0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMDE3NQorICAg ICAgICAKKyAgICAgICAgUmVtb3ZlZCB0aGUgdXNlIG9mIHRoZSBtYWNybyBTVUNDRUVERUQgd2hl biBjYWxsaW5nIFVJRGVsZWdhdGU6OmRvRHJhZ0Ryb3AKKyAgICAgICAgaW4gV2ViRHJhZ0NsaWVu dDo6c3RhcnREcmFnIHNpbmNlIHRoaXMgY2hlY2sgbmV2ZXIgZmFpbGVkIGJlY2F1c2UgCisgICAg ICAgIFVJRGVsZWdhdGU6OmRvRHJhZ0Ryb3AgYWx3YXlzIHJldHVybmVkIFNfT0sgKGFuZCBub3cg aXQgcmV0dXJucyB0aGUgY29ycmVjdCAKKyAgICAgICAgT0xFIGRyYWctYW5kLWRyb3AgcmV0dXJu IHZhbHVlIGluc3RlYWQgb2YganVzdCBTX09LKS4gUmVwbGFjZWQgaWYtcmV0dXJuCisgICAgICAg IHN0cnVjdHVyZSBpbiBXZWJEcmFnQ2xpZW50OjpzdGFydERyYWcgd2l0aCBpZi1lbHNlLgorCisg ICAgICAgICogV2ViQ29yZVN1cHBvcnQvV2ViRHJhZ0NsaWVudC5jcHA6CisgICAgICAgIChXZWJE cmFnQ2xpZW50OjpzdGFydERyYWcpOgorCiAyMDA5LTEwLTA1ICBQYXZlbCBGZWxkbWFuICA8cGZl bGRtYW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFRpbW90aHkgSGF0Y2hl ci4KSW5kZXg6IFdlYktpdC93aW4vV2ViQ29yZVN1cHBvcnQvV2ViRHJhZ0NsaWVudC5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViS2l0L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJEcmFnQ2xpZW50LmNwcAko cmV2aXNpb24gNDg5NDQpCisrKyBXZWJLaXQvd2luL1dlYkNvcmVTdXBwb3J0L1dlYkRyYWdDbGll bnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNjEsMTEgKzE2MSw5IEBAIHZvaWQgV2ViRHJhZ0Ns aWVudDo6c3RhcnREcmFnKERyYWdJbWFnZVIKICAgICAgICAgaWYgKFNVQ0NFRURFRChtX3dlYlZp ZXctPnVpRGVsZWdhdGUoJnVpKSkpIHsKICAgICAgICAgICAgIENPTVB0cjxJV2ViVUlEZWxlZ2F0 ZVByaXZhdGU+IHVpUHJpdmF0ZTsKICAgICAgICAgICAgIGlmIChTVUNDRUVERUQodWktPlF1ZXJ5 SW50ZXJmYWNlKElJRF9JV2ViVUlEZWxlZ2F0ZVByaXZhdGUsICh2b2lkKiopJnVpUHJpdmF0ZSkp KQotICAgICAgICAgICAgICAgIGlmIChTVUNDRUVERUQodWlQcml2YXRlLT5kb0RyYWdEcm9wKG1f d2ViVmlldywgZGF0YU9iamVjdC5nZXQoKSwgc291cmNlLmdldCgpLCBva0VmZmVjdCwgJmVmZmVj dCkpKQotICAgICAgICAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KLQotICAgICAgICBE b0RyYWdEcm9wKGRhdGFPYmplY3QuZ2V0KCksIHNvdXJjZS5nZXQoKSwgb2tFZmZlY3QsICZlZmZl Y3QpOworICAgICAgICAgICAgICAgIHVpUHJpdmF0ZS0+ZG9EcmFnRHJvcChtX3dlYlZpZXcsIGRh dGFPYmplY3QuZ2V0KCksIHNvdXJjZS5nZXQoKSwgb2tFZmZlY3QsICZlZmZlY3QpOworICAgICAg ICB9IGVsc2UKKyAgICAgICAgICAgIERvRHJhZ0Ryb3AoZGF0YU9iamVjdC5nZXQoKSwgc291cmNl LmdldCgpLCBva0VmZmVjdCwgJmVmZmVjdCk7CiAgICAgfQogfQogCkluZGV4OiBXZWJLaXRUb29s cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCShyZXZpc2lv biA0ODk0NCkKKysrIFdlYktpdFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI0IEBACisyMDA5LTEwLTA3ICBEYW5pZWwgQmF0ZXMgIDxkYmF0ZXNAd2Via2l0Lm9yZz4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzAxNzUKKyAgICAgICAgCisgICAgICAg IFRoZSBXaW5kb3dzIERSVCBlcXVpdmFsZW50IG9mIERvRHJhZ0Ryb3AgKGkuZS4gVUlEZWxlZ2F0 ZTo6ZG9EcmFnRHJvcCkgZG9lcyBub3QgcmV0dXJuCisgICAgICAgIHRoZSBPTEUgZHJhZy1hbmQt ZHJvcCByZXR1cm4gdmFsdWUgbGlrZSB0aGUgZnVuY3Rpb24gaXQgZW11bGF0ZXMuIEN1cnJlbnRs eSwgCisgICAgICAgIFVJRGVsZWdhdGU6OmRvRHJhZ0Ryb3AgcmV0dXJucyBhIGhhcmQtY29kZWQg U19PSy4gSGVuY2UsIHRoZSBjYWxsZXIgY2Fubm90IGRldGVybWluZSAKKyAgICAgICAgd2hldGhl ciB0aGUgZHJhZy1hbmQtZHJvcCBvcGVyYXRpb24gd2FzIHN1Y2Nlc3NmdWwgb3Igd2FzIGNhbmNl bGxlZC4KKyAgICAgICAgCisgICAgICAgIFRoaXMgcGF0Y2ggZml4ZXMgdGhpcyBpc3N1ZSBieSBo YXZpbmcgVUlEZWxlZ2F0ZTo6ZG9EcmFnRHJvcCByZXR1cm4gdGhlIE9MRSBkcmFnLWFuZC1kcm9w IAorICAgICAgICByZXR1cm4gdmFsdWUgYWNjb3JkaW5nIHRvIHdoZXRoZXIgdGhlIGRyb3Agb3Bl cmF0aW9uIHdhcyBzdWNjZXNzZnVsIG9yIG5vdC4KKworICAgICAgICAqIER1bXBSZW5kZXJUcmVl L3dpbi9FdmVudFNlbmRlci5jcHA6CisgICAgICAgIChkb01vdXNlVXApOiBBZGRlZCBwYXJhbWV0 ZXIgb2xlRHJhZ0FuZERyb3BSZXR1cm5WYWx1ZS4KKyAgICAgICAgKHJlcGxheVNhdmVkRXZlbnRz KTogRGl0dG8uCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvd2luL0V2ZW50U2VuZGVyLmg6Cisg ICAgICAgICogRHVtcFJlbmRlclRyZWUvd2luL1VJRGVsZWdhdGUuY3BwOgorICAgICAgICAoVUlE ZWxlZ2F0ZTo6ZG9EcmFnRHJvcCk6IE1vZGlmaWVkIHRvIHJldHVybiBPTEUgZHJhZy1hbmQtZHJv cCByZXR1cm4gdmFsdWUuCisKIDIwMDktMDktMzAgIERhbiBCZXJuc3RlaW4gIDxtaXR6QGFwcGxl LmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBTYW0gV2VpbmlnLgpJbmRleDogV2ViS2l0VG9v bHMvRHVtcFJlbmRlclRyZWUvd2luL0V2ZW50U2VuZGVyLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJL aXRUb29scy9EdW1wUmVuZGVyVHJlZS93aW4vRXZlbnRTZW5kZXIuY3BwCShyZXZpc2lvbiA0ODk0 NCkKKysrIFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3dpbi9FdmVudFNlbmRlci5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTM4LDcgKzM4LDYgQEAKICNpbmNsdWRlIDxKYXZhU2NyaXB0Q29yZS9K YXZhU2NyaXB0Q29yZS5oPgogI2luY2x1ZGUgPEphdmFTY3JpcHRDb3JlL0Fzc2VydGlvbnMuaD4K ICNpbmNsdWRlIDxXZWJLaXQvV2ViS2l0Lmg+Ci0jaW5jbHVkZSA8d2luZG93cy5oPgogCiAjZGVm aW5lIFdNX0RSVF9TRU5EX1FVRVVFRF9FVkVOVCAoV01fQVBQKzEpCiAKQEAgLTE5NCw3ICsxOTMs NyBAQCBzdGF0aWMgaW5saW5lIFBPSU5UTCBwb2ludGwoY29uc3QgUE9JTlQmCiAgICAgcmV0dXJu IHJlc3VsdDsKIH0KIAotc3RhdGljIHZvaWQgZG9Nb3VzZVVwKE1TRyBtc2cpCitzdGF0aWMgdm9p ZCBkb01vdXNlVXAoTVNHIG1zZywgSFJFU1VMVCogb2xlRHJhZ0FuZERyb3BSZXR1cm5WYWx1ZSA9 IDApCiB7CiAgICAgQ09NUHRyPElXZWJGcmFtZVByaXZhdGU+IGZyYW1lUHJpdmF0ZTsKICAgICBp ZiAoU1VDQ0VFREVEKGZyYW1lLT5RdWVyeUludGVyZmFjZSgmZnJhbWVQcml2YXRlKSkpCkBAIC0y MTUsNiArMjE0LDggQEAgc3RhdGljIHZvaWQgZG9Nb3VzZVVwKE1TRyBtc2cpCiAgICAgICAgICAg ICAgICAgZGlkRHJhZ0VudGVyID0gdHJ1ZTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIEhS RVNVTFQgaHIgPSBkcmFnZ2luZ0luZm8tPmRyb3BTb3VyY2UoKS0+UXVlcnlDb250aW51ZURyYWco MCwgMCk7CisgICAgICAgICAgICBpZiAob2xlRHJhZ0FuZERyb3BSZXR1cm5WYWx1ZSkKKyAgICAg ICAgICAgICAgICAqb2xlRHJhZ0FuZERyb3BSZXR1cm5WYWx1ZSA9IGhyOwogICAgICAgICAgICAg d2ViVmlld0Ryb3BUYXJnZXQtPkRyYWdPdmVyKDAsIHBvaW50bChzY3JlZW5Qb2ludCksICZlZmZl Y3QpOwogICAgICAgICAgICAgaWYgKGhyID09IERSQUdEUk9QX1NfRFJPUCAmJiBlZmZlY3QgIT0g RFJPUEVGRkVDVF9OT05FKSB7CiAgICAgICAgICAgICAgICAgRFdPUkQgZWZmZWN0ID0gMDsKQEAg LTMxNCw3ICszMTUsNyBAQCBzdGF0aWMgSlNWYWx1ZVJlZiBtb3VzZU1vdmVUb0NhbGxiYWNrKEpT CiAgICAgcmV0dXJuIEpTVmFsdWVNYWtlVW5kZWZpbmVkKGNvbnRleHQpOwogfQogCi12b2lkIHJl cGxheVNhdmVkRXZlbnRzKCkKK3ZvaWQgcmVwbGF5U2F2ZWRFdmVudHMoSFJFU1VMVCogb2xlRHJh Z0FuZERyb3BSZXR1cm5WYWx1ZSkKIHsKICAgICByZXBsYXlpbmdTYXZlZEV2ZW50cyA9IHRydWU7 CiAgIApAQCAtMzI2LDcgKzMyNyw3IEBAIHZvaWQgcmVwbGF5U2F2ZWRFdmVudHMoKQogICAgICAg ICAgICAgY2FzZSBXTV9MQlVUVE9OVVA6CiAgICAgICAgICAgICBjYXNlIFdNX1JCVVRUT05VUDoK ICAgICAgICAgICAgIGNhc2UgV01fTUJVVFRPTlVQOgotICAgICAgICAgICAgICAgIGRvTW91c2VV cChtc2cpOworICAgICAgICAgICAgICAgIGRvTW91c2VVcChtc2csIG9sZURyYWdBbmREcm9wUmV0 dXJuVmFsdWUpOwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgY2FzZSBXTV9N T1VTRU1PVkU6CiAgICAgICAgICAgICAgICAgZG9Nb3VzZU1vdmUobXNnKTsKQEAgLTM3MCw3ICsz NzEsNyBAQCB2b2lkIHJlcGxheVNhdmVkRXZlbnRzKCkKICAgICAgICAgICAgIGNhc2UgV01fTEJV VFRPTlVQOgogICAgICAgICAgICAgY2FzZSBXTV9SQlVUVE9OVVA6CiAgICAgICAgICAgICBjYXNl IFdNX01CVVRUT05VUDoKLSAgICAgICAgICAgICAgICBkb01vdXNlVXAobXNnKTsKKyAgICAgICAg ICAgICAgICBkb01vdXNlVXAobXNnLCBvbGVEcmFnQW5kRHJvcFJldHVyblZhbHVlKTsKICAgICAg ICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIGNhc2UgV01fTU9VU0VNT1ZFOgogICAgICAg ICAgICAgICAgIGRvTW91c2VNb3ZlKG1zZyk7CkluZGV4OiBXZWJLaXRUb29scy9EdW1wUmVuZGVy VHJlZS93aW4vRXZlbnRTZW5kZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9EdW1wUmVu ZGVyVHJlZS93aW4vRXZlbnRTZW5kZXIuaAkocmV2aXNpb24gNDg5NDQpCisrKyBXZWJLaXRUb29s cy9EdW1wUmVuZGVyVHJlZS93aW4vRXZlbnRTZW5kZXIuaAkod29ya2luZyBjb3B5KQpAQCAtMjks MTMgKzI5LDE1IEBACiAjaWZuZGVmIEV2ZW50U2VuZGVyX2gKICNkZWZpbmUgRXZlbnRTZW5kZXJf aAogCisjaW5jbHVkZSA8d2luZG93cy5oPgorCiBjbGFzcyBEcmFnZ2luZ0luZm87CiAKIHR5cGVk ZWYgY29uc3Qgc3RydWN0IE9wYXF1ZUpTQ29udGV4dCogSlNDb250ZXh0UmVmOwogdHlwZWRlZiBz dHJ1Y3QgT3BhcXVlSlNWYWx1ZSogSlNPYmplY3RSZWY7CiAKIEpTT2JqZWN0UmVmIG1ha2VFdmVu dFNlbmRlcihKU0NvbnRleHRSZWYgY29udGV4dCk7Ci12b2lkIHJlcGxheVNhdmVkRXZlbnRzKCk7 Cit2b2lkIHJlcGxheVNhdmVkRXZlbnRzKEhSRVNVTFQqIG9sZURyYWdBbmREcm9wUmV0dXJuVmFs dWUgPSAwKTsKIAogZXh0ZXJuIERyYWdnaW5nSW5mbyogZHJhZ2dpbmdJbmZvOwogCkluZGV4OiBX ZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS93aW4vVUlEZWxlZ2F0ZS5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvd2luL1VJRGVsZWdhdGUuY3BwCShyZXZpc2lv biA0ODk0NCkKKysrIFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3dpbi9VSURlbGVnYXRlLmNw cAkod29ya2luZyBjb3B5KQpAQCAtNTAyLDEzICs1MDIsMTQgQEAgSFJFU1VMVCBTVERNRVRIT0RD QUxMVFlQRSBVSURlbGVnYXRlOjpkbwogICAgICpwZXJmb3JtZWRFZmZlY3QgPSAwOwogCiAgICAg ZHJhZ2dpbmdJbmZvID0gbmV3IERyYWdnaW5nSW5mbyhvYmplY3QsIHNvdXJjZSk7Ci0gICAgcmVw bGF5U2F2ZWRFdmVudHMoKTsKKyAgICBIUkVTVUxUIG9sZURyYWdBbmREcm9wUmV0dXJuVmFsdWUg PSBEUkFHRFJPUF9TX0NBTkNFTDsKKyAgICByZXBsYXlTYXZlZEV2ZW50cygmb2xlRHJhZ0FuZERy b3BSZXR1cm5WYWx1ZSk7CiAgICAgaWYgKGRyYWdnaW5nSW5mbykgewogICAgICAgICAqcGVyZm9y bWVkRWZmZWN0ID0gZHJhZ2dpbmdJbmZvLT5wZXJmb3JtZWREcm9wRWZmZWN0KCk7CiAgICAgICAg IGRlbGV0ZSBkcmFnZ2luZ0luZm87CiAgICAgICAgIGRyYWdnaW5nSW5mbyA9IDA7CiAgICAgfQot ICAgIHJldHVybiBTX09LOworICAgIHJldHVybiBvbGVEcmFnQW5kRHJvcFJldHVyblZhbHVlOwog fQogCiBIUkVTVUxUIFNURE1FVEhPRENBTExUWVBFIFVJRGVsZWdhdGU6OndlYlZpZXdHZXREbGdD b2RlKCAK 40812 2009-10-07 12:22:51 -0700 2009-10-08 19:11:06 -0700 Patch Bug30175_2.patch text/plain 4620 dbates SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDQ4OTQ0KQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMjQgQEAKKzIwMDktMTAtMDcgIERhbmllbCBCYXRlcyAgPGRi YXRlc0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMDE3NQor ICAgICAgICAKKyAgICAgICAgVGhlIFdpbmRvd3MgRFJUIGVxdWl2YWxlbnQgb2YgRG9EcmFnRHJv cCAoaS5lLiBVSURlbGVnYXRlOjpkb0RyYWdEcm9wKSBkb2VzIG5vdCByZXR1cm4KKyAgICAgICAg dGhlIE9MRSBkcmFnLWFuZC1kcm9wIHJldHVybiB2YWx1ZSBsaWtlIHRoZSBmdW5jdGlvbiBpdCBl bXVsYXRlcy4gQ3VycmVudGx5LCAKKyAgICAgICAgVUlEZWxlZ2F0ZTo6ZG9EcmFnRHJvcCByZXR1 cm5zIGEgaGFyZC1jb2RlZCBTX09LLiBIZW5jZSwgdGhlIGNhbGxlciBjYW5ub3QgZGV0ZXJtaW5l IAorICAgICAgICB3aGV0aGVyIHRoZSBkcmFnLWFuZC1kcm9wIG9wZXJhdGlvbiB3YXMgc3VjY2Vz c2Z1bCBvciB3YXMgY2FuY2VsbGVkLgorICAgICAgICAKKyAgICAgICAgVGhpcyBwYXRjaCBmaXhl cyB0aGlzIGlzc3VlIGJ5IGhhdmluZyBVSURlbGVnYXRlOjpkb0RyYWdEcm9wIHJldHVybiB0aGUg T0xFIGRyYWctYW5kLWRyb3AgCisgICAgICAgIHJldHVybiB2YWx1ZSBhY2NvcmRpbmcgdG8gd2hl dGhlciB0aGUgZHJvcCBvcGVyYXRpb24gd2FzIHN1Y2Nlc3NmdWwgb3Igbm90LgorCisgICAgICAg ICogRHVtcFJlbmRlclRyZWUvd2luL0V2ZW50U2VuZGVyLmNwcDoKKyAgICAgICAgKGRvTW91c2VV cCk6IEFkZGVkIHBhcmFtZXRlciBvbGVEcmFnQW5kRHJvcFJldHVyblZhbHVlLgorICAgICAgICAo cmVwbGF5U2F2ZWRFdmVudHMpOiBEaXR0by4KKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS93aW4v RXZlbnRTZW5kZXIuaDoKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS93aW4vVUlEZWxlZ2F0ZS5j cHA6CisgICAgICAgIChVSURlbGVnYXRlOjpkb0RyYWdEcm9wKTogTW9kaWZpZWQgdG8gcmV0dXJu IE9MRSBkcmFnLWFuZC1kcm9wIHJldHVybiB2YWx1ZS4KKwogMjAwOS0wOS0zMCAgRGFuIEJlcm5z dGVpbiAgPG1pdHpAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNhbSBXZWluaWcu CkluZGV4OiBXZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS93aW4vRXZlbnRTZW5kZXIuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3dpbi9FdmVudFNlbmRlci5j cHAJKHJldmlzaW9uIDQ4OTQ0KQorKysgV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvd2luL0V2 ZW50U2VuZGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTk0LDcgKzE5NCw3IEBAIHN0YXRpYyBp bmxpbmUgUE9JTlRMIHBvaW50bChjb25zdCBQT0lOVCYKICAgICByZXR1cm4gcmVzdWx0OwogfQog Ci1zdGF0aWMgdm9pZCBkb01vdXNlVXAoTVNHIG1zZykKK3N0YXRpYyB2b2lkIGRvTW91c2VVcChN U0cgbXNnLCBIUkVTVUxUKiBvbGVEcmFnQW5kRHJvcFJldHVyblZhbHVlID0gMCkKIHsKICAgICBD T01QdHI8SVdlYkZyYW1lUHJpdmF0ZT4gZnJhbWVQcml2YXRlOwogICAgIGlmIChTVUNDRUVERUQo ZnJhbWUtPlF1ZXJ5SW50ZXJmYWNlKCZmcmFtZVByaXZhdGUpKSkKQEAgLTIxNSw2ICsyMTUsOCBA QCBzdGF0aWMgdm9pZCBkb01vdXNlVXAoTVNHIG1zZykKICAgICAgICAgICAgICAgICBkaWREcmFn RW50ZXIgPSB0cnVlOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgSFJFU1VMVCBociA9IGRy YWdnaW5nSW5mby0+ZHJvcFNvdXJjZSgpLT5RdWVyeUNvbnRpbnVlRHJhZygwLCAwKTsKKyAgICAg ICAgICAgIGlmIChvbGVEcmFnQW5kRHJvcFJldHVyblZhbHVlKQorICAgICAgICAgICAgICAgICpv bGVEcmFnQW5kRHJvcFJldHVyblZhbHVlID0gaHI7CiAgICAgICAgICAgICB3ZWJWaWV3RHJvcFRh cmdldC0+RHJhZ092ZXIoMCwgcG9pbnRsKHNjcmVlblBvaW50KSwgJmVmZmVjdCk7CiAgICAgICAg ICAgICBpZiAoaHIgPT0gRFJBR0RST1BfU19EUk9QICYmIGVmZmVjdCAhPSBEUk9QRUZGRUNUX05P TkUpIHsKICAgICAgICAgICAgICAgICBEV09SRCBlZmZlY3QgPSAwOwpAQCAtMzE0LDcgKzMxNiw3 IEBAIHN0YXRpYyBKU1ZhbHVlUmVmIG1vdXNlTW92ZVRvQ2FsbGJhY2soSlMKICAgICByZXR1cm4g SlNWYWx1ZU1ha2VVbmRlZmluZWQoY29udGV4dCk7CiB9CiAKLXZvaWQgcmVwbGF5U2F2ZWRFdmVu dHMoKQordm9pZCByZXBsYXlTYXZlZEV2ZW50cyhIUkVTVUxUKiBvbGVEcmFnQW5kRHJvcFJldHVy blZhbHVlKQogewogICAgIHJlcGxheWluZ1NhdmVkRXZlbnRzID0gdHJ1ZTsKICAgCkBAIC0zMjYs NyArMzI4LDcgQEAgdm9pZCByZXBsYXlTYXZlZEV2ZW50cygpCiAgICAgICAgICAgICBjYXNlIFdN X0xCVVRUT05VUDoKICAgICAgICAgICAgIGNhc2UgV01fUkJVVFRPTlVQOgogICAgICAgICAgICAg Y2FzZSBXTV9NQlVUVE9OVVA6Ci0gICAgICAgICAgICAgICAgZG9Nb3VzZVVwKG1zZyk7CisgICAg ICAgICAgICAgICAgZG9Nb3VzZVVwKG1zZywgb2xlRHJhZ0FuZERyb3BSZXR1cm5WYWx1ZSk7CiAg ICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICBjYXNlIFdNX01PVVNFTU9WRToKICAg ICAgICAgICAgICAgICBkb01vdXNlTW92ZShtc2cpOwpAQCAtMzcwLDcgKzM3Miw3IEBAIHZvaWQg cmVwbGF5U2F2ZWRFdmVudHMoKQogICAgICAgICAgICAgY2FzZSBXTV9MQlVUVE9OVVA6CiAgICAg ICAgICAgICBjYXNlIFdNX1JCVVRUT05VUDoKICAgICAgICAgICAgIGNhc2UgV01fTUJVVFRPTlVQ OgotICAgICAgICAgICAgICAgIGRvTW91c2VVcChtc2cpOworICAgICAgICAgICAgICAgIGRvTW91 c2VVcChtc2csIG9sZURyYWdBbmREcm9wUmV0dXJuVmFsdWUpOwogICAgICAgICAgICAgICAgIGJy ZWFrOwogICAgICAgICAgICAgY2FzZSBXTV9NT1VTRU1PVkU6CiAgICAgICAgICAgICAgICAgZG9N b3VzZU1vdmUobXNnKTsKSW5kZXg6IFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3dpbi9FdmVu dFNlbmRlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3dpbi9F dmVudFNlbmRlci5oCShyZXZpc2lvbiA0ODk0NCkKKysrIFdlYktpdFRvb2xzL0R1bXBSZW5kZXJU cmVlL3dpbi9FdmVudFNlbmRlci5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMSwxMSArMzEsMTIgQEAK IAogY2xhc3MgRHJhZ2dpbmdJbmZvOwogCit0eXBlZGVmIGxvbmcgSFJFU1VMVDsKIHR5cGVkZWYg Y29uc3Qgc3RydWN0IE9wYXF1ZUpTQ29udGV4dCogSlNDb250ZXh0UmVmOwogdHlwZWRlZiBzdHJ1 Y3QgT3BhcXVlSlNWYWx1ZSogSlNPYmplY3RSZWY7CiAKIEpTT2JqZWN0UmVmIG1ha2VFdmVudFNl bmRlcihKU0NvbnRleHRSZWYgY29udGV4dCk7Ci12b2lkIHJlcGxheVNhdmVkRXZlbnRzKCk7Cit2 b2lkIHJlcGxheVNhdmVkRXZlbnRzKEhSRVNVTFQqIG9sZURyYWdBbmREcm9wUmV0dXJuVmFsdWUg PSAwKTsKIAogZXh0ZXJuIERyYWdnaW5nSW5mbyogZHJhZ2dpbmdJbmZvOwogCkluZGV4OiBXZWJL aXRUb29scy9EdW1wUmVuZGVyVHJlZS93aW4vVUlEZWxlZ2F0ZS5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvd2luL1VJRGVsZWdhdGUuY3BwCShyZXZpc2lvbiA0 ODk0NCkKKysrIFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3dpbi9VSURlbGVnYXRlLmNwcAko d29ya2luZyBjb3B5KQpAQCAtNTAyLDEzICs1MDIsMTQgQEAgSFJFU1VMVCBTVERNRVRIT0RDQUxM VFlQRSBVSURlbGVnYXRlOjpkbwogICAgICpwZXJmb3JtZWRFZmZlY3QgPSAwOwogCiAgICAgZHJh Z2dpbmdJbmZvID0gbmV3IERyYWdnaW5nSW5mbyhvYmplY3QsIHNvdXJjZSk7Ci0gICAgcmVwbGF5 U2F2ZWRFdmVudHMoKTsKKyAgICBIUkVTVUxUIG9sZURyYWdBbmREcm9wUmV0dXJuVmFsdWUgPSBE UkFHRFJPUF9TX0NBTkNFTDsKKyAgICByZXBsYXlTYXZlZEV2ZW50cygmb2xlRHJhZ0FuZERyb3BS ZXR1cm5WYWx1ZSk7CiAgICAgaWYgKGRyYWdnaW5nSW5mbykgewogICAgICAgICAqcGVyZm9ybWVk RWZmZWN0ID0gZHJhZ2dpbmdJbmZvLT5wZXJmb3JtZWREcm9wRWZmZWN0KCk7CiAgICAgICAgIGRl bGV0ZSBkcmFnZ2luZ0luZm87CiAgICAgICAgIGRyYWdnaW5nSW5mbyA9IDA7CiAgICAgfQotICAg IHJldHVybiBTX09LOworICAgIHJldHVybiBvbGVEcmFnQW5kRHJvcFJldHVyblZhbHVlOwogfQog CiBIUkVTVUxUIFNURE1FVEhPRENBTExUWVBFIFVJRGVsZWdhdGU6OndlYlZpZXdHZXREbGdDb2Rl KCAK