wine-commits March 2012

wine-commits@winehq.org

3 participants
710 discussions

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 28 Mar '12

28 Mar '12

Module: wine Branch: master Commit: 576b639535890922f9e966caa69d3d3c003806a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=576b639535890922f9e966caa… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Mar 28 13:19:01 2012 +0200 po: Update French translation. --- po/fr.po | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/po/fr.po b/po/fr.po index a1ed20a..3ad094b 100644 --- a/po/fr.po +++ b/po/fr.po @@ -3474,10 +3474,8 @@ msgid "Expected ')'" msgstr "« ) » attendu" #: jscript.rc:37 -#, fuzzy -#| msgid "Invalid parameter.\n" msgid "Invalid character" -msgstr "Paramètre non valide.\n" +msgstr "Caractère non valide" #: jscript.rc:38 msgid "Unterminated string constant"

1 0

Matteo Bruni : include: Fix some winsock definitions.
by Alexandre Julliard 28 Mar '12

28 Mar '12

Module: wine Branch: master Commit: c0d4c66a5a790a302bd089c24c619a518e4a4909 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0d4c66a5a790a302bd089c24… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 28 13:52:13 2012 +0200 include: Fix some winsock definitions. --- include/winsock2.h | 28 ++++++++++++++-------------- include/ws2spi.h | 1 + 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/include/winsock2.h b/include/winsock2.h index b884587..3e060e5 100644 --- a/include/winsock2.h +++ b/include/winsock2.h @@ -678,9 +678,9 @@ DWORD WINAPI WSAWaitForMultipleEvents(DWORD,const WSAEVENT*,BOOL,DWORD,BOOL); * "Winsock2 Prototypes" section above. */ #if WS_API_TYPEDEFS -typedef SOCKET (WINAPI *LPFN_WSAACCEPT)(SOCKET,WS(sockaddr)*,LPINT,LPCONDITIONPROC,DWORD_PTR); -typedef INT (WINAPI *LPFN_WSAADRESSTOSTRINGA)(LPSOCKADDR,DWORD,LPWSAPROTOCOL_INFOA,LPSTR,LPDWORD); -typedef INT (WINAPI *LPFN_WSAADRESSTOSTRINGW)(LPSOCKADDR,DWORD,LPWSAPROTOCOL_INFOW,LPWSTR,LPDWORD); +typedef SOCKET (WINAPI *LPFN_WSAACCEPT)(SOCKET,struct WS(sockaddr)*,LPINT,LPCONDITIONPROC,DWORD_PTR); +typedef INT (WINAPI *LPFN_WSAADDRESSTOSTRINGA)(LPSOCKADDR,DWORD,LPWSAPROTOCOL_INFOA,LPSTR,LPDWORD); +typedef INT (WINAPI *LPFN_WSAADDRESSTOSTRINGW)(LPSOCKADDR,DWORD,LPWSAPROTOCOL_INFOW,LPWSTR,LPDWORD); #define LPFN_WSAADDRESSTOSTRING WINELIB_NAME_AW(LPFN_WSAADDRESSTOSTRING) typedef BOOL (WINAPI *LPFN_WSACLOSEEVENT)(WSAEVENT); typedef int (WINAPI *LPFN_WSACONNECT)(SOCKET,const struct WS(sockaddr)*,int,LPWSABUF,LPWSABUF,LPQOS,LPQOS); @@ -688,36 +688,36 @@ typedef WSAEVENT (WINAPI *LPFN_WSACREATEEVENT)(void); typedef INT (WINAPI *LPFN_WSADUPLICATESOCKETA)(SOCKET,DWORD,LPWSAPROTOCOL_INFOA); typedef INT (WINAPI *LPFN_WSADUPLICATESOCKETW)(SOCKET,DWORD,LPWSAPROTOCOL_INFOW); #define LPFN_WSADUPLICATESOCKET WINELIB_NAME_AW(LPFN_WSADUPLICATESOCKET) -typedef INT (WINAPI *LPFNWSAENUMNAMESPACEPROVIDERSA)(LPDWORD,LPWSANAMESPACE_INFOA); -typedef INT (WINAPI *LPFNWSAENUMNAMESPACEPROVIDERSW)(LPDWORD,LPWSANAMESPACE_INFOW); -#define LPFN_WSAENUMNAMESPACEPROVIDERS WINELIB_NAME_AW(LPFNWSAENUMNAMESPACEPROVIDERS) -typedef int (WINAPI *LPFN_WSAENUMNETWORKEVENT)(SOCKET,WSAEVENT,LPWSANETWORKEVENTS); +typedef INT (WINAPI *LPFN_WSAENUMNAMESPACEPROVIDERSA)(LPDWORD,LPWSANAMESPACE_INFOA); +typedef INT (WINAPI *LPFN_WSAENUMNAMESPACEPROVIDERSW)(LPDWORD,LPWSANAMESPACE_INFOW); +#define LPFN_WSAENUMNAMESPACEPROVIDERS WINELIB_NAME_AW(LPFN_WSAENUMNAMESPACEPROVIDERS) +typedef int (WINAPI *LPFN_WSAENUMNETWORKEVENTS)(SOCKET,WSAEVENT,LPWSANETWORKEVENTS); typedef int (WINAPI *LPFN_WSAENUMPROTOCOLSA)(LPINT,LPWSAPROTOCOL_INFOA,LPDWORD); typedef int (WINAPI *LPFN_WSAENUMPROTOCOLSW)(LPINT,LPWSAPROTOCOL_INFOW,LPDWORD); #define LPFN_WSAENUMPROTOCOLS WINELIB_NAME_AW(LPFN_WSAENUMPROTOCOLS) typedef int (WINAPI *LPFN_WSAEVENTSELECT)(SOCKET,WSAEVENT,LONG); typedef BOOL (WINAPI *LPFN_WSAGETOVERLAPPEDRESULT)(SOCKET,LPWSAOVERLAPPED,LPDWORD,BOOL,LPDWORD); -typedef BOOL (WINAPI *LPFNWSAGETQOSBYNAME)(SOCKET,LPWSABUF,LPQOS); -typedef INT (WINAPI *LPFNWSAGETSERVICECLASSINFOA)(LPGUID,LPGUID,LPDWORD,LPWSASERVICECLASSINFOA); -typedef INT (WINAPI *LPFNWSAGETSERVICECLASSINFOW)(LPGUID,LPGUID,LPDWORD,LPWSASERVICECLASSINFOW); +typedef BOOL (WINAPI *LPFN_WSAGETQOSBYNAME)(SOCKET,LPWSABUF,LPQOS); +typedef INT (WINAPI *LPFN_WSAGETSERVICECLASSINFOA)(LPGUID,LPGUID,LPDWORD,LPWSASERVICECLASSINFOA); +typedef INT (WINAPI *LPFN_WSAGETSERVICECLASSINFOW)(LPGUID,LPGUID,LPDWORD,LPWSASERVICECLASSINFOW); #define LPFN_LPFNWSAGETSERVICECLASSINFO WINELIB_NAME_AW(LPFN_LPFNWSAGETSERVICECLASSINFO) typedef INT (WINAPI *LPFN_WSAGETSERVICECLASSNAMEBYCLASSIDA)(LPGUID,LPSTR,LPDWORD); typedef INT (WINAPI *LPFN_WSAGETSERVICECLASSNAMEBYCLASSIDW)(LPGUID,LPWSTR,LPDWORD); #define LPFN_WSAGETSERVICECLASSNAMEBYCLASSID WINELIB_NAME_AW(LPFN_WSAGETSERVICECLASSNAMEBYCLASSID) typedef int (WINAPI *LPFN_WSAHTONL)(SOCKET,ULONG,ULONG*); typedef int (WINAPI *LPFN_WSAHTONS)(SOCKET,WS(u_short),WS(u_short)*); -typedef int (WINAPI LPFN_WSAINSTALLSERVICECLASSA)(LPWSASERVICECLASSINFOA); -typedef int (WINAPI LPFN_WSAINSTALLSERVICECLASSW)(LPWSASERVICECLASSINFOW); +typedef int (WINAPI *LPFN_WSAINSTALLSERVICECLASSA)(LPWSASERVICECLASSINFOA); +typedef int (WINAPI *LPFN_WSAINSTALLSERVICECLASSW)(LPWSASERVICECLASSINFOW); typedef int (WINAPI *LPFN_WSAIOCTL)(SOCKET,DWORD,LPVOID,DWORD,LPVOID,DWORD,LPDWORD,LPWSAOVERLAPPED,LPWSAOVERLAPPED_COMPLETION_ROUTINE); typedef int (WINAPI *LPFN_WSAJOINLEAF)(SOCKET,const struct WS(sockaddr)*,int,LPWSABUF,LPWSABUF,LPQOS,LPQOS,DWORD); typedef INT (WINAPI *LPFN_WSALOOKUPSERVICEBEGINA)(LPWSAQUERYSETA,DWORD,LPHANDLE); typedef INT (WINAPI *LPFN_WSALOOKUPSERVICEBEGINW)(LPWSAQUERYSETW,DWORD,LPHANDLE); #define LPFN_WSALOOKUPSERVICEBEGIN WINELIB_NAME_AW(LPFN_WSALOOKUPSERVICEBEGIN); -typedef INT (WINAPI *LPFN_WSALOOKUPSERVICEEND(HANDLE); +typedef INT (WINAPI *LPFN_WSALOOKUPSERVICEEND)(HANDLE); typedef INT (WINAPI *LPFN_WSALOOKUPSERVICENEXTA)(HANDLE,DWORD,LPDWORD,LPWSAQUERYSETA); typedef INT (WINAPI *LPFN_WSALOOKUPSERVICENEXTW)(HANDLE,DWORD,LPDWORD,LPWSAQUERYSETW); #define LPFN_WSALOOKUPSERVICENEXT WINELIB_NAME_AW(LPFN_WSALOOKUPSERVICENEXT) -typedef int (WINAPI *LPFN_WSANSPIoctl)(HANDLE, DWORD,LPVOID,DWORD,LPVOID,DWORD,LPDWORD,LPWSACOMPLETION); +typedef int (WINAPI *LPFN_WSANSPIOCTL)(HANDLE,DWORD,LPVOID,DWORD,LPVOID,DWORD,LPDWORD,LPWSACOMPLETION); typedef int (WINAPI *LPFN_WSANTOHL)(SOCKET,ULONG,ULONG*); typedef int (WINAPI *LPFN_WSANTOHS)(SOCKET,WS(u_short),WS(u_short)*); typedef INT (WINAPI *LPFN_WSAPROVIDERCONFIGCHANGE)(LPHANDLE,LPWSAOVERLAPPED,LPWSAOVERLAPPED_COMPLETION_ROUTINE); diff --git a/include/ws2spi.h b/include/ws2spi.h index b30c45c..5df7d24 100644 --- a/include/ws2spi.h +++ b/include/ws2spi.h @@ -42,6 +42,7 @@ INT WINAPI WSCEnumProtocols(LPINT,LPWSAPROTOCOL_INFOW,LPDWORD,LPINT); INT WINAPI WSCGetProviderPath(LPGUID,LPWSTR,LPINT,LPINT); INT WINAPI WSCInstallNameSpace(LPWSTR,LPWSTR,DWORD,DWORD,LPGUID); INT WINAPI WSCUnInstallNameSpace(LPGUID); +INT WINAPI WSCUpdateProvider(LPGUID, const WCHAR *, const LPWSAPROTOCOL_INFOW, DWORD, LPINT); INT WINAPI WSCWriteProviderOrder(LPDWORD,DWORD); #ifdef __cplusplus

