April 2023 - Wine-Commits - list.winehq.org

Rémi Bernon : imm32/tests: Test setting the same HIMC statuses twice.
by Alexandre Julliard April 7, 2023

April 7, 2023

Module: wine Branch: master Commit: 8cb2d2d54137247148fd3dcdfba18b669ae1778e URL: https://gitlab.winehq.org/wine/wine/-/commit/8cb2d2d54137247148fd3dcdfba18b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Apr 3 16:24:08 2023 +0200 imm32/tests: Test setting the same HIMC statuses twice. --- dlls/imm32/tests/imm32.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index d10f398d475..7bf3110f03e 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -4126,6 +4126,14 @@ static void test_ImmSetConversionStatus(void) ok_eq( 0xdeadbeef, ctx->fdwConversion, UINT, "%#x" ); ok_eq( 0xfeedcafe, ctx->fdwSentence, UINT, "%#x" ); + ok_ret( 1, ImmSetConversionStatus( default_himc, 0xdeadbeef, 0xfeedcafe ) ); + ok_seq( empty_sequence ); + + ok_ret( 1, ImmGetConversionStatus( default_himc, &conversion, NULL ) ); + ok_eq( 0xdeadbeef, conversion, UINT, "%#x" ); + ok_eq( 0xdeadbeef, ctx->fdwConversion, UINT, "%#x" ); + ok_eq( 0xfeedcafe, ctx->fdwSentence, UINT, "%#x" ); + ok_seq( empty_sequence ); ok_ret( 1, ImmSetConversionStatus( default_himc, 0, 0xfeedcafe ) ); ok_seq( set_conversion_status_1_seq ); @@ -4140,6 +4148,14 @@ static void test_ImmSetConversionStatus(void) ok_ret( 1, ImmSetConversionStatus( default_himc, ~0, ~0 ) ); ok_seq( set_conversion_status_2_seq ); + ok_ret( 1, ImmGetConversionStatus( default_himc, NULL, &sentence ) ); + ok_eq( ~0, sentence, UINT, "%#x" ); + ok_eq( ~0, ctx->fdwConversion, UINT, "%#x" ); + ok_eq( ~0, ctx->fdwSentence, UINT, "%#x" ); + + ok_ret( 1, ImmSetConversionStatus( default_himc, ~0, ~0 ) ); + ok_seq( empty_sequence ); + ok_ret( 1, ImmGetConversionStatus( default_himc, &conversion, &sentence ) ); ok_eq( ~0, conversion, UINT, "%#x" ); ok_eq( ~0, sentence, UINT, "%#x" ); @@ -4253,6 +4269,13 @@ static void test_ImmSetOpenStatus(void) ok_eq( 0xdeadbeef, status, UINT, "%#x" ); ok_eq( 0xdeadbeef, ctx->fOpen, UINT, "%#x" ); + ok_ret( 1, ImmSetOpenStatus( default_himc, 0xdeadbeef ) ); + ok_seq( empty_sequence ); + + status = ImmGetOpenStatus( default_himc ); + ok_eq( 0xdeadbeef, status, UINT, "%#x" ); + ok_eq( 0xdeadbeef, ctx->fOpen, UINT, "%#x" ); + ok_seq( empty_sequence ); ok_ret( 1, ImmSetOpenStatus( default_himc, ~0 ) ); ok_seq( set_open_status_1_seq ); @@ -4261,6 +4284,13 @@ static void test_ImmSetOpenStatus(void) todo_wine ok_eq( ~0, status, UINT, "%#x" ); todo_wine ok_eq( ~0, ctx->fOpen, UINT, "%#x" ); + ok_ret( 1, ImmSetOpenStatus( default_himc, ~0 ) ); + ok_seq( empty_sequence ); + + status = ImmGetOpenStatus( default_himc ); + todo_wine ok_eq( ~0, status, UINT, "%#x" ); + todo_wine ok_eq( ~0, ctx->fOpen, UINT, "%#x" ); + /* status is cached between IME activations */ ok_ret( 1, ImmActivateLayout( old_hkl ) );

1 0

Rémi Bernon : imm32/tests: Test WM_IME_NOTIFY messages target window.
by Alexandre Julliard April 7, 2023

April 7, 2023

