22659 2008-12-04 13:35:26 -0800 COMPropertyBag template class needs to implement IPropertyBag2 methods 2008-12-04 14:02:50 -0800 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) PC Windows XP RESOLVED FIXED P2 Normal --- 1 sfalken sfalken oldest_to_newest 101384 0 sfalken 2008-12-04 13:35:26 -0800 COMPropertyBag in WebKit/win doesn't implement IPropertyBag2::Read. It also doesn't fill in the dwType for the PROPBAG2 structure. 101385 1 25751 sfalken 2008-12-04 13:41:05 -0800 Created attachment 25751 Implemented method, filled in type field. 101386 2 25751 alice.barraclough 2008-12-04 13:58:38 -0800 Comment on attachment 25751 Implemented method, filled in type field. > Index: ChangeLog > =================================================================== > --- ChangeLog (revision 39005) > +++ ChangeLog (working copy) > @@ -1,3 +1,17 @@ > +2008-12-04 Steve Falkenburg <sfalken@apple.com> > + > + Implement IPropertyBag2::Read. > + Fill in dwType for IPropertyBag2::GetPropertyInfo (we always use PROPBAG2_TYPE_DATA). > + https://bugs.webkit.org/show_bug.cgi?id=22659 > + > + This fixes <rdar://problem/6419127> REGRESSION: Forms autocomplete is broken for "other forms" > + > + Reviewed by NOBODY (OOPS!). > + > + * COMPropertyBag.h: > + (::Read): Implemented. > + (::GetPropertyInfo): Set dwType to PROPBAG2_TYPE_DATA. > + > 2008-12-02 Adam Roben <aroben@apple.com> > > Export new-ish JSCore convenience constructor functions > Index: COMPropertyBag.h > =================================================================== > --- COMPropertyBag.h (revision 38999) > +++ COMPropertyBag.h (working copy) > @@ -158,9 +158,22 @@ HRESULT STDMETHODCALLTYPE COMPropertyBag > } > > template<typename ValueType, typename HashType> > -HRESULT STDMETHODCALLTYPE COMPropertyBag<ValueType, HashType>::Read(ULONG cProperties, PROPBAG2*, IErrorLog*, VARIANT* pvarValue, HRESULT* phrError) > +HRESULT STDMETHODCALLTYPE COMPropertyBag<ValueType, HashType>::Read(ULONG cProperties, PROPBAG2* pPropBag, IErrorLog* pErrorLog, VARIANT* pvarValue, HRESULT* phrError) > { > - return E_NOTIMPL; > + if (!pPropBag || !pvarValue || !phrError) minor pick: If we don't also check pErrorLog here, isn't it possible that we'll erroneously return E_FAIL below, if the Read() fails due to pErrorLog being null? > + return E_POINTER; > + > + HRESULT hr = S_OK; > + > + for (ULONG i = 0; i < cProperties; ++i) { > + VariantInit(&pvarValue[i]); > + pvarValue[i].vt = pPropBag[i].vt; > + phrError[i] = Read(pPropBag[i].pstrName, &pvarValue[i], pErrorLog); > + if (FAILED(phrError[i])) > + hr = E_FAIL; > + } > + > + return hr; > } > > template<typename ValueType, typename HashType> > @@ -196,10 +209,10 @@ HRESULT STDMETHODCALLTYPE COMPropertyBag > ; > for (ULONG j = 0; j < cProperties && current != end; ++j, ++current) { > // FIXME: the following fields aren't filled in > - //pPropBag[j].dwType; // (DWORD) Type of property. This will be one of the PROPBAG2_TYPE values. > - //pPropBag[j].cfType; // (CLIPFORMAT) Clipboard format or MIME type of the property. > - //pPropBag[j].clsid; // (CLSID) CLSID of the object. This member is valid only if dwType is PROPBAG2_TYPE_OBJECT. > + //pPropBag[j].cfType; // (CLIPFORMAT) Clipboard format or MIME type of the property. > + //pPropBag[j].clsid; // (CLSID) CLSID of the object. This member is valid only if dwType is PROPBAG2_TYPE_OBJECT. > > + pPropBag[j].dwType = PROPBAG2_TYPE_DATA; > pPropBag[j].vt = COMVariantSetter<ValueType>::VariantType; > pPropBag[j].dwHint = iProperty + j; > pPropBag[j].pstrName = (LPOLESTR)CoTaskMemAlloc(sizeof(wchar_t)*(current->first.length()+1)); 101388 3 sfalken 2008-12-04 14:00:31 -0800 pErrorLog is allowed to be 0 according to: http://msdn.microsoft.com/en-us/library/aa768194(VS.85).aspx pErrLog [in] The address of an IErrorlog interface in which the property bag stores any errors that occur during the reads. This argument can be NULL; in which case, the caller receives no logging errors. 101389 4 sfalken 2008-12-04 14:02:50 -0800 Fixed in r39006. 25751 2008-12-04 13:41:05 -0800 2008-12-04 13:54:56 -0800 Implemented method, filled in type field. diff.txt text/plain 2939 sfalken SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDM5MDA1 KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMDgtMTIt MDQgIFN0ZXZlIEZhbGtlbmJ1cmcgIDxzZmFsa2VuQGFwcGxlLmNvbT4KKworICAgICAgICBJbXBs ZW1lbnQgSVByb3BlcnR5QmFnMjo6UmVhZC4KKyAgICAgICAgRmlsbCBpbiBkd1R5cGUgZm9yIElQ cm9wZXJ0eUJhZzI6OkdldFByb3BlcnR5SW5mbyAod2UgYWx3YXlzIHVzZSBQUk9QQkFHMl9UWVBF X0RBVEEpLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjI2NTkKKyAgICAgICAgCisgICAgICAgIFRoaXMgZml4ZXMgPHJkYXI6Ly9wcm9ibGVtLzY0MTkx Mjc+IFJFR1JFU1NJT046IEZvcm1zIGF1dG9jb21wbGV0ZSBpcyBicm9rZW4gZm9yICJvdGhlciBm b3JtcyIKKyAgICAgICAgCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogQ09NUHJvcGVydHlCYWcuaDoKKyAgICAgICAgKDo6UmVhZCk6IEltcGxlbWVudGVk LgorICAgICAgICAoOjpHZXRQcm9wZXJ0eUluZm8pOiBTZXQgZHdUeXBlIHRvIFBST1BCQUcyX1RZ UEVfREFUQS4KKwogMjAwOC0xMi0wMiAgQWRhbSBSb2JlbiAgPGFyb2JlbkBhcHBsZS5jb20+CiAK ICAgICAgICAgRXhwb3J0IG5ldy1pc2ggSlNDb3JlIGNvbnZlbmllbmNlIGNvbnN0cnVjdG9yIGZ1 bmN0aW9ucwpJbmRleDogQ09NUHJvcGVydHlCYWcuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDT01Qcm9wZXJ0 eUJhZy5oCShyZXZpc2lvbiAzODk5OSkKKysrIENPTVByb3BlcnR5QmFnLmgJKHdvcmtpbmcgY29w eSkKQEAgLTE1OCw5ICsxNTgsMjIgQEAgSFJFU1VMVCBTVERNRVRIT0RDQUxMVFlQRSBDT01Qcm9w ZXJ0eUJhZwogfQ0KIA0KIHRlbXBsYXRlPHR5cGVuYW1lIFZhbHVlVHlwZSwgdHlwZW5hbWUgSGFz aFR5cGU+DQotSFJFU1VMVCBTVERNRVRIT0RDQUxMVFlQRSBDT01Qcm9wZXJ0eUJhZzxWYWx1ZVR5 cGUsIEhhc2hUeXBlPjo6UmVhZChVTE9ORyBjUHJvcGVydGllcywgUFJPUEJBRzIqLCBJRXJyb3JM b2cqLCBWQVJJQU5UKiBwdmFyVmFsdWUsIEhSRVNVTFQqIHBockVycm9yKQ0KK0hSRVNVTFQgU1RE TUVUSE9EQ0FMTFRZUEUgQ09NUHJvcGVydHlCYWc8VmFsdWVUeXBlLCBIYXNoVHlwZT46OlJlYWQo VUxPTkcgY1Byb3BlcnRpZXMsIFBST1BCQUcyKiBwUHJvcEJhZywgSUVycm9yTG9nKiBwRXJyb3JM b2csIFZBUklBTlQqIHB2YXJWYWx1ZSwgSFJFU1VMVCogcGhyRXJyb3IpDQogew0KLSAgICByZXR1 cm4gRV9OT1RJTVBMOw0KKyAgICBpZiAoIXBQcm9wQmFnIHx8ICFwdmFyVmFsdWUgfHwgIXBockVy cm9yKQ0KKyAgICAgICAgcmV0dXJuIEVfUE9JTlRFUjsNCisNCisgICAgSFJFU1VMVCBociA9IFNf T0s7DQorDQorICAgIGZvciAoVUxPTkcgaSA9IDA7IGkgPCBjUHJvcGVydGllczsgKytpKSB7DQor ICAgICAgICBWYXJpYW50SW5pdCgmcHZhclZhbHVlW2ldKTsNCisgICAgICAgIHB2YXJWYWx1ZVtp XS52dCA9IHBQcm9wQmFnW2ldLnZ0Ow0KKyAgICAgICAgcGhyRXJyb3JbaV0gPSBSZWFkKHBQcm9w QmFnW2ldLnBzdHJOYW1lLCAmcHZhclZhbHVlW2ldLCBwRXJyb3JMb2cpOw0KKyAgICAgICAgaWYg KEZBSUxFRChwaHJFcnJvcltpXSkpDQorICAgICAgICAgICAgaHIgPSBFX0ZBSUw7DQorICAgIH0N CisNCisgICAgcmV0dXJuIGhyOw0KIH0NCiANCiB0ZW1wbGF0ZTx0eXBlbmFtZSBWYWx1ZVR5cGUs IHR5cGVuYW1lIEhhc2hUeXBlPg0KQEAgLTE5NiwxMCArMjA5LDEwIEBAIEhSRVNVTFQgU1RETUVU SE9EQ0FMTFRZUEUgQ09NUHJvcGVydHlCYWcKICAgICAgICAgOw0KICAgICBmb3IgKFVMT05HIGog PSAwOyBqIDwgY1Byb3BlcnRpZXMgJiYgY3VycmVudCAhPSBlbmQ7ICsraiwgKytjdXJyZW50KSB7 DQogICAgICAgICAvLyBGSVhNRTogdGhlIGZvbGxvd2luZyBmaWVsZHMgYXJlbid0IGZpbGxlZCBp bg0KLSAgICAgICAgLy9wUHJvcEJhZ1tqXS5kd1R5cGU7ICAgLy8gKERXT1JEKSBUeXBlIG9mIHBy b3BlcnR5LiBUaGlzIHdpbGwgYmUgb25lIG9mIHRoZSBQUk9QQkFHMl9UWVBFIHZhbHVlcy4KLSAg ICAgICAgLy9wUHJvcEJhZ1tqXS5jZlR5cGU7ICAgLy8gKENMSVBGT1JNQVQpIENsaXBib2FyZCBm b3JtYXQgb3IgTUlNRSB0eXBlIG9mIHRoZSBwcm9wZXJ0eS4KLSAgICAgICAgLy9wUHJvcEJhZ1tq XS5jbHNpZDsgICAgLy8gKENMU0lEKSBDTFNJRCBvZiB0aGUgb2JqZWN0LiBUaGlzIG1lbWJlciBp cyB2YWxpZCBvbmx5IGlmIGR3VHlwZSBpcyBQUk9QQkFHMl9UWVBFX09CSkVDVC4KKyAgICAgICAg Ly9wUHJvcEJhZ1tqXS5jZlR5cGU7ICAgLy8gKENMSVBGT1JNQVQpIENsaXBib2FyZCBmb3JtYXQg b3IgTUlNRSB0eXBlIG9mIHRoZSBwcm9wZXJ0eS4NCisgICAgICAgIC8vcFByb3BCYWdbal0uY2xz aWQ7ICAgIC8vIChDTFNJRCkgQ0xTSUQgb2YgdGhlIG9iamVjdC4gVGhpcyBtZW1iZXIgaXMgdmFs aWQgb25seSBpZiBkd1R5cGUgaXMgUFJPUEJBRzJfVFlQRV9PQkpFQ1QuDQogDQorICAgICAgICBw UHJvcEJhZ1tqXS5kd1R5cGUgPSBQUk9QQkFHMl9UWVBFX0RBVEE7DQogICAgICAgICBwUHJvcEJh Z1tqXS52dCA9IENPTVZhcmlhbnRTZXR0ZXI8VmFsdWVUeXBlPjo6VmFyaWFudFR5cGU7DQogICAg ICAgICBwUHJvcEJhZ1tqXS5kd0hpbnQgPSBpUHJvcGVydHkgKyBqOw0KICAgICAgICAgcFByb3BC YWdbal0ucHN0ck5hbWUgPSAoTFBPTEVTVFIpQ29UYXNrTWVtQWxsb2Moc2l6ZW9mKHdjaGFyX3Qp KihjdXJyZW50LT5maXJzdC5sZW5ndGgoKSsxKSk7DQo=