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

Mohamad Al-Jaf : cfgmgr32: Implement CM_MapCrToWin32Err.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: 38601b78363b28824076e7e72b6178da7fe16a01 URL: https://gitlab.winehq.org/wine/wine/-/commit/38601b78363b28824076e7e72b6178… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Feb 2 22:06:57 2023 -0500 cfgmgr32: Implement CM_MapCrToWin32Err. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53781 (cherry picked from commit 4fab9ff230f497499da223ade9bbe3633a657f05) --- dlls/cfgmgr32/Makefile.in | 3 +++ dlls/cfgmgr32/cfgmgr32.spec | 1 + dlls/cfgmgr32/main.c | 58 +++++++++++++++++++++++++++++++++++++++++++++ include/cfgmgr32.h | 1 + 4 files changed, 63 insertions(+) diff --git a/dlls/cfgmgr32/Makefile.in b/dlls/cfgmgr32/Makefile.in index 10621fa5dc7..f05b3176aa3 100644 --- a/dlls/cfgmgr32/Makefile.in +++ b/dlls/cfgmgr32/Makefile.in @@ -1,3 +1,6 @@ MODULE = cfgmgr32.dll IMPORTLIB = cfgmgr32 IMPORTS = setupapi + +C_SRCS = \ + main.c diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index 69ec784de68..3b4f6106618 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -126,6 +126,7 @@ @ stdcall CM_Locate_DevNodeW(ptr wstr long) setupapi.CM_Locate_DevNodeW @ stdcall CM_Locate_DevNode_ExA(ptr str long long) setupapi.CM_Locate_DevNode_ExA @ stdcall CM_Locate_DevNode_ExW(ptr wstr long long) setupapi.CM_Locate_DevNode_ExW +@ stdcall CM_MapCrToWin32Err(long long) @ stub CM_Merge_Range_List @ stub CM_Modify_Res_Des @ stub CM_Modify_Res_Des_Ex diff --git a/dlls/cfgmgr32/main.c b/dlls/cfgmgr32/main.c new file mode 100644 index 00000000000..fee3c42a5c4 --- /dev/null +++ b/dlls/cfgmgr32/main.c @@ -0,0 +1,58 @@ +/* + * Copyright (C) 2023 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" +#include "cfgmgr32.h" + +WINE_DEFAULT_DEBUG_CHANNEL(setupapi); + +/*********************************************************************** + * CM_MapCrToWin32Err (cfgmgr32.@) + */ +DWORD WINAPI CM_MapCrToWin32Err( CONFIGRET code, DWORD default_error ) +{ + TRACE( "code: %#lx, default_error: %ld\n", code, default_error ); + + switch (code) + { + case CR_SUCCESS: return ERROR_SUCCESS; + case CR_OUT_OF_MEMORY: return ERROR_NOT_ENOUGH_MEMORY; + case CR_INVALID_POINTER: return ERROR_INVALID_USER_BUFFER; + case CR_INVALID_FLAG: return ERROR_INVALID_FLAGS; + case CR_INVALID_DEVNODE: + case CR_INVALID_DEVICE_ID: + case CR_INVALID_MACHINENAME: + case CR_INVALID_PROPERTY: + case CR_INVALID_REFERENCE_STRING: return ERROR_INVALID_DATA; + case CR_NO_SUCH_DEVNODE: + case CR_NO_SUCH_VALUE: + case CR_NO_SUCH_DEVICE_INTERFACE: return ERROR_NOT_FOUND; + case CR_ALREADY_SUCH_DEVNODE: return ERROR_ALREADY_EXISTS; + case CR_BUFFER_SMALL: return ERROR_INSUFFICIENT_BUFFER; + case CR_NO_REGISTRY_HANDLE: return ERROR_INVALID_HANDLE; + case CR_REGISTRY_ERROR: return ERROR_REGISTRY_CORRUPT; + case CR_NO_SUCH_REGISTRY_KEY: return ERROR_FILE_NOT_FOUND; + case CR_REMOTE_COMM_FAILURE: + case CR_MACHINE_UNAVAILABLE: + case CR_NO_CM_SERVICES: return ERROR_SERVICE_NOT_ACTIVE; + case CR_ACCESS_DENIED: return ERROR_ACCESS_DENIED; + case CR_CALL_NOT_IMPLEMENTED: return ERROR_CALL_NOT_IMPLEMENTED; + } + + return default_error; +} diff --git a/include/cfgmgr32.h b/include/cfgmgr32.h index d300c4babaa..b78f118622e 100644 --- a/include/cfgmgr32.h +++ b/include/cfgmgr32.h @@ -242,6 +242,7 @@ CMAPI WORD WINAPI CM_Get_Version(void); CMAPI CONFIGRET WINAPI CM_Locate_DevNodeA(PDEVINST,DEVINSTID_A,ULONG); CMAPI CONFIGRET WINAPI CM_Locate_DevNodeW(PDEVINST,DEVINSTID_W,ULONG); #define CM_Locate_DevNode WINELIB_NAME_AW(CM_Locate_DevNode) +CMAPI DWORD WINAPI CM_MapCrToWin32Err(CONFIGRET,DWORD); CMAPI CONFIGRET WINAPI CM_Open_DevNode_Key(DEVINST dnDevInst, REGSAM access, ULONG ulHardwareProfile, REGDISPOSITION disposition, PHKEY phkDevice, ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Request_Device_EjectA(DEVINST dev, PPNP_VETO_TYPE type, LPSTR name, ULONG length, ULONG flags);