Module: wine Branch: master Commit: 0522c01be32b56b1e295c7d683a4d63b0d86fc79 URL: https://gitlab.winehq.org/wine/wine/-/commit/0522c01be32b56b1e295c7d683a4d6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Apr 6 00:47:15 2023 +0200 imm32/tests: Test WM_IME_NOTIFY messages target window. Showing that they aren't sent to the focused window but only to the INPUTCONTEXT hWnd member. --- dlls/imm32/tests/imm32.c | 61 +++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 53 insertions(+), 8 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 7bf3110f03e..0f3d9582a4e 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -2670,6 +2670,7 @@ done: received->himc, received->message.msg, received->message.wparam, received->message.lparam ); return ret; case MSG_TEST_WIN: + todo_wine_if( expected->todo ) ok_(file, line)( !ret, "got hkl %p, himc %p, MSG_TEST_WIN msg %#x, wparam %#Ix, lparam %#Ix\n", received->hkl, received->himc, received->message.msg, received->message.wparam, received->message.lparam ); return ret; @@ -2703,6 +2704,7 @@ done: expected->himc, expected->message.msg, expected->message.wparam, expected->message.lparam ); break; case MSG_TEST_WIN: + todo_wine_if( expected->todo ) ok_(file, line)( !ret, "hkl %p, himc %p, MSG_TEST_WIN msg %#x, wparam %#Ix, lparam %#Ix\n", expected->hkl, expected->himc, expected->message.msg, expected->message.wparam, expected->message.lparam ); break; @@ -2722,7 +2724,8 @@ static void ok_seq_( const char *file, int line, const struct ime_call *expected winetest_push_context( "%u%s%s", i++, !expected->func ? " (spurious)" : "", !received->func ? " (missing)" : "" ); ret = ok_call_( file, line, expected, received ); - if (ret && expected->todo && !strcmp( winetest_platform, "wine" )) + if (ret && expected->todo && expected->func && + !strcmp( winetest_platform, "wine" )) expected++; else if (ret && broken(expected->broken)) expected++; @@ -4022,6 +4025,10 @@ static void test_ImmSetConversionStatus(void) .hkl = expect_ime, .himc = default_himc, .func = IME_NOTIFY, .notify = {.action = NI_CONTEXTUPDATED, .index = 0, .value = IMC_SETCONVERSIONMODE}, }, + { + .hkl = expect_ime, .himc = default_himc, + .func = MSG_TEST_WIN, .message = {.msg = WM_IME_NOTIFY, .wparam = IMN_SETCONVERSIONMODE}, + }, { .hkl = expect_ime, .himc = default_himc, .func = MSG_IME_UI, .message = {.msg = WM_IME_NOTIFY, .wparam = IMN_SETCONVERSIONMODE}, @@ -4030,6 +4037,10 @@ static void test_ImmSetConversionStatus(void) .hkl = expect_ime, .himc = default_himc, .func = IME_NOTIFY, .notify = {.action = NI_CONTEXTUPDATED, .index = 0, .value = IMC_SETSENTENCEMODE}, }, + { + .hkl = expect_ime, .himc = default_himc, + .func = MSG_TEST_WIN, .message = {.msg = WM_IME_NOTIFY, .wparam = IMN_SETSENTENCEMODE}, + }, { .hkl = expect_ime, .himc = default_himc, .func = MSG_IME_UI, .message = {.msg = WM_IME_NOTIFY, .wparam = IMN_SETSENTENCEMODE}, @@ -4042,10 +4053,7 @@ static void test_ImmSetConversionStatus(void) .hkl = expect_ime, .himc = default_himc, .func = IME_NOTIFY, .notify = {.action = NI_CONTEXTUPDATED, .index = 0xdeadbeef, .value = IMC_SETCONVERSIONMODE}, }, - { - .hkl = expect_ime, .himc = default_himc, - .func = MSG_IME_UI, .message = {.msg = WM_IME_NOTIFY, .wparam = IMN_SETCONVERSIONMODE}, - }, + {.todo = TRUE}, /* spurious calls */ {0}, }; const struct ime_call set_conversion_status_2_seq[] = @@ -4054,6 +4062,10 @@ static void test_ImmSetConversionStatus(void) .hkl = expect_ime, .himc = default_himc, .func = IME_NOTIFY, .notify = {.action = NI_CONTEXTUPDATED, .index = 0, .value = IMC_SETCONVERSIONMODE}, }, + { + .hkl = expect_ime, .himc = default_himc, + .func = MSG_TEST_WIN, .message = {.msg = WM_IME_NOTIFY, .wparam = IMN_SETCONVERSIONMODE}, + }, { .hkl = expect_ime, .himc = default_himc, .func = MSG_IME_UI, .message = {.msg = WM_IME_NOTIFY, .wparam = IMN_SETCONVERSIONMODE}, @@ -4062,6 +4074,10 @@ static void test_ImmSetConversionStatus(void) .hkl = expect_ime, .himc = default_himc, .func = IME_NOTIFY, .notify = {.action = NI_CONTEXTUPDATED, .index = 0xfeedcafe, .value = IMC_SETSENTENCEMODE}, }, + { + .hkl = expect_ime, .himc = default_himc, + .func = MSG_TEST_WIN, .message = {.msg = WM_IME_NOTIFY, .wparam = IMN_SETSENTENCEMODE}, + }, { .hkl = expect_ime, .himc = default_himc, .func = MSG_IME_UI, .message = {.msg = WM_IME_NOTIFY, .wparam = IMN_SETSENTENCEMODE}, @@ -4080,7 +4096,7 @@ static void test_ImmSetConversionStatus(void) ok_eq( old_conversion, ctx->fdwConversion, UINT, "%#x" ); ok_eq( old_sentence, ctx->fdwSentence, UINT, "%#x" ); - hwnd = CreateWindowW( L"static", NULL, WS_OVERLAPPEDWINDOW | WS_VISIBLE, + hwnd = CreateWindowW( test_class.lpszClassName, NULL, WS_OVERLAPPEDWINDOW | WS_VISIBLE, 100, 100, 100, 100, NULL, NULL, NULL, NULL ); ok( !!hwnd, "CreateWindowW failed, error %lu\n", GetLastError() ); process_messages(); @@ -4134,6 +4150,7 @@ static void test_ImmSetConversionStatus(void) ok_eq( 0xdeadbeef, ctx->fdwConversion, UINT, "%#x" ); ok_eq( 0xfeedcafe, ctx->fdwSentence, UINT, "%#x" ); + ctx->hWnd = 0; ok_seq( empty_sequence ); ok_ret( 1, ImmSetConversionStatus( default_himc, 0, 0xfeedcafe ) ); ok_seq( set_conversion_status_1_seq ); @@ -4144,6 +4161,7 @@ static void test_ImmSetConversionStatus(void) ok_eq( 0, ctx->fdwConversion, UINT, "%#x" ); ok_eq( 0xfeedcafe, ctx->fdwSentence, UINT, "%#x" ); + ctx->hWnd = hwnd; ok_seq( empty_sequence ); ok_ret( 1, ImmSetConversionStatus( default_himc, ~0, ~0 ) ); ok_seq( set_conversion_status_2_seq ); @@ -4200,6 +4218,10 @@ static void test_ImmSetOpenStatus(void) .hkl = expect_ime, .himc = default_himc, .func = IME_NOTIFY, .notify = {.action = NI_CONTEXTUPDATED, .index = 0, .value = IMC_SETOPENSTATUS}, }, + { + .hkl = expect_ime, .himc = default_himc, + .func = MSG_TEST_WIN, .message = {.msg = WM_IME_NOTIFY, .wparam = IMN_SETOPENSTATUS}, + }, { .hkl = expect_ime, .himc = default_himc, .func = MSG_IME_UI, .message = {.msg = WM_IME_NOTIFY, .wparam = IMN_SETOPENSTATUS}, @@ -4213,6 +4235,20 @@ static void test_ImmSetOpenStatus(void) .func = IME_NOTIFY, .notify = {.action = NI_CONTEXTUPDATED, .index = 0, .value = IMC_SETOPENSTATUS}, .todo = TRUE, }, + {0}, + }; + const struct ime_call set_open_status_2_seq[] = + { + { + .hkl = expect_ime, .himc = default_himc, + .func = IME_NOTIFY, .notify = {.action = NI_CONTEXTUPDATED, .index = 0, .value = IMC_SETOPENSTATUS}, + .todo = TRUE, + }, + { + .hkl = expect_ime, .himc = default_himc, + .func = MSG_TEST_WIN, .message = {.msg = WM_IME_NOTIFY, .wparam = IMN_SETOPENSTATUS}, + .todo = TRUE, + }, { .hkl = expect_ime, .himc = default_himc, .func = MSG_IME_UI, .message = {.msg = WM_IME_NOTIFY, .wparam = IMN_SETOPENSTATUS}, @@ -4231,7 +4267,7 @@ static void test_ImmSetOpenStatus(void) ok_ne( NULL, ctx, INPUTCONTEXT *, "%p" ); ok_eq( old_status, ctx->fOpen, UINT, "%#x" ); - hwnd = CreateWindowW( L"static", NULL, WS_OVERLAPPEDWINDOW | WS_VISIBLE, + hwnd = CreateWindowW( test_class.lpszClassName, NULL, WS_OVERLAPPEDWINDOW | WS_VISIBLE, 100, 100, 100, 100, NULL, NULL, NULL, NULL ); ok( !!hwnd, "CreateWindowW failed, error %lu\n", GetLastError() ); process_messages(); @@ -4276,9 +4312,18 @@ static void test_ImmSetOpenStatus(void) ok_eq( 0xdeadbeef, status, UINT, "%#x" ); ok_eq( 0xdeadbeef, ctx->fOpen, UINT, "%#x" ); + ctx->hWnd = 0; + ok_ret( 1, ImmSetOpenStatus( default_himc, 0xfeedcafe ) ); + ok_seq( set_open_status_1_seq ); + + status = ImmGetOpenStatus( default_himc ); + todo_wine ok_eq( 0xfeedcafe, status, UINT, "%#x" ); + todo_wine ok_eq( 0xfeedcafe, ctx->fOpen, UINT, "%#x" ); + + ctx->hWnd = hwnd; ok_seq( empty_sequence ); ok_ret( 1, ImmSetOpenStatus( default_himc, ~0 ) ); - ok_seq( set_open_status_1_seq ); + ok_seq( set_open_status_2_seq ); status = ImmGetOpenStatus( default_himc ); todo_wine ok_eq( ~0, status, UINT, "%#x" );

