March 2010 - Wine-commits - list.winehq.org

Vincent Povirk : mscoree: Add a setting to access mono' s tracing functionality.
by Alexandre Julliard 24 Mar '10

24 Mar '10

Module: wine Branch: master Commit: b8c7dec6b8ba8005b86ccf5b17ccaa0c6361e6ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8c7dec6b8ba8005b86ccf5b1… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Mar 24 13:35:57 2010 -0500 mscoree: Add a setting to access mono's tracing functionality. --- dlls/mscoree/mscoree_main.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index dcdc91a..f9d8070 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -144,6 +144,11 @@ __int32 WINAPI _CorExeMain(void) PROCESS_INFORMATION pi; WCHAR *mono_exe, *cmd_line; DWORD size, exit_code; + static const WCHAR WINE_MONO_TRACE[]={'W','I','N','E','_','M','O','N','O','_','T','R','A','C','E',0}; + static const WCHAR trace_switch_start[]={'"','-','-','t','r','a','c','e','=',0}; + static const WCHAR trace_switch_end[]={'"',' ',0}; + int trace_size; + WCHAR trace_setting[256]; if (!(mono_exe = get_mono_exe())) { @@ -151,7 +156,13 @@ __int32 WINAPI _CorExeMain(void) return -1; } + trace_size = GetEnvironmentVariableW(WINE_MONO_TRACE, trace_setting, sizeof(trace_setting)/sizeof(WCHAR)); + size = (lstrlenW(mono_exe) + lstrlenW(GetCommandLineW()) + 1) * sizeof(WCHAR); + + if (trace_size) + size += (trace_size + lstrlenW(trace_switch_start) + lstrlenW(trace_switch_end)) * sizeof(WCHAR); + if (!(cmd_line = HeapAlloc(GetProcessHeap(), 0, size))) { HeapFree(GetProcessHeap(), 0, mono_exe); @@ -160,6 +171,14 @@ __int32 WINAPI _CorExeMain(void) lstrcpyW(cmd_line, mono_exe); HeapFree(GetProcessHeap(), 0, mono_exe); + + if (trace_size) + { + lstrcatW(cmd_line, trace_switch_start); + lstrcatW(cmd_line, trace_setting); + lstrcatW(cmd_line, trace_switch_end); + } + lstrcatW(cmd_line, GetCommandLineW()); TRACE("new command line: %s\n", debugstr_w(cmd_line));

1 0

Juan Lang : crypt32: Use an empty string as a separator when no separator is desired to avoid special cases for NULL .
by Alexandre Julliard 24 Mar '10

24 Mar '10

