November 2022 - Wine-Commits

Alexandre Julliard : wmc: Add support for named locales.
by Alexandre Julliard Nov. 15, 2022

Nov. 15, 2022

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

Hans Leidekker : wldap32: Add a prefix to definitions that conflict with OpenLDAP headers.
by Alexandre Julliard Nov. 15, 2022

Nov. 15, 2022

Module: wine Branch: master Commit: 17021e530755176076703c4596c175d3bffcf4bf URL: https://gitlab.winehq.org/wine/wine/-/commit/17021e530755176076703c4596c175… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 19 16:35:55 2022 +0200 wldap32: Add a prefix to definitions that conflict with OpenLDAP headers. --- dlls/wldap32/add.c | 24 +-- dlls/wldap32/ber.c | 6 +- dlls/wldap32/bind.c | 62 +++--- dlls/wldap32/compare.c | 24 +-- dlls/wldap32/control.c | 38 ++-- dlls/wldap32/delete.c | 24 +-- dlls/wldap32/dn.c | 14 +- dlls/wldap32/error.c | 44 ++-- dlls/wldap32/extended.c | 26 +-- dlls/wldap32/init.c | 17 +- dlls/wldap32/misc.c | 20 +- dlls/wldap32/modify.c | 20 +- dlls/wldap32/modrdn.c | 24 +-- dlls/wldap32/option.c | 464 ++++++++++++++++++++--------------------- dlls/wldap32/page.c | 56 ++--- dlls/wldap32/parse.c | 52 ++--- dlls/wldap32/rename.c | 16 +- dlls/wldap32/search.c | 28 +-- dlls/wldap32/value.c | 6 +- dlls/wldap32/winldap_private.h | 152 ++++++++++++++ 20 files changed, 632 insertions(+), 485 deletions(-)

1 0

Hans Leidekker : wldap32: Use the bundled liblber and libldap.
by Alexandre Julliard Nov. 15, 2022

Nov. 15, 2022

Module: wine Branch: master Commit: d08d6f51040e18982612658a885af659fbfa4afe URL: https://gitlab.winehq.org/wine/wine/-/commit/d08d6f51040e18982612658a885af6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 20 13:06:43 2022 +0200 wldap32: Use the bundled liblber and libldap. --- configure | 198 ++--------- configure.ac | 29 +- dlls/wldap32/Makefile.in | 7 +- dlls/wldap32/add.c | 15 +- dlls/wldap32/ber.c | 166 ++++----- dlls/wldap32/bind.c | 161 ++++----- dlls/wldap32/compare.c | 33 +- dlls/wldap32/control.c | 34 +- dlls/wldap32/delete.c | 15 +- dlls/wldap32/dn.c | 55 +-- dlls/wldap32/error.c | 91 +++-- dlls/wldap32/extended.c | 38 +- dlls/wldap32/init.c | 18 +- dlls/wldap32/libldap.c | 683 ------------------------------------ dlls/wldap32/libldap.h | 624 --------------------------------- dlls/wldap32/main.c | 6 - dlls/wldap32/misc.c | 131 +++---- dlls/wldap32/modify.c | 23 +- dlls/wldap32/modrdn.c | 9 +- dlls/wldap32/option.c | 80 ++--- dlls/wldap32/page.c | 38 +- dlls/wldap32/parse.c | 88 ++--- dlls/wldap32/rename.c | 20 +- dlls/wldap32/search.c | 57 ++- dlls/wldap32/tests/ber.c | 2 +- dlls/wldap32/value.c | 40 +-- dlls/wldap32/winldap_private.h | 776 +++++++++++++++++++++++++++++------------ include/config.h.in | 12 - 28 files changed, 1087 insertions(+), 2362 deletions(-)

1 0

Alexandre Julliard : wrc: Add support for named locales.
by Alexandre Julliard Nov. 15, 2022

Nov. 15, 2022

Module: wine Branch: master Commit: 4e89a2592755b97de8c9050755baaff4b77dedc6 URL: https://gitlab.winehq.org/wine/wine/-/commit/4e89a2592755b97de8c9050755baaf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 15 16:55:47 2022 +0100 wrc: Add support for named locales. --- tools/wrc/po.c | 430 +++++++++++------------------------------------------- tools/wrc/utils.c | 46 ++++++ tools/wrc/utils.h | 1 + 3 files changed, 133 insertions(+), 344 deletions(-)

1 0

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

Nov. 15, 2022

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

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

Nov. 15, 2022

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/tests: Switch to db.debian.org.
by Alexandre Julliard Nov. 15, 2022

Nov. 15, 2022

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/tests: Get rid of workarounds for old Windows versions.
by Alexandre Julliard Nov. 15, 2022

Nov. 15, 2022

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

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

Nov. 15, 2022

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 Nov. 15, 2022

Nov. 15, 2022

1 0