- Wine-Commits - list.winehq.org

Alex Henrie : wldap32: Handle null DN or null message in ldap_add* and add tests.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: de145c376d9e740b317b330d2deb5bbb636b56f5 URL: https://gitlab.winehq.org/wine/wine/-/commit/de145c376d9e740b317b330d2deb5b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Mar 21 00:18:20 2023 -0600 wldap32: Handle null DN or null message in ldap_add* and add tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54702 (cherry picked from commit fce0baa9b6c19d6763b126d276e119c7998515b2) --- dlls/wldap32/add.c | 8 +++--- dlls/wldap32/tests/parse.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 4 deletions(-) diff --git a/dlls/wldap32/add.c b/dlls/wldap32/add.c index 6fd0f82cf33..4509910abc5 100644 --- a/dlls/wldap32/add.c +++ b/dlls/wldap32/add.c @@ -79,7 +79,7 @@ ULONG CDECL ldap_add_extA( LDAP *ld, char *dn, LDAPModA **attrs, LDAPControlA ** TRACE( "(%p, %s, %p, %p, %p, %p)\n", ld, debugstr_a(dn), attrs, serverctrls, clientctrls, message ); - if (!ld) return WLDAP32_LDAP_PARAM_ERROR; + if (!ld || !message) return WLDAP32_LDAP_PARAM_ERROR; if (dn && !(dnW = strAtoW( dn ))) goto exit; if (attrs && !(attrsW = modarrayAtoW( attrs ))) goto exit; @@ -109,9 +109,9 @@ ULONG CDECL ldap_add_extW( LDAP *ld, WCHAR *dn, LDAPModW **attrs, LDAPControlW * TRACE( "(%p, %s, %p, %p, %p, %p)\n", ld, debugstr_w(dn), attrs, serverctrls, clientctrls, message ); - if (!ld) return WLDAP32_LDAP_PARAM_ERROR; + if (!ld || !message) return WLDAP32_LDAP_PARAM_ERROR; - if (dn && !(dnU = strWtoU( dn ))) goto exit; + if (!(dnU = dn ? strWtoU( dn ) : strdup( "" ))) goto exit; if (attrs && !(attrsU = modarrayWtoU( attrs ))) goto exit; if (serverctrls && !(serverctrlsU = controlarrayWtoU( serverctrls ))) goto exit; if (clientctrls && !(clientctrlsU = controlarrayWtoU( clientctrls ))) goto exit; @@ -173,7 +173,7 @@ ULONG CDECL ldap_add_ext_sW( LDAP *ld, WCHAR *dn, LDAPModW **attrs, LDAPControlW if (!ld) return WLDAP32_LDAP_PARAM_ERROR; - if (dn && !(dnU = strWtoU( dn ))) goto exit; + if (!(dnU = dn ? strWtoU( dn ) : strdup(""))) goto exit; if (attrs && !(attrsU = modarrayWtoU( attrs ))) goto exit; if (serverctrls && !(serverctrlsU = controlarrayWtoU( serverctrls ))) goto exit; if (clientctrls && !(clientctrlsU = controlarrayWtoU( clientctrls ))) goto exit; diff --git a/dlls/wldap32/tests/parse.c b/dlls/wldap32/tests/parse.c index 375acbbe776..788af6f921c 100644 --- a/dlls/wldap32/tests/parse.c +++ b/dlls/wldap32/tests/parse.c @@ -175,6 +175,66 @@ static void test_ldap_bind_sA( void ) ldap_unbind( ld ); } +static void test_ldap_add(void) +{ + char *one_empty_string[] = { (char *)"", NULL }; + LDAPModA empty_equals_empty = { 0, (char *)"", { one_empty_string } }; + LDAPModA *attrs[] = { &empty_equals_empty, NULL }; + LDAP *ld; + ULONG ret, num; + + ld = ldap_initA( (char *)"db.debian.org", 389 ); + ok( ld != NULL, "ldap_init failed\n" ); + + ret = ldap_addA( NULL, NULL, NULL ); + ok( ret == (ULONG)-1, "ldap_addA should fail, got %#lx\n", ret ); + ret = ldap_addA( NULL, (char *)"", attrs ); + ok( ret == (ULONG)-1, "ldap_addA should fail, got %#lx\n", ret ); + ret = ldap_addA( ld, NULL, attrs ); + ok( ret != (ULONG)-1, "ldap_addA should succeed, got %#lx\n", ret ); + ret = ldap_addA( ld, (char *)"", NULL ); + ok( ret != (ULONG)-1, "ldap_addA should succeed, got %#lx\n", ret ); + ret = ldap_addA( ld, (char *)"", attrs ); + ok( ret != (ULONG)-1, "ldap_addA should succeed, got %#lx\n", ret ); + + ret = ldap_add_sA( NULL, NULL, NULL ); + ok( ret == LDAP_PARAM_ERROR, "ldap_add_sA should fail, got %#lx\n", ret ); + ret = ldap_add_sA( NULL, (char *)"", attrs ); + ok( ret == LDAP_PARAM_ERROR, "ldap_add_sA should fail, got %#lx\n", ret ); + ret = ldap_add_sA( ld, NULL, attrs ); + ok( ret == LDAP_ALREADY_EXISTS, "ldap_add_sA should fail, got %#lx\n", ret ); + ret = ldap_add_sA( ld, (char *)"", NULL ); + ok( ret == LDAP_PROTOCOL_ERROR, "ldap_add_sA should fail, got %#lx\n", ret ); + ret = ldap_add_sA( ld, (char *)"", attrs ); + ok( ret == LDAP_ALREADY_EXISTS, "ldap_add_sA should fail, got %#lx\n", ret ); + + ret = ldap_add_extA( NULL, NULL, NULL, NULL, NULL, NULL ); + ok( ret == LDAP_PARAM_ERROR, "ldap_add_extA should fail, got %#lx\n", ret ); + ret = ldap_add_extA( NULL, (char *)"", attrs, NULL, NULL, &num ); + ok( ret == LDAP_PARAM_ERROR, "ldap_add_extA should fail, got %#lx\n", ret ); + ret = ldap_add_extA( ld, NULL, attrs, NULL, NULL, &num ); + ok( !ret, "ldap_add_extA should succeed, got %#lx\n", ret ); + ret = ldap_add_extA( ld, (char *)"", NULL, NULL, NULL, &num ); + ok( !ret, "ldap_add_extA should succeed, got %#lx\n", ret ); + ret = ldap_add_extA( ld, (char *)"", attrs, NULL, NULL, NULL ); + ok( ret == LDAP_PARAM_ERROR, "ldap_add_extA should fail, got %#lx\n", ret ); + ret = ldap_add_extA( ld, (char *)"", attrs, NULL, NULL, &num ); + ok( !ret, "ldap_add_extA should succeed, got %#lx\n", ret ); + + ret = ldap_add_ext_sA( NULL, NULL, NULL, NULL, NULL ); + ok( ret == LDAP_PARAM_ERROR, "ldap_add_ext_sA should fail, got %#lx\n", ret ); + ret = ldap_add_ext_sA( NULL, (char *)"", attrs, NULL, NULL ); + ok( ret == LDAP_PARAM_ERROR, "ldap_add_ext_sA should fail, got %#lx\n", ret ); + ret = ldap_add_ext_sA( ld, NULL, attrs, NULL, NULL ); + ok( ret == LDAP_ALREADY_EXISTS, "ldap_add_ext_sA should fail, got %#lx\n", ret ); + ret = ldap_add_ext_sA( ld, (char *)"", NULL, NULL, NULL ); + ok( ret == LDAP_PROTOCOL_ERROR, "ldap_add_ext_sA should fail, got %#lx\n", ret ); + ret = ldap_add_ext_sA( ld, (char *)"", attrs, NULL, NULL ); + ok( ret == LDAP_ALREADY_EXISTS, "ldap_add_ext_sA should fail, got %#lx\n", ret ); + + ldap_unbind( ld ); +} + static void test_ldap_server_control( void ) { /* SEQUENCE { INTEGER :: 0x07 } */ @@ -297,6 +357,7 @@ START_TEST (parse) test_ldap_paged_search(); test_ldap_server_control(); test_ldap_bind_sA(); + test_ldap_add(); ld = ldap_initA( (char *)"db.debian.org", 389 ); ok( ld != NULL, "ldap_init failed\n" );