1 0

Mohamad Al-Jaf : cfgmgr32/tests: Add CM_MapCrToWin32Err tests.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: f360b3648e546322ece902248e05391fc8dcbed5 URL: https://gitlab.winehq.org/wine/wine/-/commit/f360b3648e546322ece902248e0539… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sat Feb 18 18:10:34 2023 -0500 cfgmgr32/tests: Add CM_MapCrToWin32Err tests. (cherry picked from commit 19156ccfa747d0e9227852b6bc316d3577eb6f43) --- configure | 1 + configure.ac | 1 + dlls/cfgmgr32/tests/Makefile.in | 5 ++ dlls/cfgmgr32/tests/cfgmgr32.c | 111 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 118 insertions(+) diff --git a/configure b/configure index 3c67a22d5fc..bbfced4f174 100755 --- a/configure +++ b/configure @@ -21054,6 +21054,7 @@ wine_fn_config_makefile dlls/capi2032 enable_capi2032 wine_fn_config_makefile dlls/cards enable_cards wine_fn_config_makefile dlls/cdosys enable_cdosys wine_fn_config_makefile dlls/cfgmgr32 enable_cfgmgr32 +wine_fn_config_makefile dlls/cfgmgr32/tests enable_tests wine_fn_config_makefile dlls/clusapi enable_clusapi wine_fn_config_makefile dlls/cng.sys enable_cng_sys wine_fn_config_makefile dlls/combase enable_combase diff --git a/configure.ac b/configure.ac index 3c30db8fd45..ee4eff090a1 100644 --- a/configure.ac +++ b/configure.ac @@ -2392,6 +2392,7 @@ WINE_CONFIG_MAKEFILE(dlls/capi2032) WINE_CONFIG_MAKEFILE(dlls/cards) WINE_CONFIG_MAKEFILE(dlls/cdosys) WINE_CONFIG_MAKEFILE(dlls/cfgmgr32) +WINE_CONFIG_MAKEFILE(dlls/cfgmgr32/tests) WINE_CONFIG_MAKEFILE(dlls/clusapi) WINE_CONFIG_MAKEFILE(dlls/cng.sys) WINE_CONFIG_MAKEFILE(dlls/combase) diff --git a/dlls/cfgmgr32/tests/Makefile.in b/dlls/cfgmgr32/tests/Makefile.in new file mode 100644 index 00000000000..4e1f97b1c0c --- /dev/null +++ b/dlls/cfgmgr32/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = cfgmgr32.dll +IMPORTS = cfgmgr32 + +C_SRCS = \ + cfgmgr32.c diff --git a/dlls/cfgmgr32/tests/cfgmgr32.c b/dlls/cfgmgr32/tests/cfgmgr32.c new file mode 100644 index 00000000000..aa1a2100ee1 --- /dev/null +++ b/dlls/cfgmgr32/tests/cfgmgr32.c @@ -0,0 +1,111 @@ +/* + * Copyright (C) 2023 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/test.h" +#include "cfgmgr32.h" + +static void test_CM_MapCrToWin32Err(void) +{ + unsigned int i; + DWORD ret; + + static const struct + { + CONFIGRET code; + DWORD win32_error; + } + map_codes[] = + { + { CR_SUCCESS, ERROR_SUCCESS }, + { CR_OUT_OF_MEMORY, ERROR_NOT_ENOUGH_MEMORY }, + { CR_INVALID_POINTER, ERROR_INVALID_USER_BUFFER }, + { CR_INVALID_FLAG, ERROR_INVALID_FLAGS }, + { CR_INVALID_DEVNODE, ERROR_INVALID_DATA }, + { CR_INVALID_DEVINST, ERROR_INVALID_DATA }, + { CR_NO_SUCH_DEVNODE, ERROR_NOT_FOUND }, + { CR_NO_SUCH_DEVINST, ERROR_NOT_FOUND }, + { CR_ALREADY_SUCH_DEVNODE, ERROR_ALREADY_EXISTS }, + { CR_ALREADY_SUCH_DEVINST, ERROR_ALREADY_EXISTS }, + { CR_BUFFER_SMALL, ERROR_INSUFFICIENT_BUFFER }, + { CR_NO_REGISTRY_HANDLE, ERROR_INVALID_HANDLE }, + { CR_REGISTRY_ERROR, ERROR_REGISTRY_CORRUPT }, + { CR_INVALID_DEVICE_ID, ERROR_INVALID_DATA }, + { CR_NO_SUCH_VALUE, ERROR_NOT_FOUND }, + { CR_NO_SUCH_REGISTRY_KEY, ERROR_FILE_NOT_FOUND }, + { CR_INVALID_MACHINENAME, ERROR_INVALID_DATA }, + { CR_REMOTE_COMM_FAILURE, ERROR_SERVICE_NOT_ACTIVE }, + { CR_MACHINE_UNAVAILABLE, ERROR_SERVICE_NOT_ACTIVE }, + { CR_NO_CM_SERVICES, ERROR_SERVICE_NOT_ACTIVE }, + { CR_ACCESS_DENIED, ERROR_ACCESS_DENIED }, + { CR_CALL_NOT_IMPLEMENTED, ERROR_CALL_NOT_IMPLEMENTED }, + { CR_INVALID_PROPERTY, ERROR_INVALID_DATA }, + { CR_NO_SUCH_DEVICE_INTERFACE, ERROR_NOT_FOUND }, + { CR_INVALID_REFERENCE_STRING, ERROR_INVALID_DATA }, + { CR_DEFAULT, 0xdeadbeef }, + { CR_INVALID_RES_DES, 0xdeadbeef }, + { CR_INVALID_LOG_CONF, 0xdeadbeef }, + { CR_INVALID_ARBITRATOR, 0xdeadbeef }, + { CR_INVALID_NODELIST, 0xdeadbeef }, + { CR_DEVNODE_HAS_REQS, 0xdeadbeef }, + { CR_DEVINST_HAS_REQS, 0xdeadbeef }, + { CR_INVALID_RESOURCEID, 0xdeadbeef }, + { CR_DLVXD_NOT_FOUND, 0xdeadbeef }, + { CR_NO_MORE_LOG_CONF, 0xdeadbeef }, + { CR_NO_MORE_RES_DES, 0xdeadbeef }, + { CR_INVALID_RANGE_LIST, 0xdeadbeef }, + { CR_INVALID_RANGE, 0xdeadbeef }, + { CR_FAILURE, 0xdeadbeef }, + { CR_NO_SUCH_LOGICAL_DEV, 0xdeadbeef }, + { CR_CREATE_BLOCKED, 0xdeadbeef }, + { CR_NOT_SYSTEM_VM, 0xdeadbeef }, + { CR_REMOVE_VETOED, 0xdeadbeef }, + { CR_APM_VETOED, 0xdeadbeef }, + { CR_INVALID_LOAD_TYPE, 0xdeadbeef }, + { CR_NO_ARBITRATOR, 0xdeadbeef }, + { CR_INVALID_DATA, 0xdeadbeef }, + { CR_INVALID_API, 0xdeadbeef }, + { CR_DEVLOADER_NOT_READY, 0xdeadbeef }, + { CR_NEED_RESTART, 0xdeadbeef }, + { CR_NO_MORE_HW_PROFILES, 0xdeadbeef }, + { CR_DEVICE_NOT_THERE, 0xdeadbeef }, + { CR_WRONG_TYPE, 0xdeadbeef }, + { CR_INVALID_PRIORITY, 0xdeadbeef }, + { CR_NOT_DISABLEABLE, 0xdeadbeef }, + { CR_FREE_RESOURCES, 0xdeadbeef }, + { CR_QUERY_VETOED, 0xdeadbeef }, + { CR_CANT_SHARE_IRQ, 0xdeadbeef }, + { CR_NO_DEPENDENT, 0xdeadbeef }, + { CR_SAME_RESOURCES, 0xdeadbeef }, + { CR_DEVICE_INTERFACE_ACTIVE, 0xdeadbeef }, + { CR_INVALID_CONFLICT_LIST, 0xdeadbeef }, + { CR_INVALID_INDEX, 0xdeadbeef }, + { CR_INVALID_STRUCTURE_SIZE, 0xdeadbeef }, + { NUM_CR_RESULTS, 0xdeadbeef }, + }; + + for ( i = 0; i < ARRAY_SIZE(map_codes); i++ ) + { + ret = CM_MapCrToWin32Err( map_codes[i].code, 0xdeadbeef ); + ok( ret == map_codes[i].win32_error, "%#lx returned unexpected %ld.\n", map_codes[i].code, ret ); + } +} + +START_TEST(cfgmgr32) +{ + test_CM_MapCrToWin32Err(); +}

