November 2022 - Wine-commits

Alexandre Julliard : wmc: Add support for named locales.
by Alexandre Julliard 15 Nov '22

15 Nov '22

Module: wine Branch: master Commit: c44eb6d627d25f02a01f87a6b4b2fcea44cb4008 URL: https://gitlab.winehq.org/wine/wine/-/commit/c44eb6d627d25f02a01f87a6b4b2fc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 15 16:56:20 2022 +0100 wmc: Add support for named locales. --- tools/makedep.c | 1 + tools/wmc/po.c | 394 +++++++++++------------------------------------------- tools/wmc/utils.c | 112 ++++++++++++++-- tools/wmc/utils.h | 1 + 4 files changed, 179 insertions(+), 329 deletions(-)

1 0

Alexandre Julliard : configure: Skip the rest of the PE checks if the cross-compiler isn't detected.
by Alexandre Julliard 15 Nov '22

15 Nov '22

Module: wine Branch: master Commit: 266c97107b698ef70946e27b14b9529e9b4bc7e2 URL: https://gitlab.winehq.org/wine/wine/-/commit/266c97107b698ef70946e27b14b952… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 15 21:14:18 2022 +0100 configure: Skip the rest of the PE checks if the cross-compiler isn't detected. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53923 --- configure | 9 ++++++++- configure.ac | 11 +++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 0f8d5ff5044..8f780aff3ad 100755 --- a/configure +++ b/configure @@ -10886,10 +10886,17 @@ then : CFLAGS="$CFLAGS -target $target $llvm_cflags" fi } eval "${wine_arch}_TARGET=\$target" - PE_ARCHS="$PE_ARCHS $wine_arch" fi + if test -z "$target" + then + CC=$saved_CC + CFLAGS=$saved_CFLAGS + continue + fi + as_fn_append PE_ARCHS " $wine_arch" + as_wine_cv_crosscc_c99=`printf "%s\n" "ac_cv_${wine_arch}_crosscc_c99" | $as_tr_sh` { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5 diff --git a/configure.ac b/configure.ac index 076d30e581d..1d0ae5c3fc2 100644 --- a/configure.ac +++ b/configure.ac @@ -951,10 +951,17 @@ do AS_VAR_SET([${wine_arch}_DELAYLOADFLAG],["-Wl,-delayload,"]) AS_VAR_APPEND([${wine_arch}_EXTRACFLAGS],[" -target $target"]) CFLAGS="$CFLAGS -target $target $llvm_cflags"]) - AS_VAR_SET([${wine_arch}_TARGET],[$target]) - PE_ARCHS="$PE_ARCHS $wine_arch"]) + AS_VAR_SET([${wine_arch}_TARGET],[$target])]) AS_VAR_POPDEF([wine_cv_crosscc]) + if test -z "$target" + then + CC=$saved_CC + CFLAGS=$saved_CFLAGS + continue + fi + AS_VAR_APPEND([PE_ARCHS],[" $wine_arch"]) + AS_VAR_PUSHDEF([wine_cv_crosscc_c99],[ac_cv_${wine_arch}_crosscc_c99]) AC_MSG_CHECKING([for $CC option to enable C99 features]) AC_CACHE_VAL([wine_cv_crosscc_c99],

1 0

Nikolay Sivov : d3dx9: Add missing path conversion call in D3DXLoadVolumeFromFileA().
by Alexandre Julliard 15 Nov '22

15 Nov '22

Module: wine Branch: master Commit: f63f0d3b2bebe8bc4373cbce9c6d64d56f3e745e URL: https://gitlab.winehq.org/wine/wine/-/commit/f63f0d3b2bebe8bc4373cbce9c6d64… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 15 07:02:20 2022 +0300 d3dx9: Add missing path conversion call in D3DXLoadVolumeFromFileA(). --- dlls/d3dx9_36/volume.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3dx9_36/volume.c b/dlls/d3dx9_36/volume.c index d7d52b72626..c0357e0520e 100644 --- a/dlls/d3dx9_36/volume.c +++ b/dlls/d3dx9_36/volume.c @@ -38,6 +38,7 @@ HRESULT WINAPI D3DXLoadVolumeFromFileA(IDirect3DVolume9 *dst_volume, const PALET length = MultiByteToWideChar(CP_ACP, 0, filename, -1, NULL, 0); filenameW = HeapAlloc(GetProcessHeap(), 0, length * sizeof(*filenameW)); if (!filenameW) return E_OUTOFMEMORY; + MultiByteToWideChar(CP_ACP, 0, filename, -1, filenameW, length); hr = D3DXLoadVolumeFromFileW(dst_volume, dst_palette, dst_box, filenameW, src_box, filter, color_key, info);