1 0

Alex Henrie : wldap32/tests: Use the same context in test_ldap_(add|modify_compare).
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: 72ad9c60930ad41a4441bff241c75a3a2dcb29fc URL: https://gitlab.winehq.org/wine/wine/-/commit/72ad9c60930ad41a4441bff241c75a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Mar 23 18:46:35 2023 -0600 wldap32/tests: Use the same context in test_ldap_(add|modify_compare). (cherry picked from commit 4eff0667f836eba258a7b6f37ccffa83c914ac1b) --- dlls/wldap32/tests/parse.c | 30 ++++++------------------------ 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/dlls/wldap32/tests/parse.c b/dlls/wldap32/tests/parse.c index 34fcb9a4201..f5af100ca60 100644 --- a/dlls/wldap32/tests/parse.c +++ b/dlls/wldap32/tests/parse.c @@ -175,17 +175,13 @@ static void test_ldap_bind_sA( void ) ldap_unbind( ld ); } -static void test_ldap_add(void) +static void test_ldap_add( LDAP *ld ) { char *one_empty_string[] = { (char *)"", NULL }; LDAPModA empty_equals_empty = { 0, (char *)"", { one_empty_string } }; LDAPModA *attrs[] = { &empty_equals_empty, NULL }; - LDAP *ld; ULONG ret, num; - ld = ldap_initA( (char *)"db.debian.org", 389 ); - ok( ld != NULL, "ldap_init failed\n" ); - ret = ldap_addA( NULL, NULL, NULL ); ok( ret == (ULONG)-1, "ldap_addA should fail, got %#lx\n", ret ); ret = ldap_addA( NULL, (char *)"", attrs ); @@ -231,21 +227,15 @@ static void test_ldap_add(void) ok( ret == LDAP_PROTOCOL_ERROR, "ldap_add_ext_sA should fail, got %#lx\n", ret ); ret = ldap_add_ext_sA( ld, (char *)"", attrs, NULL, NULL ); ok( ret == LDAP_ALREADY_EXISTS, "ldap_add_ext_sA should fail, got %#lx\n", ret ); - - ldap_unbind( ld ); } -static void test_ldap_modify(void) +static void test_ldap_modify( LDAP *ld ) { char *one_empty_string[] = { (char *)"", NULL }; LDAPModA empty_equals_empty = { 0, (char *)"", { one_empty_string } }; LDAPModA *attrs[] = { &empty_equals_empty, NULL }; - LDAP *ld; ULONG ret, num; - ld = ldap_initA( (char *)"db.debian.org", 389 ); - ok( ld != NULL, "ldap_init failed\n" ); - ret = ldap_modifyA( NULL, NULL, NULL ); ok( ret == (ULONG)-1, "ldap_modifyA should fail, got %#lx\n", ret ); ret = ldap_modifyA( NULL, (char *)"", attrs ); @@ -291,19 +281,13 @@ static void test_ldap_modify(void) ok( ret == LDAP_UNWILLING_TO_PERFORM, "ldap_modify_ext_sA should fail, got %#lx\n", ret ); ret = ldap_modify_ext_sA( ld, (char *)"", attrs, NULL, NULL ); ok( ret == LDAP_UNDEFINED_TYPE, "ldap_modify_ext_sA should fail, got %#lx\n", ret ); - - ldap_unbind( ld ); } -static void test_ldap_compare(void) +static void test_ldap_compare( LDAP *ld ) { struct berval empty_value = { 0 }; - LDAP *ld; ULONG ret, num; - ld = ldap_initA( (char *)"db.debian.org", 389 ); - ok( ld != NULL, "ldap_init failed\n" ); - ret = ldap_compareA( NULL, NULL, NULL, NULL ); ok( ret == (ULONG)-1, "ldap_compareA should fail, got %#lx\n", ret ); ret = ldap_compareA( NULL, (char *)"", (char *)"", (char *)"" ); @@ -363,8 +347,6 @@ static void test_ldap_compare(void) ok( ret == LDAP_UNDEFINED_TYPE, "ldap_compare_ext_sA should fail, got %#lx\n", ret ); ret = ldap_compare_ext_sA( ld, (char *)"", (char *)"", (char *)"", &empty_value, NULL, NULL ); ok( ret == LDAP_UNDEFINED_TYPE, "ldap_compare_ext_sA should fail, got %#lx\n", ret ); - - ldap_unbind( ld ); } static void test_ldap_server_control( void ) @@ -489,13 +471,13 @@ START_TEST (parse) test_ldap_paged_search(); test_ldap_server_control(); test_ldap_bind_sA(); - test_ldap_add(); - test_ldap_modify(); - test_ldap_compare(); ld = ldap_initA( (char *)"db.debian.org", 389 ); ok( ld != NULL, "ldap_init failed\n" ); + test_ldap_add( ld ); + test_ldap_modify( ld ); + test_ldap_compare( ld ); test_ldap_parse_sort_control( ld ); test_ldap_search_extW( ld ); test_ldap_get_optionW( ld );