1 0

Francois Gouget : dinput/tests: Fix the spelling of an ok() message.
by Alexandre Julliard April 7, 2023

April 7, 2023

Module: wine Branch: master Commit: 089cfc7953fcfd62b2bbb023f72f78ee0965e595 URL: https://gitlab.winehq.org/wine/wine/-/commit/089cfc7953fcfd62b2bbb023f72f78… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 5 15:30:03 2023 +0200 dinput/tests: Fix the spelling of an ok() message. --- dlls/dinput/tests/device8.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/tests/device8.c b/dlls/dinput/tests/device8.c index 523c2506a39..71982f8f622 100644 --- a/dlls/dinput/tests/device8.c +++ b/dlls/dinput/tests/device8.c @@ -2153,7 +2153,7 @@ static void test_sys_keyboard( DWORD version ) hr = IDirectInputDevice8_GetDeviceState( device, sizeof(full_state), full_state ); ok( hr == DI_OK, "GetDeviceState returned %#lx\n", hr ); hr = IDirectInputDevice8_Unacquire( device ); - ok( hr == DI_OK, "Uncquire returned %#lx\n", hr ); + ok( hr == DI_OK, "Unacquire returned %#lx\n", hr ); hr = IDirectInputDevice8_SetDataFormat( device, &data_format ); ok( hr == DI_OK, "SetDataFormat returned %#lx\n", hr ); hr = IDirectInputDevice8_Acquire( device );