Module: wine Branch: master Commit: 7eb61a6e5cced2edf379ce1cddf6a6bf50f0c97e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7eb61a6e5cced2edf379ce1cd… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Mar 24 11:51:23 2010 -0700 crypt32: Use an empty string as a separator when no separator is desired to avoid special cases for NULL. --- dlls/crypt32/base64.c | 50 ++++++++++++++++-------------------------------- 1 files changed, 17 insertions(+), 33 deletions(-) diff --git a/dlls/crypt32/base64.c b/dlls/crypt32/base64.c index 2a91372..2996ba3 100644 --- a/dlls/crypt32/base64.c +++ b/dlls/crypt32/base64.c @@ -99,8 +99,7 @@ static LONG encodeBase64A(const BYTE *in_buf, int in_len, LPCSTR sep, TRACE("bytes is %d, pad bytes is %d\n", bytes, pad_bytes); needed = bytes + pad_bytes + 1; - if (sep) - needed += (needed / 64 + 1) * strlen(sep); + needed += (needed / 64 + 1) * strlen(sep); if (needed > *out_len) { @@ -117,7 +116,7 @@ static LONG encodeBase64A(const BYTE *in_buf, int in_len, LPCSTR sep, i = 0; while (div > 0) { - if (sep && i && i % 64 == 0) + if (i && i % 64 == 0) { strcpy(ptr, sep); ptr += strlen(sep); @@ -163,8 +162,7 @@ static LONG encodeBase64A(const BYTE *in_buf, int in_len, LPCSTR sep, *ptr++ = '='; break; } - if (sep) - strcpy(ptr, sep); + strcpy(ptr, sep); return ERROR_SUCCESS; } @@ -180,7 +178,7 @@ static BOOL BinaryToBase64A(const BYTE *pbBinary, if (dwFlags & CRYPT_STRING_NOCR) sep = lf; else if (dwFlags & CRYPT_STRING_NOCRLF) - sep = NULL; + sep = ""; else sep = crlf; switch (dwFlags & 0x0fffffff) @@ -217,11 +215,8 @@ static BOOL BinaryToBase64A(const BYTE *pbBinary, { strcpy(ptr, header); ptr += strlen(ptr); - if (sep) - { - strcpy(ptr, sep); - ptr += strlen(sep); - } + strcpy(ptr, sep); + ptr += strlen(sep); } encodeBase64A(pbBinary, cbBinary, sep, ptr, &size); ptr += size - 1; @@ -229,11 +224,8 @@ static BOOL BinaryToBase64A(const BYTE *pbBinary, { strcpy(ptr, trailer); ptr += strlen(ptr); - if (sep) - { - strcpy(ptr, sep); - ptr += strlen(sep); - } + strcpy(ptr, sep); + ptr += strlen(sep); } *pcchString = charsNeeded - 1; } @@ -302,8 +294,7 @@ static LONG encodeBase64W(const BYTE *in_buf, int in_len, LPCWSTR sep, TRACE("bytes is %d, pad bytes is %d\n", bytes, pad_bytes); needed = bytes + pad_bytes + 1; - if (sep) - needed += (needed / 64 + 1) * strlenW(sep); + needed += (needed / 64 + 1) * strlenW(sep); if (needed > *out_len) { @@ -320,7 +311,7 @@ static LONG encodeBase64W(const BYTE *in_buf, int in_len, LPCWSTR sep, i = 0; while (div > 0) { - if (sep && i && i % 64 == 0) + if (i && i % 64 == 0) { strcpyW(ptr, sep); ptr += strlenW(sep); @@ -366,8 +357,7 @@ static LONG encodeBase64W(const BYTE *in_buf, int in_len, LPCWSTR sep, *ptr++ = '='; break; } - if (sep) - strcpyW(ptr, sep); + strcpyW(ptr, sep); return ERROR_SUCCESS; } @@ -375,7 +365,7 @@ static LONG encodeBase64W(const BYTE *in_buf, int in_len, LPCWSTR sep, static BOOL BinaryToBase64W(const BYTE *pbBinary, DWORD cbBinary, DWORD dwFlags, LPWSTR pszString, DWORD *pcchString) { - static const WCHAR crlf[] = { '\r','\n',0 }, lf[] = { '\n',0 }; + static const WCHAR crlf[] = { '\r','\n',0 }, lf[] = { '\n',0 }, empty = {0}; BOOL ret = TRUE; LPCWSTR header = NULL, trailer = NULL, sep; DWORD charsNeeded; @@ -383,7 +373,7 @@ static BOOL BinaryToBase64W(const BYTE *pbBinary, if (dwFlags & CRYPT_STRING_NOCR) sep = lf; else if (dwFlags & CRYPT_STRING_NOCRLF) - sep = NULL; + sep = empty; else sep = crlf; switch (dwFlags & 0x0fffffff) @@ -420,11 +410,8 @@ static BOOL BinaryToBase64W(const BYTE *pbBinary, { strcpyW(ptr, header); ptr += strlenW(ptr); - if (sep) - { - strcpyW(ptr, sep); - ptr += strlenW(sep); - } + strcpyW(ptr, sep); + ptr += strlenW(sep); } encodeBase64W(pbBinary, cbBinary, sep, ptr, &size); ptr += size - 1; @@ -432,11 +419,8 @@ static BOOL BinaryToBase64W(const BYTE *pbBinary, { strcpyW(ptr, trailer); ptr += strlenW(ptr); - if (sep) - { - strcpyW(ptr, sep); - ptr += strlenW(sep); - } + strcpyW(ptr, sep); + ptr += strlenW(sep); } *pcchString = charsNeeded - 1; }

1 0

Jacek Caban : mshtml: Moved builtin properties lookup to separate function.
by Alexandre Julliard 24 Mar '10

24 Mar '10

Module: wine Branch: master Commit: 1b093221e615065a53ea7652b3ce9d758372e53a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b093221e615065a53ea7652b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 24 19:59:38 2010 +0100 mshtml: Moved builtin properties lookup to separate function. --- dlls/mshtml/dispex.c | 78 ++++++++++++++++++++++++++++---------------------- 1 files changed, 44 insertions(+), 34 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 4b1bd88..592d999 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -729,6 +729,47 @@ static HRESULT get_builtin_func(dispex_data_t *data, DISPID id, func_info_t **re return DISP_E_UNKNOWNNAME; } +static HRESULT get_builtin_id(DispatchEx *This, BSTR name, DWORD grfdex, DISPID *ret) +{ + dispex_data_t *data; + int min, max, n, c; + + data = get_dispex_data(This); + if(!data) + return E_FAIL; + + min = 0; + max = data->func_cnt-1; + + while(min <= max) { + n = (min+max)/2; + + c = strcmpiW(data->name_table[n]->name, name); + if(!c) { + if((grfdex & fdexNameCaseSensitive) && strcmpW(data->name_table[n]->name, name)) + break; + + *ret = data->name_table[n]->id; + return S_OK; + } + + if(c > 0) + max = n-1; + else + min = n+1; + } + + if(This->data->vtbl && This->data->vtbl->get_dispid) { + HRESULT hres; + + hres = This->data->vtbl->get_dispid(This->outer, name, grfdex, ret); + if(hres != DISP_E_UNKNOWNNAME) + return hres; + } + + return DISP_E_UNKNOWNNAME; +} + #define DISPATCHEX_THIS(iface) DEFINE_THIS(DispatchEx, IDispatchEx, iface) static HRESULT WINAPI DispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, void **ppv) @@ -815,8 +856,6 @@ static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DW { DispatchEx *This = DISPATCHEX_THIS(iface); dynamic_prop_t *dprop; - dispex_data_t *data; - int min, max, n, c; HRESULT hres; TRACE("(%p)->(%s %x %p)\n", This, debugstr_w(bstrName), grfdex, pid); @@ -824,38 +863,9 @@ static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DW if(grfdex & ~(fdexNameCaseSensitive|fdexNameCaseInsensitive|fdexNameEnsure|fdexNameImplicit|FDEX_VERSION_MASK)) FIXME("Unsupported grfdex %x\n", grfdex); - data = get_dispex_data(This); - if(!data) - return E_FAIL; - - min = 0; - max = data->func_cnt-1; - - while(min <= max) { - n = (min+max)/2; - - c = strcmpiW(data->name_table[n]->name, bstrName); - if(!c) { - if((grfdex & fdexNameCaseSensitive) && strcmpW(data->name_table[n]->name, bstrName)) - break; - - *pid = data->name_table[n]->id; - return S_OK; - } - - if(c > 0) - max = n-1; - else - min = n+1; - } - - if(This->data->vtbl && This->data->vtbl->get_dispid) { - HRESULT hres; - - hres = This->data->vtbl->get_dispid(This->outer, bstrName, grfdex, pid); - if(hres != DISP_E_UNKNOWNNAME) - return hres; - } + hres = get_builtin_id(This, bstrName, grfdex, pid); + if(hres != DISP_E_UNKNOWNNAME) + return hres; hres = get_dynamic_prop(This, bstrName, grfdex, &dprop); if(FAILED(hres))

1 0

Jacek Caban : mshtml: Moved builtin property invocation to separate function.
by Alexandre Julliard 24 Mar '10

24 Mar '10

Module: wine Branch: master Commit: 30bed7eab3a352e664b70972613f3e2d21eed2c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30bed7eab3a352e664b709726… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 24 20:00:08 2010 +0100 mshtml: Moved builtin property invocation to separate function. --- dlls/mshtml/dispex.c | 44 ++++++++++++++++++++++++++------------------ 1 files changed, 26 insertions(+), 18 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 592d999..c5e6de2 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -770,6 +770,31 @@ static HRESULT get_builtin_id(DispatchEx *This, BSTR name, DWORD grfdex, DISPID return DISP_E_UNKNOWNNAME; } +static HRESULT invoke_builtin_prop(DispatchEx *This, DISPID id, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) +{ + dispex_data_t *data; + func_info_t *func; + HRESULT hres; + + data = get_dispex_data(This); + if(!data) + return E_FAIL; + + hres = get_builtin_func(data, id, &func); + if(id == DISPID_VALUE && hres == DISP_E_UNKNOWNNAME) + return dispex_value(This, lcid, flags, dp, res, ei, caller); + if(FAILED(hres)) + return hres; + + if(func->func_disp_idx == -1) + hres = typeinfo_invoke(This, func, flags, dp, res, ei); + else + hres = function_invoke(This, func, flags, dp, res, ei); + + return hres; +} + #define DISPATCHEX_THIS(iface) DEFINE_THIS(DispatchEx, IDispatchEx, iface) static HRESULT WINAPI DispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, void **ppv) @@ -879,8 +904,6 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { DispatchEx *This = DISPATCHEX_THIS(iface); - dispex_data_t *data; - func_info_t *func; HRESULT hres; TRACE("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); @@ -972,22 +995,7 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc } } - data = get_dispex_data(This); - if(!data) - return E_FAIL; - - hres = get_builtin_func(data, id, &func); - if(id == DISPID_VALUE && hres == DISP_E_UNKNOWNNAME) - return dispex_value(This, lcid, wFlags, pdp, pvarRes, pei, pspCaller); - if(FAILED(hres)) - return hres; - - if(func->func_disp_idx == -1) - hres = typeinfo_invoke(This, func, wFlags, pdp, pvarRes, pei); - else - hres = function_invoke(This, func, wFlags, pdp, pvarRes, pei); - - return hres; + return invoke_builtin_prop(This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); } static HRESULT WINAPI DispatchEx_DeleteMemberByName(IDispatchEx *iface, BSTR bstrName, DWORD grfdex)

1 0

Jacek Caban : mshtml: Added IHTMLElement::removeAttribute implementation.
by Alexandre Julliard 24 Mar '10

24 Mar '10

Module: wine Branch: master Commit: 00293e9b0bcee3768fe8a142bd1b73ae9bb92c52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00293e9b0bcee3768fe8a142b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 24 20:34:17 2010 +0100 mshtml: Added IHTMLElement::removeAttribute implementation. --- dlls/mshtml/dispex.c | 96 ++++++++++++++++++++++++++++++++++-------- dlls/mshtml/htmlelem.c | 6 ++- dlls/mshtml/mshtml_private.h | 1 + 3 files changed, 83 insertions(+), 20 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index c5e6de2..3917b30 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -52,8 +52,11 @@ struct dispex_data_t { typedef struct { VARIANT var; LPWSTR name; + DWORD flags; } dynamic_prop_t; +#define DYNPROP_DELETED 0x01 + typedef struct { DispatchEx dispex; const IUnknownVtbl *lpIUnknownVtbl; @@ -442,7 +445,7 @@ static HRESULT get_dynamic_prop(DispatchEx *This, const WCHAR *name, DWORD flags { const BOOL alloc = flags & fdexNameEnsure; dispex_dynamic_data_t *data; - unsigned i; + dynamic_prop_t *prop; data = get_dynamic_data(This, alloc); if(!data) { @@ -453,9 +456,14 @@ static HRESULT get_dynamic_prop(DispatchEx *This, const WCHAR *name, DWORD flags return DISP_E_UNKNOWNNAME; } - for(i=0; i < data->prop_cnt; i++) { - if(flags & fdexNameCaseInsensitive ? !strcmpiW(data->props[i].name, name) : !strcmpW(data->props[i].name, name)) { - *ret = data->props+i; + for(prop = data->props; prop < data->props+data->prop_cnt; prop++) { + if(flags & fdexNameCaseInsensitive ? !strcmpiW(prop->name, name) : !strcmpW(prop->name, name)) { + if(prop->flags & DYNPROP_DELETED) { + if(!alloc) + return DISP_E_UNKNOWNNAME; + prop->flags &= ~DYNPROP_DELETED; + } + *ret = prop; return S_OK; } } @@ -481,10 +489,16 @@ static HRESULT get_dynamic_prop(DispatchEx *This, const WCHAR *name, DWORD flags data->buf_size <<= 1; } - data->props[data->prop_cnt].name = heap_strdupW(name); - VariantInit(&data->props[data->prop_cnt].var); - *ret = data->props + data->prop_cnt++; + prop = data->props + data->prop_cnt; + prop->name = heap_strdupW(name); + if(!prop->name) + return E_OUTOFMEMORY; + + VariantInit(&prop->var); + prop->flags = 0; + data->prop_cnt++; + *ret = prop; return S_OK; } @@ -795,6 +809,43 @@ static HRESULT invoke_builtin_prop(DispatchEx *This, DISPID id, LCID lcid, WORD return hres; } +HRESULT remove_prop(DispatchEx *This, BSTR name, VARIANT_BOOL *success) +{ + dynamic_prop_t *prop; + DISPID id; + HRESULT hres; + + hres = get_builtin_id(This, name, 0, &id); + if(hres == S_OK) { + DISPID named_id = DISPID_PROPERTYPUT; + VARIANT var; + DISPPARAMS dp = {&var,&named_id,1,1}; + EXCEPINFO ei; + + V_VT(&var) = VT_EMPTY; + memset(&ei, 0, sizeof(ei)); + hres = invoke_builtin_prop(This, id, 0, DISPATCH_PROPERTYPUT, &dp, NULL, &ei, NULL); + if(FAILED(hres)) + return hres; + + *success = VARIANT_TRUE; + return S_OK; + } + + hres = get_dynamic_prop(This, name, 0, &prop); + if(FAILED(hres)) { + if(hres != DISP_E_UNKNOWNNAME) + return hres; + *success = VARIANT_FALSE; + return S_OK; + } + + VariantClear(&prop->var); + prop->flags |= DYNPROP_DELETED; + *success = VARIANT_TRUE; + return S_OK; +} + #define DISPATCHEX_THIS(iface) DEFINE_THIS(DispatchEx, IDispatchEx, iface) static HRESULT WINAPI DispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, void **ppv) @@ -926,12 +977,12 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc if(is_dynamic_dispid(id)) { DWORD idx = id - DISPID_DYNPROP_0; - VARIANT *var; + dynamic_prop_t *prop; if(!This->dynamic_data || This->dynamic_data->prop_cnt <= idx) return DISP_E_UNKNOWNNAME; - var = &This->dynamic_data->props[idx].var; + prop = This->dynamic_data->props+idx; switch(wFlags) { case DISPATCH_METHOD|DISPATCH_PROPERTYGET: @@ -942,8 +993,8 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc DISPPARAMS dp = {NULL, &named_arg, 0, 1}; IDispatchEx *dispex; - if(V_VT(var) != VT_DISPATCH) { - FIXME("invoke vt %d\n", V_VT(var)); + if(V_VT(&prop->var) != VT_DISPATCH) { + FIXME("invoke %s\n", debugstr_variant(&prop->var)); return E_NOTIMPL; } @@ -962,14 +1013,14 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc V_VT(dp.rgvarg) = VT_DISPATCH; V_DISPATCH(dp.rgvarg) = (IDispatch*)DISPATCHEX(This); - hres = IDispatch_QueryInterface(V_DISPATCH(var), &IID_IDispatchEx, (void**)&dispex); + hres = IDispatch_QueryInterface(V_DISPATCH(&prop->var), &IID_IDispatchEx, (void**)&dispex); TRACE("%s call\n", debugstr_w(This->dynamic_data->props[idx].name)); if(SUCCEEDED(hres)) { hres = IDispatchEx_InvokeEx(dispex, DISPID_VALUE, lcid, wFlags, &dp, pvarRes, pei, pspCaller); IDispatchEx_Release(dispex); }else { ULONG err = 0; - hres = IDispatch_Invoke(V_DISPATCH(var), DISPID_VALUE, &IID_NULL, lcid, wFlags, pdp, pvarRes, pei, &err); + hres = IDispatch_Invoke(V_DISPATCH(&prop->var), DISPID_VALUE, &IID_NULL, lcid, wFlags, pdp, pvarRes, pei, &err); } TRACE("%s ret %08x\n", debugstr_w(This->dynamic_data->props[idx].name), hres); @@ -977,7 +1028,9 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc return hres; } case DISPATCH_PROPERTYGET: - return VariantCopy(pvarRes, var); + if(prop->flags & DYNPROP_DELETED) + return DISP_E_UNKNOWNNAME; + return VariantCopy(pvarRes, &prop->var); case DISPATCH_PROPERTYPUT|DISPATCH_PROPERTYPUTREF: case DISPATCH_PROPERTYPUT: if(pdp->cArgs != 1 || (pdp->cNamedArgs == 1 && *pdp->rgdispidNamedArgs != DISPID_PROPERTYPUT) @@ -987,8 +1040,13 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc } TRACE("put %s\n", debugstr_variant(pdp->rgvarg)); - VariantClear(var); - return VariantCopy(var, pdp->rgvarg); + VariantClear(&prop->var); + hres = VariantCopy(&prop->var, pdp->rgvarg); + if(FAILED(hres)) + return hres; + + prop->flags &= ~DYNPROP_DELETED; + return S_OK; default: FIXME("unhandled wFlags %x\n", wFlags); return E_NOTIMPL; @@ -1073,12 +1131,14 @@ static HRESULT WINAPI DispatchEx_GetNextDispID(IDispatchEx *iface, DWORD grfdex, if(!This->dynamic_data || This->dynamic_data->prop_cnt <= idx) return DISP_E_UNKNOWNNAME; - if(idx+1 == This->dynamic_data->prop_cnt) { + while(++idx < This->dynamic_data->prop_cnt && This->dynamic_data->props[idx].flags & DYNPROP_DELETED); + + if(idx == This->dynamic_data->prop_cnt) { *pid = DISPID_STARTENUM; return S_FALSE; } - *pid = id+1; + *pid = DISPID_DYNPROP_0+idx; return S_OK; } diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index e77c1dc..b0cb791 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -198,8 +198,10 @@ static HRESULT WINAPI HTMLElement_removeAttribute(IHTMLElement *iface, BSTR strA LONG lFlags, VARIANT_BOOL *pfSuccess) { HTMLElement *This = HTMLELEM_THIS(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + + TRACE("(%p)->(%s %x %p)\n", This, debugstr_w(strAttributeName), lFlags, pfSuccess); + + return remove_prop(&This->node.dispex, strAttributeName, pfSuccess); } static HRESULT WINAPI HTMLElement_put_className(IHTMLElement *iface, BSTR v) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 228be35..374b6c0 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -171,6 +171,7 @@ void release_dispex(DispatchEx*); BOOL dispex_query_interface(DispatchEx*,REFIID,void**); HRESULT dispex_get_dprop_ref(DispatchEx*,const WCHAR*,BOOL,VARIANT**); HRESULT get_dispids(tid_t,DWORD*,DISPID**); +HRESULT remove_prop(DispatchEx*,BSTR,VARIANT_BOOL*); typedef struct HTMLWindow HTMLWindow; typedef struct HTMLDocumentNode HTMLDocumentNode;

1 0

Jacek Caban : mshtml: Added IHTMLElement:removeAttribute tests.
by Alexandre Julliard 24 Mar '10

24 Mar '10

Module: wine Branch: master Commit: 621694efcdb9966bfb1880f379f120f79fb9bd59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=621694efcdb9966bfb1880f37… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 24 20:01:19 2010 +0100 mshtml: Added IHTMLElement:removeAttribute tests. --- dlls/mshtml/tests/jstest.html | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/jstest.html b/dlls/mshtml/tests/jstest.html index 72ef427..6192f81 100644 --- a/dlls/mshtml/tests/jstest.html +++ b/dlls/mshtml/tests/jstest.html @@ -5,12 +5,30 @@ function ok(b,m) { return external.ok(b, m); } +function test_removeAttribute(e) { + ok(e.removeAttribute('nonexisting') === false, "removeAttribute('nonexisting') didn't return false"); + + e.title = "title"; + ok(e.removeAttribute('title') === true, "removeAttribute('title') didn't return true"); + ok(e.title === "", "e.title = " + e.title); + ok(("title" in e) === true, "title is not in e"); + + e["myattr"] = "test"; + ok(e.removeAttribute('myattr') === true, "removeAttribute('myattr') didn't return true"); + ok(e["myattr"] === undefined, "e['myattr'] = " + e['myattr']); + ok(("myattr" in e) === false, "myattr is in e"); + +} + function runTest() { obj = new Object(); ok(obj === window.obj, "obj !== window.obj"); ok(typeof(divid) === "object", "typeof(divid) = " + typeof(divid)); + test_removeAttribute(document.getElementById("divid")); + test_removeAttribute(document.body); + external.reportSuccess(); } </script>

1 0

André Hentschel : winegcc: Make condition easier to read and look like the statement after the block.
by Alexandre Julliard 24 Mar '10

24 Mar '10

Module: wine Branch: master Commit: 6c8af386384c7d26fb366754a76fe0bd4cc4bd51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c8af386384c7d26fb366754a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Mar 24 20:16:27 2010 +0100 winegcc: Make condition easier to read and look like the statement after the block. --- tools/winegcc/winegcc.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 396bcc8..a690754 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -441,8 +441,7 @@ no_compat_defines: { if (opts->use_msvcrt) { - if (gcc_defs) strarray_add(comp_args, "-isystem" INCLUDEDIR "/msvcrt"); - else strarray_add(comp_args, "-I" INCLUDEDIR "/msvcrt"); + strarray_add(comp_args, gcc_defs ? "-isystem" INCLUDEDIR "/msvcrt" : "-I" INCLUDEDIR "/msvcrt" ); strarray_add(comp_args, "-D__MSVCRT__"); } strarray_add(comp_args, gcc_defs ? "-isystem" INCLUDEDIR "/windows" : "-I" INCLUDEDIR "/windows" );

1 0

Paul Vriens : msi/tests: Fix test failures on W2K with Windows Installer 2. x.
by Alexandre Julliard 24 Mar '10

24 Mar '10

Module: wine Branch: master Commit: 05d0787d08d834d23b2eca09ca92fcb943ee5d21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05d0787d08d834d23b2eca09c… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Mar 24 21:32:43 2010 +0100 msi/tests: Fix test failures on W2K with Windows Installer 2.x. --- dlls/msi/tests/install.c | 27 +++++++++++++++++++++++++-- 1 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 3d99fb9..0631a5e 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -4572,6 +4572,7 @@ static void test_publish_publishproduct(void) CHAR keypath[MAX_PATH]; CHAR temp[MAX_PATH]; CHAR path[MAX_PATH]; + BOOL old_installer = FALSE; static const CHAR prodpath[] = "Software\\Microsoft\\Windows\\CurrentVersion" "\\Installer\\UserData\\%s\\Products" @@ -4609,6 +4610,22 @@ static void test_publish_publishproduct(void) sprintf(keypath, prodpath, usersid); res = RegOpenKeyA(HKEY_LOCAL_MACHINE, keypath, &hkey); + if (res == ERROR_FILE_NOT_FOUND) + { + res = RegOpenKeyA(HKEY_CURRENT_USER, cuprodpath, &hkey); + if (res == ERROR_SUCCESS) + { + win_skip("Windows Installer < 3.0 detected\n"); + RegCloseKey(hkey); + old_installer = TRUE; + goto currentuser; + } + else + { + win_skip("Install failed, no need to continue\n"); + return; + } + } ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); res = RegOpenKeyA(hkey, "InstallProperties", &props); @@ -4627,6 +4644,7 @@ static void test_publish_publishproduct(void) RegDeleteKeyA(hkey, ""); RegCloseKey(hkey); +currentuser: res = RegOpenKeyA(HKEY_CURRENT_USER, cuprodpath, &hkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -4634,7 +4652,8 @@ static void test_publish_publishproduct(void) CHECK_DEL_REG_STR(hkey, "PackageCode", "AC75740029052c94DA02821EECD05F2F"); CHECK_DEL_REG_DWORD(hkey, "Language", 1033); CHECK_DEL_REG_DWORD(hkey, "Version", 0x1010001); - CHECK_DEL_REG_DWORD(hkey, "AuthorizedLUAApp", 0); + if (!old_installer) + CHECK_DEL_REG_DWORD(hkey, "AuthorizedLUAApp", 0); CHECK_DEL_REG_DWORD(hkey, "Assignment", 0); CHECK_DEL_REG_DWORD(hkey, "AdvertiseFlags", 0x184); CHECK_DEL_REG_DWORD(hkey, "InstanceType", 0); @@ -4678,6 +4697,8 @@ static void test_publish_publishproduct(void) /* PublishProduct, machine */ r = MsiInstallProductA(msifile, "PUBLISH_PRODUCT=1 ALLUSERS=1"); + if (old_installer) + goto machprod; ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "File not installed\n"); @@ -4705,6 +4726,7 @@ static void test_publish_publishproduct(void) RegDeleteKeyA(hkey, ""); RegCloseKey(hkey); +machprod: res = RegOpenKeyA(HKEY_CLASSES_ROOT, machprod, &hkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -4712,7 +4734,8 @@ static void test_publish_publishproduct(void) CHECK_DEL_REG_STR(hkey, "PackageCode", "AC75740029052c94DA02821EECD05F2F"); CHECK_DEL_REG_DWORD(hkey, "Language", 1033); CHECK_DEL_REG_DWORD(hkey, "Version", 0x1010001); - CHECK_DEL_REG_DWORD(hkey, "AuthorizedLUAApp", 0); + if (!old_installer) + CHECK_DEL_REG_DWORD(hkey, "AuthorizedLUAApp", 0); todo_wine CHECK_DEL_REG_DWORD(hkey, "Assignment", 1); CHECK_DEL_REG_DWORD(hkey, "AdvertiseFlags", 0x184); CHECK_DEL_REG_DWORD(hkey, "InstanceType", 0);

1 0

Nikolay Sivov : shell32/tests: Fix a test crash on Win9x.
by Alexandre Julliard 24 Mar '10

24 Mar '10

Module: wine Branch: master Commit: ef7abf10870c10eed7bf6fff86cdd3313f61d384 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef7abf10870c10eed7bf6fff8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 24 02:41:26 2010 +0300 shell32/tests: Fix a test crash on Win9x. --- dlls/shell32/tests/shlview.c | 144 ++++++++++++++++++++++++++++++++++++++---- 1 files changed, 131 insertions(+), 13 deletions(-) diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index 59716d5..dc60a49 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -86,13 +86,134 @@ static HWND subclass_listview(HWND hwnd) return listview; } +/* dummy IDataObject implementation */ typedef struct { + const IDataObjectVtbl *lpVtbl; + LONG ref; +} IDataObjectImpl; + +static const IDataObjectVtbl IDataObjectImpl_Vtbl; + +IDataObject* IDataObjectImpl_Construct(void) +{ + IDataObjectImpl *obj; + + obj = HeapAlloc(GetProcessHeap(), 0, sizeof(*obj)); + obj->lpVtbl = &IDataObjectImpl_Vtbl; + obj->ref = 1; + + return (IDataObject*)obj; +} + +static HRESULT WINAPI IDataObjectImpl_QueryInterface(IDataObject *iface, REFIID riid, void **ppvObj) +{ + IDataObjectImpl *This = (IDataObjectImpl *)iface; + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IDataObject)) + { + *ppvObj = This; + } + + if(*ppvObj) + { + IUnknown_AddRef(iface); + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI IDataObjectImpl_AddRef(IDataObject * iface) +{ + IDataObjectImpl *This = (IDataObjectImpl *)iface; + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI IDataObjectImpl_Release(IDataObject * iface) +{ + IDataObjectImpl *This = (IDataObjectImpl *)iface; + ULONG ref = InterlockedDecrement(&This->ref); + + if (!ref) + { + HeapFree(GetProcessHeap(), 0, This); + return 0; + } + return ref; +} + +static HRESULT WINAPI IDataObjectImpl_GetData(IDataObject *iface, FORMATETC *pformat, STGMEDIUM *pmedium) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI IDataObjectImpl_GetDataHere(IDataObject *iface, FORMATETC *pformat, STGMEDIUM *pmedium) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI IDataObjectImpl_QueryGetData(IDataObject *iface, FORMATETC *pformat) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI IDataObjectImpl_GetCanonicalFormatEtc( + IDataObject *iface, FORMATETC *pformatIn, FORMATETC *pformatOut) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI IDataObjectImpl_SetData( + IDataObject *iface, FORMATETC *pformat, STGMEDIUM *pmedium, BOOL release) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI IDataObjectImpl_EnumFormatEtc( + IDataObject *iface, DWORD direction, IEnumFORMATETC **ppenumFormatEtc) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI IDataObjectImpl_DAdvise( + IDataObject *iface, FORMATETC *pformatetc, DWORD advf, IAdviseSink *pSink, DWORD *pConnection) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI IDataObjectImpl_DUnadvise(IDataObject *iface, DWORD connection) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI IDataObjectImpl_EnumDAdvise(IDataObject *iface, IEnumSTATDATA **ppenumAdvise) +{ + return E_NOTIMPL; +} + +static const IDataObjectVtbl IDataObjectImpl_Vtbl = +{ + IDataObjectImpl_QueryInterface, + IDataObjectImpl_AddRef, + IDataObjectImpl_Release, + IDataObjectImpl_GetData, + IDataObjectImpl_GetDataHere, + IDataObjectImpl_QueryGetData, + IDataObjectImpl_GetCanonicalFormatEtc, + IDataObjectImpl_SetData, + IDataObjectImpl_EnumFormatEtc, + IDataObjectImpl_DAdvise, + IDataObjectImpl_DUnadvise, + IDataObjectImpl_EnumDAdvise +}; +/* dummy IShellBrowser implementation */ +typedef struct { const IShellBrowserVtbl *lpVtbl; LONG ref; } IShellBrowserImpl; -/* dummy IShellBrowser implementation */ static const IShellBrowserVtbl IShellBrowserImpl_Vtbl; IShellBrowser* IShellBrowserImpl_Construct(void) @@ -114,22 +235,16 @@ static HRESULT WINAPI IShellBrowserImpl_QueryInterface(IShellBrowser *iface, *ppvObj = NULL; - if(IsEqualIID(riid, &IID_IUnknown)) - { - *ppvObj = This; - } - else if(IsEqualIID(riid, &IID_IOleWindow)) - { - *ppvObj = This; - } - else if(IsEqualIID(riid, &IID_IShellBrowser)) + if(IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IOleWindow) || + IsEqualIID(riid, &IID_IShellBrowser)) { *ppvObj = This; } if(*ppvObj) { - IUnknown_AddRef( (IShellBrowser*) *ppvObj); + IUnknown_AddRef(iface); return S_OK; } @@ -556,6 +671,7 @@ static void test_IShellFolderView(void) IShellFolderView *folderview; IShellFolder *desktop; IShellView *view; + IDataObject *obj; UINT i; HRESULT hr; @@ -575,8 +691,10 @@ static void test_IShellFolderView(void) } /* ::MoveIcons */ - hr = IShellFolderView_MoveIcons(folderview, NULL); - ok(hr == E_NOTIMPL, "got (0x%08x)\n", hr); + obj = IDataObjectImpl_Construct(); + hr = IShellFolderView_MoveIcons(folderview, obj); + ok(hr == E_NOTIMPL || broken(hr == S_OK) /* W98 */, "got (0x%08x)\n", hr); + IDataObject_Release(obj); /* ::SetRedraw without list created */ hr = IShellFolderView_SetRedraw(folderview, TRUE);

1 0

Mike Kaplinskiy : ws2_32/tests: Fix win9x test failure.
by Alexandre Julliard 24 Mar '10

24 Mar '10

Module: wine Branch: master Commit: 03651926b746f9f7024d1da8c4d1306cfe68ea6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=03651926b746f9f7024d1da8c… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Tue Mar 23 22:02:59 2010 -0400 ws2_32/tests: Fix win9x test failure. --- dlls/ws2_32/tests/sock.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index a8baeeb..88b62e3 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2822,7 +2822,8 @@ static void test_WSARecv(void) ok(dwret == WAIT_OBJECT_0, "Waiting for disconnect event failed with %d + errno %d\n", dwret, GetLastError()); bret = GetOverlappedResult((HANDLE)dest, &ov, &bytesReturned, FALSE); - todo_wine ok(!bret && GetLastError() == ERROR_NETNAME_DELETED, "Did not get disconnect event: %d, error %d\n", bret, GetLastError()); + todo_wine ok(!bret && (GetLastError() == ERROR_NETNAME_DELETED || broken(GetLastError() == ERROR_IO_INCOMPLETE) /* win9x */), + "Did not get disconnect event: %d, error %d\n", bret, GetLastError()); ok(bytesReturned == 0, "Bytes received is %d\n", bytesReturned); end:

1 0