1 0

Alex Henrie : wldap32: Handle null DN or null message in ldap_delete* and add tests.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: 48101ac3fab233538a20a233d653f25ae83a1748 URL: https://gitlab.winehq.org/wine/wine/-/commit/48101ac3fab233538a20a233d653f2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Mar 24 10:09:09 2023 -0600 wldap32: Handle null DN or null message in ldap_delete* and add tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54702 (cherry picked from commit 124e90d9e54f8d6385827a656ed2ddf8bc788d54) --- dlls/wldap32/delete.c | 8 ++++---- dlls/wldap32/tests/parse.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/dlls/wldap32/delete.c b/dlls/wldap32/delete.c index b085142d83d..8539b7266eb 100644 --- a/dlls/wldap32/delete.c +++ b/dlls/wldap32/delete.c @@ -72,7 +72,7 @@ ULONG CDECL ldap_delete_extA( LDAP *ld, char *dn, LDAPControlA **serverctrls, LD TRACE( "(%p, %s, %p, %p, %p)\n", ld, debugstr_a(dn), serverctrls, clientctrls, message ); - if (!ld) return WLDAP32_LDAP_PARAM_ERROR; + if (!ld || !message) return WLDAP32_LDAP_PARAM_ERROR; if (dn && !(dnW = strAtoW( dn ))) goto exit; if (serverctrls && !(serverctrlsW = controlarrayAtoW( serverctrls ))) goto exit; @@ -99,9 +99,9 @@ ULONG CDECL ldap_delete_extW( LDAP *ld, WCHAR *dn, LDAPControlW **serverctrls, L TRACE( "(%p, %s, %p, %p, %p)\n", ld, debugstr_w(dn), serverctrls, clientctrls, message ); - if (!ld) return WLDAP32_LDAP_PARAM_ERROR; + if (!ld || !message) return WLDAP32_LDAP_PARAM_ERROR; - if (dn && !(dnU = strWtoU( dn ))) goto exit; + if (!(dnU = dn ? strWtoU( dn ) : strdup( "" ))) goto exit; if (serverctrls && !(serverctrlsU = controlarrayWtoU( serverctrls ))) goto exit; if (clientctrls && !(clientctrlsU = controlarrayWtoU( clientctrls ))) goto exit; else @@ -155,7 +155,7 @@ ULONG CDECL ldap_delete_ext_sW( LDAP *ld, WCHAR *dn, LDAPControlW **serverctrls, if (!ld) return WLDAP32_LDAP_PARAM_ERROR; - if (dn && !(dnU = strWtoU( dn ))) goto exit; + if (!(dnU = dn ? strWtoU( dn ) : strdup( "" ))) goto exit; if (serverctrls && !(serverctrlsU = controlarrayWtoU( serverctrls ))) goto exit; if (clientctrls && !(clientctrlsU = controlarrayWtoU( clientctrls ))) goto exit; else diff --git a/dlls/wldap32/tests/parse.c b/dlls/wldap32/tests/parse.c index f5af100ca60..19e7a48b471 100644 --- a/dlls/wldap32/tests/parse.c +++ b/dlls/wldap32/tests/parse.c @@ -349,6 +349,33 @@ static void test_ldap_compare( LDAP *ld ) ok( ret == LDAP_UNDEFINED_TYPE, "ldap_compare_ext_sA should fail, got %#lx\n", ret ); } +static void test_ldap_delete( LDAP *ld ) +{ + ULONG ret, num; + + ret = ldap_deleteA( NULL, NULL ); + ok( ret == (ULONG)-1, "ldap_deleteA should fail, got %#lx\n", ret ); + ret = ldap_deleteA( NULL, (char *)"" ); + ok( ret == (ULONG)-1, "ldap_deleteA should fail, got %#lx\n", ret ); + + ret = ldap_delete_sA( NULL, NULL ); + ok( ret == LDAP_PARAM_ERROR, "ldap_delete_sA should fail, got %#lx\n", ret ); + ret = ldap_delete_sA( NULL, (char *)"" ); + ok( ret == LDAP_PARAM_ERROR, "ldap_delete_sA should fail, got %#lx\n", ret ); + + ret = ldap_delete_extA( NULL, NULL, NULL, NULL, NULL ); + ok( ret == LDAP_PARAM_ERROR, "ldap_delete_extA should fail, got %#lx\n", ret ); + ret = ldap_delete_extA( NULL, (char *)"", NULL, NULL, &num ); + ok( ret == LDAP_PARAM_ERROR, "ldap_delete_extA should fail, got %#lx\n", ret ); + ret = ldap_delete_extA( ld, (char *)"", NULL, NULL, NULL ); + ok( ret == LDAP_PARAM_ERROR, "ldap_delete_extA should fail, got %#lx\n", ret ); + + ret = ldap_delete_ext_sA( NULL, NULL, NULL, NULL ); + ok( ret == LDAP_PARAM_ERROR, "ldap_delete_ext_sA should fail, got %#lx\n", ret ); + ret = ldap_delete_ext_sA( NULL, (char *)"", NULL, NULL ); + ok( ret == LDAP_PARAM_ERROR, "ldap_delete_ext_sA should fail, got %#lx\n", ret ); +} + static void test_ldap_server_control( void ) { /* SEQUENCE { INTEGER :: 0x07 } */ @@ -478,6 +505,7 @@ START_TEST (parse) test_ldap_add( ld ); test_ldap_modify( ld ); test_ldap_compare( ld ); + test_ldap_delete( ld ); test_ldap_parse_sort_control( ld ); test_ldap_search_extW( ld ); test_ldap_get_optionW( ld );