1 0

Alistair Leslie-Hughes : msado15: Initialize all SYSTEMTIME members.
by Alexandre Julliard April 7, 2023

April 7, 2023

Module: wine Branch: master Commit: f1594312fb6f772fabb2ccd7d31b08895e5e5bd7 URL: https://gitlab.winehq.org/wine/wine/-/commit/f1594312fb6f772fabb2ccd7d31b08… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Apr 2 07:32:09 2023 +1000 msado15: Initialize all SYSTEMTIME members. --- dlls/msado15/recordset.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 0f4acda0156..5522a3c9e61 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -1994,6 +1994,7 @@ static HRESULT load_all_recordset_data(struct recordset *recordset, IUnknown *ro st.wMinute = ts->minute; st.wSecond = ts->second; st.wMilliseconds = ts->fraction/1000000; + st.wDayOfWeek = 0; hr = (SystemTimeToVariantTime(&st, &d) ? S_OK : E_FAIL); V_DATE(&copy) = d;

1 0

Zebediah Figura : d3d10core/tests: Add a regression test for mismatch of layered framebuffer attachments.
by Alexandre Julliard April 7, 2023

April 7, 2023

Module: wine Branch: master Commit: 58a791b7f945193536399cc1333f508c04bbfc64 URL: https://gitlab.winehq.org/wine/wine/-/commit/58a791b7f945193536399cc1333f50… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jul 21 18:52:55 2022 -0500 d3d10core/tests: Add a regression test for mismatch of layered framebuffer attachments. --- dlls/d3d10core/tests/d3d10core.c | 68 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index bb68c5f2989..730229ac5af 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -19626,6 +19626,73 @@ static void test_vertex_formats(void) release_test_context(&test_context); } +/* This is a regression test for a specific code path triggered by + * "Sonic Colors: Ultimate" and "My Place". + * + * GL_ARB_geometry_shader4 requires that either all or none of the FBO + * attachments are layered, where "layered" notably means whether they were + * array textures attached with glFramebufferTexture(), and does *not* depend + * on whether the attachment has more than one layer. */ +static void test_layered_rtv_mismatch(void) +{ + static const struct vec4 black = {0.0f, 0.0f, 0.0f, 0.0f}; + static const struct vec4 green = {0.0f, 1.0f, 0.0f, 1.0f}; + struct d3d10core_test_context test_context; + ID3D10Texture2D *rt_texture, *ds_texture; + D3D10_RENDER_TARGET_VIEW_DESC rtv_desc; + D3D10_TEXTURE2D_DESC texture_desc; + struct resource_readback rb; + ID3D10RenderTargetView *rtv; + ID3D10DepthStencilView *dsv; + const struct vec4 *colour; + ID3D10Device *device; + HRESULT hr; + + if (!init_test_context(&test_context)) + return; + device = test_context.device; + + ID3D10Texture2D_GetDesc(test_context.backbuffer, &texture_desc); + texture_desc.Format = DXGI_FORMAT_D32_FLOAT; + texture_desc.BindFlags = D3D10_BIND_DEPTH_STENCIL; + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &ds_texture); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = ID3D10Device_CreateDepthStencilView(device, (ID3D10Resource *)ds_texture, NULL, &dsv); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + ID3D10Texture2D_GetDesc(test_context.backbuffer, &texture_desc); + texture_desc.Format = DXGI_FORMAT_R32G32B32A32_TYPELESS; + texture_desc.ArraySize = 2; + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &rt_texture); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + rtv_desc.Format = DXGI_FORMAT_R32G32B32A32_UINT; + rtv_desc.ViewDimension = D3D10_RTV_DIMENSION_TEXTURE2DARRAY; + rtv_desc.Texture2DArray.ArraySize = 1; + rtv_desc.Texture2DArray.FirstArraySlice = 0; + rtv_desc.Texture2DArray.MipSlice = 0; + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)rt_texture, &rtv_desc, &rtv); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + ID3D10Device_OMSetRenderTargets(device, 1, &rtv, dsv); + clear_rtv(&test_context, rtv, &black); + ID3D10Device_ClearDepthStencilView(device, dsv, D3D10_CLEAR_DEPTH, 1.0f, 0); + + draw_color_quad(&test_context, &green); + + get_texture_readback(rt_texture, 0, &rb); + colour = get_readback_vec4(&rb, 320, 240); + ok(compare_vec4(colour, &green, 0), "Got colour {%.8e, %.8e, %.8e, %.8e}.\n", + colour->x, colour->y, colour->z, colour->w); + release_resource_readback(&rb); + + ID3D10Texture2D_Release(rt_texture); + ID3D10Texture2D_Release(ds_texture); + ID3D10RenderTargetView_Release(rtv); + ID3D10DepthStencilView_Release(dsv); + release_test_context(&test_context); +} + START_TEST(d3d10core) { unsigned int argc, i; @@ -19759,6 +19826,7 @@ START_TEST(d3d10core) queue_test(test_rtv_depth_slice); queue_test(test_stencil_only_write_after_clear); queue_test(test_vertex_formats); + queue_test(test_layered_rtv_mismatch); run_queued_tests();