1 0

Matteo Bruni : wined3d: Support WINED3D_TTFF_COUNT3 texture projection in the ARB backend.
by Alexandre Julliard 28 Mar '12

28 Mar '12

Module: wine Branch: master Commit: 7e3c7840e3d873aa4c6b323d4bc0fc07b669e1b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e3c7840e3d873aa4c6b323d4… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 28 13:52:12 2012 +0200 wined3d: Support WINED3D_TTFF_COUNT3 texture projection in the ARB backend. --- dlls/wined3d/arb_program_shader.c | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 50cd91a..6b2d950 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1914,6 +1914,7 @@ static void pshader_hw_tex(const struct wined3d_shader_instruction *ins) char reg_coord[40]; DWORD reg_sampler_code; WORD myflags = 0; + BOOL swizzle_coord = FALSE; /* All versions have a destination register */ shader_arb_get_dst_param(ins, dst, reg_dest); @@ -1948,18 +1949,18 @@ static void pshader_hw_tex(const struct wined3d_shader_instruction *ins) if (reg_sampler_code < MAX_TEXTURES) flags = priv->cur_ps_args->super.tex_transform >> reg_sampler_code * WINED3D_PSARGS_TEXTRANSFORM_SHIFT; if (flags & WINED3D_PSARGS_PROJECTED) + { myflags |= TEX_PROJ; + if ((flags & ~WINED3D_PSARGS_PROJECTED) == WINED3D_TTFF_COUNT3) + swizzle_coord = TRUE; + } } else if (shader_version < WINED3D_SHADER_VERSION(2,0)) { enum wined3d_shader_src_modifier src_mod = ins->src[0].modifiers; if (src_mod == WINED3DSPSM_DZ) { - /* TXP cannot handle DZ natively, so move the z coordinate to .w. reg_coord is a read-only - * varying register, so we need a temp reg - */ - shader_addline(ins->ctx->buffer, "SWZ TA, %s, x, y, z, z;\n", reg_coord); - strcpy(reg_coord, "TA"); + swizzle_coord = TRUE; myflags |= TEX_PROJ; } else if(src_mod == WINED3DSPSM_DW) { myflags |= TEX_PROJ; @@ -1968,6 +1969,15 @@ static void pshader_hw_tex(const struct wined3d_shader_instruction *ins) if (ins->flags & WINED3DSI_TEXLD_PROJECT) myflags |= TEX_PROJ; if (ins->flags & WINED3DSI_TEXLD_BIAS) myflags |= TEX_BIAS; } + + if (swizzle_coord) + { + /* TXP cannot handle DZ natively, so move the z coordinate to .w. + * reg_coord is a read-only varying register, so we need a temp reg */ + shader_addline(ins->ctx->buffer, "SWZ TA, %s, x, y, z, z;\n", reg_coord); + strcpy(reg_coord, "TA"); + } + shader_hw_sample(ins, reg_sampler_code, reg_dest, reg_coord, myflags, NULL, NULL); }

1 0

Matteo Bruni : wined3d: Update the correct draw buffers mask.
by Alexandre Julliard 28 Mar '12

28 Mar '12

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

Jacek Caban : mshtml: Improved more VARIANT debug traces.
by Alexandre Julliard 28 Mar '12

28 Mar '12

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 htmldoc*.c.
by Alexandre Julliard 28 Mar '12

28 Mar '12

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 htmlbody.c.
by Alexandre Julliard 28 Mar '12

28 Mar '12

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 VARIANT debug traces in htmlelem.c.
by Alexandre Julliard 28 Mar '12

28 Mar '12

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 28 Mar '12

28 Mar '12

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

Jacek Caban : mshtml: Improved VARIANT debug traces in htmltable.c.
by Alexandre Julliard 28 Mar '12

28 Mar '12

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

← Newer
1
...
6
7
8
9
10
11
12
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2012