1 0

Nikolay Sivov : d2d1: Silently ignore non-default state block implementations.
by Alexandre Julliard 15 Nov '22

15 Nov '22

Module: wine Branch: master Commit: 798d659f04250757ee18b009619f08d45e99b395 URL: https://gitlab.winehq.org/wine/wine/-/commit/798d659f04250757ee18b009619f08… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 14 09:22:58 2022 +0300 d2d1: Silently ignore non-default state block implementations. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53915 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/device.c | 6 ++++-- dlls/d2d1/state_block.c | 6 +++++- dlls/d2d1/tests/d2d1.c | 10 ++++++++++ 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 72781a48d10..89d17149ca4 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1735,11 +1735,12 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_Flush(ID2D1DeviceContext1 *i static void STDMETHODCALLTYPE d2d_device_context_SaveDrawingState(ID2D1DeviceContext1 *iface, ID2D1DrawingStateBlock *state_block) { - struct d2d_state_block *state_block_impl = unsafe_impl_from_ID2D1DrawingStateBlock(state_block); struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); + struct d2d_state_block *state_block_impl; TRACE("iface %p, state_block %p.\n", iface, state_block); + if (!(state_block_impl = unsafe_impl_from_ID2D1DrawingStateBlock(state_block))) return; state_block_impl->drawing_state = render_target->drawing_state; if (render_target->text_rendering_params) IDWriteRenderingParams_AddRef(render_target->text_rendering_params); @@ -1751,11 +1752,12 @@ static void STDMETHODCALLTYPE d2d_device_context_SaveDrawingState(ID2D1DeviceCon static void STDMETHODCALLTYPE d2d_device_context_RestoreDrawingState(ID2D1DeviceContext1 *iface, ID2D1DrawingStateBlock *state_block) { - struct d2d_state_block *state_block_impl = unsafe_impl_from_ID2D1DrawingStateBlock(state_block); struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); + struct d2d_state_block *state_block_impl; TRACE("iface %p, state_block %p.\n", iface, state_block); + if (!(state_block_impl = unsafe_impl_from_ID2D1DrawingStateBlock(state_block))) return; if (context->target.type == D2D_TARGET_COMMAND_LIST) { struct d2d_command_list *command_list = context->target.command_list; diff --git a/dlls/d2d1/state_block.c b/dlls/d2d1/state_block.c index 7415471ce3a..770c165fd90 100644 --- a/dlls/d2d1/state_block.c +++ b/dlls/d2d1/state_block.c @@ -186,6 +186,10 @@ struct d2d_state_block *unsafe_impl_from_ID2D1DrawingStateBlock(ID2D1DrawingStat { if (!iface) return NULL; - assert(iface->lpVtbl == (ID2D1DrawingStateBlockVtbl *)&d2d_state_block_vtbl); + if (iface->lpVtbl != (ID2D1DrawingStateBlockVtbl *)&d2d_state_block_vtbl) + { + WARN("Unexpected state block vtbl %p.\n", iface->lpVtbl); + return NULL; + } return CONTAINING_RECORD(iface, struct d2d_state_block, ID2D1DrawingStateBlock1_iface); } diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 1dcce63381e..1935955ec84 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -1835,6 +1835,7 @@ static void test_state_block(BOOL d3d11) ID2D1Factory *factory; ULONG refcount; HRESULT hr; + void *ptr; static const D2D1_MATRIX_3X2_F identity = {{{ 1.0f, 0.0f, @@ -2078,6 +2079,15 @@ static void test_state_block(BOOL d3d11) refcount = IDWriteRenderingParams_Release(text_rendering_params1); ok(!refcount, "Rendering params %lu references left.\n", refcount); + + /* State block object pointer is validated, but does not result in an error state. */ + ptr = (void *)0xdeadbeef; + ID2D1RenderTarget_BeginDraw(rt); + ID2D1RenderTarget_SaveDrawingState(rt, (ID2D1DrawingStateBlock *)&ptr); + ID2D1RenderTarget_RestoreDrawingState(rt, (ID2D1DrawingStateBlock *)&ptr); + hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + release_test_context(&ctx); }

