October 2021 - Wine-commits

Nikolay Sivov : d3d10/effect: Remove a cast in IsValid() for SRV variables.
by Alexandre Julliard 29 Oct '21

29 Oct '21

Module: wine Branch: master Commit: e81ad39d87db502e61eec3ec87da87516b0fe6f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e81ad39d87db502e61eec3ec… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 28 10:46:35 2021 +0300 d3d10/effect: Remove a cast in IsValid() for SRV variables. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 22a09f45e14..23374fdb48f 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -6411,9 +6411,11 @@ static inline struct d3d10_effect_variable *impl_from_ID3D10EffectShaderResource static BOOL STDMETHODCALLTYPE d3d10_effect_shader_resource_variable_IsValid(ID3D10EffectShaderResourceVariable *iface) { - TRACE("iface %p\n", iface); + struct d3d10_effect_variable *v = impl_from_ID3D10EffectShaderResourceVariable(iface); + + TRACE("iface %p.\n", iface); - return (struct d3d10_effect_variable *)iface != &null_shader_resource_variable; + return v != &null_shader_resource_variable; } static struct ID3D10EffectType * STDMETHODCALLTYPE d3d10_effect_shader_resource_variable_GetType(

1 0

Nikolay Sivov : d3d10/effect: Get rid of interface pointer casts in IsValid().
by Alexandre Julliard 29 Oct '21

29 Oct '21

Module: wine Branch: master Commit: 166babb2d17d7f54866d15c118c1507082944041 URL: https://source.winehq.org/git/wine.git/?a=commit;h=166babb2d17d7f54866d15c1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 28 10:46:37 2021 +0300 d3d10/effect: Get rid of interface pointer casts in IsValid(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 96 ++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 77 insertions(+), 19 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=166babb2d17d7f54866d…

1 0

Nikolay Sivov : d3d10/effect: Reduce duplication when releasing shader objects.
by Alexandre Julliard 29 Oct '21

29 Oct '21

Module: wine Branch: master Commit: 3d5f8b98698be75508a221898ea9accf2943028e URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d5f8b98698be75508a22189… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 28 10:46:38 2021 +0300 d3d10/effect: Reduce duplication when releasing shader objects. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_private.h | 1 + dlls/d3d10/effect.c | 12 ++---------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 11b3b4e9482..75d00371ba6 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -87,6 +87,7 @@ struct d3d10_effect_shader_variable ID3D10VertexShader *vs; ID3D10PixelShader *ps; ID3D10GeometryShader *gs; + IUnknown *object; } shader; unsigned int resource_count; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 20a929b9f7c..5da8d2065f7 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2983,18 +2983,10 @@ static void d3d10_effect_shader_variable_destroy(struct d3d10_effect_shader_vari switch (type) { case D3D10_SVT_VERTEXSHADER: - if (s->shader.vs) - ID3D10VertexShader_Release(s->shader.vs); - break; - case D3D10_SVT_PIXELSHADER: - if (s->shader.ps) - ID3D10PixelShader_Release(s->shader.ps); - break; - case D3D10_SVT_GEOMETRYSHADER: - if (s->shader.gs) - ID3D10GeometryShader_Release(s->shader.gs); + if (s->shader.object) + IUnknown_Release(s->shader.object); break; default:

1 0

Rémi Bernon : server: Clear dr7 before setting other registers.
by Alexandre Julliard 29 Oct '21

29 Oct '21

Module: wine Branch: master Commit: 4db8cdc267efd62fc7349912fe352cf214c012f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4db8cdc267efd62fc7349912… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 29 18:35:13 2021 +0200 server: Clear dr7 before setting other registers. Resetting their length to make sure we pass alignment checks both for their current values and for the new values we'll write. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46472 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/ptrace.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/server/ptrace.c b/server/ptrace.c index bcd0fe48f16..b9dd9e9539a 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -633,8 +633,7 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign switch (context->machine) { case IMAGE_FILE_MACHINE_I386: - /* Linux 2.6.33+ does DR0-DR3 alignment validation, so it has to know LEN bits first */ - if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(7), context->debug.i386_regs.dr7 & 0xffff0000 ) == -1) goto error; + if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(7), 0 ) == -1) goto error; if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(0), context->debug.i386_regs.dr0 ) == -1) goto error; if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(1), context->debug.i386_regs.dr1 ) == -1) goto error; if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(2), context->debug.i386_regs.dr2 ) == -1) goto error; @@ -646,7 +645,7 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign thread->system_regs |= SERVER_CTX_DEBUG_REGISTERS; break; case IMAGE_FILE_MACHINE_AMD64: - if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(7), context->debug.x86_64_regs.dr7 & 0xffff0000 ) == -1) goto error; + if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(7), 0 ) == -1) goto error; if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(0), context->debug.x86_64_regs.dr0 ) == -1) goto error; if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(1), context->debug.x86_64_regs.dr1 ) == -1) goto error; if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(2), context->debug.x86_64_regs.dr2 ) == -1) goto error;

1 0

Rémi Bernon : server: Remove dr7 PTRACE_POKEUSER workaround.
by Alexandre Julliard 29 Oct '21

29 Oct '21

Module: wine Branch: master Commit: 75bccf99d1f90555c998f2c9b907ed9292ce47f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=75bccf99d1f90555c998f2c9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 29 18:35:14 2021 +0200 server: Remove dr7 PTRACE_POKEUSER workaround. It is needed for Linux Kernel version 4.18, and has been fixed in 4.19. Also see https://bugzilla.kernel.org/show_bug.cgi?id=200965 for a more detailed description of the regression and the fix. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46472 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/ptrace.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/server/ptrace.c b/server/ptrace.c index b9dd9e9539a..1875e1dfd56 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -627,9 +627,6 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign if (!suspend_for_ptrace( thread )) return; - /* force all breakpoint lengths to 1, workaround for kernel bug 200965 */ - ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(7), 0x11110055 ); - switch (context->machine) { case IMAGE_FILE_MACHINE_I386:

1 0

Alistair Leslie-Hughes : msdasql: Implement IDBCreateCommand CreateCommand.
by Alexandre Julliard 29 Oct '21

29 Oct '21

Module: wine Branch: master Commit: 067c0e91e3a2b60f1e3139a76b4cee521c476aa1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=067c0e91e3a2b60f1e3139a7… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Oct 29 17:32:44 2021 +1100 msdasql: Implement IDBCreateCommand CreateCommand. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/session.c | 123 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 121 insertions(+), 2 deletions(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index e01dcf7ab7e..afdbccb5a03 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -275,13 +275,132 @@ static ULONG WINAPI createcommand_Release(IDBCreateCommand *iface) return IUnknown_Release(&session->session_iface); } +struct command +{ + ICommandText ICommandText_iface; + LONG refs; +}; + +static inline struct command *impl_from_ICommandText( ICommandText *iface ) +{ + return CONTAINING_RECORD( iface, struct command, ICommandText_iface ); +} + +static HRESULT WINAPI command_QueryInterface(ICommandText *iface, REFIID riid, void **ppv) +{ + struct command *command = impl_from_ICommandText( iface ); + + TRACE( "%p, %s, %p\n", command, debugstr_guid(riid), ppv ); + *ppv = NULL; + + if(IsEqualGUID(&IID_IUnknown, riid) || + IsEqualGUID(&IID_ICommand, riid) || + IsEqualGUID(&IID_ICommandText, riid)) + { + *ppv = &command->ICommandText_iface; + } + + if(*ppv) + { + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + + FIXME("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static ULONG WINAPI command_AddRef(ICommandText *iface) +{ + struct command *command = impl_from_ICommandText( iface ); + LONG refs = InterlockedIncrement( &command->refs ); + TRACE( "%p new refcount %d\n", command, refs ); + return refs; +} + +static ULONG WINAPI command_Release(ICommandText *iface) +{ + struct command *command = impl_from_ICommandText( iface ); + LONG refs = InterlockedDecrement( &command->refs ); + TRACE( "%p new refcount %d\n", command, refs ); + if (!refs) + { + TRACE( "destroying %p\n", command ); + heap_free( command ); + } + return refs; +} + +static HRESULT WINAPI command_Cancel(ICommandText *iface) +{ + struct command *command = impl_from_ICommandText( iface ); + FIXME("%p\n", command); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_Execute(ICommandText *iface, IUnknown *outer, REFIID riid, + DBPARAMS *params, DBROWCOUNT *affected, IUnknown **rowset) +{ + struct command *command = impl_from_ICommandText( iface ); + FIXME("%p, %p, %s, %p %p %p\n", command, outer, debugstr_guid(riid), params, affected, rowset); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_GetDBSession(ICommandText *iface, REFIID riid, IUnknown **session) +{ + struct command *command = impl_from_ICommandText( iface ); + FIXME("%p, %s, %p\n", command, debugstr_guid(riid), session); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_GetCommandText(ICommandText *iface, GUID *dialect, LPOLESTR *commandstr) +{ + struct command *command = impl_from_ICommandText( iface ); + FIXME("%p, %p, %p\n", command, dialect, commandstr); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_SetCommandText(ICommandText *iface, REFGUID dialect, LPCOLESTR commandstr) +{ + struct command *command = impl_from_ICommandText( iface ); + FIXME("%p, %s, %s\n", command, debugstr_guid(dialect), debugstr_w(commandstr)); + return S_OK; +} + +static const ICommandTextVtbl commandVtbl = +{ + command_QueryInterface, + command_AddRef, + command_Release, + command_Cancel, + command_Execute, + command_GetDBSession, + command_GetCommandText, + command_SetCommandText +}; + static HRESULT WINAPI createcommand_CreateCommand(IDBCreateCommand *iface, IUnknown *outer, REFIID riid, IUnknown **out) { struct msdasql_session *session = impl_from_IDBCreateCommand( iface ); - FIXME("%p, %p, %s, %p\n", session, outer, debugstr_guid(riid), out); + struct command *command; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p, %s, %p\n", session, outer, debugstr_guid(riid), out); + + if (outer) + FIXME("Outer not currently supported\n"); + + command = heap_alloc(sizeof(*command)); + if (!command) + return E_OUTOFMEMORY; + + command->ICommandText_iface.lpVtbl = &commandVtbl; + command->refs = 1; + + hr = ICommandText_QueryInterface(&command->ICommandText_iface, riid, (void**)out); + ICommandText_Release(&command->ICommandText_iface); + return hr; } static const IDBCreateCommandVtbl createcommandVtbl =

1 0

Alistair Leslie-Hughes : msdasql: Add ICommandProperties interface to ICommandText.
by Alexandre Julliard 29 Oct '21

29 Oct '21

Module: wine Branch: master Commit: 1bc19b0c402c9e349daecb42ad3cf4dd78afd01c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1bc19b0c402c9e349daecb42… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Oct 29 17:32:45 2021 +1100 msdasql: Add ICommandProperties interface to ICommandText. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/session.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index afdbccb5a03..42b40349f1b 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -278,6 +278,7 @@ static ULONG WINAPI createcommand_Release(IDBCreateCommand *iface) struct command { ICommandText ICommandText_iface; + ICommandProperties ICommandProperties_iface; LONG refs; }; @@ -286,6 +287,11 @@ static inline struct command *impl_from_ICommandText( ICommandText *iface ) return CONTAINING_RECORD( iface, struct command, ICommandText_iface ); } +static inline struct command *impl_from_ICommandProperties( ICommandProperties *iface ) +{ + return CONTAINING_RECORD( iface, struct command, ICommandProperties_iface ); +} + static HRESULT WINAPI command_QueryInterface(ICommandText *iface, REFIID riid, void **ppv) { struct command *command = impl_from_ICommandText( iface ); @@ -299,6 +305,10 @@ static HRESULT WINAPI command_QueryInterface(ICommandText *iface, REFIID riid, v { *ppv = &command->ICommandText_iface; } + else if(IsEqualGUID(&IID_ICommandProperties, riid)) + { + *ppv = &command->ICommandProperties_iface; + } if(*ppv) { @@ -379,6 +389,49 @@ static const ICommandTextVtbl commandVtbl = command_SetCommandText }; +static HRESULT WINAPI command_prop_QueryInterface(ICommandProperties *iface, REFIID riid, void **out) +{ + struct command *command = impl_from_ICommandProperties( iface ); + return ICommandText_QueryInterface(&command->ICommandText_iface, riid, out); +} + +static ULONG WINAPI command_prop_AddRef(ICommandProperties *iface) +{ + struct command *command = impl_from_ICommandProperties( iface ); + return ICommandText_AddRef(&command->ICommandText_iface); +} + +static ULONG WINAPI command_prop_Release(ICommandProperties *iface) +{ + struct command *command = impl_from_ICommandProperties( iface ); + return ICommandText_Release(&command->ICommandText_iface); +} + +static HRESULT WINAPI command_prop_GetProperties(ICommandProperties *iface, ULONG count, + const DBPROPIDSET propertyidsets[], ULONG *sets_cnt, DBPROPSET **propertyset) +{ + struct command *command = impl_from_ICommandProperties( iface ); + FIXME("%p %d %p %p %p\n", command, count, propertyidsets, sets_cnt, propertyset); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_prop_SetProperties(ICommandProperties *iface, ULONG count, + DBPROPSET propertyset[]) +{ + struct command *command = impl_from_ICommandProperties( iface ); + FIXME("%p %p\n", command, propertyset); + return S_OK; +} + +static const ICommandPropertiesVtbl commonpropsVtbl = +{ + command_prop_QueryInterface, + command_prop_AddRef, + command_prop_Release, + command_prop_GetProperties, + command_prop_SetProperties +}; + static HRESULT WINAPI createcommand_CreateCommand(IDBCreateCommand *iface, IUnknown *outer, REFIID riid, IUnknown **out) { @@ -396,6 +449,7 @@ static HRESULT WINAPI createcommand_CreateCommand(IDBCreateCommand *iface, IUnkn return E_OUTOFMEMORY; command->ICommandText_iface.lpVtbl = &commandVtbl; + command->ICommandProperties_iface.lpVtbl = &commonpropsVtbl; command->refs = 1; hr = ICommandText_QueryInterface(&command->ICommandText_iface, riid, (void**)out);

1 0

Alistair Leslie-Hughes : msdasql: Trace unsupported interfaces.
by Alexandre Julliard 29 Oct '21

29 Oct '21

Module: wine Branch: master Commit: e18045a6625b2370f281ace9f7b456c6cffd7edd URL: https://source.winehq.org/git/wine.git/?a=commit;h=e18045a6625b2370f281ace9… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Oct 29 17:32:46 2021 +1100 msdasql: Trace unsupported interfaces. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/session.c | 25 +++++++++++++++++++++++++ dlls/msdasql/tests/provider.c | 10 ++++++++++ 2 files changed, 35 insertions(+) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 42b40349f1b..85e79e00108 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -315,6 +315,31 @@ static HRESULT WINAPI command_QueryInterface(ICommandText *iface, REFIID riid, v IUnknown_AddRef((IUnknown*)*ppv); return S_OK; } + else if (IsEqualGUID(&IID_IMultipleResults, riid)) + { + TRACE("IID_IMultipleResults not supported\n"); + return E_NOINTERFACE; + } + else if(IsEqualGUID(&IID_ICommandStream, riid)) + { + TRACE("ICommandStream not support\n"); + return E_NOINTERFACE; + } + else if (IsEqualGUID(&IID_IRowsetChange, riid)) + { + TRACE("IID_IRowsetChange not supported\n"); + return E_NOINTERFACE; + } + else if (IsEqualGUID(&IID_IRowsetUpdate, riid)) + { + TRACE("IID_IRowsetUpdate not supported\n"); + return E_NOINTERFACE; + } + else if (IsEqualGUID(&IID_IRowsetLocate, riid)) + { + TRACE("IID_IRowsetLocate not supported\n"); + return E_NOINTERFACE; + } FIXME("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); return E_NOINTERFACE; diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 0d9630070b3..184e5d3b1e8 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -119,6 +119,7 @@ static void test_command_interfaces(IUnknown *cmd) ICommandStream *commandstream; IColumnsInfo *colinfo; IMultipleResults *multiple; + IUnknown *unk; hr = IUnknown_QueryInterface(cmd, &IID_ICommandProperties, (void**)&commandProp); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -148,6 +149,15 @@ static void test_command_interfaces(IUnknown *cmd) hr = IUnknown_QueryInterface(cmd, &IID_IMultipleResults, (void**)&multiple); ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + hr = IUnknown_QueryInterface(cmd, &IID_IRowsetChange, (void**)&unk); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + hr = IUnknown_QueryInterface(cmd, &IID_IRowsetUpdate, (void**)&unk); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + hr = IUnknown_QueryInterface(cmd, &IID_IRowsetLocate, (void**)&unk); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); } static void test_sessions(void)

1 0

Alistair Leslie-Hughes : msdasql: Add IColumnsInfo interface for ICommandText.
by Alexandre Julliard 29 Oct '21

29 Oct '21

Module: wine Branch: master Commit: d9e0dde2ca99f9a43ce62ed66ce02d47a2998c48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9e0dde2ca99f9a43ce62ed6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Oct 29 17:32:47 2021 +1100 msdasql: Add IColumnsInfo interface for ICommandText. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/session.c | 54 +++++++++++++++++++++++++++++++++++++++++++ dlls/msdasql/tests/provider.c | 5 ++-- 2 files changed, 56 insertions(+), 3 deletions(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 85e79e00108..eabdcacc968 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -279,6 +279,7 @@ struct command { ICommandText ICommandText_iface; ICommandProperties ICommandProperties_iface; + IColumnsInfo IColumnsInfo_iface; LONG refs; }; @@ -292,6 +293,11 @@ static inline struct command *impl_from_ICommandProperties( ICommandProperties * return CONTAINING_RECORD( iface, struct command, ICommandProperties_iface ); } +static inline struct command *impl_from_IColumnsInfo( IColumnsInfo *iface ) +{ + return CONTAINING_RECORD( iface, struct command, IColumnsInfo_iface ); +} + static HRESULT WINAPI command_QueryInterface(ICommandText *iface, REFIID riid, void **ppv) { struct command *command = impl_from_ICommandText( iface ); @@ -309,6 +315,10 @@ static HRESULT WINAPI command_QueryInterface(ICommandText *iface, REFIID riid, v { *ppv = &command->ICommandProperties_iface; } + else if(IsEqualGUID(&IID_IColumnsInfo, riid)) + { + *ppv = &command->IColumnsInfo_iface; + } if(*ppv) { @@ -457,6 +467,49 @@ static const ICommandPropertiesVtbl commonpropsVtbl = command_prop_SetProperties }; +static HRESULT WINAPI colsinfo_QueryInterface(IColumnsInfo *iface, REFIID riid, void **out) +{ + struct command *command = impl_from_IColumnsInfo( iface ); + return ICommandText_QueryInterface(&command->ICommandText_iface, riid, out); +} + +static ULONG WINAPI colsinfo_AddRef(IColumnsInfo *iface) +{ + struct command *command = impl_from_IColumnsInfo( iface ); + return ICommandText_AddRef(&command->ICommandText_iface); +} + +static ULONG WINAPI colsinfo_Release(IColumnsInfo *iface) +{ + struct command *command = impl_from_IColumnsInfo( iface ); + return ICommandText_Release(&command->ICommandText_iface); +} + +static HRESULT WINAPI colsinfo_GetColumnInfo(IColumnsInfo *iface, DBORDINAL *columns, + DBCOLUMNINFO **colinfo, OLECHAR **stringsbuffer) +{ + struct command *command = impl_from_IColumnsInfo( iface ); + FIXME("%p, %p, %p, %p\n", command, columns, colinfo, stringsbuffer); + return E_NOTIMPL; +} + +static HRESULT WINAPI colsinfo_MapColumnIDs(IColumnsInfo *iface, DBORDINAL column_ids, + const DBID *dbids, DBORDINAL *columns) +{ + struct command *command = impl_from_IColumnsInfo( iface ); + FIXME("%p, %lu, %p, %p\n", command, column_ids, dbids, columns); + return E_NOTIMPL; +} + +static struct IColumnsInfoVtbl columninfoVtbl = +{ + colsinfo_QueryInterface, + colsinfo_AddRef, + colsinfo_Release, + colsinfo_GetColumnInfo, + colsinfo_MapColumnIDs +}; + static HRESULT WINAPI createcommand_CreateCommand(IDBCreateCommand *iface, IUnknown *outer, REFIID riid, IUnknown **out) { @@ -475,6 +528,7 @@ static HRESULT WINAPI createcommand_CreateCommand(IDBCreateCommand *iface, IUnkn command->ICommandText_iface.lpVtbl = &commandVtbl; command->ICommandProperties_iface.lpVtbl = &commonpropsVtbl; + command->IColumnsInfo_iface.lpVtbl = &columninfoVtbl; command->refs = 1; hr = ICommandText_QueryInterface(&command->ICommandText_iface, riid, (void**)out); diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 184e5d3b1e8..d4c6930bc8e 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -140,9 +140,8 @@ static void test_command_interfaces(IUnknown *cmd) ICommandPrepare_Release(commandprepare); hr = IUnknown_QueryInterface(cmd, &IID_IColumnsInfo, (void**)&colinfo); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - if (hr == S_OK) - IColumnsInfo_Release(colinfo); + ok(hr == S_OK, "got 0x%08x\n", hr); + IColumnsInfo_Release(colinfo); hr = IUnknown_QueryInterface(cmd, &IID_ICommandStream, (void**)&commandstream); ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr);

1 0

Alistair Leslie-Hughes : msdasql: Add IConvertType interface for ICommandText.
by Alexandre Julliard 29 Oct '21

29 Oct '21

Module: wine Branch: master Commit: fed2ca76c18ddfff01428593faa3b8063d614b8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=fed2ca76c18ddfff01428593… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Oct 29 17:32:48 2021 +1100 msdasql: Add IConvertType interface for ICommandText. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/session.c | 44 +++++++++++++++++++++++++++++++++++++++++++ dlls/msdasql/tests/provider.c | 5 ++--- 2 files changed, 46 insertions(+), 3 deletions(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index eabdcacc968..3ee4b72a1d1 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -280,6 +280,7 @@ struct command ICommandText ICommandText_iface; ICommandProperties ICommandProperties_iface; IColumnsInfo IColumnsInfo_iface; + IConvertType IConvertType_iface; LONG refs; }; @@ -298,6 +299,11 @@ static inline struct command *impl_from_IColumnsInfo( IColumnsInfo *iface ) return CONTAINING_RECORD( iface, struct command, IColumnsInfo_iface ); } +static inline struct command *impl_from_IConvertType( IConvertType *iface ) +{ + return CONTAINING_RECORD( iface, struct command, IConvertType_iface ); +} + static HRESULT WINAPI command_QueryInterface(ICommandText *iface, REFIID riid, void **ppv) { struct command *command = impl_from_ICommandText( iface ); @@ -319,6 +325,10 @@ static HRESULT WINAPI command_QueryInterface(ICommandText *iface, REFIID riid, v { *ppv = &command->IColumnsInfo_iface; } + else if(IsEqualGUID(&IID_IConvertType, riid)) + { + *ppv = &command->IConvertType_iface; + } if(*ppv) { @@ -510,6 +520,39 @@ static struct IColumnsInfoVtbl columninfoVtbl = colsinfo_MapColumnIDs }; +static HRESULT WINAPI converttype_QueryInterface(IConvertType *iface, REFIID riid, void **out) +{ + struct command *command = impl_from_IConvertType( iface ); + return ICommandText_QueryInterface(&command->ICommandText_iface, riid, out); +} + +static ULONG WINAPI converttype_AddRef(IConvertType *iface) +{ + struct command *command = impl_from_IConvertType( iface ); + return ICommandText_AddRef(&command->ICommandText_iface); +} + +static ULONG WINAPI converttype_Release(IConvertType *iface) +{ + struct command *command = impl_from_IConvertType( iface ); + return ICommandText_Release(&command->ICommandText_iface); +} + +static HRESULT WINAPI converttype_CanConvert(IConvertType *iface, DBTYPE from, DBTYPE to, DBCONVERTFLAGS flags) +{ + struct command *command = impl_from_IConvertType( iface ); + FIXME("%p, %u, %d, 0x%08x\n", command, from, to, flags); + return E_NOTIMPL; +} + +static struct IConvertTypeVtbl converttypeVtbl = +{ + converttype_QueryInterface, + converttype_AddRef, + converttype_Release, + converttype_CanConvert +}; + static HRESULT WINAPI createcommand_CreateCommand(IDBCreateCommand *iface, IUnknown *outer, REFIID riid, IUnknown **out) { @@ -529,6 +572,7 @@ static HRESULT WINAPI createcommand_CreateCommand(IDBCreateCommand *iface, IUnkn command->ICommandText_iface.lpVtbl = &commandVtbl; command->ICommandProperties_iface.lpVtbl = &commonpropsVtbl; command->IColumnsInfo_iface.lpVtbl = &columninfoVtbl; + command->IConvertType_iface.lpVtbl = &converttypeVtbl; command->refs = 1; hr = ICommandText_QueryInterface(&command->ICommandText_iface, riid, (void**)out); diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index d4c6930bc8e..7d14928e50b 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -130,9 +130,8 @@ static void test_command_interfaces(IUnknown *cmd) ICommandText_Release(comand_text); hr = IUnknown_QueryInterface(cmd, &IID_IConvertType, (void**)&convertype); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - if (hr == S_OK) - IConvertType_Release(convertype); + ok(hr == S_OK, "got 0x%08x\n", hr); + IConvertType_Release(convertype); hr = IUnknown_QueryInterface(cmd, &IID_ICommandPrepare, (void**)&commandprepare); todo_wine ok(hr == S_OK, "got 0x%08x\n", hr);

1 0