1 0

Hans Leidekker : ldap: Return an error when the server doesn't respond to the SSL handshake.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: d55a5d8677047094735df0dc736fba71abfc740b URL: https://gitlab.winehq.org/wine/wine/-/commit/d55a5d8677047094735df0dc736fba… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 24 10:20:16 2023 +0100 ldap: Return an error when the server doesn't respond to the SSL handshake. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54724 (cherry picked from commit 9af7faca7cadc706dcb4d0842e909f8f272dbccd) --- libs/ldap/libldap/tls_w.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libs/ldap/libldap/tls_w.c b/libs/ldap/libldap/tls_w.c index 137fb58a27a..bc64b9f62e5 100644 --- a/libs/ldap/libldap/tls_w.c +++ b/libs/ldap/libldap/tls_w.c @@ -221,8 +221,8 @@ tlsw_session_connect( LDAP *ld, tls_session *session, const char *name_in ) while ( expected > 0 ) { size = tlsw_recv( s->sbiod, (char *)in_bufs[0].pvBuffer + recv_offset, expected ); - if ( size < 0 ) - break; + if ( size <= 0 ) + goto done; in_bufs[0].cbBuffer += size; recv_offset += size; expected -= size; @@ -239,6 +239,7 @@ tlsw_session_connect( LDAP *ld, tls_session *session, const char *name_in ) } } +done: ber_memfree( in_bufs[0].pvBuffer ); FreeContextBuffer( out_bufs[0].pvBuffer ); return status == SEC_E_OK ? 0 : -1; @@ -247,7 +248,7 @@ tlsw_session_connect( LDAP *ld, tls_session *session, const char *name_in ) static int tlsw_session_upflags( Sockbuf *sb, tls_session *session, int rc ) { - return -1; + return 0; } static char *

1 0

Alex Henrie : winex11: Simplify confusing condition and error messages in wglShareLists.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: 6760e664514375ab610e57597b7cb90a464b929a URL: https://gitlab.winehq.org/wine/wine/-/commit/6760e664514375ab610e57597b7cb9… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jan 5 08:58:22 2023 -0700 winex11: Simplify confusing condition and error messages in wglShareLists. Mathematically, ((a && b) || b) == b. Moreover, test_sharelists in dlls/opengl32/tests/opengl.c checks that wglShareLists can share lists from a source context that has been current. (cherry picked from commit aa70bdb5d60d643af11feb91fe4367960f85e192) --- dlls/winex11.drv/opengl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 96a8526604b..c44e9579cb6 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1931,14 +1931,14 @@ static BOOL glxdrv_wglShareLists(struct wgl_context *org, struct wgl_context *de * current or when it hasn't shared display lists before. */ - if((org->has_been_current && dest->has_been_current) || dest->has_been_current) + if(dest->has_been_current) { - ERR("Could not share display lists, one of the contexts has been current already !\n"); + ERR("Could not share display lists because the destination context has already been current\n"); return FALSE; } else if(dest->sharing) { - ERR("Could not share display lists because hglrc2 has already shared lists before\n"); + ERR("Could not share display lists because the destination context has already shared lists\n"); return FALSE; } else

