Commit 57aa75f7 authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard

msxml3: Fixed dynamic properties allocation.

parent e7ff1019
...@@ -436,18 +436,37 @@ static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DW ...@@ -436,18 +436,37 @@ static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DW
} }
if(grfdex & fdexNameEnsure) { if(grfdex & fdexNameEnsure) {
dispex_dynamic_data_t *dynamic_data;
TRACE("creating dynamic prop %s\n", debugstr_w(bstrName)); TRACE("creating dynamic prop %s\n", debugstr_w(bstrName));
if(!This->dynamic_data) { if(This->dynamic_data) {
This->dynamic_data = heap_alloc_zero(sizeof(dispex_dynamic_data_t)); dynamic_data = This->dynamic_data;
This->dynamic_data->props = heap_alloc(This->dynamic_data->buf_size = 4); }else {
}else if(This->dynamic_data->buf_size == This->dynamic_data->prop_cnt) { dynamic_data = This->dynamic_data = heap_alloc_zero(sizeof(dispex_dynamic_data_t));
This->dynamic_data->props = heap_realloc(This->dynamic_data->props, This->dynamic_data->buf_size<<=1); if(!dynamic_data)
return E_OUTOFMEMORY;
}
if(!dynamic_data->buf_size) {
dynamic_data->props = heap_alloc(sizeof(dynamic_prop_t)*4);
if(!dynamic_data->props)
return E_OUTOFMEMORY;
dynamic_data->buf_size = 4;
}else if(dynamic_data->buf_size == dynamic_data->prop_cnt) {
dynamic_prop_t *new_props;
new_props = heap_realloc(dynamic_data->props, sizeof(dynamic_prop_t)*(dynamic_data->buf_size<<1));
if(!new_props)
return E_OUTOFMEMORY;
dynamic_data->props = new_props;
dynamic_data->buf_size <<= 1;
} }
This->dynamic_data->props[This->dynamic_data->prop_cnt].name = heap_strdupW(bstrName); dynamic_data->props[dynamic_data->prop_cnt].name = heap_strdupW(bstrName);
VariantInit(&This->dynamic_data->props[This->dynamic_data->prop_cnt].var); VariantInit(&dynamic_data->props[dynamic_data->prop_cnt].var);
*pid = DISPID_DYNPROP_0 + This->dynamic_data->prop_cnt++; *pid = DISPID_DYNPROP_0 + dynamic_data->prop_cnt++;
return S_OK; return S_OK;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment