wine-commits January 2022

wine-commits@winehq.org

2 participants
726 discussions

Zebediah Figura : tests: Move d3d12-specific members of struct texture to a new d3d12_texture structure.
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: vkd3d Branch: master Commit: 33c845ece52ef6bd7c6ae9ee3825d7583710617b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=33c845ece52ef6bd7c6ae9e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 26 19:40:30 2022 -0600 tests: Move d3d12-specific members of struct texture to a new d3d12_texture structure. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/shader_runner.h | 5 ----- tests/shader_runner_d3d12.c | 31 ++++++++++++++++++++++++------- 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/tests/shader_runner.h b/tests/shader_runner.h index c541b56..2e6d360 100644 --- a/tests/shader_runner.h +++ b/tests/shader_runner.h @@ -60,11 +60,6 @@ struct texture_params struct texture { unsigned int slot; - - D3D12_DESCRIPTOR_RANGE descriptor_range; - ID3D12DescriptorHeap *heap; - ID3D12Resource *resource; - unsigned int root_index; }; struct shader_context diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 94399ae..f79c53b 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -24,6 +24,21 @@ #include "d3d12_crosstest.h" #include "shader_runner.h" +struct d3d12_texture +{ + struct texture t; + + D3D12_DESCRIPTOR_RANGE descriptor_range; + ID3D12DescriptorHeap *heap; + ID3D12Resource *resource; + unsigned int root_index; +}; + +static struct d3d12_texture *d3d12_texture(struct texture *t) +{ + return CONTAINING_RECORD(t, struct d3d12_texture, t); +} + struct d3d12_shader_context { struct shader_context c; @@ -68,11 +83,11 @@ static struct texture *d3d12_runner_create_texture(struct shader_context *c, con struct test_context *test_context = &context->test_context; ID3D12Device *device = test_context->device; D3D12_SUBRESOURCE_DATA resource_data; - struct texture *texture; + struct d3d12_texture *texture; texture = calloc(1, sizeof(*texture)); - texture->slot = params->slot; + texture->t.slot = params->slot; texture->heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1); texture->resource = create_default_texture(device, params->width, params->height, @@ -86,11 +101,13 @@ static struct texture *d3d12_runner_create_texture(struct shader_context *c, con ID3D12Device_CreateShaderResourceView(device, texture->resource, NULL, get_cpu_descriptor_handle(test_context, texture->heap, 0)); - return texture; + return &texture->t; } -static void d3d12_runner_destroy_texture(struct shader_context *c, struct texture *texture) +static void d3d12_runner_destroy_texture(struct shader_context *c, struct texture *t) { + struct d3d12_texture *texture = d3d12_texture(t); + ID3D12DescriptorHeap_Release(texture->heap); ID3D12Resource_Release(texture->resource); free(texture); @@ -133,7 +150,7 @@ static void d3d12_runner_draw_quad(struct shader_context *c) for (i = 0; i < context->c.texture_count; ++i) { - struct texture *texture = context->c.textures[i]; + struct d3d12_texture *texture = d3d12_texture(context->c.textures[i]); D3D12_DESCRIPTOR_RANGE *range; range = &texture->descriptor_range; @@ -147,7 +164,7 @@ static void d3d12_runner_draw_quad(struct shader_context *c) range->RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SRV; range->NumDescriptors = 1; - range->BaseShaderRegister = texture->slot; + range->BaseShaderRegister = texture->t.slot; range->RegisterSpace = 0; range->OffsetInDescriptorsFromTableStart = 0; } @@ -188,7 +205,7 @@ static void d3d12_runner_draw_quad(struct shader_context *c) context->c.uniform_count, context->c.uniforms, 0); for (i = 0; i < context->c.texture_count; ++i) { - struct texture *texture = context->c.textures[i]; + struct d3d12_texture *texture = d3d12_texture(context->c.textures[i]); ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, texture->root_index, get_gpu_descriptor_handle(test_context, texture->heap, 0));

1 0

Zebediah Figura : tests: Make texture allocation and destruction into separate shader_runner ops.
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: vkd3d Branch: master Commit: c417d3f830d4a2a06043909e7272a3372e7db2c0 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c417d3f830d4a2a06043909… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 26 19:40:29 2022 -0600 tests: Make texture allocation and destruction into separate shader_runner ops. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/shader_runner.c | 60 +++++++++++++++++++---------------------- tests/shader_runner.h | 11 ++++++-- tests/shader_runner_d3d12.c | 65 ++++++++++++++++++++++++++------------------- 3 files changed, 75 insertions(+), 61 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=c417d3f830d4a2a0604…