1 0

Alex Henrie : wldap32: Handle null DN or null attr in ldap_compare* and add tests.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: cf8be0e1ebee4f01ab4847166982188da91f3bcf URL: https://gitlab.winehq.org/wine/wine/-/commit/cf8be0e1ebee4f01ab484716698218… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Mar 21 23:18:49 2023 -0600 wldap32: Handle null DN or null attr in ldap_compare* and add tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54702 (cherry picked from commit e9376fd18e58c6816855a96b51e20dcbeca26021) --- dlls/wldap32/compare.c | 16 ++++++---- dlls/wldap32/tests/parse.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+), 6 deletions(-) diff --git a/dlls/wldap32/compare.c b/dlls/wldap32/compare.c index c7fb83a3723..389e6e87632 100644 --- a/dlls/wldap32/compare.c +++ b/dlls/wldap32/compare.c @@ -81,9 +81,10 @@ ULONG CDECL ldap_compare_extA( LDAP *ld, char *dn, char *attr, char *value, stru data, serverctrls, clientctrls, message ); if (!ld || !message) return WLDAP32_LDAP_PARAM_ERROR; + if (!attr) return WLDAP32_LDAP_NO_MEMORY; if (dn && !(dnW = strAtoW( dn ))) goto exit; - if (attr && !(attrW = strAtoW( attr ))) goto exit; + if (!(attrW = strAtoW( attr ))) goto exit; if (value && !(valueW = strAtoW( value ))) goto exit; if (serverctrls && !(serverctrlsW = controlarrayAtoW( serverctrls ))) goto exit; if (clientctrls && !(clientctrlsW = controlarrayAtoW( clientctrls ))) goto exit; @@ -116,7 +117,7 @@ ULONG CDECL ldap_compare_extW( LDAP *ld, WCHAR *dn, WCHAR *attr, WCHAR *value, s if (!ld || !message) return WLDAP32_LDAP_PARAM_ERROR; if (!attr) return WLDAP32_LDAP_NO_MEMORY; - if (dn && !(dnU = strWtoU( dn ))) goto exit; + if (!(dnU = dn ? strWtoU( dn ) : strdup( "" ))) goto exit; if (!(attrU = strWtoU( attr ))) goto exit; if (!data) { @@ -161,9 +162,10 @@ ULONG CDECL ldap_compare_ext_sA( LDAP *ld, char *dn, char *attr, char *value, st data, serverctrls, clientctrls ); if (!ld) return WLDAP32_LDAP_PARAM_ERROR; + if (!attr) return LDAP_UNDEFINED_TYPE; if (dn && !(dnW = strAtoW( dn ))) goto exit; - if (attr && !(attrW = strAtoW( attr ))) goto exit; + if (!(attrW = strAtoW( attr ))) goto exit; if (value && !(valueW = strAtoW( value ))) goto exit; if (serverctrls && !(serverctrlsW = controlarrayAtoW( serverctrls ))) goto exit; if (clientctrls && !(clientctrlsW = controlarrayAtoW( clientctrls ))) goto exit; @@ -194,9 +196,10 @@ ULONG CDECL ldap_compare_ext_sW( LDAP *ld, WCHAR *dn, WCHAR *attr, WCHAR *value, serverctrls, clientctrls ); if (!ld) return WLDAP32_LDAP_PARAM_ERROR; + if (!attr) return LDAP_UNDEFINED_TYPE; - if (dn && !(dnU = strWtoU( dn ))) goto exit; - if (attr && !(attrU = strWtoU( attr ))) goto exit; + if (!(dnU = dn ? strWtoU( dn ) : strdup( "" ))) goto exit; + if (!(attrU = strWtoU( attr ))) goto exit; if (!data) { if (value) @@ -235,9 +238,10 @@ ULONG CDECL ldap_compare_sA( LDAP *ld, PCHAR dn, PCHAR attr, PCHAR value ) TRACE( "(%p, %s, %s, %s)\n", ld, debugstr_a(dn), debugstr_a(attr), debugstr_a(value) ); if (!ld) return WLDAP32_LDAP_PARAM_ERROR; + if (!attr) return WLDAP32_LDAP_UNDEFINED_TYPE; if (dn && !(dnW = strAtoW( dn ))) goto exit; - if (attr && !(attrW = strAtoW( attr ))) goto exit; + if (!(attrW = strAtoW( attr ))) goto exit; if (value && !(valueW = strAtoW( value ))) goto exit; ret = ldap_compare_sW( ld, dnW, attrW, valueW ); diff --git a/dlls/wldap32/tests/parse.c b/dlls/wldap32/tests/parse.c index 1653b0ef72c..34fcb9a4201 100644 --- a/dlls/wldap32/tests/parse.c +++ b/dlls/wldap32/tests/parse.c @@ -295,6 +295,78 @@ static void test_ldap_modify(void) ldap_unbind( ld ); } +static void test_ldap_compare(void) +{ + struct berval empty_value = { 0 }; + LDAP *ld; + ULONG ret, num; + + ld = ldap_initA( (char *)"db.debian.org", 389 ); + ok( ld != NULL, "ldap_init failed\n" ); + + ret = ldap_compareA( NULL, NULL, NULL, NULL ); + ok( ret == (ULONG)-1, "ldap_compareA should fail, got %#lx\n", ret ); + ret = ldap_compareA( NULL, (char *)"", (char *)"", (char *)"" ); + ok( ret == (ULONG)-1, "ldap_compareA should fail, got %#lx\n", ret ); + ret = ldap_compareA( ld, NULL, (char *)"", (char *)"" ); + ok( ret != (ULONG)-1, "ldap_compareA should succeed, got %#lx\n", ret ); + ret = ldap_compareA( ld, (char *)"", NULL, (char *)"" ); + ok( ret == (ULONG)-1, "ldap_compareA should fail, got %#lx\n", ret ); + ret = ldap_compareA( ld, (char *)"", (char *)"", NULL ); + ok( ret != (ULONG)-1, "ldap_compareA should succeed, got %#lx\n", ret ); + ret = ldap_compareA( ld, (char *)"", (char *)"", (char *)"" ); + ok( ret != (ULONG)-1, "ldap_compareA should succeed, got %#lx\n", ret ); + + ret = ldap_compare_sA( NULL, NULL, NULL, NULL ); + ok( ret == LDAP_PARAM_ERROR, "ldap_compare_sA should fail, got %#lx\n", ret ); + ret = ldap_compare_sA( NULL, (char *)"", (char *)"", (char *)"" ); + ok( ret == LDAP_PARAM_ERROR, "ldap_compare_sA should fail, got %#lx\n", ret ); + ret = ldap_compare_sA( ld, NULL, (char *)"", (char *)"" ); + ok( ret == LDAP_UNDEFINED_TYPE, "ldap_compare_sA should fail, got %#lx\n", ret ); + ret = ldap_compare_sA( ld, (char *)"", NULL, (char *)"" ); + ok( ret == LDAP_UNDEFINED_TYPE, "ldap_compare_sA should fail, got %#lx\n", ret ); + ret = ldap_compare_sA( ld, (char *)"", (char *)"", NULL ); + ok( ret == LDAP_UNDEFINED_TYPE, "ldap_compare_sA should fail, got %#lx\n", ret ); + ret = ldap_compare_sA( ld, (char *)"", (char *)"", (char *)"" ); + ok( ret == LDAP_UNDEFINED_TYPE, "ldap_compare_sA should fail, got %#lx\n", ret ); + + ret = ldap_compare_extA( NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ); + ok( ret == LDAP_PARAM_ERROR, "ldap_compare_extA should fail, got %#lx\n", ret ); + ret = ldap_compare_extA( NULL, (char *)"", (char *)"", (char *)"", &empty_value, NULL, NULL, &num ); + ok( ret == LDAP_PARAM_ERROR, "ldap_compare_extA should fail, got %#lx\n", ret ); + ret = ldap_compare_extA( ld, NULL, (char *)"", (char *)"", &empty_value, NULL, NULL, &num ); + ok( !ret, "ldap_compare_extA should succeed, got %#lx\n", ret ); + ret = ldap_compare_extA( ld, (char *)"", NULL, (char *)"", &empty_value, NULL, NULL, &num ); + ok( ret == LDAP_NO_MEMORY, "ldap_compare_extA should fail, got %#lx\n", ret ); + ret = ldap_compare_extA( ld, (char *)"", (char *)"", NULL, &empty_value, NULL, NULL, &num ); + ok( !ret, "ldap_compare_extA should succeed, got %#lx\n", ret ); + ret = ldap_compare_extA( ld, (char *)"", (char *)"", (char *)"", NULL, NULL, NULL, &num ); + ok( !ret, "ldap_compare_extA should succeed, got %#lx\n", ret ); + ret = ldap_compare_extA( ld, (char *)"", (char *)"", (char *)"", &empty_value, NULL, NULL, &num ); + ok( !ret, "ldap_compare_extA should succeed, got %#lx\n", ret ); + ret = ldap_compare_extA( ld, (char *)"", (char *)"", (char *)"", &empty_value, NULL, NULL, NULL ); + ok( ret == LDAP_PARAM_ERROR, "ldap_compare_extA should fail, got %#lx\n", ret ); + ret = ldap_compare_extA( ld, (char *)"", (char *)"", (char *)"", &empty_value, NULL, NULL, &num ); + ok( !ret, "ldap_compare_extA should succeed, got %#lx\n", ret ); + + ret = ldap_compare_ext_sA( NULL, NULL, NULL, NULL, NULL, NULL, NULL ); + ok( ret == LDAP_PARAM_ERROR, "ldap_compare_ext_sA should fail, got %#lx\n", ret ); + ret = ldap_compare_ext_sA( NULL, (char *)"", (char *)"", (char *)"", &empty_value, NULL, NULL ); + ok( ret == LDAP_PARAM_ERROR, "ldap_compare_ext_sA should fail, got %#lx\n", ret ); + ret = ldap_compare_ext_sA( ld, NULL, (char *)"", (char *)"", &empty_value, NULL, NULL ); + ok( ret == LDAP_UNDEFINED_TYPE, "ldap_compare_ext_sA should fail, got %#lx\n", ret ); + ret = ldap_compare_ext_sA( ld, (char *)"", NULL, (char *)"", &empty_value, NULL, NULL ); + ok( ret == LDAP_UNDEFINED_TYPE, "ldap_compare_ext_sA should fail, got %#lx\n", ret ); + ret = ldap_compare_ext_sA( ld, (char *)"", (char *)"", NULL, &empty_value, NULL, NULL ); + ok( ret == LDAP_UNDEFINED_TYPE, "ldap_compare_ext_sA should fail, got %#lx\n", ret ); + ret = ldap_compare_ext_sA( ld, (char *)"", (char *)"", (char *)"", NULL, NULL, NULL ); + ok( ret == LDAP_UNDEFINED_TYPE, "ldap_compare_ext_sA should fail, got %#lx\n", ret ); + ret = ldap_compare_ext_sA( ld, (char *)"", (char *)"", (char *)"", &empty_value, NULL, NULL ); + ok( ret == LDAP_UNDEFINED_TYPE, "ldap_compare_ext_sA should fail, got %#lx\n", ret ); + + ldap_unbind( ld ); +} + static void test_ldap_server_control( void ) { /* SEQUENCE { INTEGER :: 0x07 } */ @@ -419,6 +491,7 @@ START_TEST (parse) test_ldap_bind_sA(); test_ldap_add(); test_ldap_modify(); + test_ldap_compare(); ld = ldap_initA( (char *)"db.debian.org", 389 ); ok( ld != NULL, "ldap_init failed\n" );

