Piotr Caban : mshtml: Make sure dynamic properties are initialized in Dispatch functions.
Alexandre Julliard
julliard at winehq.org
Tue Aug 23 12:45:05 CDT 2011
Module: wine
Branch: master
Commit: ff449dd1d7538e492ef0f7d148e0a7de2ccd4bed
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff449dd1d7538e492ef0f7d148e0a7de2ccd4bed
Author: Piotr Caban <piotr at codeweavers.com>
Date: Tue Aug 23 11:33:28 2011 +0200
mshtml: Make sure dynamic properties are initialized in Dispatch functions.
---
dlls/mshtml/dispex.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c
index 6d175f4..44d0911 100644
--- a/dlls/mshtml/dispex.c
+++ b/dlls/mshtml/dispex.c
@@ -923,7 +923,7 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc
DWORD idx = id - DISPID_DYNPROP_0;
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;
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)) {
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;
*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)) {
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;
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++;
}
- if(This->dynamic_data && This->dynamic_data->prop_cnt) {
+ if(get_dynamic_data(This) && This->dynamic_data->prop_cnt) {
*pid = DISPID_DYNPROP_0;
return S_OK;
}
More information about the wine-cvs
mailing list