1 0

Zebediah Figura : wined3d: Do not use glFramebufferTexture() to bind array RTVs with an array size of one.
by Alexandre Julliard April 7, 2023

April 7, 2023

Module: wine Branch: master Commit: 41581e8de8595175314412b14519069e6ce119ac URL: https://gitlab.winehq.org/wine/wine/-/commit/41581e8de8595175314412b1451906… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jul 21 18:51:36 2022 -0500 wined3d: Do not use glFramebufferTexture() to bind array RTVs with an array size of one. Despite the array size, these are considered to be "layered" for the purposes of GL_FRAMEBUFFER_ATTACHMENT_LAYERED, and mixing array and non-array textures in this way will trigger GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49002 --- dlls/wined3d/context_gl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 240eaec349c..a8c5160a5b3 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -507,7 +507,7 @@ static inline void wined3d_context_gl_set_fbo_key_for_render_target(const struct key->objects[idx].object = render_target->gl_view.name; key->objects[idx].target = render_target->gl_view.target; key->objects[idx].level = 0; - key->objects[idx].layer = WINED3D_ALL_LAYERS; + key->objects[idx].layer = (render_target->layer_count == 1 ? 0 : WINED3D_ALL_LAYERS); return; }

1 0

Hans Leidekker : wldap32: Don't call ldap_connect() when a connection has already been established.
by Alexandre Julliard April 7, 2023

April 7, 2023

