March 2012 - Wine-Commits - list.winehq.org

Hwang YunSong : po: Update Korean translation.
by Alexandre Julliard March 28, 2012

March 28, 2012

Module: wine Branch: master Commit: 1528d9021f174875ecda0af1ed0458deba3a7a26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1528d9021f174875ecda0af1e… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Tue Mar 27 21:19:44 2012 +0900 po: Update Korean translation. --- po/ko.po | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/po/ko.po b/po/ko.po index 474cc9c..7f4ae51 100644 --- a/po/ko.po +++ b/po/ko.po @@ -3440,10 +3440,8 @@ msgid "Expected ')'" msgstr "')' 가 필요합니다" #: jscript.rc:37 -#, fuzzy -#| msgid "Invalid parameter.\n" msgid "Invalid character" -msgstr "잘못된 매개변수.\n" +msgstr "잘못된 문자" #: jscript.rc:38 msgid "Unterminated string constant"

1 0

Jacek Caban : jscript: Properly handle NULL bstr in str_to_number.
by Alexandre Julliard March 28, 2012

March 28, 2012

Module: wine Branch: master Commit: 8f36daa4229389bfbbf10801381f6f9c3a643e57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f36daa4229389bfbbf108013… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 28 15:04:28 2012 +0200 jscript: Properly handle NULL bstr in str_to_number. --- dlls/jscript/jsutils.c | 5 +++++ dlls/jscript/tests/lang.js | 4 +++- dlls/jscript/tests/run.c | 28 ++++++++++++++++++++++++---- 3 files changed, 32 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 31c471f..040ec58 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -320,6 +320,11 @@ static HRESULT str_to_number(BSTR str, double *ret) static const WCHAR infinityW[] = {'I','n','f','i','n','i','t','y'}; + if(!ptr) { + *ret = 0; + return S_OK; + } + while(isspaceW(*ptr)) ptr++; diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index b6fe821..8f5e5d5 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -1238,7 +1238,9 @@ for(var i=0; i<2; i++) tmp[i] = /b/; ok(tmp[0] != tmp[1], "tmp[0] == tmp [1]"); -ok(createNullBSTR() === '', "createNullBSTR() !== ''"); +ok(isNullBSTR(getNullBSTR()), "isNullBSTR(getNullBSTR()) failed\n"); +ok(getNullBSTR() === '', "getNullBSTR() !== ''"); +ok(+getNullBSTR() === 0 , "+getNullBTR() !=== 0"); ok(getVT(nullDisp) === "VT_DISPATCH", "getVT(nullDisp) = " + getVT(nullDisp)); ok(typeof(nullDisp) === "object", "typeof(nullDisp) = " + typeof(nullDisp)); diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index dbf83e6..e6f0009 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -84,7 +84,7 @@ DEFINE_EXPECT(DeleteMemberByDispID); #define DISPID_GLOBAL_OK 0x1004 #define DISPID_GLOBAL_GETVT 0x1005 #define DISPID_GLOBAL_TESTOBJ 0x1006 -#define DISPID_GLOBAL_NULL_BSTR 0x1007 +#define DISPID_GLOBAL_GETNULLBSTR 0x1007 #define DISPID_GLOBAL_NULL_DISP 0x1008 #define DISPID_GLOBAL_TESTTHIS 0x1009 #define DISPID_GLOBAL_TESTTHIS2 0x100a @@ -95,6 +95,7 @@ DEFINE_EXPECT(DeleteMemberByDispID); #define DISPID_GLOBAL_ISWIN64 0x100f #define DISPID_GLOBAL_PUREDISP 0x1010 #define DISPID_GLOBAL_TESTPROPDELETE 0x1010 +#define DISPID_GLOBAL_ISNULLBSTR 0x1011 #define DISPID_TESTOBJ_PROP 0x2000 #define DISPID_TESTOBJ_ONLYDISPID 0x2001 @@ -438,8 +439,12 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD *pid = DISPID_GLOBAL_TESTOBJ; return S_OK; } - if(!strcmp_wa(bstrName, "createNullBSTR")) { - *pid = DISPID_GLOBAL_NULL_BSTR; + if(!strcmp_wa(bstrName, "getNullBSTR")) { + *pid = DISPID_GLOBAL_GETNULLBSTR; + return S_OK; + } + if(!strcmp_wa(bstrName, "isNullBSTR")) { + *pid = DISPID_GLOBAL_ISNULLBSTR; return S_OK; } if(!strcmp_wa(bstrName, "nullDisp")) { @@ -663,13 +668,28 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, V_DISPATCH(pvarRes) = (IDispatch*)&pureDisp; return S_OK; - case DISPID_GLOBAL_NULL_BSTR: + case DISPID_GLOBAL_GETNULLBSTR: if(pvarRes) { V_VT(pvarRes) = VT_BSTR; V_BSTR(pvarRes) = NULL; } return S_OK; + case DISPID_GLOBAL_ISNULLBSTR: + ok(pdp != NULL, "pdp == NULL\n"); + ok(pdp->rgvarg != NULL, "rgvarg == NULL\n"); + ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); + ok(pdp->cArgs == 1, "cArgs = %d\n", pdp->cArgs); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pvarRes != NULL, "pvarRes == NULL\n"); + ok(V_VT(pvarRes) == VT_EMPTY, "V_VT(pvarRes) = %d\n", V_VT(pvarRes)); + ok(pei != NULL, "pei == NULL\n"); + ok(V_VT(pdp->rgvarg) == VT_BSTR, "V_VT(pdp->rgvarg) = %d\n", V_VT(pdp->rgvarg)); + + V_VT(pvarRes) = VT_BOOL; + V_BOOL(pvarRes) = V_BSTR(pdp->rgvarg) ? VARIANT_FALSE : VARIANT_TRUE; + return S_OK; + case DISPID_GLOBAL_ISWIN64: if(pvarRes) { V_VT(pvarRes) = VT_BOOL;

1 0

Matteo Bruni : wined3d: Update the correct draw buffers mask.
by Alexandre Julliard March 28, 2012

March 28, 2012