1 0

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

July 19, 2023

Module: wine Branch: stable Commit: 70e46a9ddaa9212591ca91ee80511c36e6f347af URL: https://gitlab.winehq.org/wine/wine/-/commit/70e46a9ddaa9212591ca91ee80511c… 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_modify* and add tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54702 (cherry picked from commit 320c688ed3393c688717404941caf09024baa046) --- dlls/wldap32/modify.c | 8 +++--- dlls/wldap32/tests/parse.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 4 deletions(-) diff --git a/dlls/wldap32/modify.c b/dlls/wldap32/modify.c index a062bf4bb15..2dea3279151 100644 --- a/dlls/wldap32/modify.c +++ b/dlls/wldap32/modify.c @@ -79,7 +79,7 @@ ULONG CDECL ldap_modify_extA( LDAP *ld, char *dn, LDAPModA **mods, LDAPControlA TRACE( "(%p, %s, %p, %p, %p, %p)\n", ld, debugstr_a(dn), mods, serverctrls, clientctrls, message ); - if (!ld) return ~0u; + if (!ld || !message) return WLDAP32_LDAP_PARAM_ERROR; if (dn && !(dnW = strAtoW( dn ))) goto exit; if (mods && !(modsW = modarrayAtoW( mods ))) goto exit; @@ -109,9 +109,9 @@ ULONG CDECL ldap_modify_extW( LDAP *ld, WCHAR *dn, LDAPModW **mods, LDAPControlW TRACE( "(%p, %s, %p, %p, %p, %p)\n", ld, debugstr_w(dn), mods, serverctrls, clientctrls, message ); - if (!ld) return ~0u; + if (!ld || !message) return WLDAP32_LDAP_PARAM_ERROR; - if (dn && !(dnU = strWtoU( dn ))) goto exit; + if (!(dnU = dn ? strWtoU( dn ) : strdup( "" ))) goto exit; if (mods && !(modsU = modarrayWtoU( mods ))) goto exit; if (serverctrls && !(serverctrlsU = controlarrayWtoU( serverctrls ))) goto exit; if (clientctrls && !(clientctrlsU = controlarrayWtoU( clientctrls ))) goto exit; @@ -173,7 +173,7 @@ ULONG CDECL ldap_modify_ext_sW( LDAP *ld, WCHAR *dn, LDAPModW **mods, LDAPContro if (!ld) return WLDAP32_LDAP_PARAM_ERROR; - if (dn && !(dnU = strWtoU( dn ))) goto exit; + if (!(dnU = dn ? strWtoU( dn ) : strdup( "" ))) goto exit; if (mods && !(modsU = modarrayWtoU( mods ))) 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 788af6f921c..1653b0ef72c 100644 --- a/dlls/wldap32/tests/parse.c +++ b/dlls/wldap32/tests/parse.c @@ -235,6 +235,66 @@ static void test_ldap_add(void) ldap_unbind( ld ); } +static void test_ldap_modify(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_modifyA( NULL, NULL, NULL ); + ok( ret == (ULONG)-1, "ldap_modifyA should fail, got %#lx\n", ret ); + ret = ldap_modifyA( NULL, (char *)"", attrs ); + ok( ret == (ULONG)-1, "ldap_modifyA should fail, got %#lx\n", ret ); + ret = ldap_modifyA( ld, NULL, attrs ); + ok( ret != (ULONG)-1, "ldap_modifyA should succeed, got %#lx\n", ret ); + ret = ldap_modifyA( ld, (char *)"", NULL ); + ok( ret != (ULONG)-1, "ldap_modifyA should succeed, got %#lx\n", ret ); + ret = ldap_modifyA( ld, (char *)"", attrs ); + ok( ret != (ULONG)-1, "ldap_modifyA should succeed, got %#lx\n", ret ); + + ret = ldap_modify_sA( NULL, NULL, NULL ); + ok( ret == LDAP_PARAM_ERROR, "ldap_modify_sA should fail, got %#lx\n", ret ); + ret = ldap_modify_sA( NULL, (char *)"", attrs ); + ok( ret == LDAP_PARAM_ERROR, "ldap_modify_sA should fail, got %#lx\n", ret ); + ret = ldap_modify_sA( ld, NULL, attrs ); + ok( ret == LDAP_UNDEFINED_TYPE, "ldap_modify_sA should fail, got %#lx\n", ret ); + ret = ldap_modify_sA( ld, (char *)"", NULL ); + ok( ret == LDAP_UNWILLING_TO_PERFORM, "ldap_modify_sA should fail, got %#lx\n", ret ); + ret = ldap_modify_sA( ld, (char *)"", attrs ); + ok( ret == LDAP_UNDEFINED_TYPE, "ldap_modify_sA should fail, got %#lx\n", ret ); + + ret = ldap_modify_extA( NULL, NULL, NULL, NULL, NULL, NULL ); + ok( ret == LDAP_PARAM_ERROR, "ldap_modify_extA should fail, got %#lx\n", ret ); + ret = ldap_modify_extA( NULL, (char *)"", attrs, NULL, NULL, &num ); + ok( ret == LDAP_PARAM_ERROR, "ldap_modify_extA should fail, got %#lx\n", ret ); + ret = ldap_modify_extA( ld, NULL, attrs, NULL, NULL, &num ); + ok( !ret, "ldap_modify_extA should succeed, got %#lx\n", ret ); + ret = ldap_modify_extA( ld, (char *)"", NULL, NULL, NULL, &num ); + ok( !ret, "ldap_modify_extA should succeed, got %#lx\n", ret ); + ret = ldap_modify_extA( ld, (char *)"", attrs, NULL, NULL, NULL ); + ok( ret == LDAP_PARAM_ERROR, "ldap_modify_extA should fail, got %#lx\n", ret ); + ret = ldap_modify_extA( ld, (char *)"", attrs, NULL, NULL, &num ); + ok( !ret, "ldap_modify_extA should succeed, got %#lx\n", ret ); + + ret = ldap_modify_ext_sA( NULL, NULL, NULL, NULL, NULL ); + ok( ret == LDAP_PARAM_ERROR, "ldap_modify_ext_sA should fail, got %#lx\n", ret ); + ret = ldap_modify_ext_sA( NULL, (char *)"", attrs, NULL, NULL ); + ok( ret == LDAP_PARAM_ERROR, "ldap_modify_ext_sA should fail, got %#lx\n", ret ); + ret = ldap_modify_ext_sA( ld, NULL, attrs, NULL, NULL ); + ok( ret == LDAP_UNDEFINED_TYPE, "ldap_modify_ext_sA should fail, got %#lx\n", ret ); + ret = ldap_modify_ext_sA( ld, (char *)"", NULL, NULL, NULL ); + 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_server_control( void ) { /* SEQUENCE { INTEGER :: 0x07 } */ @@ -358,6 +418,7 @@ START_TEST (parse) test_ldap_server_control(); test_ldap_bind_sA(); test_ldap_add(); + test_ldap_modify(); ld = ldap_initA( (char *)"db.debian.org", 389 ); ok( ld != NULL, "ldap_init failed\n" );

1 0

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