Module: wine Branch: master Commit: 93a2556fae32589aaa37d9270328ef525b4a80b5 URL: https://gitlab.winehq.org/wine/wine/-/commit/93a2556fae32589aaa37d9270328ef… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 31 09:28:46 2023 +0200 wldap32: Don't call ldap_connect() when a connection has already been established. --- dlls/wldap32/init.c | 12 +++++----- dlls/wldap32/winldap_private.h | 51 +++++++++++++++++++++++------------------- 2 files changed, 33 insertions(+), 30 deletions(-) diff --git a/dlls/wldap32/init.c b/dlls/wldap32/init.c index f1fd33cd34e..519466da1ee 100644 --- a/dlls/wldap32/init.c +++ b/dlls/wldap32/init.c @@ -256,12 +256,10 @@ ULONG CDECL WLDAP32_ldap_connect( LDAP *ld, struct l_timeval *timeout ) TRACE( "(%p, %p)\n", ld, timeout ); if (!ld) return WLDAP32_LDAP_PARAM_ERROR; + if (CONNECTED(ld)) return WLDAP32_LDAP_SUCCESS; - if (timeout && (timeout->tv_sec || timeout->tv_usec)) - FIXME( "ignoring timeout\n" ); - - if ((ret = ldap_connect( CTX(ld) ))) - return map_error( ret ); + if (timeout && (timeout->tv_sec || timeout->tv_usec)) FIXME( "ignoring timeout\n" ); + if ((ret = ldap_connect( CTX(ld) ))) return map_error( ret ); if (cert_callback) { @@ -285,6 +283,7 @@ ULONG CDECL WLDAP32_ldap_connect( LDAP *ld, struct l_timeval *timeout ) } } + CONNECTED(ld) = TRUE; return WLDAP32_LDAP_SUCCESS; } @@ -456,9 +455,8 @@ ULONG CDECL ldap_start_tls_sW( LDAP *ld, ULONG *retval, LDAPMessage **result, LD if (clientctrls && !(clientctrlsU = controlarrayWtoU( clientctrls ))) goto exit; else { + if (CONNECTED(ld)) return WLDAP32_LDAP_LOCAL_ERROR; ret = map_error( ldap_start_tls_s( CTX(ld), serverctrlsU, clientctrlsU ) ); - if (!ret && WLDAP32_ldap_connect( ld, NULL ) != WLDAP32_LDAP_SUCCESS) - ret = WLDAP32_LDAP_LOCAL_ERROR; } exit: diff --git a/dlls/wldap32/winldap_private.h b/dlls/wldap32/winldap_private.h index a4f2caf7772..e31dcbb6207 100644 --- a/dlls/wldap32/winldap_private.h +++ b/dlls/wldap32/winldap_private.h @@ -194,16 +194,17 @@ typedef struct WLDAP32_berelement char *opaque; } WLDAP32_BerElement; -typedef struct ldap +struct ld_sb { - struct - { - UINT_PTR sb_sd; - UCHAR Reserved1[41]; - ULONG_PTR sb_naddr; - UCHAR Reserved2[24]; - } ld_sb; + UINT_PTR sb_sd; + UCHAR Reserved1[41]; + ULONG_PTR sb_naddr; + UCHAR Reserved2[24]; +}; +typedef struct ldap +{ + struct ld_sb ld_sb; char *ld_host; ULONG ld_version; UCHAR ld_lberoptions; @@ -221,6 +222,25 @@ typedef struct ldap ULONG ld_options; } LDAP, *PLDAP; +typedef BOOLEAN (CDECL VERIFYSERVERCERT)(LDAP *, const CERT_CONTEXT **); + +struct private_data +{ + LDAP *ctx; + struct berval **server_ctrls; + VERIFYSERVERCERT *cert_callback; + BOOL connected; +}; +C_ASSERT(sizeof(struct private_data) < FIELD_OFFSET(struct ld_sb, sb_naddr) - FIELD_OFFSET(struct ld_sb, Reserved1)); + +#define CTX(ld) (((struct private_data *)ld->ld_sb.Reserved1)->ctx) +#define SERVER_CTRLS(ld) (((struct private_data *)ld->ld_sb.Reserved1)->server_ctrls) +#define CERT_CALLBACK(ld) (((struct private_data *)ld->ld_sb.Reserved1)->cert_callback) +#define CONNECTED(ld) (((struct private_data *)ld->ld_sb.Reserved1)->connected) + +#define MSG(entry) (entry->Request) +#define BER(ber) ((BerElement *)((ber)->opaque)) + typedef struct l_timeval { LONG tv_sec; @@ -366,21 +386,6 @@ typedef struct ldapsearch struct WLDAP32_berval *cookie; } LDAPSearch; -typedef BOOLEAN (CDECL VERIFYSERVERCERT)(LDAP*,const CERT_CONTEXT**); - -struct private_data -{ - LDAP *ctx; - struct berval **server_ctrls; - VERIFYSERVERCERT *cert_callback; -}; - -#define CTX(ld) (((struct private_data *)ld->Reserved3)->ctx) -#define SERVER_CTRLS(ld) (((struct private_data *)ld->Reserved3)->server_ctrls) -#define CERT_CALLBACK(ld) (((struct private_data *)ld->Reserved3)->cert_callback) -#define MSG(entry) (entry->Request) -#define BER(ber) ((BerElement *)((ber)->opaque)) - void CDECL WLDAP32_ber_bvecfree( BERVAL ** ); void CDECL WLDAP32_ber_bvfree( BERVAL * ); void CDECL WLDAP32_ber_free( WLDAP32_BerElement *, int );

1 0

Hans Leidekker : wldap32: Implement LDAP_OPT_REFERRAL_HOP_LIMIT.
by Alexandre Julliard April 7, 2023

April 7, 2023