1 0

Alex Henrie : comctl32: Fix memory leak on error path in EDIT_MakeUndoFit.
by Alexandre Julliard 15 Nov '22

15 Nov '22

Module: wine Branch: master Commit: 0b09db5902abad62ca7b9a3393b3090544fc5258 URL: https://gitlab.winehq.org/wine/wine/-/commit/0b09db5902abad62ca7b9a3393b309… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Nov 13 21:32:22 2022 -0700 comctl32: Fix memory leak on error path in EDIT_MakeUndoFit. --- dlls/comctl32/edit.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index a9a469ffd47..96ed2b0ae1b 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -1292,6 +1292,7 @@ static BOOL EDIT_MakeFit(EDITSTATE *es, UINT size) static BOOL EDIT_MakeUndoFit(EDITSTATE *es, UINT size) { UINT alloc_size; + WCHAR *new_undo_text; if (size <= es->undo_buffer_size) return TRUE; @@ -1299,7 +1300,8 @@ static BOOL EDIT_MakeUndoFit(EDITSTATE *es, UINT size) TRACE("trying to ReAlloc to %d+1\n", size); alloc_size = ROUND_TO_GROW((size + 1) * sizeof(WCHAR)); - if ((es->undo_text = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, es->undo_text, alloc_size))) { + if ((new_undo_text = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, es->undo_text, alloc_size))) { + es->undo_text = new_undo_text; es->undo_buffer_size = alloc_size/sizeof(WCHAR) - 1; return TRUE; }

1 0

Hans Leidekker : libs: Import code from upstream openldap 2.5.13.
by Alexandre Julliard 15 Nov '22

15 Nov '22

1 0

Hans Leidekker : wldap32/tests: Get rid of workarounds for old Windows versions.
by Alexandre Julliard 15 Nov '22

15 Nov '22

Module: wine Branch: master Commit: eafcb9499394f8531bbf82fbe5d66931c84e84cb URL: https://gitlab.winehq.org/wine/wine/-/commit/eafcb9499394f8531bbf82fbe5d669… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 30 11:16:16 2022 +0200 wldap32/tests: Get rid of workarounds for old Windows versions. --- dlls/wldap32/tests/parse.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/dlls/wldap32/tests/parse.c b/dlls/wldap32/tests/parse.c index 8ed95dd03f2..704ce0766a1 100644 --- a/dlls/wldap32/tests/parse.c +++ b/dlls/wldap32/tests/parse.c @@ -67,14 +67,6 @@ static void test_ldap_parse_sort_control( LDAP *ld ) ok( !ret, "ldap_search_ext_sA failed %#lx\n", ret ); ok( res != NULL, "expected res != NULL\n" ); - if (GetProcAddress(GetModuleHandleA("wldap32.dll"), "ber_init")) - { - ret = ldap_parse_resultA( NULL, res, &result, NULL, NULL, NULL, &server_ctrls, 1 ); - ok( ret == LDAP_PARAM_ERROR, "ldap_parse_resultA failed %#lx\n", ret ); - } - else - win_skip("Test would crash on older wldap32 versions\n"); - result = ~0u; ret = ldap_parse_resultA( ld, res, &result, NULL, NULL, NULL, &server_ctrls, 1 ); ok( !ret, "ldap_parse_resultA failed %#lx\n", ret ); @@ -127,7 +119,7 @@ static void test_ldap_set_optionW( LDAP *ld ) } ret = ldap_set_optionW( ld, LDAP_OPT_REFERRALS, LDAP_OPT_OFF ); - ok( !ret || broken(ret == LDAP_PARAM_ERROR) /* nt4, win2k */, "ldap_set_optionW failed %#lx\n", ret ); + ok( !ret, "ldap_set_optionW failed %#lx\n", ret ); ret = ldap_set_optionW( ld, LDAP_OPT_REFERRALS, (void *)&oldvalue ); ok( !ret, "ldap_set_optionW failed %#lx\n", ret );