1 0

Zebediah Figura : tests: Move the drawing and readback implementation to the d3d12 shader runner.
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: vkd3d Branch: master Commit: 09e3018b6d9d08bf4bfcd6e878c3e5eed26e3a99 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=09e3018b6d9d08bf4bfcd6e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 26 19:40:28 2022 -0600 tests: Move the drawing and readback implementation to the d3d12 shader runner. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 3 +- tests/d3d12_test_utils.h | 5 +- tests/shader_runner.c | 285 +++++++------------------------------------- tests/shader_runner.h | 58 ++++++++- tests/shader_runner_d3d12.c | 200 +++++++++++++++++++++++++++++-- tests/utils.h | 58 +++++++++ 6 files changed, 351 insertions(+), 258 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=09e3018b6d9d08bf4bf…

1 0

Zebediah Figura : tests: Move HLSL shader compilation to a new d3d12 shader runner backend.
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: vkd3d Branch: master Commit: 85d61f0c642f09e4b8f8ccdf1066d76233bd2c1a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=85d61f0c642f09e4b8f8ccd… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 26 19:40:27 2022 -0600 tests: Move HLSL shader compilation to a new d3d12 shader runner backend. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 37 +++++++++++++++++-------- include/private/vkd3d_test.h | 19 +++++++++---- tests/shader_runner.c | 49 ++++++++------------------------ tests/shader_runner.h | 37 +++++++++++++++++++++++++ tests/shader_runner_d3d12.c | 66 ++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 154 insertions(+), 54 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=85d61f0c642f09e4b8f…

1 0

Zebediah Figura : tests: Rename shader_runner_d3d12 to shader_runner.
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: vkd3d Branch: master Commit: 63622a92e84f3f8a93de8d1e604350bca686194e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=63622a92e84f3f8a93de8d1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 26 19:40:26 2022 -0600 tests: Rename shader_runner_d3d12 to shader_runner. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 6 +++--- tests/{shader_runner_d3d12.c => shader_runner.c} | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index db0a6f6..17fcae3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -51,7 +51,7 @@ vkd3d_cross_tests = \ tests/hlsl_d3d12 vkd3d_shader_runners = \ - tests/shader_runner_d3d12 + tests/shader_runner vkd3d_shader_tests = \ tests/abs.shader_test \ @@ -282,10 +282,10 @@ TESTS = $(vkd3d_tests) $(vkd3d_cross_tests) $(vkd3d_shader_tests) tests_d3d12_LDADD = $(LDADD) @PTHREAD_LIBS@ @VULKAN_LIBS@ tests_d3d12_invalid_usage_LDADD = $(LDADD) @VULKAN_LIBS@ tests_hlsl_d3d12_LDADD = $(LDADD) @VULKAN_LIBS@ -tests_shader_runner_d3d12_LDADD = $(LDADD) @VULKAN_LIBS@ +tests_shader_runner_LDADD = $(LDADD) @VULKAN_LIBS@ tests_vkd3d_api_LDADD = libvkd3d.la @VULKAN_LIBS@ tests_vkd3d_shader_api_LDADD = libvkd3d-shader.la -SHADER_TEST_LOG_COMPILER = tests/shader_runner_d3d12 +SHADER_TEST_LOG_COMPILER = tests/shader_runner XFAIL_TESTS = \ tests/cast-to-float.shader_test \ tests/cast-to-half.shader_test \ diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner.c similarity index 99% rename from tests/shader_runner_d3d12.c rename to tests/shader_runner.c index 4a8d1f1..5db963f 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner.c @@ -643,7 +643,7 @@ static struct texture *get_texture(struct shader_context *context, unsigned int return NULL; } -START_TEST(shader_runner_d3d12) +START_TEST(shader_runner) { static const struct test_context_desc desc = {

1 0

Jeremy Newman : ignore hidden files created by mac finder
by Jeremy Newman 27 Jan '22

27 Jan '22

Module: website Branch: master Commit: 7a676ea9d0545f365238e52336454af5c8138624 URL: https://source.winehq.org/git/website.git/?a=commit;h=7a676ea9d0545f365238e… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Jan 27 10:32:56 2022 -0600 ignore hidden files created by mac finder --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 3e820fc4..f2646f99 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,6 @@ site templates/en/docs templates/en/winapi_stats.template .htaccess +*.DS_Store +*._.DS_Store +*._*

1 0

Jeremy Newman : test using CDATA for sections
by Jeremy Newman 27 Jan '22

27 Jan '22

Module: website Branch: master Commit: 40f8f7719696b3c043cfc45746dae1bf778c2bb6 URL: https://source.winehq.org/git/website.git/?a=commit;h=40f8f7719696b3c043cfc… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Jan 27 10:28:34 2022 -0600 test using CDATA for sections --- wwn/en/wn20211210_409.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wwn/en/wn20211210_409.xml b/wwn/en/wn20211210_409.xml index c24f3d68..76364256 100755 --- a/wwn/en/wn20211210_409.xml +++ b/wwn/en/wn20211210_409.xml @@ -2,13 +2,13 @@ <title>Wine Traffic</title> <author contact="mailto:wwn@winehq.org">Cressida Silver</author> <issue num="NNN" date="12/10/2021"/> - <intro> + <intro><![CDATA[ <p> This is the 409th issue of the World Wine News publication. Its main goal is to inform you of what's going on around Wine. Wine is an open source implementation of the Windows API on top of X and Unix. Think of it as a Windows compatibility layer. Wine does not require Microsoft Windows, as it is a completely alternative implementation consisting of 100% Microsoft-free code, but it can optionally use native system DLLs if they are available. You can find more info at <a href="http://www.winehq.org">www.winehq.org</a> </p> - </intro> + ]]></intro> - <section title="Wine 6.23" subject="" archive="" posts=""> + <section title="Wine 6.23" subject="" archive="" posts=""><![CDATA[ <p> Wine 6.23 was released last Friday, and it contains more work on <a href="https://www.winehq.org/wwn/408">PE conversion.</a> For more details, see <a href="https://www.winehq.org/announce/6.23">here</a> for the full release notes. </p> @@ -19,5 +19,5 @@ <p> Happy Holidays to you and yours! </p> - </section> + ]]></section> </kc>

1 0

Stefan Dösinger : ddraw/tests: Don't insist on a different refresh rate if no refresh rate was requested.
by Alexandre Julliard 26 Jan '22

26 Jan '22

Module: wine Branch: master Commit: 9a4992173e165b04ff79d5283f81064f7585e7ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a4992173e165b04ff79d528… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 26 11:52:26 2022 +0300 ddraw/tests: Don't insist on a different refresh rate if no refresh rate was requested. d4fdb1f62cf5 broke test_cursor_clipping by accident. It added a requirement that width, height and refresh rate are different from the old mode, but test_cursor_clipping does not use DDEDM_REFRESHRATES, so all refresh rates are 0. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw2.c | 2 +- dlls/ddraw/tests/ddraw4.c | 2 +- dlls/ddraw/tests/ddraw7.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 8a6c4b41ac1..625776c652c 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -15116,7 +15116,7 @@ static HRESULT CALLBACK find_different_mode_callback(DDSURFACEDESC *surface_desc /* See comment in ddraw7 about the frequency. */ if (surface_desc->dwWidth != param->old_width && surface_desc->dwHeight != param->old_height && - !compare_uint(surface_desc->dwRefreshRate, param->old_frequency, 1)) + (!compare_uint(surface_desc->dwRefreshRate, param->old_frequency, 1) || !param->old_frequency)) { param->new_width = surface_desc->dwWidth; param->new_height = surface_desc->dwHeight; diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index c229ab66341..9b8acb674e3 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -18153,7 +18153,7 @@ static HRESULT CALLBACK find_different_mode_callback(DDSURFACEDESC2 *surface_des /* See comment in ddraw7 about the frequency. */ if (surface_desc->dwWidth != param->old_width && surface_desc->dwHeight != param->old_height && - !compare_uint(surface_desc->dwRefreshRate, param->old_frequency, 1)) + (!compare_uint(surface_desc->dwRefreshRate, param->old_frequency, 1) || !param->old_frequency)) { param->new_width = surface_desc->dwWidth; param->new_height = surface_desc->dwHeight; diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 18ebf849391..84789e8f177 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -18427,7 +18427,7 @@ static HRESULT CALLBACK find_different_mode_callback(DDSURFACEDESC2 *surface_des * set 60hz in the advanced display properties manually. Usually the restriction to one refresh * rate applies to laptop panels. */ if (surface_desc->dwWidth != param->old_width && surface_desc->dwHeight != param->old_height && - !compare_uint(surface_desc->dwRefreshRate, param->old_frequency, 1)) + (!compare_uint(surface_desc->dwRefreshRate, param->old_frequency, 1) || !param->old_frequency)) { param->new_width = surface_desc->dwWidth; param->new_height = surface_desc->dwHeight;

1 0

Stefan Dösinger : ddraw/tests: Treat refresh rates with 1 hz difference as equal.
by Alexandre Julliard 26 Jan '22

26 Jan '22

Module: wine Branch: master Commit: dc79534a6d2c6e1e73194ff4ab5f7f34a4363ff7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc79534a6d2c6e1e73194ff4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 26 11:52:25 2022 +0300 ddraw/tests: Treat refresh rates with 1 hz difference as equal. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw2.c | 3 ++- dlls/ddraw/tests/ddraw4.c | 3 ++- dlls/ddraw/tests/ddraw7.c | 11 ++++++++++- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 00c8f820edb..8a6c4b41ac1 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -15114,8 +15114,9 @@ static HRESULT CALLBACK find_different_mode_callback(DDSURFACEDESC *surface_desc if (U1(U4(*surface_desc).ddpfPixelFormat).dwRGBBitCount != registry_mode.dmBitsPerPel) return DDENUMRET_OK; + /* See comment in ddraw7 about the frequency. */ if (surface_desc->dwWidth != param->old_width && surface_desc->dwHeight != param->old_height && - surface_desc->dwRefreshRate != param->old_frequency) + !compare_uint(surface_desc->dwRefreshRate, param->old_frequency, 1)) { param->new_width = surface_desc->dwWidth; param->new_height = surface_desc->dwHeight; diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index a8b68b8a20b..c229ab66341 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -18151,8 +18151,9 @@ static HRESULT CALLBACK find_different_mode_callback(DDSURFACEDESC2 *surface_des if (U1(U4(*surface_desc).ddpfPixelFormat).dwRGBBitCount != registry_mode.dmBitsPerPel) return DDENUMRET_OK; + /* See comment in ddraw7 about the frequency. */ if (surface_desc->dwWidth != param->old_width && surface_desc->dwHeight != param->old_height && - surface_desc->dwRefreshRate != param->old_frequency) + !compare_uint(surface_desc->dwRefreshRate, param->old_frequency, 1)) { param->new_width = surface_desc->dwWidth; param->new_height = surface_desc->dwHeight; diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index f4388296702..18ebf849391 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -18417,8 +18417,17 @@ static HRESULT CALLBACK find_different_mode_callback(DDSURFACEDESC2 *surface_des if (U1(U4(*surface_desc).ddpfPixelFormat).dwRGBBitCount != registry_mode.dmBitsPerPel) return DDENUMRET_OK; + /* Windows will advertise 59hz (for 59.94) and 60hz (for proper 60hz) on monitors that support + * only one of the two (usually 59.94). If an application requests 60hz windows will apply 59.94. + * Thus if we think we found a different refresh rate, we get 59hz instead of the 60hz we + * requested. + * + * The same is true of other 1% slowed-down TV compatible refresh rates according to a Microsoft + * support document: 23.976 vs 24, 30, 48, 72 and 120 hz. It can be reproduced by attempting to + * set 60hz in the advanced display properties manually. Usually the restriction to one refresh + * rate applies to laptop panels. */ if (surface_desc->dwWidth != param->old_width && surface_desc->dwHeight != param->old_height && - surface_desc->dwRefreshRate != param->old_frequency) + !compare_uint(surface_desc->dwRefreshRate, param->old_frequency, 1)) { param->new_width = surface_desc->dwWidth; param->new_height = surface_desc->dwHeight;

1 0

Alistair Leslie-Hughes : msdasql: Add ITransactionJoin to session interface.
by Alexandre Julliard 26 Jan '22

26 Jan '22

Module: wine Branch: master Commit: 7bdef00a75e50e54975b155126e75dbffbc0d963 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bdef00a75e50e54975b1551… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jan 26 21:55:02 2022 +1100 msdasql: Add ITransactionJoin to session interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/session.c | 58 +++++++++++++++++++++++++++++++++++++++++++ dlls/msdasql/tests/provider.c | 5 ++-- 2 files changed, 60 insertions(+), 3 deletions(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index f0e915ca710..e58d152a418 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -43,6 +43,7 @@ struct msdasql_session IOpenRowset IOpenRowset_iface; ISessionProperties ISessionProperties_iface; IDBCreateCommand IDBCreateCommand_iface; + ITransactionJoin ITransactionJoin_iface; LONG refs; IUnknown *datasource; @@ -75,6 +76,11 @@ static inline struct msdasql_session *impl_from_IDBCreateCommand( IDBCreateComma return CONTAINING_RECORD( iface, struct msdasql_session, IDBCreateCommand_iface ); } +static inline struct msdasql_session *impl_from_ITransactionJoin( ITransactionJoin *iface ) +{ + return CONTAINING_RECORD( iface, struct msdasql_session, ITransactionJoin_iface ); +} + static HRESULT WINAPI session_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) { struct msdasql_session *session = impl_from_IUnknown( iface ); @@ -107,6 +113,11 @@ static HRESULT WINAPI session_QueryInterface(IUnknown *iface, REFIID riid, void TRACE("(%p)->(IDBCreateCommand_iface %p)\n", iface, ppv); *ppv = &session->IDBCreateCommand_iface; } + else if(IsEqualGUID(&IID_ITransactionJoin, riid)) + { + TRACE("(%p)->(ITransactionJoin %p)\n", iface, ppv); + *ppv = &session->ITransactionJoin_iface; + } else if(IsEqualGUID(&IID_IBindResource, riid)) { TRACE("(%p)->(IID_IBindResource not support)\n", iface); @@ -1191,6 +1202,52 @@ static const IDBCreateCommandVtbl createcommandVtbl = createcommand_CreateCommand }; +static HRESULT WINAPI transjoin_QueryInterface(ITransactionJoin *iface, REFIID riid, void **out) +{ + struct msdasql_session *session = impl_from_ITransactionJoin( iface ); + return IUnknown_QueryInterface(&session->session_iface, riid, out); +} + +static ULONG WINAPI transjoin_AddRef(ITransactionJoin *iface) +{ + struct msdasql_session *session = impl_from_ITransactionJoin( iface ); + return IUnknown_AddRef(&session->session_iface); +} + +static ULONG WINAPI transjoin_Release(ITransactionJoin *iface) +{ + struct msdasql_session *session = impl_from_ITransactionJoin( iface ); + return IUnknown_Release(&session->session_iface); +} + +static HRESULT WINAPI transjoin_GetOptionsObject(ITransactionJoin *iface, ITransactionOptions **options) +{ + struct msdasql_session *session = impl_from_ITransactionJoin( iface ); + + FIXME("%p, %p\n", session, options); + + return E_NOTIMPL; +} + +static HRESULT WINAPI transjoin_JoinTransaction(ITransactionJoin *iface, IUnknown *unk, ISOLEVEL level, + ULONG flags, ITransactionOptions *options) +{ + struct msdasql_session *session = impl_from_ITransactionJoin( iface ); + + FIXME("%p, %p, %d, 0x%08x, %p\n", session, unk, level, flags, options); + + return E_NOTIMPL; +} + +static const ITransactionJoinVtbl transactionjoinVtbl = +{ + transjoin_QueryInterface, + transjoin_AddRef, + transjoin_Release, + transjoin_GetOptionsObject, + transjoin_JoinTransaction +}; + HRESULT create_db_session(REFIID riid, IUnknown *datasource, HDBC hdbc, void **unk) { struct msdasql_session *session; @@ -1205,6 +1262,7 @@ HRESULT create_db_session(REFIID riid, IUnknown *datasource, HDBC hdbc, void **u session->IOpenRowset_iface.lpVtbl = &openrowsetVtbl; session->ISessionProperties_iface.lpVtbl = &propertiesVtbl; session->IDBCreateCommand_iface.lpVtbl = &createcommandVtbl; + session->ITransactionJoin_iface.lpVtbl = &transactionjoinVtbl; IUnknown_QueryInterface(datasource, &IID_IUnknown, (void**)&session->datasource); session->refs = 1; session->hdbc = hdbc; diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index eefddbf6dcb..ee81ad1d311 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -494,9 +494,8 @@ static void test_sessions(void) ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); hr = IUnknown_QueryInterface(session, &IID_ITransactionJoin, (void**)&join); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - if(hr == S_OK) - ITransactionJoin_Release(join); + ok(hr == S_OK, "got 0x%08x\n", hr); + ITransactionJoin_Release(join); hr = IUnknown_QueryInterface(session, &IID_IBindResource, (void**)&unimplemented); ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr);

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
73
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 January 2022