Module: wine Branch: master Commit: 3bdf2ad64c0f955ff6c3f147b5f52cade1691bd2 URL: https://gitlab.winehq.org/wine/wine/-/commit/3bdf2ad64c0f955ff6c3f147b5f52c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 29 15:57:12 2023 +0200 wldap32: Implement LDAP_OPT_REFERRAL_HOP_LIMIT. --- dlls/wldap32/option.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/wldap32/option.c b/dlls/wldap32/option.c index b64b544d1ed..3d63b116e10 100644 --- a/dlls/wldap32/option.c +++ b/dlls/wldap32/option.c @@ -96,6 +96,9 @@ ULONG CDECL ldap_get_optionA( LDAP *ld, int option, void *value ) case WLDAP32_LDAP_OPT_TIMELIMIT: return ldap_get_optionW( ld, option, value ); + case WLDAP32_LDAP_OPT_REFERRAL_HOP_LIMIT: + return ldap_get_optionW( ld, LDAP_OPT_REFHOPLIMIT, value ); + case WLDAP32_LDAP_OPT_CACHE_ENABLE: case WLDAP32_LDAP_OPT_CACHE_FN_PTRS: case WLDAP32_LDAP_OPT_CACHE_STRATEGY: @@ -122,7 +125,6 @@ ULONG CDECL ldap_get_optionA( LDAP *ld, int option, void *value ) case WLDAP32_LDAP_OPT_PROMPT_CREDENTIALS: case WLDAP32_LDAP_OPT_REF_DEREF_CONN_PER_MSG: case WLDAP32_LDAP_OPT_REFERRAL_CALLBACK: - case WLDAP32_LDAP_OPT_REFERRAL_HOP_LIMIT: case WLDAP32_LDAP_OPT_ROOTDSE_CACHE: case WLDAP32_LDAP_OPT_SASL_METHOD: case WLDAP32_LDAP_OPT_SECURITY_CONTEXT: @@ -215,6 +217,9 @@ ULONG CDECL ldap_get_optionW( LDAP *ld, int option, void *value ) case WLDAP32_LDAP_OPT_TIMELIMIT: return map_error( ldap_get_option( CTX(ld), option, value ) ); + case WLDAP32_LDAP_OPT_REFERRAL_HOP_LIMIT: + return map_error( ldap_get_option( CTX(ld), LDAP_OPT_REFHOPLIMIT, value ) ); + case WLDAP32_LDAP_OPT_CACHE_ENABLE: case WLDAP32_LDAP_OPT_CACHE_FN_PTRS: case WLDAP32_LDAP_OPT_CACHE_STRATEGY: @@ -241,7 +246,6 @@ ULONG CDECL ldap_get_optionW( LDAP *ld, int option, void *value ) case WLDAP32_LDAP_OPT_PROMPT_CREDENTIALS: case WLDAP32_LDAP_OPT_REF_DEREF_CONN_PER_MSG: case WLDAP32_LDAP_OPT_REFERRAL_CALLBACK: - case WLDAP32_LDAP_OPT_REFERRAL_HOP_LIMIT: case WLDAP32_LDAP_OPT_ROOTDSE_CACHE: case WLDAP32_LDAP_OPT_SASL_METHOD: case WLDAP32_LDAP_OPT_SECURITY_CONTEXT: @@ -459,8 +463,7 @@ ULONG CDECL ldap_set_optionW( LDAP *ld, int option, void *value ) return map_error( ldap_set_option( CTX(ld), option, value ) ); } case WLDAP32_LDAP_OPT_REFERRAL_HOP_LIMIT: - FIXME( "ignoring referral hop limit\n" ); - return WLDAP32_LDAP_SUCCESS; + return map_error( ldap_set_option( CTX(ld), LDAP_OPT_REFHOPLIMIT, value ) ); case WLDAP32_LDAP_OPT_SERVER_CERTIFICATE: CERT_CALLBACK(ld) = value;

1 0

Alexandre Julliard : msvcrt: Use the pow()/powf() implementation from the bundled musl library.
by Alexandre Julliard April 7, 2023

April 7, 2023

Module: wine Branch: master Commit: b89b7b9aaf6f1bb6a8bb9c4308c6107b35793552 URL: https://gitlab.winehq.org/wine/wine/-/commit/b89b7b9aaf6f1bb6a8bb9c4308c610… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 30 17:06:07 2023 +0200 msvcrt: Use the pow()/powf() implementation from the bundled musl library. --- dlls/msvcrt/math.c | 597 ----------------------------------------- libs/musl/src/math/pow.c | 42 ++- libs/musl/src/math/powf.c | 21 +- libs/musl/src/math/powf_data.h | 4 - 4 files changed, 25 insertions(+), 639 deletions(-)

1 0

Alexandre Julliard : msvcrt: Use the cos()/cosf() implementation from the bundled musl library.
by Alexandre Julliard April 7, 2023

April 7, 2023