1 0

Hans Leidekker : wldap32/tests: Switch to db.debian.org.
by Alexandre Julliard 15 Nov '22

15 Nov '22

Module: wine Branch: master Commit: a4a7e8b9e158f92fb8cf8b4f91f0ccac7e158bda URL: https://gitlab.winehq.org/wine/wine/-/commit/a4a7e8b9e158f92fb8cf8b4f91f0cc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 19 13:11:38 2022 +0200 wldap32/tests: Switch to db.debian.org. This server supports secure connections. --- dlls/wldap32/tests/parse.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/wldap32/tests/parse.c b/dlls/wldap32/tests/parse.c index 704ce0766a1..f30912324ba 100644 --- a/dlls/wldap32/tests/parse.c +++ b/dlls/wldap32/tests/parse.c @@ -57,7 +57,8 @@ static void test_ldap_parse_sort_control( LDAP *ld ) ctrls[1] = NULL; timeout.tv_sec = 20; timeout.tv_usec = 0; - ret = ldap_search_ext_sA( ld, (char *)"", LDAP_SCOPE_ONELEVEL, (char *)"(ou=*)", NULL, 0, ctrls, NULL, &timeout, 10, &res ); + ret = ldap_search_ext_sA( ld, (char *)"dc=debian,dc=org", LDAP_SCOPE_ONELEVEL, (char *)"(uid=*)", NULL, 0, + ctrls, NULL, &timeout, 10, &res ); if (ret == LDAP_SERVER_DOWN || ret == LDAP_TIMEOUT) { skip("test server can't be reached\n"); @@ -140,8 +141,8 @@ static void test_ldap_bind_sA( void ) ULONG ret; int version; - ld = ldap_initA( (char *)"ldap.forumsys.com", 389 ); - ok( ld != NULL, "ldap_init failed\n" ); + ld = ldap_sslinitA( (char *)"db.debian.org", 636, 1 ); + ok( ld != NULL, "ldap_sslinit failed\n" ); version = LDAP_VERSION3; ret = ldap_set_optionW( ld, LDAP_OPT_PROTOCOL_VERSION, &version ); @@ -155,9 +156,16 @@ static void test_ldap_bind_sA( void ) ret = ldap_connect( ld, NULL ); ok( !ret, "ldap_connect failed %#lx\n", ret ); - ret = ldap_bind_sA( ld, (char *)"CN=read-only-admin,DC=example,DC=com", (char *)"password", LDAP_AUTH_SIMPLE ); - ok( !ret, "ldap_bind_s failed %#lx\n", ret ); + ret = ldap_bind_sA( ld, (char *)"uid=winetest,ou=users,dc=debian,dc=org", (char *)"winetest", + LDAP_AUTH_SIMPLE ); + ok( ret == LDAP_INVALID_CREDENTIALS, "ldap_bind_s returned %#lx\n", ret ); + ldap_unbind( ld ); + + ld = ldap_sslinitA( (char *)"db.debian.org", 389, 0 ); + ok( ld != NULL, "ldap_sslinit failed\n" ); + ret = ldap_connect( ld, NULL ); + ok( !ret, "ldap_connect failed %#lx\n", ret ); ldap_unbind( ld ); } @@ -171,7 +179,7 @@ static void test_ldap_server_control( void ) LDAPControlW *ctrls[2], mask; LDAPMessage *res; - ld = ldap_initA( (char *)"ldap.forumsys.com", 389 ); + ld = ldap_initA( (char *)"db.debian.org", 389 ); ok( ld != NULL, "ldap_init failed\n" ); version = LDAP_VERSION3; @@ -197,7 +205,7 @@ static void test_ldap_server_control( void ) ok( ret == LDAP_PARAM_ERROR, "ldap_set_optionW should fail: %#lx\n", ret ); res = NULL; - ret = ldap_search_sA( ld, (char *)"OU=scientists,DC=example,DC=com", LDAP_SCOPE_BASE, (char *)"(objectclass=*)", NULL, FALSE, &res ); + ret = ldap_search_sA( ld, (char *)"dc=debian,dc=org", LDAP_SCOPE_BASE, (char *)"(objectclass=*)", NULL, FALSE, &res ); ok( !ret, "ldap_search_sA failed %#lx\n", ret ); ok( res != NULL, "expected res != NULL\n" ); @@ -215,7 +223,7 @@ static void test_ldap_paged_search(void) BerElement *ber; WCHAR *attr; - ld = ldap_initA( (char *)"ldap.forumsys.com", 389 ); + ld = ldap_initA( (char *)"db.debian.org", 389 ); ok( ld != NULL, "ldap_init failed\n" ); version = LDAP_VERSION3; @@ -272,7 +280,7 @@ START_TEST (parse) test_ldap_server_control(); test_ldap_bind_sA(); - ld = ldap_initA((char *)"ldap.itd.umich.edu", 389 ); + ld = ldap_initA( (char *)"db.debian.org", 389 ); ok( ld != NULL, "ldap_init failed\n" ); test_ldap_parse_sort_control( ld );

