diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-16 14:56:46 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-16 14:57:30 +0200 |
| commit | b297e0fa5c217c9467033b7c8b46891a52870120 (patch) | |
| tree | 43fc14689295e9e64f2719d05aad94e3049f6cd7 /Source/WebKit/win/COMPropertyBag.h | |
| parent | 69d517dbfa69903d8593cc1737f0474b21e3251e (diff) | |
| download | qtwebkit-b297e0fa5c217c9467033b7c8b46891a52870120.tar.gz | |
Revert "Imported WebKit commit 0dc6cd75e1d4836eaffbb520be96fac4847cc9d2 (http://svn.webkit.org/repository/webkit/trunk@131300)"
This reverts commit 5466563f4b5b6b86523e3f89bb7f77e5b5270c78.
Caused OOM issues on some CI machines :(
Diffstat (limited to 'Source/WebKit/win/COMPropertyBag.h')
| -rw-r--r-- | Source/WebKit/win/COMPropertyBag.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/WebKit/win/COMPropertyBag.h b/Source/WebKit/win/COMPropertyBag.h index 8e84e4740..c76863f15 100644 --- a/Source/WebKit/win/COMPropertyBag.h +++ b/Source/WebKit/win/COMPropertyBag.h @@ -147,9 +147,9 @@ HRESULT STDMETHODCALLTYPE COMPropertyBag<ValueType, KeyType, HashType>::Read(LPC VARTYPE requestedType = V_VT(pVar); V_VT(pVar) = VT_EMPTY; - COMVariantSetter<ValueType>::setVariant(pVar, it->value); + COMVariantSetter<ValueType>::setVariant(pVar, it->second); - if (requestedType != COMVariantSetter<ValueType>::variantType(it->value) && requestedType != VT_EMPTY) + if (requestedType != COMVariantSetter<ValueType>::variantType(it->second) && requestedType != VT_EMPTY) return ::VariantChangeType(pVar, pVar, VARIANT_NOUSEROVERRIDE | VARIANT_ALPHABOOL, requestedType); return S_OK; @@ -217,12 +217,12 @@ HRESULT STDMETHODCALLTYPE COMPropertyBag<ValueType, KeyType, HashType>::GetPrope //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(current->value); + pPropBag[j].vt = COMVariantSetter<ValueType>::variantType(current->second); pPropBag[j].dwHint = iProperty + j; - pPropBag[j].pstrName = (LPOLESTR)CoTaskMemAlloc(sizeof(wchar_t)*(current->key.length()+1)); + pPropBag[j].pstrName = (LPOLESTR)CoTaskMemAlloc(sizeof(wchar_t)*(current->first.length()+1)); if (!pPropBag[j].pstrName) return E_OUTOFMEMORY; - wcscpy_s(pPropBag[j].pstrName, current->key.length()+1, static_cast<String>(current->key).charactersWithNullTermination()); + wcscpy_s(pPropBag[j].pstrName, current->first.length()+1, static_cast<String>(current->first).charactersWithNullTermination()); ++*pcProperties; } return S_OK; |