ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mshtml: Make sure dynamic properties are initialized in Dispatch functions.

This commit is contained in:
Piotr Caban 2011-08-23 11:33:28 +02:00 committed by Alexandre Julliard
parent 0a03ae75b0
commit ff449dd1d7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/mshtml/dispex.c
View File

@ -923,7 +923,7 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc
DWORD idx = id - DISPID_DYNPROP_0; DWORD idx = id - DISPID_DYNPROP_0;
dynamic_prop_t *prop; dynamic_prop_t *prop;
if(!This->dynamic_data || This->dynamic_data->prop_cnt <= idx) if(!get_dynamic_data(This) || This->dynamic_data->prop_cnt <= idx)
return DISP_E_UNKNOWNNAME; return DISP_E_UNKNOWNNAME;
prop = This->dynamic_data->props+idx; prop = This->dynamic_data->props+idx;
@ -1039,7 +1039,7 @@ static HRESULT WINAPI DispatchEx_GetMemberName(IDispatchEx *iface, DISPID id, BS
if(is_dynamic_dispid(id)) { if(is_dynamic_dispid(id)) {
DWORD idx = id - DISPID_DYNPROP_0; DWORD idx = id - DISPID_DYNPROP_0;
if(!This->dynamic_data || This->dynamic_data->prop_cnt <= idx) if(!get_dynamic_data(This) || This->dynamic_data->prop_cnt <= idx)
return DISP_E_UNKNOWNNAME; return DISP_E_UNKNOWNNAME;
*pbstrName = SysAllocString(This->dynamic_data->props[idx].name); *pbstrName = SysAllocString(This->dynamic_data->props[idx].name);
@ -1075,7 +1075,7 @@ static HRESULT WINAPI DispatchEx_GetNextDispID(IDispatchEx *iface, DWORD grfdex,
if(is_dynamic_dispid(id)) { if(is_dynamic_dispid(id)) {
DWORD idx = id - DISPID_DYNPROP_0; DWORD idx = id - DISPID_DYNPROP_0;
if(!This->dynamic_data || This->dynamic_data->prop_cnt <= idx) if(!get_dynamic_data(This) || This->dynamic_data->prop_cnt <= idx)
return DISP_E_UNKNOWNNAME; return DISP_E_UNKNOWNNAME;
while(++idx < This->dynamic_data->prop_cnt && This->dynamic_data->props[idx].flags & DYNPROP_DELETED); while(++idx < This->dynamic_data->prop_cnt && This->dynamic_data->props[idx].flags & DYNPROP_DELETED);
@ -1111,7 +1111,7 @@ static HRESULT WINAPI DispatchEx_GetNextDispID(IDispatchEx *iface, DWORD grfdex,
func++; func++;
} }
if(This->dynamic_data && This->dynamic_data->prop_cnt) { if(get_dynamic_data(This) && This->dynamic_data->prop_cnt) {
*pid = DISPID_DYNPROP_0; *pid = DISPID_DYNPROP_0;
return S_OK; return S_OK;
} }