1 0

Hans Leidekker : wldap32: Get rid of the function documentation.
by Alexandre Julliard 15 Nov '22

15 Nov '22

Module: wine Branch: master Commit: 9003877dfb31f0d25b84cbe188ae3a88fb9752e9 URL: https://gitlab.winehq.org/wine/wine/-/commit/9003877dfb31f0d25b84cbe188ae3a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 19 13:38:43 2022 +0200 wldap32: Get rid of the function documentation. --- dlls/wldap32/add.c | 75 ---------------- dlls/wldap32/ber.c | 177 -------------------------------------- dlls/wldap32/bind.c | 123 --------------------------- dlls/wldap32/compare.c | 73 ---------------- dlls/wldap32/control.c | 96 --------------------- dlls/wldap32/delete.c | 67 --------------- dlls/wldap32/dn.c | 60 ------------- dlls/wldap32/error.c | 57 ------------- dlls/wldap32/extended.c | 61 ------------- dlls/wldap32/init.c | 125 --------------------------- dlls/wldap32/misc.c | 221 ------------------------------------------------ dlls/wldap32/modify.c | 75 ---------------- dlls/wldap32/modrdn.c | 64 -------------- dlls/wldap32/option.c | 29 ------- dlls/wldap32/page.c | 17 ---- dlls/wldap32/parse.c | 95 --------------------- dlls/wldap32/rename.c | 41 +-------- dlls/wldap32/search.c | 117 ------------------------- dlls/wldap32/value.c | 84 ------------------ 19 files changed, 1 insertion(+), 1656 deletions(-)

1 0

Hans Leidekker : wldap32: Add a prefix to functions that conflict with OpenLDAP exports.
by Alexandre Julliard 15 Nov '22

15 Nov '22

Module: wine Branch: master Commit: bf88332cc54d9b3394325fcfff72a828c32884e5 URL: https://gitlab.winehq.org/wine/wine/-/commit/bf88332cc54d9b3394325fcfff72a8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 19 14:43:35 2022 +0200 wldap32: Add a prefix to functions that conflict with OpenLDAP exports. --- dlls/wldap32/ber.c | 30 +++++++++++----------- dlls/wldap32/bind.c | 4 +-- dlls/wldap32/error.c | 4 +-- dlls/wldap32/init.c | 2 +- dlls/wldap32/misc.c | 18 ++++++------- dlls/wldap32/page.c | 20 +++++++-------- dlls/wldap32/value.c | 4 +-- dlls/wldap32/winldap_private.h | 19 ++++++++++++++ dlls/wldap32/wldap32.spec | 58 +++++++++++++++++++++--------------------- 9 files changed, 89 insertions(+), 70 deletions(-)

1 0