1 0

Alex Henrie : comctl32/treeview: Ignore the lParam to WM_PRINTCLIENT and add tests.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: 40ee74b5dc2c37608007004b79ed09e40594b0e7 URL: https://gitlab.winehq.org/wine/wine/-/commit/40ee74b5dc2c37608007004b79ed09… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Mar 14 21:59:04 2023 -0600 comctl32/treeview: Ignore the lParam to WM_PRINTCLIENT and add tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54640 (cherry picked from commit 231199bc462e2aa8fa98247b66022c62281fb508) --- dlls/comctl32/tests/treeview.c | 61 ++++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/treeview.c | 17 ++++-------- 2 files changed, 66 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index eda57ed2c81..4b5703b6b76 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -2181,6 +2181,66 @@ static void test_WM_PAINT(void) DestroyWindow(hTree); } +static void test_WM_PRINTCLIENT(void) +{ + static const LPARAM params[] = {0, PRF_CHECKVISIBLE, PRF_NONCLIENT, PRF_CLIENT, PRF_ERASEBKGND, + PRF_CHILDREN, PRF_OWNED}; + BOOL glyph_is_transparent; + HTHEME hTheme; + HWND hTree; + COLORREF clr; + LONG ret; + RECT rc; + HDC hdc; + int i; + + hTree = create_treeview_control(0); + + clr = SendMessageA(hTree, TVM_SETBKCOLOR, 0, RGB(255, 0, 0)); + ok(clr == CLR_NONE, "got 0x%lx, expected 0x%lx\n", clr, CLR_NONE); + + hdc = GetDC(hMainWnd); + GetClientRect(hMainWnd, &rc); + + hTheme = pGetWindowTheme(hTree); + glyph_is_transparent = hTheme && pIsThemeBackgroundPartiallyTransparent(hTheme, TVP_GLYPH, 0); + + /* test parameters when the treeview is visible */ + for (i = 0; i < ARRAY_SIZE(params); i++) + { + winetest_push_context("lParam=0x%Ix", params[i]); + FillRect(hdc, &rc, GetStockObject(BLACK_BRUSH)); + clr = GetPixel(hdc, 1, 1); + ok(clr == RGB(0, 0, 0), "got 0x%lx\n", clr); + ret = SendMessageA(hTree, WM_PRINTCLIENT, (WPARAM)hdc, params[i]); + ok(ret == 0, "got %ld\n", ret); + clr = GetPixel(hdc, 1, 1); + ok(clr == RGB(255, 0, 0) || (glyph_is_transparent && clr == GetSysColor(COLOR_WINDOW)), + "got 0x%lx\n", clr); + winetest_pop_context(); + } + + /* test parameters when the treeview is hidden */ + ShowWindow(hTree, SW_HIDE); + for (i = 0; i < ARRAY_SIZE(params); i++) + { + winetest_push_context("lParam=0x%Ix", params[i]); + FillRect(hdc, &rc, GetStockObject(BLACK_BRUSH)); + clr = GetPixel(hdc, 1, 1); + ok(clr == RGB(0, 0, 0), "got 0x%lx\n", clr); + ret = SendMessageA(hTree, WM_PRINTCLIENT, (WPARAM)hdc, params[i]); + ok(ret == 0, "got %ld\n", ret); + clr = GetPixel(hdc, 1, 1); + ok(clr == RGB(255, 0, 0) || (glyph_is_transparent && clr == GetSysColor(COLOR_WINDOW)), + "got 0x%lx\n", clr); + winetest_pop_context(); + } + ShowWindow(hTree, SW_SHOW); + + ReleaseDC(hMainWnd, hdc); + DestroyWindow(hTree); +} + static void test_delete_items(void) { const struct message *msg; @@ -3042,6 +3102,7 @@ START_TEST(treeview) test_expandnotify(); test_TVS_SINGLEEXPAND(); test_WM_PAINT(); + test_WM_PRINTCLIENT(); test_delete_items(); test_cchildren(); test_htreeitem_layout(FALSE); diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 1c87dc29b05..e866f82db11 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -3114,20 +3114,13 @@ TREEVIEW_Paint(TREEVIEW_INFO *infoPtr, HDC hdc_ref) static LRESULT TREEVIEW_PrintClient(TREEVIEW_INFO *infoPtr, HDC hdc, DWORD options) { - FIXME("Partial Stub: (hdc=%p options=%#lx)\n", hdc, options); - - if ((options & PRF_CHECKVISIBLE) && !IsWindowVisible(infoPtr->hwnd)) - return 0; + RECT rc; - if (options & PRF_ERASEBKGND) - TREEVIEW_EraseBackground(infoPtr, hdc); + FIXME("Partial Stub: (hdc=%p options=%#lx)\n", hdc, options); - if (options & PRF_CLIENT) - { - RECT rc; - GetClientRect(infoPtr->hwnd, &rc); - TREEVIEW_Refresh(infoPtr, hdc, &rc); - } + TREEVIEW_EraseBackground(infoPtr, hdc); + GetClientRect(infoPtr->hwnd, &rc); + TREEVIEW_Refresh(infoPtr, hdc, &rc); return 0; }

1 0

Louis Lenders : wine.inf: Add EditionID to HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: aed64c043359904ddd6107a0ad588fa0faed3849 URL: https://gitlab.winehq.org/wine/wine/-/commit/aed64c043359904ddd6107a0ad588f… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Sat Mar 25 18:32:07 2023 +0100 wine.inf: Add EditionID to HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54675 Conflicts: loader/wine.inf.in (cherry picked from commit e8b0c9239562ed78c94d7dba87d5004b4d82b113) --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index f1525c4f6dd..20dc77e56a8 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2467,6 +2467,7 @@ HKLM,%CurrentVersionNT%,"DigitalProductId",1,00,00,00,00,00,00,00,00,00,00,00,\ 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%,"EditionId",2,"Professional" HKLM,%CurrentVersionNT%,"ProductName",2,"Microsoft Windows 7" HKLM,%Control%\ProductOptions,"ProductType",2,"WinNT" HKLM,%Control%\Windows,"CSDVersion",0x10003,0x100

1 0

Tyson Whitehead : crypt32: Add some CertGetNameStringW fallback cases.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: 694997f4f9aa24a93d2ab3ab097b36ee245d565a URL: https://gitlab.winehq.org/wine/wine/-/commit/694997f4f9aa24a93d2ab3ab097b36… Author: Tyson Whitehead <twhitehead(a)gmail.com> Date: Tue Mar 14 09:57:48 2023 -0400 crypt32: Add some CertGetNameStringW fallback cases. When called with CERT_NAME_ATTR_TYPE and pvTypePara=NULL, Windows did the first of email, CN, OU, or O while Wine just did email. (cherry picked from commit 01c69eb3023d2b85827020a8da8bb43c19560450) --- dlls/crypt32/str.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index d74df308e4a..42046369652 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -965,11 +965,22 @@ static DWORD cert_get_name_from_rdn_attr(DWORD encodingType, if (CryptDecodeObjectEx(encodingType, X509_NAME, name->pbData, name->cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, &nameInfo, &bytes)) { - PCERT_RDN_ATTR nameAttr; + PCERT_RDN_ATTR nameAttr = NULL; - if (!oid) - oid = szOID_RSA_emailAddr; - nameAttr = CertFindRDNAttr(oid, nameInfo); + if (oid) + nameAttr = CertFindRDNAttr(oid, nameInfo); + else + { + static const LPCSTR attributeOIDs[] = + { + szOID_RSA_emailAddr, szOID_COMMON_NAME, + szOID_ORGANIZATIONAL_UNIT_NAME, szOID_ORGANIZATION_NAME + }; + DWORD i; + + for (i = 0; !nameAttr && i < ARRAY_SIZE(attributeOIDs); i++) + nameAttr = CertFindRDNAttr(attributeOIDs[i], nameInfo); + } if (nameAttr) ret = rdn_value_to_strW(nameAttr->dwValueType, &nameAttr->Value, pszNameString, cchNameString, TRUE);

