33738 2010-01-15 14:05:45 -0800 DataTransfer interface does not work on Windows 2010-01-21 22:05:31 -0800 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) PC Windows Vista RESOLVED DUPLICATE 30527 http://www.whatwg.org/specs/web-apps/current-work/multipage/dnd.html#datatransfer P2 Normal --- 0 dcheng webkit-unassigned aroben oldest_to_newest 181378 0 dcheng 2010-01-15 14:05:45 -0800 The format enumerator isn't being called correctly in ClipboardWin::types and ClipboardWin::hasData. 181383 1 46711 dcheng 2010-01-15 14:10:41 -0800 Created attachment 46711 Patch for the problems described 181408 2 46711 aroben 2010-01-15 14:43:42 -0800 Comment on attachment 46711 Patch for the problems described > + Not sure how to add a good test for it. I'll bet we can come up with a test. If .types and .getData are completely broken, it should be pretty easy! There are probably existing tests you can build off of; grep through LayoutTests for uses of event.dataTransfer. > + * platform/win/ClipboardWin.cpp: > + (WebCore::addMimeTypesForFormat): > + (WebCore::ClipboardWin::types): > + (WebCore::ClipboardWin::hasData): You should add function-level comments about what your patch does and why. > @@ -568,7 +568,7 @@ HashSet<String> ClipboardWin::types() co > > FORMATETC data; > > - while (SUCCEEDED(itr->Next(1, &data, 0))) { > + while (itr->Next(1, &data, 0) == S_OK) { > addMimeTypesForFormat(results, data); > } > > @@ -789,7 +789,7 @@ bool ClipboardWin::hasData() > > FORMATETC data; > > - if (SUCCEEDED(itr->Next(1, &data, 0))) { > + if (itr->Next(1, &data, 0) == S_OK) { > // There is at least one item in the IDataObject > return true; > } It might be worth adding a comment about the return value of IEnumFORMATETC::Next. The code changes look good, but r- so we can come up with a test and fix up the ChangeLog. 181438 3 46719 dcheng 2010-01-15 16:57:49 -0800 Created attachment 46719 Patch Updated ChangeLog, added a few comments in the code, and updated a layout test. As it turns out, fast/events/drag-and-drop-dataTransfer-types-nocrash.html already partially covers this so I extended it to test event.dataTransfer.getData() as well. 181850 4 46719 aroben 2010-01-18 06:20:21 -0800 Comment on attachment 46719 Patch This looks great! The one thing we still need to do is actually enable that test on Windows. You will find it listed in LayoutTests/platform/win/Skipped. Please remove it from that file and resubmit your patch and we can get this committed! 181853 5 aroben 2010-01-18 06:21:38 -0800 Duping to bug 30527. Daniel, please attach your next revision of the patch to that bug. *** This bug has been marked as a duplicate of bug 30527 *** 46711 2010-01-15 14:10:41 -0800 2010-01-15 16:57:49 -0800 Patch for the problems described ClipboardWinPatch.txt text/plain 2424 dcheng SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MzM0NSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMTAtMDEtMTUgIERhbmllbCBDaGVuZyAgPGRjaGVuZ0Bnb29nbGUu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIERh dGFUcmFuc2ZlciBpbnRlcmZhY2UgYnJva2VuIG9uIFdpbmRvd3MtLXR5cGVzIG1lbWJlciBpcyBh bHdheXMKKyAgICAgICAgdW5kZWZpbmVkLCBhbmQgZ2V0RGF0YSgpIGRvZXMgbm90IHdvcmsuCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMzczOAorCisg ICAgICAgIE5vdCBzdXJlIGhvdyB0byBhZGQgYSBnb29kIHRlc3QgZm9yIGl0LgorCisgICAgICAg ICogcGxhdGZvcm0vd2luL0NsaXBib2FyZFdpbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjphZGRN aW1lVHlwZXNGb3JGb3JtYXQpOgorICAgICAgICAoV2ViQ29yZTo6Q2xpcGJvYXJkV2luOjp0eXBl cyk6CisgICAgICAgIChXZWJDb3JlOjpDbGlwYm9hcmRXaW46Omhhc0RhdGEpOgorCiAyMDEwLTAx LTE1ICBEbWl0cnkgVGl0b3YgIDxkaW1pY2hAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmll d2VkIGJ5IERhcmluIEFkbGVyLgpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS93aW4vQ2xpcGJvYXJk V2luLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL3dpbi9DbGlwYm9hcmRXaW4u Y3BwCShyZXZpc2lvbiA1MzM0MykKKysrIFdlYkNvcmUvcGxhdGZvcm0vd2luL0NsaXBib2FyZFdp bi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTUzNCw3ICs1MzQsNyBAQCBib29sIENsaXBib2FyZFdp bjo6c2V0RGF0YShjb25zdCBTdHJpbmcmCiAgICAgcmV0dXJuIGZhbHNlOwogfQogCi1zdGF0aWMg dm9pZCBhZGRNaW1lVHlwZXNGb3JGb3JtYXQoSGFzaFNldDxTdHJpbmc+JiByZXN1bHRzLCBGT1JN QVRFVEMmIGZvcm1hdCkKK3N0YXRpYyB2b2lkIGFkZE1pbWVUeXBlc0ZvckZvcm1hdChIYXNoU2V0 PFN0cmluZz4mIHJlc3VsdHMsIGNvbnN0IEZPUk1BVEVUQyYgZm9ybWF0KQogewogICAgIC8vIFVS TCBhbmQgVGV4dCBhcmUgcHJvdmlkZWQgZm9yIGNvbXBhdGliaWxpdHkgd2l0aCBJRSdzIG1vZGVs CiAgICAgaWYgKGZvcm1hdC5jZkZvcm1hdCA9PSB1cmxGb3JtYXQoKS0+Y2ZGb3JtYXQgfHwgZm9y bWF0LmNmRm9ybWF0ID09IHVybFdGb3JtYXQoKS0+Y2ZGb3JtYXQpIHsKQEAgLTU2MCw3ICs1NjAs NyBAQCBIYXNoU2V0PFN0cmluZz4gQ2xpcGJvYXJkV2luOjp0eXBlcygpIGNvCiAKICAgICBDT01Q dHI8SUVudW1GT1JNQVRFVEM+IGl0cjsKIAotICAgIGlmIChGQUlMRUQobV9kYXRhT2JqZWN0LT5F bnVtRm9ybWF0RXRjKDAsICZpdHIpKSkKKyAgICBpZiAoRkFJTEVEKG1fZGF0YU9iamVjdC0+RW51 bUZvcm1hdEV0YyhEQVRBRElSX0dFVCwgJml0cikpKQogICAgICAgICByZXR1cm4gcmVzdWx0czsK IAogICAgIGlmICghaXRyKQpAQCAtNTY4LDcgKzU2OCw3IEBAIEhhc2hTZXQ8U3RyaW5nPiBDbGlw Ym9hcmRXaW46OnR5cGVzKCkgY28KIAogICAgIEZPUk1BVEVUQyBkYXRhOwogCi0gICAgd2hpbGUg KFNVQ0NFRURFRChpdHItPk5leHQoMSwgJmRhdGEsIDApKSkgeworICAgIHdoaWxlIChpdHItPk5l eHQoMSwgJmRhdGEsIDApID09IFNfT0spIHsKICAgICAgICAgYWRkTWltZVR5cGVzRm9yRm9ybWF0 KHJlc3VsdHMsIGRhdGEpOwogICAgIH0KIApAQCAtNzgxLDcgKzc4MSw3IEBAIGJvb2wgQ2xpcGJv YXJkV2luOjpoYXNEYXRhKCkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgQ09NUHRyPElF bnVtRk9STUFURVRDPiBpdHI7Ci0gICAgaWYgKEZBSUxFRChtX2RhdGFPYmplY3QtPkVudW1Gb3Jt YXRFdGMoMCwgJml0cikpKQorICAgIGlmIChGQUlMRUQobV9kYXRhT2JqZWN0LT5FbnVtRm9ybWF0 RXRjKERBVEFESVJfR0VULCAmaXRyKSkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIGlm ICghaXRyKQpAQCAtNzg5LDcgKzc4OSw3IEBAIGJvb2wgQ2xpcGJvYXJkV2luOjpoYXNEYXRhKCkK IAogICAgIEZPUk1BVEVUQyBkYXRhOwogCi0gICAgaWYgKFNVQ0NFRURFRChpdHItPk5leHQoMSwg JmRhdGEsIDApKSkgeworICAgIGlmIChpdHItPk5leHQoMSwgJmRhdGEsIDApID09IFNfT0spIHsK ICAgICAgICAgLy8gVGhlcmUgaXMgYXQgbGVhc3Qgb25lIGl0ZW0gaW4gdGhlIElEYXRhT2JqZWN0 CiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0K 46719 2010-01-15 16:57:49 -0800 2010-01-21 22:05:31 -0800 Patch ClipboardWinPatch.txt text/plain 4720 dcheng SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MzM0OSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTYgQEAKKzIwMTAtMDEtMTUgIERhbmllbCBDaGVuZyAgPGRjaGVuZ0Bnb29nbGUu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIERh dGFUcmFuc2ZlciBpbnRlcmZhY2UgYnJva2VuIG9uIFdpbmRvd3MtLXR5cGVzIG1lbWJlciBpcyBh bHdheXMKKyAgICAgICAgdW5kZWZpbmVkLCBhbmQgZ2V0RGF0YSgpIGRvZXMgbm90IHdvcmsuCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMzczOAorCisg ICAgICAgICogcGxhdGZvcm0vd2luL0NsaXBib2FyZFdpbi5jcHA6CisgICAgICAgIChXZWJDb3Jl OjphZGRNaW1lVHlwZXNGb3JGb3JtYXQpOiBwYXNzIEZPUk1BVEVUQyBhcyBhIGNvbnN0IHJlZi4K KyAgICAgICAgKFdlYkNvcmU6OkNsaXBib2FyZFdpbjo6dHlwZXMpOiBmaXggY2FsbHMgdG8gSUVu dW1GT1JNQVRFVEMuCisgICAgICAgIChXZWJDb3JlOjpDbGlwYm9hcmRXaW46Omhhc0RhdGEpOiBm aXggY2FsbHMgdG8gSUVudW1GT1JNQVRFVEMuCisKIDIwMTAtMDEtMTUgIE9saXZlciBIdW50ICA8 b2xpdmVyQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBTYW0gV2VpbmlnLgpJbmRl eDogV2ViQ29yZS9wbGF0Zm9ybS93aW4vQ2xpcGJvYXJkV2luLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJDb3JlL3BsYXRmb3JtL3dpbi9DbGlwYm9hcmRXaW4uY3BwCShyZXZpc2lvbiA1MzM0OSkKKysr IFdlYkNvcmUvcGxhdGZvcm0vd2luL0NsaXBib2FyZFdpbi5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTUzNCw3ICs1MzQsNyBAQCBib29sIENsaXBib2FyZFdpbjo6c2V0RGF0YShjb25zdCBTdHJpbmcm CiAgICAgcmV0dXJuIGZhbHNlOwogfQogCi1zdGF0aWMgdm9pZCBhZGRNaW1lVHlwZXNGb3JGb3Jt YXQoSGFzaFNldDxTdHJpbmc+JiByZXN1bHRzLCBGT1JNQVRFVEMmIGZvcm1hdCkKK3N0YXRpYyB2 b2lkIGFkZE1pbWVUeXBlc0ZvckZvcm1hdChIYXNoU2V0PFN0cmluZz4mIHJlc3VsdHMsIGNvbnN0 IEZPUk1BVEVUQyYgZm9ybWF0KQogewogICAgIC8vIFVSTCBhbmQgVGV4dCBhcmUgcHJvdmlkZWQg Zm9yIGNvbXBhdGliaWxpdHkgd2l0aCBJRSdzIG1vZGVsCiAgICAgaWYgKGZvcm1hdC5jZkZvcm1h dCA9PSB1cmxGb3JtYXQoKS0+Y2ZGb3JtYXQgfHwgZm9ybWF0LmNmRm9ybWF0ID09IHVybFdGb3Jt YXQoKS0+Y2ZGb3JtYXQpIHsKQEAgLTU2MCw3ICs1NjAsNyBAQCBIYXNoU2V0PFN0cmluZz4gQ2xp cGJvYXJkV2luOjp0eXBlcygpIGNvCiAKICAgICBDT01QdHI8SUVudW1GT1JNQVRFVEM+IGl0cjsK IAotICAgIGlmIChGQUlMRUQobV9kYXRhT2JqZWN0LT5FbnVtRm9ybWF0RXRjKDAsICZpdHIpKSkK KyAgICBpZiAoRkFJTEVEKG1fZGF0YU9iamVjdC0+RW51bUZvcm1hdEV0YyhEQVRBRElSX0dFVCwg Jml0cikpKQogICAgICAgICByZXR1cm4gcmVzdWx0czsKIAogICAgIGlmICghaXRyKQpAQCAtNTY4 LDcgKzU2OCw4IEBAIEhhc2hTZXQ8U3RyaW5nPiBDbGlwYm9hcmRXaW46OnR5cGVzKCkgY28KIAog ICAgIEZPUk1BVEVUQyBkYXRhOwogCi0gICAgd2hpbGUgKFNVQ0NFRURFRChpdHItPk5leHQoMSwg JmRhdGEsIDApKSkgeworICAgIC8vIElFbnVtRk9STUFURVRDOjpOZXh0IHJldHVybnMgU19GQUxT RSBpZiB0aGVyZSBhcmUgbm8gbW9yZSBpdGVtcy4KKyAgICB3aGlsZSAoaXRyLT5OZXh0KDEsICZk YXRhLCAwKSA9PSBTX09LKSB7CiAgICAgICAgIGFkZE1pbWVUeXBlc0ZvckZvcm1hdChyZXN1bHRz LCBkYXRhKTsKICAgICB9CiAKQEAgLTc4MSw3ICs3ODIsNyBAQCBib29sIENsaXBib2FyZFdpbjo6 aGFzRGF0YSgpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIENPTVB0cjxJRW51bUZPUk1B VEVUQz4gaXRyOwotICAgIGlmIChGQUlMRUQobV9kYXRhT2JqZWN0LT5FbnVtRm9ybWF0RXRjKDAs ICZpdHIpKSkKKyAgICBpZiAoRkFJTEVEKG1fZGF0YU9iamVjdC0+RW51bUZvcm1hdEV0YyhEQVRB RElSX0dFVCwgJml0cikpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBpZiAoIWl0cikK QEAgLTc4OSw3ICs3OTAsOCBAQCBib29sIENsaXBib2FyZFdpbjo6aGFzRGF0YSgpCiAKICAgICBG T1JNQVRFVEMgZGF0YTsKIAotICAgIGlmIChTVUNDRUVERUQoaXRyLT5OZXh0KDEsICZkYXRhLCAw KSkpIHsKKyAgICAvLyBJRW51bUZPUk1BVEVUQzo6TmV4dCByZXR1cm5zIFNfRkFMU0UgaWYgdGhl cmUgYXJlIG5vIG1vcmUgaXRlbXMuCisgICAgaWYgKGl0ci0+TmV4dCgxLCAmZGF0YSwgMCkgPT0g U19PSykgewogICAgICAgICAvLyBUaGVyZSBpcyBhdCBsZWFzdCBvbmUgaXRlbSBpbiB0aGUgSURh dGFPYmplY3QKICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQpJbmRleDogTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24g NTMzNDkpCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyAr MSwxMiBAQAorMjAxMC0wMS0xNSAgRGFuaWVsIENoZW5nICA8ZGNoZW5nQGdvb2dsZS5jb20+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRXh0ZW5kZWQg dGVzdCB0byBjb3ZlciBldmVudC5kYXRhVHJhbnNmZXIuZ2V0RGF0YSgpLgorCisgICAgICAgICog ZmFzdC9ldmVudHMvZHJhZy1hbmQtZHJvcC1kYXRhVHJhbnNmZXItdHlwZXMtbm9jcmFzaC1leHBl Y3RlZC50eHQ6IFVwZGF0ZWQgdGVzdCBleHBlY3RhdGlvbnMuCisgICAgICAgICogZmFzdC9ldmVu dHMvZHJhZy1hbmQtZHJvcC1kYXRhVHJhbnNmZXItdHlwZXMtbm9jcmFzaC5odG1sOiBBZGRlZCB0 ZXN0IGNhc2VzLgorCiAyMDEwLTAxLTE1ICBEYXJpbiBGaXNoZXIgIDxkYXJpbkBjaHJvbWl1bS5v cmc+CiAKICAgICAgICAgRGlzYWJsZSB0aGlzIHRlc3QgdGVtcG9yYXJpbHkgc2luY2UgaXQgaXMg ZmFpbGluZyBvbiBhbGwgb2YgdGhlCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L2V2ZW50cy9kcmFn LWFuZC1kcm9wLWRhdGFUcmFuc2Zlci10eXBlcy1ub2NyYXNoLWV4cGVjdGVkLnR4dAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L2V2ZW50cy9kcmFnLWFuZC1kcm9wLWRhdGFUcmFuc2Zl ci10eXBlcy1ub2NyYXNoLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gNTMzNDkpCisrKyBMYXlvdXRU ZXN0cy9mYXN0L2V2ZW50cy9kcmFnLWFuZC1kcm9wLWRhdGFUcmFuc2Zlci10eXBlcy1ub2NyYXNo LWV4cGVjdGVkLnR4dAkod29ya2luZyBjb3B5KQpAQCAtNCw2ICs0LDcgQEAgT24gc3VjY2Vzcywg eW91IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQQQogCiAKIFBBU1MgZXZlbnQuZGF0YVRyYW5zZmVy LnR5cGVzIGNvbnRhaW5zIGZvcm1hdCAidGV4dC9wbGFpbiIKK1BBU1MgZXZlbnQuZGF0YVRyYW5z ZmVyLmdldERhdGEoInRleHQvcGxhaW4iKSBjb250YWlucyAiU3F1YXJlIgogCiBURVNUIENPTVBM RVRFCiAKSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvZXZlbnRzL2RyYWctYW5kLWRyb3AtZGF0YVRy YW5zZmVyLXR5cGVzLW5vY3Jhc2guaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0 L2V2ZW50cy9kcmFnLWFuZC1kcm9wLWRhdGFUcmFuc2Zlci10eXBlcy1ub2NyYXNoLmh0bWwJKHJl dmlzaW9uIDUzMzQ5KQorKysgTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMvZHJhZy1hbmQtZHJvcC1k YXRhVHJhbnNmZXItdHlwZXMtbm9jcmFzaC5odG1sCSh3b3JraW5nIGNvcHkpCkBAIC04OSw2ICs4 OSwxMSBAQAogICAgICAgICAgICAgdGVzdEZhaWxlZCgnZXZlbnQuZGF0YVRyYW5zZmVyLnR5cGVz IHNob3VsZCBjb250YWluIGZvcm1hdCAiJyArIEZPUk1BVF9UWVBFICsgJyIsIGJ1dCBpdCBkb2Vz IG5vdC4nKTsKICAgICAgICAgZWxzZQogICAgICAgICAgICAgdGVzdFBhc3NlZCgnZXZlbnQuZGF0 YVRyYW5zZmVyLnR5cGVzIGNvbnRhaW5zIGZvcm1hdCAiJyArIEZPUk1BVF9UWVBFICsgJyInKTsK KworICAgICAgICBpZiAoZXZlbnQuZGF0YVRyYW5zZmVyLmdldERhdGEoRk9STUFUX1RZUEUpICE9 ICdTcXVhcmUnKQorICAgICAgICAgICAgdGVzdEZhaWxlZCgnZXZlbnQuZGF0YVRyYW5zZmVyLmdl dERhdGEoIicgKyBGT1JNQVRfVFlQRSArICciKSBzaG91bGQgY29udGFpbiAiU3F1YXJlIiwgYnV0 IGl0IGRvZXMgbm90LicpOworICAgICAgICBlbHNlCisgICAgICAgICAgICB0ZXN0UGFzc2VkKCdl dmVudC5kYXRhVHJhbnNmZXIuZ2V0RGF0YSgiJyArIEZPUk1BVF9UWVBFICsgJyIpIGNvbnRhaW5z ICJTcXVhcmUiJyk7CiAgICAgfQogCiAgICAgZnVuY3Rpb24gcnVuVGVzdCgpCg==