Module: wine Branch: master Commit: 6ec636f288d98fdf8f1cb15ff1d9a13dbc61f55f URL: https://gitlab.winehq.org/wine/wine/-/commit/6ec636f288d98fdf8f1cb15ff1d9a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 4 14:53:15 2023 +0200 msvcrt: Use the cos()/cosf() implementation from the bundled musl library. --- dlls/msvcrt/math.c | 147 ---------------------------------------------- libs/musl/src/math/cos.c | 2 + libs/musl/src/math/cosf.c | 2 + 3 files changed, 4 insertions(+), 147 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index d676f813055..8b5f8ee3099 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -219,9 +219,6 @@ float CDECL _chgsignf( float num ) #endif #ifndef __i386__ -extern float __sindf(double x); -extern float __cosdf(double x); - static const UINT64 exp2f_T[] = { 0x3ff0000000000000ULL, 0x3fefd9b0d3158574ULL, 0x3fefb5586cf9890fULL, 0x3fef9301d0125b51ULL, 0x3fef72b83c7d517bULL, 0x3fef54873168b9aaULL, 0x3fef387a6e756238ULL, 0x3fef1e9df51fdee1ULL, @@ -494,70 +491,6 @@ float CDECL atanf( float x ) extern int __rem_pio2f(float x, double *y); -/********************************************************************* - * cosf (MSVCRT.@) - * - * Copied from musl: src/math/cosf.c - */ -float CDECL cosf( float x ) -{ - static const double c1pio2 = 1*M_PI_2, - c2pio2 = 2*M_PI_2, - c3pio2 = 3*M_PI_2, - c4pio2 = 4*M_PI_2; - - double y; - UINT32 ix; - unsigned n, sign; - - ix = *(UINT32*)&x; - sign = ix >> 31; - ix &= 0x7fffffff; - - if (ix <= 0x3f490fda) { /* |x| ~<= pi/4 */ - if (ix < 0x39800000) { /* |x| < 2**-12 */ - /* raise inexact if x != 0 */ - fp_barrierf(x + 0x1p120f); - return 1.0f; - } - return __cosdf(x); - } - if (ix <= 0x407b53d1) { /* |x| ~<= 5*pi/4 */ - if (ix > 0x4016cbe3) /* |x| ~> 3*pi/4 */ - return -__cosdf(sign ? x + c2pio2 : x - c2pio2); - else { - if (sign) - return __sindf(x + c1pio2); - else - return __sindf(c1pio2 - x); - } - } - if (ix <= 0x40e231d5) { /* |x| ~<= 9*pi/4 */ - if (ix > 0x40afeddf) /* |x| ~> 7*pi/4 */ - return __cosdf(sign ? x + c4pio2 : x - c4pio2); - else { - if (sign) - return __sindf(-x - c3pio2); - else - return __sindf(x - c3pio2); - } - } - - /* cos(Inf or NaN) is NaN */ - if (isinf(x)) return math_error(_DOMAIN, "cosf", x, 0, x - x); - if (ix >= 0x7f800000) - return x - x; - - /* general argument reduction needed */ - n = __rem_pio2f(x, &y); - switch (n & 3) { - case 0: return __cosdf(y); - case 1: return __sindf(-y); - case 2: return -__cosdf(y); - default: return __sindf(y); - } -} - /********************************************************************* * expf (MSVCRT.@) */ @@ -1309,86 +1242,6 @@ double CDECL rint(double x) extern int __rem_pio2(double x, double *y); -/* Copied from musl: src/math/__sin.c */ -static double __sin(double x, double y, int iy) -{ - static const double S1 = -1.66666666666666324348e-01, - S2 = 8.33333333332248946124e-03, - S3 = -1.98412698298579493134e-04, - S4 = 2.75573137070700676789e-06, - S5 = -2.50507602534068634195e-08, - S6 = 1.58969099521155010221e-10; - - double z, r, v, w; - - z = x * x; - w = z * z; - r = S2 + z * (S3 + z * S4) + z * w * (S5 + z * S6); - v = z * x; - if (iy == 0) - return x + v * (S1 + z * r); - else - return x - ((z * (0.5 * y - v * r) - y) - v * S1); -} - -/* Copied from musl: src/math/__cos.c */ -static double __cos(double x, double y) -{ - static const double C1 = 4.16666666666666019037e-02, - C2 = -1.38888888888741095749e-03, - C3 = 2.48015872894767294178e-05, - C4 = -2.75573143513906633035e-07, - C5 = 2.08757232129817482790e-09, - C6 = -1.13596475577881948265e-11; - double hz, z, r, w; - - z = x * x; - w = z * z; - r = z * (C1 + z * (C2 + z * C3)) + w * w * (C4 + z * (C5 + z * C6)); - hz = 0.5 * z; - w = 1.0 - hz; - return w + (((1.0 - w) - hz) + (z * r - x * y)); -} - -/********************************************************************* - * cos (MSVCRT.@) - * - * Copied from musl: src/math/cos.c - */ -double CDECL cos( double x ) -{ - double y[2]; - UINT32 ix; - unsigned n; - - ix = *(ULONGLONG*)&x >> 32; - ix &= 0x7fffffff; - - /* |x| ~< pi/4 */ - if (ix <= 0x3fe921fb) { - if (ix < 0x3e46a09e) { /* |x| < 2**-27 * sqrt(2) */ - /* raise inexact if x!=0 */ - fp_barrier(x + 0x1p120f); - return 1.0; - } - return __cos(x, 0); - } - - /* cos(Inf or NaN) is NaN */ - if (isinf(x)) return math_error(_DOMAIN, "cos", x, 0, x - x); - if (ix >= 0x7ff00000) - return x - x; - - /* argument reduction */ - n = __rem_pio2(x, y); - switch (n & 3) { - case 0: return __cos(y[0], y[1]); - case 1: return -__sin(y[0], y[1], 1); - case 2: return -__cos(y[0], y[1]); - default: return __sin(y[0], y[1], 1); - } -} - /* Copied from musl: src/math/exp_data.c */ static const UINT64 exp_T[] = { 0x0ULL, 0x3ff0000000000000ULL, diff --git a/libs/musl/src/math/cos.c b/libs/musl/src/math/cos.c index 0fae2287270..eb5c2a475e9 100644 --- a/libs/musl/src/math/cos.c +++ b/libs/musl/src/math/cos.c @@ -62,6 +62,8 @@ double __cdecl cos(double x) } /* cos(Inf or NaN) is NaN */ + if (isinf(x)) + return math_error(_DOMAIN, "cos", x, 0, x - x); if (ix >= 0x7ff00000) return x-x; diff --git a/libs/musl/src/math/cosf.c b/libs/musl/src/math/cosf.c index 25f4da07409..a2d7b149c02 100644 --- a/libs/musl/src/math/cosf.c +++ b/libs/musl/src/math/cosf.c @@ -63,6 +63,8 @@ float __cdecl cosf(float x) } /* cos(Inf or NaN) is NaN */ + if (isinf(x)) + return math_error(_DOMAIN, "cosf", x, 0, x - x); if (ix >= 0x7f800000) return x-x;

1 0