Module: wine Branch: master Commit: 439097c810bdcb2bd3f838d2ee47369d1f4d7e8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=439097c810bdcb2bd3f838d2e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 28 13:52:11 2012 +0200 wined3d: Update the correct draw buffers mask. --- dlls/wined3d/context.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index fe26549..7d16d3c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2041,7 +2041,7 @@ static DWORD context_generate_rt_mask_no_fbo(const struct wined3d_device *device void context_apply_blit_state(struct wined3d_context *context, const struct wined3d_device *device) { struct wined3d_surface *rt = context->current_rt; - DWORD rt_mask, old_mask; + DWORD rt_mask, *cur_mask; if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { @@ -2072,13 +2072,13 @@ void context_apply_blit_state(struct wined3d_context *context, const struct wine rt_mask = context_generate_rt_mask_no_fbo(device, rt); } - old_mask = context->current_fbo ? context->current_fbo->rt_mask : context->draw_buffers_mask; + cur_mask = context->current_fbo ? &context->current_fbo->rt_mask : &context->draw_buffers_mask; ENTER_GL(); - if (rt_mask != old_mask) + if (rt_mask != *cur_mask) { context_apply_draw_buffers(context, rt_mask); - context->draw_buffers_mask = rt_mask; + *cur_mask = rt_mask; } if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) @@ -2112,7 +2112,7 @@ static BOOL context_validate_rt_config(UINT rt_count, BOOL context_apply_clear_state(struct wined3d_context *context, const struct wined3d_device *device, UINT rt_count, const struct wined3d_fb_state *fb) { - DWORD rt_mask = 0, old_mask; + DWORD rt_mask = 0, *cur_mask; UINT i; struct wined3d_surface **rts = fb->render_targets; @@ -2177,13 +2177,13 @@ BOOL context_apply_clear_state(struct wined3d_context *context, const struct win rt_mask = context_generate_rt_mask_no_fbo(device, rt_count ? rts[0] : NULL); } - old_mask = context->current_fbo ? context->current_fbo->rt_mask : context->draw_buffers_mask; + cur_mask = context->current_fbo ? &context->current_fbo->rt_mask : &context->draw_buffers_mask; ENTER_GL(); - if (rt_mask != old_mask) + if (rt_mask != *cur_mask) { context_apply_draw_buffers(context, rt_mask); - context->draw_buffers_mask = rt_mask; + *cur_mask = rt_mask; context_invalidate_state(context, STATE_FRAMEBUFFER); } @@ -2246,7 +2246,7 @@ void context_state_fb(struct wined3d_context *context, const struct wined3d_stat const struct wined3d_device *device = context->swapchain->device; const struct wined3d_fb_state *fb = state->fb; DWORD rt_mask = find_draw_buffers_mask(context, device); - DWORD old_mask; + DWORD *cur_mask; if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { @@ -2263,11 +2263,11 @@ void context_state_fb(struct wined3d_context *context, const struct wined3d_stat } } - old_mask = context->current_fbo ? context->current_fbo->rt_mask : context->draw_buffers_mask; - if (rt_mask != old_mask) + cur_mask = context->current_fbo ? &context->current_fbo->rt_mask : &context->draw_buffers_mask; + if (rt_mask != *cur_mask) { context_apply_draw_buffers(context, rt_mask); - context->draw_buffers_mask = rt_mask; + *cur_mask = rt_mask; } } @@ -2275,16 +2275,16 @@ void context_state_fb(struct wined3d_context *context, const struct wined3d_stat void context_state_drawbuf(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_device *device = context->swapchain->device; - DWORD rt_mask, old_mask; + DWORD rt_mask, *cur_mask; if (isStateDirty(context, STATE_FRAMEBUFFER)) return; - old_mask = context->current_fbo ? context->current_fbo->rt_mask : context->draw_buffers_mask; + cur_mask = context->current_fbo ? &context->current_fbo->rt_mask : &context->draw_buffers_mask; rt_mask = find_draw_buffers_mask(context, device); - if (rt_mask != old_mask) + if (rt_mask != *cur_mask) { context_apply_draw_buffers(context, rt_mask); - context->draw_buffers_mask = rt_mask; + *cur_mask = rt_mask; } }

1 0

Hans Leidekker : sxs: Parse the display name in CreateAssemblyNameObject.
by Alexandre Julliard March 28, 2012

March 28, 2012

Module: wine Branch: master Commit: 5a6b9ec329e852345599d5f18cd5461c8eff48fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a6b9ec329e852345599d5f18… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 28 15:33:30 2012 +0200 sxs: Parse the display name in CreateAssemblyNameObject. --- dlls/sxs/name.c | 196 ++++++++++++++++++++++++++++++++++++++++++++++-- dlls/sxs/sxs_private.h | 38 +++++++++ 2 files changed, 227 insertions(+), 7 deletions(-) diff --git a/dlls/sxs/name.c b/dlls/sxs/name.c index 1adeebd..9ca911b 100644 --- a/dlls/sxs/name.c +++ b/dlls/sxs/name.c @@ -28,6 +28,8 @@ #include "winsxs.h" #include "wine/debug.h" +#include "wine/unicode.h" +#include "sxs_private.h" WINE_DEFAULT_DEBUG_CHANNEL(sxs); @@ -35,8 +37,18 @@ struct name { IAssemblyName IAssemblyName_iface; LONG refs; + WCHAR *name; + WCHAR *arch; + WCHAR *token; + WCHAR *type; + WCHAR *version; }; +static const WCHAR archW[] = {'p','r','o','c','e','s','s','o','r','A','r','c','h','i','t','e','c','t','u','r','e',0}; +static const WCHAR tokenW[] = {'p','u','b','l','i','c','K','e','y','T','o','k','e','n',0}; +static const WCHAR typeW[] = {'t','y','p','e',0}; +static const WCHAR versionW[] = {'v','e','r','s','i','o','n',0}; + static inline struct name *impl_from_IAssemblyName( IAssemblyName *iface ) { return CONTAINING_RECORD( iface, struct name, IAssemblyName_iface ); @@ -79,6 +91,11 @@ static ULONG WINAPI name_Release( IAssemblyName *iface ) if (!refs) { TRACE("destroying %p\n", name); + HeapFree( GetProcessHeap(), 0, name->name ); + HeapFree( GetProcessHeap(), 0, name->arch ); + HeapFree( GetProcessHeap(), 0, name->token ); + HeapFree( GetProcessHeap(), 0, name->type ); + HeapFree( GetProcessHeap(), 0, name->version ); HeapFree( GetProcessHeap(), 0, name ); } return refs; @@ -117,8 +134,32 @@ static HRESULT WINAPI name_GetDisplayName( LPDWORD buflen, DWORD flags ) { - FIXME("%p, %p, %p, 0x%08x\n", iface, buffer, buflen, flags); - return E_NOTIMPL; + static const WCHAR fmtW[] = {',','%','s','=','\"','%','s','\"',0}; + struct name *name = impl_from_IAssemblyName( iface ); + WCHAR version[30]; + unsigned int len; + + TRACE("%p, %p, %p, 0x%08x\n", iface, buffer, buflen, flags); + + if (!buflen || flags) return E_INVALIDARG; + + len = strlenW( name->name ) + 1; + if (name->arch) len += strlenW( archW ) + strlenW( name->arch ) + 4; + if (name->token) len += strlenW( tokenW ) + strlenW( name->token ) + 4; + if (name->type) len += strlenW( typeW ) + strlenW( name->type ) + 4; + if (name->version) len += strlenW( versionW ) + strlenW( version ) + 4; + if (len > *buflen) + { + *buflen = len; + return HRESULT_FROM_WIN32( ERROR_INSUFFICIENT_BUFFER ); + } + strcpyW( buffer, name->name ); + len = strlenW( buffer ); + if (name->arch) len += sprintfW( buffer + len, fmtW, archW, name->arch ); + if (name->token) len += sprintfW( buffer + len, fmtW, tokenW, name->token ); + if (name->type) len += sprintfW( buffer + len, fmtW, typeW, name->type ); + if (name->version) len += sprintfW( buffer + len, fmtW, versionW, name->version ); + return S_OK; } static HRESULT WINAPI name_Reserved( @@ -139,22 +180,85 @@ static HRESULT WINAPI name_Reserved( return E_NOTIMPL; } +const WCHAR *get_name_attribute( IAssemblyName *iface, enum name_attr_id id ) +{ + struct name *name = impl_from_IAssemblyName( iface ); + + switch (id) + { + case NAME_ATTR_ID_NAME: return name->name; + case NAME_ATTR_ID_ARCH: return name->arch; + case NAME_ATTR_ID_TOKEN: return name->token; + case NAME_ATTR_ID_TYPE: return name->type; + case NAME_ATTR_ID_VERSION: return name->version; + default: + ERR("unhandled name attribute %u\n", id); + break; + } + return NULL; +} + static HRESULT WINAPI name_GetName( IAssemblyName *iface, LPDWORD buflen, WCHAR *buffer ) { - FIXME("%p, %p, %p\n", iface, buflen, buffer); - return E_NOTIMPL; + const WCHAR *name; + int len; + + TRACE("%p, %p, %p\n", iface, buflen, buffer); + + if (!buflen || !buffer) return E_INVALIDARG; + + name = get_name_attribute( iface, NAME_ATTR_ID_NAME ); + len = strlenW( name ) + 1; + if (len > *buflen) + { + *buflen = len; + return HRESULT_FROM_WIN32( ERROR_INSUFFICIENT_BUFFER ); + } + strcpyW( buffer, name ); + *buflen = len + 3; + return S_OK; +} + +static HRESULT parse_version( WCHAR *version, DWORD *high, DWORD *low ) +{ + WORD ver[4]; + WCHAR *p, *q; + unsigned int i; + + memset( ver, 0, sizeof(ver) ); + for (i = 0, p = version; i < 4; i++) + { + if (!*p) break; + q = strchrW( p, '.' ); + if (q) *q = 0; + ver[i] = atolW( p ); + if (!q && i < 3) break; + p = q + 1; + } + *high = (ver[0] << 16) + ver[1]; + *low = (ver[2] << 16) + ver[3]; + return S_OK; } static HRESULT WINAPI name_GetVersion( IAssemblyName *iface, - LPDWORD hi, + LPDWORD high, LPDWORD low ) { - FIXME("%p, %p, %p\n", iface, hi, low); - return E_NOTIMPL; + struct name *name = impl_from_IAssemblyName( iface ); + WCHAR *version; + HRESULT hr; + + TRACE("%p, %p, %p\n", iface, high, low); + + if (!name->version) return HRESULT_FROM_WIN32( ERROR_NOT_FOUND ); + if (!(version = strdupW( name->version ))) return E_OUTOFMEMORY; + hr = parse_version( version, high, low ); + HeapFree( GetProcessHeap(), 0, version ); + return hr; } static HRESULT WINAPI name_IsEqual( @@ -190,6 +294,72 @@ static const IAssemblyNameVtbl name_vtbl = name_Clone }; +static WCHAR *parse_value( const WCHAR *str, unsigned int *len ) +{ + WCHAR *ret; + const WCHAR *p = str; + + if (*p++ != '\"') return NULL; + while (*p && *p != '\"') p++; + if (!*p) return NULL; + + *len = p - str; + if (!(ret = HeapAlloc( GetProcessHeap(), 0, *len * sizeof(WCHAR) ))) return NULL; + memcpy( ret, str + 1, (*len - 1) * sizeof(WCHAR) ); + ret[*len - 1] = 0; + return ret; +} + +static HRESULT parse_displayname( struct name *name, const WCHAR *displayname ) +{ + const WCHAR *p, *q; + unsigned int len; + + p = q = displayname; + while (*q && *q != ',') q++; + len = q - p; + if (!(name->name = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) return E_OUTOFMEMORY; + memcpy( name->name, p, len * sizeof(WCHAR) ); + name->name[len] = 0; + if (!*q) return S_OK; + + for (;;) + { + p = ++q; + while (*q && *q != '=') q++; + if (!*q) return E_INVALIDARG; + len = q - p; + if (len == sizeof(archW)/sizeof(archW[0]) - 1 && !memcmp( p, archW, len * sizeof(WCHAR) )) + { + p = ++q; + if (!(name->arch = parse_value( p, &len ))) return E_INVALIDARG; + q += len; + } + else if (len == sizeof(tokenW)/sizeof(tokenW[0]) - 1 && !memcmp( p, tokenW, len * sizeof(WCHAR) )) + { + p = ++q; + if (!(name->token = parse_value( p, &len ))) return E_INVALIDARG; + q += len; + } + else if (len == sizeof(typeW)/sizeof(typeW[0]) - 1 && !memcmp( p, typeW, len * sizeof(WCHAR) )) + { + p = ++q; + if (!(name->type = parse_value( p, &len ))) return E_INVALIDARG; + q += len; + } + else if (len == sizeof(versionW)/sizeof(versionW[0]) - 1 && !memcmp( p, versionW, len * sizeof(WCHAR) )) + { + p = ++q; + if (!(name->version = parse_value( p, &len ))) return E_INVALIDARG; + q += len; + } + else return HRESULT_FROM_WIN32( ERROR_SXS_INVALID_ASSEMBLY_IDENTITY_ATTRIBUTE_NAME ); + while (*q && *q != ',') q++; + if (!*q) break; + } + return S_OK; +} + /****************************************************************** * CreateAssemblyNameObject (SXS.@) */ @@ -200,6 +370,7 @@ HRESULT WINAPI CreateAssemblyNameObject( LPVOID reserved ) { struct name *name; + HRESULT hr; TRACE("%p, %s, 0x%08x, %p\n", obj, debugstr_w(assembly), flags, reserved); @@ -215,6 +386,17 @@ HRESULT WINAPI CreateAssemblyNameObject( name->IAssemblyName_iface.lpVtbl = &name_vtbl; name->refs = 1; + hr = parse_displayname( name, assembly ); + if (hr != S_OK) + { + HeapFree( GetProcessHeap(), 0, name->name ); + HeapFree( GetProcessHeap(), 0, name->arch ); + HeapFree( GetProcessHeap(), 0, name->token ); + HeapFree( GetProcessHeap(), 0, name->type ); + HeapFree( GetProcessHeap(), 0, name->version ); + HeapFree( GetProcessHeap(), 0, name ); + return hr; + } *obj = &name->IAssemblyName_iface; return S_OK; } diff --git a/dlls/sxs/sxs_private.h b/dlls/sxs/sxs_private.h new file mode 100644 index 0000000..8ff9920 --- /dev/null +++ b/dlls/sxs/sxs_private.h @@ -0,0 +1,38 @@ +/* + * Copyright 2012 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +enum name_attr_id +{ + NAME_ATTR_ID_NAME, + NAME_ATTR_ID_ARCH, + NAME_ATTR_ID_TOKEN, + NAME_ATTR_ID_TYPE, + NAME_ATTR_ID_VERSION +}; + +const WCHAR *get_name_attribute( IAssemblyName *, enum name_attr_id ); + +static inline WCHAR *strdupW( const WCHAR *src ) +{ + WCHAR *dst; + + if (!src) return NULL; + dst = HeapAlloc( GetProcessHeap(), 0, (strlenW( src ) + 1) * sizeof(WCHAR) ); + if (dst) strcpyW( dst, src ); + return dst; +}

1 0

Jacek Caban : mshtml: Improved VARIANT debug traces in htmltable.c.
by Alexandre Julliard March 28, 2012

March 28, 2012

Module: wine Branch: master Commit: f51ceff7e8ed095064e1938eb98766389e67ae97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f51ceff7e8ed095064e1938eb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 28 14:26:20 2012 +0200 mshtml: Improved VARIANT debug traces in htmltable.c. --- dlls/mshtml/htmltable.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index 7490d98..975e53c 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -128,7 +128,7 @@ static HRESULT WINAPI HTMLTable_get_cols(IHTMLTable *iface, LONG *p) static HRESULT WINAPI HTMLTable_put_border(IHTMLTable *iface, VARIANT v) { HTMLTable *This = impl_from_IHTMLTable(iface); - FIXME("(%p)->(v)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -170,7 +170,7 @@ static HRESULT WINAPI HTMLTable_get_rules(IHTMLTable *iface, BSTR *p) static HRESULT WINAPI HTMLTable_put_cellSpacing(IHTMLTable *iface, VARIANT v) { HTMLTable *This = impl_from_IHTMLTable(iface); - FIXME("(%p)->(v)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -184,7 +184,7 @@ static HRESULT WINAPI HTMLTable_get_cellSpacing(IHTMLTable *iface, VARIANT *p) static HRESULT WINAPI HTMLTable_put_cellPadding(IHTMLTable *iface, VARIANT v) { HTMLTable *This = impl_from_IHTMLTable(iface); - FIXME("(%p)->(v)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -212,7 +212,7 @@ static HRESULT WINAPI HTMLTable_get_background(IHTMLTable *iface, BSTR *p) static HRESULT WINAPI HTMLTable_put_bgColor(IHTMLTable *iface, VARIANT v) { HTMLTable *This = impl_from_IHTMLTable(iface); - FIXME("(%p)->(v)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -226,7 +226,7 @@ static HRESULT WINAPI HTMLTable_get_bgColor(IHTMLTable *iface, VARIANT *p) static HRESULT WINAPI HTMLTable_put_borderColor(IHTMLTable *iface, VARIANT v) { HTMLTable *This = impl_from_IHTMLTable(iface); - FIXME("(%p)->(v)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -240,7 +240,7 @@ static HRESULT WINAPI HTMLTable_get_borderColor(IHTMLTable *iface, VARIANT *p) static HRESULT WINAPI HTMLTable_put_borderColorLight(IHTMLTable *iface, VARIANT v) { HTMLTable *This = impl_from_IHTMLTable(iface); - FIXME("(%p)->(v)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -254,7 +254,7 @@ static HRESULT WINAPI HTMLTable_get_borderColorLight(IHTMLTable *iface, VARIANT static HRESULT WINAPI HTMLTable_put_borderColorDark(IHTMLTable *iface, VARIANT v) { HTMLTable *This = impl_from_IHTMLTable(iface); - FIXME("(%p)->(v)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -310,7 +310,7 @@ static HRESULT WINAPI HTMLTable_get_rows(IHTMLTable *iface, IHTMLElementCollecti static HRESULT WINAPI HTMLTable_put_width(IHTMLTable *iface, VARIANT v) { HTMLTable *This = impl_from_IHTMLTable(iface); - FIXME("(%p)->(v)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -324,7 +324,7 @@ static HRESULT WINAPI HTMLTable_get_width(IHTMLTable *iface, VARIANT *p) static HRESULT WINAPI HTMLTable_put_height(IHTMLTable *iface, VARIANT v) { HTMLTable *This = impl_from_IHTMLTable(iface); - FIXME("(%p)->(v)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -457,7 +457,7 @@ static HRESULT WINAPI HTMLTable_get_readyState(IHTMLTable *iface, BSTR *p) static HRESULT WINAPI HTMLTable_put_onreadystatechange(IHTMLTable *iface, VARIANT v) { HTMLTable *This = impl_from_IHTMLTable(iface); - FIXME("(%p)->(v)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; }

1 0

Jacek Caban : mshtml: Improved VARIANT debug traces in htmlbody.c.
by Alexandre Julliard March 28, 2012

March 28, 2012

Module: wine Branch: master Commit: 706ec7a10d7c7edf7370de3b5348384915bb1641 URL: http://source.winehq.org/git/wine.git/?a=commit;h=706ec7a10d7c7edf7370de3b5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 28 14:26:57 2012 +0200 mshtml: Improved VARIANT debug traces in htmlbody.c. --- dlls/mshtml/htmlbody.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index bb3e85b..26f5574 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -171,7 +171,7 @@ static BOOL variant_to_nscolor(const VARIANT *v, nsAString *nsstr) } default: - FIXME("invalid vt=%d\n", V_VT(v)); + FIXME("invalid color %s\n", debugstr_variant(v)); } return FALSE; @@ -313,7 +313,7 @@ static HRESULT WINAPI HTMLBodyElement_get_bgProperties(IHTMLBodyElement *iface, static HRESULT WINAPI HTMLBodyElement_put_leftMargin(IHTMLBodyElement *iface, VARIANT v) { HTMLBodyElement *This = impl_from_IHTMLBodyElement(iface); - FIXME("(%p)->()\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -327,7 +327,7 @@ static HRESULT WINAPI HTMLBodyElement_get_leftMargin(IHTMLBodyElement *iface, VA static HRESULT WINAPI HTMLBodyElement_put_topMargin(IHTMLBodyElement *iface, VARIANT v) { HTMLBodyElement *This = impl_from_IHTMLBodyElement(iface); - FIXME("(%p)->()\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -341,7 +341,7 @@ static HRESULT WINAPI HTMLBodyElement_get_topMargin(IHTMLBodyElement *iface, VAR static HRESULT WINAPI HTMLBodyElement_put_rightMargin(IHTMLBodyElement *iface, VARIANT v) { HTMLBodyElement *This = impl_from_IHTMLBodyElement(iface); - FIXME("(%p)->()\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -355,7 +355,7 @@ static HRESULT WINAPI HTMLBodyElement_get_rightMargin(IHTMLBodyElement *iface, V static HRESULT WINAPI HTMLBodyElement_put_bottomMargin(IHTMLBodyElement *iface, VARIANT v) { HTMLBodyElement *This = impl_from_IHTMLBodyElement(iface); - FIXME("(%p)->()\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -386,7 +386,7 @@ static HRESULT WINAPI HTMLBodyElement_put_bgColor(IHTMLBodyElement *iface, VARIA nsAString strColor; nsresult nsres; - TRACE("(%p)->()\n", This); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); if(!variant_to_nscolor(&v, &strColor)) return S_OK; @@ -431,7 +431,7 @@ static HRESULT WINAPI HTMLBodyElement_put_text(IHTMLBodyElement *iface, VARIANT nsAString text; nsresult nsres; - TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); if(!variant_to_nscolor(&v, &text)) return S_OK; @@ -479,7 +479,7 @@ static HRESULT WINAPI HTMLBodyElement_put_link(IHTMLBodyElement *iface, VARIANT nsAString link_str; nsresult nsres; - TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); if(!variant_to_nscolor(&v, &link_str)) return S_OK; @@ -517,7 +517,7 @@ static HRESULT WINAPI HTMLBodyElement_put_vLink(IHTMLBodyElement *iface, VARIANT nsAString vlink_str; nsresult nsres; - TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); if(!variant_to_nscolor(&v, &vlink_str)) return S_OK; @@ -555,7 +555,7 @@ static HRESULT WINAPI HTMLBodyElement_put_aLink(IHTMLBodyElement *iface, VARIANT nsAString alink_str; nsresult nsres; - TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); if(!variant_to_nscolor(&v, &alink_str)) return S_OK; @@ -590,7 +590,7 @@ static HRESULT WINAPI HTMLBodyElement_get_aLink(IHTMLBodyElement *iface, VARIANT static HRESULT WINAPI HTMLBodyElement_put_onload(IHTMLBodyElement *iface, VARIANT v) { HTMLBodyElement *This = impl_from_IHTMLBodyElement(iface); - FIXME("(%p)->()\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -604,7 +604,7 @@ static HRESULT WINAPI HTMLBodyElement_get_onload(IHTMLBodyElement *iface, VARIAN static HRESULT WINAPI HTMLBodyElement_put_onunload(IHTMLBodyElement *iface, VARIANT v) { HTMLBodyElement *This = impl_from_IHTMLBodyElement(iface); - FIXME("(%p)->()\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -632,7 +632,7 @@ static HRESULT WINAPI HTMLBodyElement_get_scroll(IHTMLBodyElement *iface, BSTR * static HRESULT WINAPI HTMLBodyElement_put_onselect(IHTMLBodyElement *iface, VARIANT v) { HTMLBodyElement *This = impl_from_IHTMLBodyElement(iface); - FIXME("(%p)->()\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -646,7 +646,7 @@ static HRESULT WINAPI HTMLBodyElement_get_onselect(IHTMLBodyElement *iface, VARI static HRESULT WINAPI HTMLBodyElement_put_onbeforeunload(IHTMLBodyElement *iface, VARIANT v) { HTMLBodyElement *This = impl_from_IHTMLBodyElement(iface); - FIXME("(%p)->()\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; }

1 0

Jacek Caban : mshtml: Improved more VARIANT debug traces.
by Alexandre Julliard March 28, 2012

March 28, 2012

Module: wine Branch: master Commit: 21f5ef2808f77e381c2f3ec8bc6a481c1a872b98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21f5ef2808f77e381c2f3ec8b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 28 14:27:20 2012 +0200 mshtml: Improved more VARIANT debug traces. --- dlls/mshtml/editor.c | 10 +++++----- dlls/mshtml/htmlelem3.c | 2 +- dlls/mshtml/htmlevent.c | 4 ++-- dlls/mshtml/htmlform.c | 2 +- dlls/mshtml/htmlinput.c | 4 ++-- dlls/mshtml/htmlnode.c | 8 +++----- dlls/mshtml/htmloption.c | 8 ++++---- dlls/mshtml/htmlscript.c | 2 +- dlls/mshtml/htmlstylesheet.c | 4 ++-- dlls/mshtml/olecmd.c | 8 ++++---- dlls/mshtml/oleobj.c | 8 ++++---- dlls/mshtml/persist.c | 4 ++-- 12 files changed, 31 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=21f5ef2808f77e381c2f3…

1 0

Jacek Caban : mshtml: Improved VARIANT debug traces in htmlelem.c.
by Alexandre Julliard March 28, 2012

March 28, 2012

Module: wine Branch: master Commit: 3f9c706606de825eca5b8710bd8a82a770eb0e5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f9c706606de825eca5b8710b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 28 14:26:48 2012 +0200 mshtml: Improved VARIANT debug traces in htmlelem.c. --- dlls/mshtml/htmlelem.c | 38 +++++++++++++++++++------------------- 1 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index b82c4df..5f33f96 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -523,7 +523,7 @@ static HRESULT WINAPI HTMLElement_get_style(IHTMLElement *iface, IHTMLStyle **p) static HRESULT WINAPI HTMLElement_put_onhelp(IHTMLElement *iface, VARIANT v) { HTMLElement *This = impl_from_IHTMLElement(iface); - FIXME("(%p)->()\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -538,7 +538,7 @@ static HRESULT WINAPI HTMLElement_put_onclick(IHTMLElement *iface, VARIANT v) { HTMLElement *This = impl_from_IHTMLElement(iface); - TRACE("(%p)->()\n", This); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); return set_node_event(&This->node, EVENTID_CLICK, &v); } @@ -592,7 +592,7 @@ static HRESULT WINAPI HTMLElement_put_onkeyup(IHTMLElement *iface, VARIANT v) { HTMLElement *This = impl_from_IHTMLElement(iface); - TRACE("(%p)->()\n", This); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); return set_node_event(&This->node, EVENTID_KEYUP, &v); } @@ -607,7 +607,7 @@ static HRESULT WINAPI HTMLElement_get_onkeyup(IHTMLElement *iface, VARIANT *p) static HRESULT WINAPI HTMLElement_put_onkeypress(IHTMLElement *iface, VARIANT v) { HTMLElement *This = impl_from_IHTMLElement(iface); - FIXME("(%p)->()\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -640,7 +640,7 @@ static HRESULT WINAPI HTMLElement_put_onmouseover(IHTMLElement *iface, VARIANT v { HTMLElement *This = impl_from_IHTMLElement(iface); - TRACE("(%p)->()\n", This); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); return set_node_event(&This->node, EVENTID_MOUSEOVER, &v); } @@ -658,7 +658,7 @@ static HRESULT WINAPI HTMLElement_put_onmousemove(IHTMLElement *iface, VARIANT v { HTMLElement *This = impl_from_IHTMLElement(iface); - TRACE("(%p)->()\n", This); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); return set_node_event(&This->node, EVENTID_MOUSEMOVE, &v); } @@ -676,7 +676,7 @@ static HRESULT WINAPI HTMLElement_put_onmousedown(IHTMLElement *iface, VARIANT v { HTMLElement *This = impl_from_IHTMLElement(iface); - TRACE("(%p)->()\n", This); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); return set_node_event(&This->node, EVENTID_MOUSEDOWN, &v); } @@ -833,7 +833,7 @@ static HRESULT WINAPI HTMLElement_get_onselectstart(IHTMLElement *iface, VARIANT static HRESULT WINAPI HTMLElement_scrollIntoView(IHTMLElement *iface, VARIANT varargStart) { HTMLElement *This = impl_from_IHTMLElement(iface); - FIXME("(%p)->()\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&varargStart)); return E_NOTIMPL; } @@ -1323,7 +1323,7 @@ static HRESULT WINAPI HTMLElement_get_filters(IHTMLElement *iface, static HRESULT WINAPI HTMLElement_put_ondragstart(IHTMLElement *iface, VARIANT v) { HTMLElement *This = impl_from_IHTMLElement(iface); - FIXME("(%p)->()\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -1344,7 +1344,7 @@ static HRESULT WINAPI HTMLElement_toString(IHTMLElement *iface, BSTR *String) static HRESULT WINAPI HTMLElement_put_onbeforeupdate(IHTMLElement *iface, VARIANT v) { HTMLElement *This = impl_from_IHTMLElement(iface); - FIXME("(%p)->()\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -1358,7 +1358,7 @@ static HRESULT WINAPI HTMLElement_get_onbeforeupdate(IHTMLElement *iface, VARIAN static HRESULT WINAPI HTMLElement_put_onafterupdate(IHTMLElement *iface, VARIANT v) { HTMLElement *This = impl_from_IHTMLElement(iface); - FIXME("(%p)->()\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -1372,7 +1372,7 @@ static HRESULT WINAPI HTMLElement_get_onafterupdate(IHTMLElement *iface, VARIANT static HRESULT WINAPI HTMLElement_put_onerrorupdate(IHTMLElement *iface, VARIANT v) { HTMLElement *This = impl_from_IHTMLElement(iface); - FIXME("(%p)->()\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -1386,7 +1386,7 @@ static HRESULT WINAPI HTMLElement_get_onerrorupdate(IHTMLElement *iface, VARIANT static HRESULT WINAPI HTMLElement_put_onrowexit(IHTMLElement *iface, VARIANT v) { HTMLElement *This = impl_from_IHTMLElement(iface); - FIXME("(%p)->()\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -1400,7 +1400,7 @@ static HRESULT WINAPI HTMLElement_get_onrowexit(IHTMLElement *iface, VARIANT *p) static HRESULT WINAPI HTMLElement_put_onrowenter(IHTMLElement *iface, VARIANT v) { HTMLElement *This = impl_from_IHTMLElement(iface); - FIXME("(%p)->()\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -1414,7 +1414,7 @@ static HRESULT WINAPI HTMLElement_get_onrowenter(IHTMLElement *iface, VARIANT *p static HRESULT WINAPI HTMLElement_put_ondatasetchanged(IHTMLElement *iface, VARIANT v) { HTMLElement *This = impl_from_IHTMLElement(iface); - FIXME("(%p)->()\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -1428,7 +1428,7 @@ static HRESULT WINAPI HTMLElement_get_ondatasetchanged(IHTMLElement *iface, VARI static HRESULT WINAPI HTMLElement_put_ondataavailable(IHTMLElement *iface, VARIANT v) { HTMLElement *This = impl_from_IHTMLElement(iface); - FIXME("(%p)->()\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -1442,7 +1442,7 @@ static HRESULT WINAPI HTMLElement_get_ondataavailable(IHTMLElement *iface, VARIA static HRESULT WINAPI HTMLElement_put_ondatasetcomplete(IHTMLElement *iface, VARIANT v) { HTMLElement *This = impl_from_IHTMLElement(iface); - FIXME("(%p)->()\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -1456,7 +1456,7 @@ static HRESULT WINAPI HTMLElement_get_ondatasetcomplete(IHTMLElement *iface, VAR static HRESULT WINAPI HTMLElement_put_onfilterchange(IHTMLElement *iface, VARIANT v) { HTMLElement *This = impl_from_IHTMLElement(iface); - FIXME("(%p)->()\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -2294,7 +2294,7 @@ static HRESULT WINAPI HTMLAttributeCollection_item(IHTMLAttributeCollection *ifa hres = get_attr_dispid_by_name(This, V_BSTR(name), &id); break; default: - FIXME("unsupported vt %x\n", V_VT(name)); + FIXME("unsupported name %s\n", debugstr_variant(name)); hres = E_NOTIMPL; } if(hres == DISP_E_UNKNOWNNAME)

1 0

Jacek Caban : mshtml: Improved VARIANT debug traces in htmldoc*.c.
by Alexandre Julliard March 28, 2012

March 28, 2012

Module: wine Branch: master Commit: 1dd2010f31dcbf034457d2c094bc8aaa066e29f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dd2010f31dcbf034457d2c09… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 28 14:27:07 2012 +0200 mshtml: Improved VARIANT debug traces in htmldoc*.c. --- dlls/mshtml/htmldoc3.c | 4 ++-- dlls/mshtml/htmldoc5.c | 24 +++++++++++------------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/htmldoc3.c b/dlls/mshtml/htmldoc3.c index 4153871..2541145 100644 --- a/dlls/mshtml/htmldoc3.c +++ b/dlls/mshtml/htmldoc3.c @@ -717,7 +717,7 @@ static HRESULT WINAPI HTMLDocument4_hasFocus(IHTMLDocument4 *iface, VARIANT_BOOL static HRESULT WINAPI HTMLDocument4_put_onselectionchange(IHTMLDocument4 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument4(iface); - FIXME("(%p)->(v)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -784,7 +784,7 @@ static HRESULT WINAPI HTMLDocument4_createRenderStyle(IHTMLDocument4 *iface, BST static HRESULT WINAPI HTMLDocument4_put_oncontrolselect(IHTMLDocument4 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument4(iface); - FIXME("(%p)->(v)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } diff --git a/dlls/mshtml/htmldoc5.c b/dlls/mshtml/htmldoc5.c index f283041..587d75b 100644 --- a/dlls/mshtml/htmldoc5.c +++ b/dlls/mshtml/htmldoc5.c @@ -91,7 +91,7 @@ static HRESULT WINAPI HTMLDocument5_Invoke(IHTMLDocument5 *iface, DISPID dispIdM static HRESULT WINAPI HTMLDocument5_put_onmousewheel(IHTMLDocument5 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument5(iface); - FIXME("(%p)->(v)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -162,7 +162,7 @@ static HRESULT WINAPI HTMLDocument5_createComment(IHTMLDocument5 *iface, BSTR bs static HRESULT WINAPI HTMLDocument5_put_onfocusin(IHTMLDocument5 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument5(iface); - FIXME("(%p)->(v)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -176,7 +176,7 @@ static HRESULT WINAPI HTMLDocument5_get_onfocusin(IHTMLDocument5 *iface, VARIANT static HRESULT WINAPI HTMLDocument5_put_onfocusout(IHTMLDocument5 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument5(iface); - FIXME("(%p)->(v)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -190,7 +190,7 @@ static HRESULT WINAPI HTMLDocument5_get_onfocusout(IHTMLDocument5 *iface, VARIAN static HRESULT WINAPI HTMLDocument5_put_onactivate(IHTMLDocument5 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument5(iface); - FIXME("(%p)->(v)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -204,7 +204,7 @@ static HRESULT WINAPI HTMLDocument5_get_onactivate(IHTMLDocument5 *iface, VARIAN static HRESULT WINAPI HTMLDocument5_put_ondeactivate(IHTMLDocument5 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument5(iface); - FIXME("(%p)->(v)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -218,7 +218,7 @@ static HRESULT WINAPI HTMLDocument5_get_ondeactivate(IHTMLDocument5 *iface, VARI static HRESULT WINAPI HTMLDocument5_put_onbeforeactivate(IHTMLDocument5 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument5(iface); - FIXME("(%p)->(v)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -232,7 +232,7 @@ static HRESULT WINAPI HTMLDocument5_get_onbeforeactivate(IHTMLDocument5 *iface, static HRESULT WINAPI HTMLDocument5_put_onbeforedeactivate(IHTMLDocument5 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument5(iface); - FIXME("(%p)->(v)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -373,11 +373,10 @@ static HRESULT WINAPI HTMLDocument6_get_onstorage(IHTMLDocument6 *iface, return E_NOTIMPL; } -static HRESULT WINAPI HTMLDocument6_put_onstorage(IHTMLDocument6 *iface, - VARIANT p) +static HRESULT WINAPI HTMLDocument6_put_onstorage(IHTMLDocument6 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument6(iface); - FIXME("(%p)->(v)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -389,11 +388,10 @@ static HRESULT WINAPI HTMLDocument6_get_onstoragecommit(IHTMLDocument6 *iface, return E_NOTIMPL; } -static HRESULT WINAPI HTMLDocument6_put_onstoragecommit(IHTMLDocument6 *iface, - VARIANT p) +static HRESULT WINAPI HTMLDocument6_put_onstoragecommit(IHTMLDocument6 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument6(iface); - FIXME("(%p)->(v)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; }

1 0

Jacek Caban : mshtml: Improved VARIANT debug traces in htmldoc.c.
by Alexandre Julliard March 28, 2012

March 28, 2012

Module: wine Branch: master Commit: 6e3d322cce54619909779c2a97de86341ef74b37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e3d322cce54619909779c2a9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 28 14:26:34 2012 +0200 mshtml: Improved VARIANT debug traces in htmldoc.c. --- dlls/mshtml/htmldoc.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 46838d6..32b54ec 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -494,7 +494,7 @@ static HRESULT WINAPI HTMLDocument_get_plugins(IHTMLDocument2 *iface, IHTMLEleme static HRESULT WINAPI HTMLDocument_put_alinkColor(IHTMLDocument2 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -508,7 +508,7 @@ static HRESULT WINAPI HTMLDocument_get_alinkColor(IHTMLDocument2 *iface, VARIANT static HRESULT WINAPI HTMLDocument_put_bgColor(IHTMLDocument2 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -522,7 +522,7 @@ static HRESULT WINAPI HTMLDocument_get_bgColor(IHTMLDocument2 *iface, VARIANT *p static HRESULT WINAPI HTMLDocument_put_fgColor(IHTMLDocument2 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -536,7 +536,7 @@ static HRESULT WINAPI HTMLDocument_get_fgColor(IHTMLDocument2 *iface, VARIANT *p static HRESULT WINAPI HTMLDocument_put_linkColor(IHTMLDocument2 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)->()\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -550,7 +550,7 @@ static HRESULT WINAPI HTMLDocument_get_linkColor(IHTMLDocument2 *iface, VARIANT static HRESULT WINAPI HTMLDocument_put_vlinkColor(IHTMLDocument2 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -821,7 +821,7 @@ static HRESULT document_write(HTMLDocument *This, SAFEARRAY *psarray, BOOL ln) if(NS_FAILED(nsres)) ERR("Write failed: %08x\n", nsres); }else { - FIXME("vt=%d\n", V_VT(var+i)); + FIXME("unsupported arg[%d] = %s\n", i, debugstr_variant(var+i)); } } @@ -973,7 +973,7 @@ static HRESULT WINAPI HTMLDocument_execCommand(IHTMLDocument2 *iface, BSTR cmdID VARIANT_BOOL showUI, VARIANT value, VARIANT_BOOL *pfRet) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)->(%s %x %p)\n", This, debugstr_w(cmdID), showUI, pfRet); + FIXME("(%p)->(%s %x %s %p)\n", This, debugstr_w(cmdID), showUI, debugstr_variant(&value), pfRet); return E_NOTIMPL; } @@ -1012,7 +1012,7 @@ static HRESULT WINAPI HTMLDocument_createElement(IHTMLDocument2 *iface, BSTR eTa static HRESULT WINAPI HTMLDocument_put_onhelp(IHTMLDocument2 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -1044,7 +1044,7 @@ static HRESULT WINAPI HTMLDocument_get_onclick(IHTMLDocument2 *iface, VARIANT *p static HRESULT WINAPI HTMLDocument_put_ondblclick(IHTMLDocument2 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -1094,7 +1094,7 @@ static HRESULT WINAPI HTMLDocument_get_onkeydown(IHTMLDocument2 *iface, VARIANT static HRESULT WINAPI HTMLDocument_put_onkeypress(IHTMLDocument2 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -1127,7 +1127,7 @@ static HRESULT WINAPI HTMLDocument_put_onmousedown(IHTMLDocument2 *iface, VARIAN { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - TRACE("(%p)->()\n", This); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); return set_doc_event(This, EVENTID_MOUSEDOWN, &v); } @@ -1145,7 +1145,7 @@ static HRESULT WINAPI HTMLDocument_put_onmousemove(IHTMLDocument2 *iface, VARIAN { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - TRACE("(%p)->()\n", This); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); return set_doc_event(This, EVENTID_MOUSEMOVE, &v); } @@ -1181,7 +1181,7 @@ static HRESULT WINAPI HTMLDocument_put_onmouseover(IHTMLDocument2 *iface, VARIAN { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - TRACE("(%p)\n", This); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); return set_doc_event(This, EVENTID_MOUSEOVER, &v); } @@ -1216,7 +1216,7 @@ static HRESULT WINAPI HTMLDocument_get_onreadystatechange(IHTMLDocument2 *iface, static HRESULT WINAPI HTMLDocument_put_onafterupdate(IHTMLDocument2 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -1230,7 +1230,7 @@ static HRESULT WINAPI HTMLDocument_get_onafterupdate(IHTMLDocument2 *iface, VARI static HRESULT WINAPI HTMLDocument_put_onrowexit(IHTMLDocument2 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -1244,7 +1244,7 @@ static HRESULT WINAPI HTMLDocument_get_onrowexit(IHTMLDocument2 *iface, VARIANT static HRESULT WINAPI HTMLDocument_put_onrowenter(IHTMLDocument2 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -1363,7 +1363,7 @@ static HRESULT WINAPI HTMLDocument_get_styleSheets(IHTMLDocument2 *iface, static HRESULT WINAPI HTMLDocument_put_onbeforeupdate(IHTMLDocument2 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -1377,7 +1377,7 @@ static HRESULT WINAPI HTMLDocument_get_onbeforeupdate(IHTMLDocument2 *iface, VAR static HRESULT WINAPI HTMLDocument_put_onerrorupdate(IHTMLDocument2 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; }

1 0