1 0

Mohamad Al-Jaf : pdh: Implement PdhVbGetDoubleCounterValue().
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: c747c1f2586bc2bbc67046a80a9100080336090c URL: https://gitlab.winehq.org/wine/wine/-/commit/c747c1f2586bc2bbc67046a80a9100… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Tue Nov 1 20:49:41 2022 -0500 pdh: Implement PdhVbGetDoubleCounterValue(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54618 (cherry picked from commit e1c59cc5621a8d3420fc30314fd8daa5c6e55a26) --- dlls/pdh/pdh.spec | 2 +- dlls/pdh/pdh_main.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/pdh/pdh.spec b/dlls/pdh/pdh.spec index 5f61a8a42ca..711c970029b 100644 --- a/dlls/pdh/pdh.spec +++ b/dlls/pdh/pdh.spec @@ -145,7 +145,7 @@ @ stub PdhVbCreateCounterPathList @ stub PdhVbGetCounterPathElements @ stub PdhVbGetCounterPathFromList -@ stub PdhVbGetDoubleCounterValue +@ stdcall PdhVbGetDoubleCounterValue(ptr ptr) @ stub PdhVbGetLogFileSize @ stub PdhVbGetOneCounterPath @ stub PdhVbIsGoodStatus diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index 7eae7872b48..121b7e712ce 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -1062,6 +1062,23 @@ PDH_STATUS WINAPI PdhVbAddCounter( PDH_HQUERY query, LPCSTR path, PDH_HCOUNTER * return PDH_NOT_IMPLEMENTED; } +/*********************************************************************** + * PdhVbGetDoubleCounterValue (PDH.@) + */ +double WINAPI PdhVbGetDoubleCounterValue( PDH_HCOUNTER handle, PDH_STATUS *counter_status ) +{ + PDH_FMT_COUNTERVALUE value; + PDH_STATUS status; + + TRACE( "%p %p\n", handle, counter_status ); + + memset( &value, 0, sizeof(value) ); + status = PdhGetFormattedCounterValue( handle, PDH_FMT_DOUBLE, NULL, &value ); + + if (counter_status) *counter_status = status; + return value.u.doubleValue; +} + /*********************************************************************** * PdhValidatePathExA (PDH.@) */

1 0