- Wine-Commits - list.winehq.org

Rémi Bernon : dinput: Keep device objects app data in the object properties.
by Alexandre Julliard March 22, 2023

March 22, 2023

Module: wine Branch: master Commit: b1a95b9671091aad2bf8ed29465c307db39f3447 URL: https://gitlab.winehq.org/wine/wine/-/commit/b1a95b9671091aad2bf8ed29465c30… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Mar 22 09:19:49 2023 +0100 dinput: Keep device objects app data in the object properties. --- dlls/dinput/device.c | 157 ++++++++++++++---------------------------- dlls/dinput/device_private.h | 11 +-- dlls/dinput/tests/joystick8.c | 12 ---- 3 files changed, 54 insertions(+), 126 deletions(-)

1 0

Rémi Bernon : dinput: Check IDirectInputDevice8W_SetActionMap flags.
by Alexandre Julliard March 22, 2023

March 22, 2023

Module: wine Branch: master Commit: 5d3f2d18ad36993033bb046d5177fc7130894e2f URL: https://gitlab.winehq.org/wine/wine/-/commit/5d3f2d18ad36993033bb046d5177fc… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 20 16:57:27 2023 +0100 dinput: Check IDirectInputDevice8W_SetActionMap flags. --- dlls/dinput/device.c | 1 + dlls/dinput/tests/joystick8.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 2817ca9839b..0df0199317b 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1972,6 +1972,7 @@ static HRESULT WINAPI dinput_device_SetActionMap( IDirectInputDevice8W *iface, D debugstr_w(username), flags ); if (!format) return DIERR_INVALIDPARAM; + if (flags != DIDSAM_DEFAULT && flags != DIDSAM_FORCESAVE && flags != DIDSAM_NOUSER) return DIERR_INVALIDPARAM; if (!(data_format.rgodf = malloc( sizeof(DIOBJECTDATAFORMAT) * format->dwNumActions ))) return DIERR_OUTOFMEMORY; data_format.dwDataSize = format->dwDataSize; diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index 6e8a9292f84..7947e6e33cc 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -807,7 +807,6 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e ok( hr == DIERR_INVALIDPARAM, "SetActionMap returned %#lx\n", hr ); flags = DIDSAM_FORCESAVE | DIDSAM_NOUSER; hr = IDirectInputDevice8_SetActionMap( device, &action_format_1, NULL, flags ); - todo_wine ok( hr == DIERR_INVALIDPARAM, "SetActionMap returned %#lx\n", hr );

1 0

Rémi Bernon : dinput: Initialize object formats from device objects in SetActionMap.
by Alexandre Julliard March 22, 2023

March 22, 2023

Module: wine Branch: master Commit: 8ff74b157acc7ec3d4c69c84091421db5584666e URL: https://gitlab.winehq.org/wine/wine/-/commit/8ff74b157acc7ec3d4c69c84091421… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Mar 22 09:01:08 2023 +0100 dinput: Initialize object formats from device objects in SetActionMap. --- dlls/dinput/device.c | 50 +++++++++---------------------------------- dlls/dinput/tests/joystick8.c | 11 ++++------ 2 files changed, 14 insertions(+), 47 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index fb7be1e2e6d..28494c3bec6 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1975,7 +1975,6 @@ static HRESULT WINAPI dinput_device_SetActionMap( IDirectInputDevice8W *iface, D const WCHAR *username, DWORD flags ) { struct dinput_device *impl = impl_from_IDirectInputDevice8W( iface ); - DIOBJECTDATAFORMAT *obj_df = NULL; DIDATAFORMAT data_format = { .dwSize = sizeof(DIDATAFORMAT), @@ -2011,9 +2010,8 @@ static HRESULT WINAPI dinput_device_SetActionMap( IDirectInputDevice8W *iface, D }; WCHAR username_buf[MAX_PATH]; DWORD username_len = MAX_PATH; - int i, action = 0, num_actions = 0; + int i, index, action = 0, num_actions = 0; unsigned int offset = 0; - const DIDATAFORMAT *df; ActionMap *action_map; FIXME( "iface %p, format %p, username %s, flags %#lx stub!\n", iface, format, @@ -2021,21 +2019,6 @@ static HRESULT WINAPI dinput_device_SetActionMap( IDirectInputDevice8W *iface, D if (!format) return DIERR_INVALIDPARAM; - switch (GET_DIDEVICE_TYPE( impl->instance.dwDevType )) - { - case DIDEVTYPE_KEYBOARD: - case DI8DEVTYPE_KEYBOARD: - df = &c_dfDIKeyboard; - break; - case DIDEVTYPE_MOUSE: - case DI8DEVTYPE_MOUSE: - df = &c_dfDIMouse2; - break; - default: - df = &impl->device_format; - break; - } - if (impl->status == STATUS_ACQUIRED) return DIERR_ACQUIRED; /* Count the actions */ @@ -2045,34 +2028,21 @@ static HRESULT WINAPI dinput_device_SetActionMap( IDirectInputDevice8W *iface, D if (num_actions == 0) return DI_NOEFFECT; - /* Construct the dataformat and actionmap */ - obj_df = malloc( sizeof(DIOBJECTDATAFORMAT) * num_actions ); - data_format.rgodf = (LPDIOBJECTDATAFORMAT)obj_df; + data_format.rgodf = malloc( sizeof(DIOBJECTDATAFORMAT) * num_actions ); data_format.dwDataSize = format->dwDataSize; action_map = malloc( sizeof(ActionMap) * num_actions ); for (i = 0; i < format->dwNumActions; i++, offset += sizeof(ULONG)) { - if (IsEqualGUID( &impl->guid, &format->rgoAction[i].guidInstance )) - { - DWORD inst = DIDFT_GETINSTANCE( format->rgoAction[i].dwObjID ); - DWORD type = DIDFT_GETTYPE( format->rgoAction[i].dwObjID ); - LPDIOBJECTDATAFORMAT obj; - - if (type == DIDFT_PSHBUTTON) type = DIDFT_BUTTON; - if (type == DIDFT_RELAXIS) type = DIDFT_AXIS; + if (!IsEqualGUID( &impl->guid, &format->rgoAction[i].guidInstance )) continue; + if ((index = dinput_device_object_index_from_id( iface, format->rgoAction[i].dwObjID )) < 0) continue; - if (!(obj = dataformat_to_odf_by_type( df, inst, type ))) continue; - - memcpy( &obj_df[action], obj, df->dwObjSize ); - - action_map[action].uAppData = format->rgoAction[i].uAppData; - action_map[action].offset = offset; - obj_df[action].dwOfs = offset; - data_format.dwNumObjs++; - action++; - } + action_map[action].uAppData = format->rgoAction[i].uAppData; + action_map[action].offset = offset; + data_format.rgodf[data_format.dwNumObjs] = impl->device_format.rgodf[index]; + data_format.rgodf[data_format.dwNumObjs].dwOfs = offset; + data_format.dwNumObjs++; } IDirectInputDevice8_SetDataFormat( iface, &data_format ); @@ -2080,7 +2050,7 @@ static HRESULT WINAPI dinput_device_SetActionMap( IDirectInputDevice8W *iface, D impl->action_map = action_map; impl->num_actions = num_actions; - free( obj_df ); + free( data_format.rgodf ); if (format->lAxisMin != format->lAxisMax) { diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index 1ca2975a15e..40fd3d23e29 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -1046,13 +1046,11 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e hr = IDirectInputDevice8_GetDeviceState( device, sizeof(state), state ); ok( hr == DI_OK, "GetDeviceState returned: %#lx\n", hr ); - todo_wine_if( i > 5 ) ok( state[0] == expect_state[i][0], "got state[0] %+ld\n", state[0] ); - todo_wine_if( i == 2 || i > 4 ) + todo_wine_if( i == 2 || i == 5 ) ok( state[1] == expect_state[i][1], "got state[1] %+ld\n", state[1] ); todo_wine_if( expect_state[i][2] ) ok( state[2] == expect_state[i][2], "got state[2] %+ld\n", state[2] ); - todo_wine_if( i > 5 ) ok( state[3] == expect_state[i][3], "got state[3] %+ld\n", state[3] ); todo_wine_if( expect_state[i][4] ) ok( state[4] == expect_state[i][4], "got state[4] %+ld\n", state[4] ); @@ -1060,7 +1058,6 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e ok( state[5] == expect_state[i][5], "got state[5] %+ld\n", state[5] ); todo_wine_if( expect_state[i][6] ) ok( state[6] == expect_state[i][6], "got state[6] %+ld\n", state[6] ); - todo_wine_if( expect_state[i][7] ) ok( state[7] == expect_state[i][7] || broken(state[7] == -45 && expect_state[i][7] == -43) /* 32-bit rounding */, "got state[7] %+ld\n", state[7] ); @@ -1082,13 +1079,13 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e while (res--) { winetest_push_context( "%lu", res ); - todo_wine_if( res != 1 && res != 4 ) + todo_wine check_member( objdata[res], expect_objdata[res], "%#lx", dwOfs ); - todo_wine_if( res == 0 || res == 3 || res == 6 ) + todo_wine ok( objdata[res].dwData == expect_objdata[res].dwData || broken(objdata[res].dwData == -45 && expect_objdata[res].dwData == -43) /* 32-bit rounding */, "got dwData %+ld\n", objdata[res].dwData ); - todo_wine_if( res != 1 && res != 4 ) + todo_wine check_member( objdata[res], expect_objdata[res], "%#Ix", uAppData ); winetest_pop_context(); }

1 0

Rémi Bernon : dinput: Use 4 bytes for every object user state in SetActionMap.
by Alexandre Julliard March 22, 2023

March 22, 2023

Module: wine Branch: master Commit: df90c379fb91b413d0a652cf20ffaeea963e7207 URL: https://gitlab.winehq.org/wine/wine/-/commit/df90c379fb91b413d0a652cf20ffae… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 20 09:04:46 2023 +0100 dinput: Use 4 bytes for every object user state in SetActionMap. --- dlls/dinput/device.c | 4 +--- dlls/dinput/tests/joystick8.c | 8 ++++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 9dd7a3f478f..fb7be1e2e6d 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -2052,7 +2052,7 @@ static HRESULT WINAPI dinput_device_SetActionMap( IDirectInputDevice8W *iface, D action_map = malloc( sizeof(ActionMap) * num_actions ); - for (i = 0; i < format->dwNumActions; i++) + for (i = 0; i < format->dwNumActions; i++, offset += sizeof(ULONG)) { if (IsEqualGUID( &impl->guid, &format->rgoAction[i].guidInstance )) { @@ -2070,9 +2070,7 @@ static HRESULT WINAPI dinput_device_SetActionMap( IDirectInputDevice8W *iface, D action_map[action].uAppData = format->rgoAction[i].uAppData; action_map[action].offset = offset; obj_df[action].dwOfs = offset; - offset += (type & DIDFT_BUTTON) ? 1 : 4; data_format.dwNumObjs++; - action++; } } diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index 22a83f911bc..1ca2975a15e 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -1046,13 +1046,13 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e hr = IDirectInputDevice8_GetDeviceState( device, sizeof(state), state ); ok( hr == DI_OK, "GetDeviceState returned: %#lx\n", hr ); - todo_wine + todo_wine_if( i > 5 ) ok( state[0] == expect_state[i][0], "got state[0] %+ld\n", state[0] ); - todo_wine_if( i != 2 ) + todo_wine_if( i == 2 || i > 4 ) ok( state[1] == expect_state[i][1], "got state[1] %+ld\n", state[1] ); todo_wine_if( expect_state[i][2] ) ok( state[2] == expect_state[i][2], "got state[2] %+ld\n", state[2] ); - todo_wine_if( expect_state[i][3] ) + todo_wine_if( i > 5 ) ok( state[3] == expect_state[i][3], "got state[3] %+ld\n", state[3] ); todo_wine_if( expect_state[i][4] ) ok( state[4] == expect_state[i][4], "got state[4] %+ld\n", state[4] ); @@ -1082,7 +1082,7 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e while (res--) { winetest_push_context( "%lu", res ); - todo_wine + todo_wine_if( res != 1 && res != 4 ) check_member( objdata[res], expect_objdata[res], "%#lx", dwOfs ); todo_wine_if( res == 0 || res == 3 || res == 6 ) ok( objdata[res].dwData == expect_objdata[res].dwData ||

1 0

Rémi Bernon : dinput: Respect DIA_APPNOMAP in IDirectInputDevice8W_SetActionMap.
by Alexandre Julliard March 22, 2023

March 22, 2023

Module: wine Branch: master Commit: c6a922c1a1a6f6cf6b04323cc5883873f28183cc URL: https://gitlab.winehq.org/wine/wine/-/commit/c6a922c1a1a6f6cf6b04323cc58838… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 20 16:57:27 2023 +0100 dinput: Respect DIA_APPNOMAP in IDirectInputDevice8W_SetActionMap. --- dlls/dinput/device.c | 1 + dlls/dinput/tests/joystick8.c | 9 +-------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 28494c3bec6..e493149a474 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -2035,6 +2035,7 @@ static HRESULT WINAPI dinput_device_SetActionMap( IDirectInputDevice8W *iface, D for (i = 0; i < format->dwNumActions; i++, offset += sizeof(ULONG)) { + if (format->rgoAction[i].dwFlags & DIA_APPNOMAP) continue; if (!IsEqualGUID( &impl->guid, &format->rgoAction[i].guidInstance )) continue; if ((index = dinput_device_object_index_from_id( iface, format->rgoAction[i].dwObjID )) < 0) continue; diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index 40fd3d23e29..8561c4f2848 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -1047,16 +1047,11 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e hr = IDirectInputDevice8_GetDeviceState( device, sizeof(state), state ); ok( hr == DI_OK, "GetDeviceState returned: %#lx\n", hr ); ok( state[0] == expect_state[i][0], "got state[0] %+ld\n", state[0] ); - todo_wine_if( i == 2 || i == 5 ) ok( state[1] == expect_state[i][1], "got state[1] %+ld\n", state[1] ); - todo_wine_if( expect_state[i][2] ) ok( state[2] == expect_state[i][2], "got state[2] %+ld\n", state[2] ); ok( state[3] == expect_state[i][3], "got state[3] %+ld\n", state[3] ); - todo_wine_if( expect_state[i][4] ) ok( state[4] == expect_state[i][4], "got state[4] %+ld\n", state[4] ); - todo_wine_if( expect_state[i][5] ) ok( state[5] == expect_state[i][5], "got state[5] %+ld\n", state[5] ); - todo_wine_if( expect_state[i][6] ) ok( state[6] == expect_state[i][6], "got state[6] %+ld\n", state[6] ); ok( state[7] == expect_state[i][7] || broken(state[7] == -45 && expect_state[i][7] == -43) /* 32-bit rounding */, @@ -1079,13 +1074,11 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e while (res--) { winetest_push_context( "%lu", res ); - todo_wine check_member( objdata[res], expect_objdata[res], "%#lx", dwOfs ); - todo_wine ok( objdata[res].dwData == expect_objdata[res].dwData || broken(objdata[res].dwData == -45 && expect_objdata[res].dwData == -43) /* 32-bit rounding */, "got dwData %+ld\n", objdata[res].dwData ); - todo_wine + todo_wine_if( res != 0 && res != 3 && res != 6 ) check_member( objdata[res], expect_objdata[res], "%#Ix", uAppData ); winetest_pop_context(); }

1 0

Rémi Bernon : dinput: Only set DIPROP_RANGE in SetActionMap if range isn't empty.
by Alexandre Julliard March 22, 2023

March 22, 2023

Module: wine Branch: master Commit: 8e069f0bf2d9784b66ae863a9894d765e182787f URL: https://gitlab.winehq.org/wine/wine/-/commit/8e069f0bf2d9784b66ae863a9894d7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 20 16:18:58 2023 +0100 dinput: Only set DIPROP_RANGE in SetActionMap if range isn't empty. --- dlls/dinput/device.c | 9 ++++++--- dlls/dinput/tests/joystick8.c | 4 ---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index a17df9aa69d..9dd7a3f478f 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -2084,9 +2084,12 @@ static HRESULT WINAPI dinput_device_SetActionMap( IDirectInputDevice8W *iface, D free( obj_df ); - prop_range.lMin = format->lAxisMin; - prop_range.lMax = format->lAxisMax; - IDirectInputDevice8_SetProperty( iface, DIPROP_RANGE, &prop_range.diph ); + if (format->lAxisMin != format->lAxisMax) + { + prop_range.lMin = format->lAxisMin; + prop_range.lMax = format->lAxisMax; + IDirectInputDevice8_SetProperty( iface, DIPROP_RANGE, &prop_range.diph ); + } prop_buffer.dwData = format->dwBufferSize; IDirectInputDevice8_SetProperty( iface, DIPROP_BUFFERSIZE, &prop_buffer.diph ); diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index 48e097dcafa..22a83f911bc 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -925,18 +925,14 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e prop_range.diph.dwObj = DIDFT_ABSAXIS | DIDFT_MAKEINSTANCE( 2 ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_RANGE, &prop_range.diph ); ok( hr == DI_OK, "GetProperty returned %#lx\n", hr ); - todo_wine ok( prop_range.lMin == +1000, "got lMin %+ld\n", prop_range.lMin ); - todo_wine ok( prop_range.lMax == +51000, "got lMax %+ld\n", prop_range.lMax ); prop_range.diph.dwHow = DIPH_BYUSAGE; prop_range.diph.dwObj = MAKELONG(HID_USAGE_GENERIC_X, HID_USAGE_PAGE_GENERIC); hr = IDirectInputDevice8_GetProperty( device, DIPROP_RANGE, &prop_range.diph ); ok( hr == DI_OK, "GetProperty returned %#lx\n", hr ); - todo_wine ok( prop_range.lMin == -14000, "got lMin %+ld\n", prop_range.lMin ); - todo_wine ok( prop_range.lMax == -4000, "got lMax %+ld\n", prop_range.lMax ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_BUFFERSIZE, &prop_dword.diph );

1 0

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

March 22, 2023

Module: wine Branch: master Commit: e9376fd18e58c6816855a96b51e20dcbeca26021 URL: https://gitlab.winehq.org/wine/wine/-/commit/e9376fd18e58c6816855a96b51e20d… 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 --- 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 d23e52ef207..cc51c64ebeb 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

Rémi Bernon : dinput: Return error from SetActionMap if SetDataFormat fails.
by Alexandre Julliard March 22, 2023

March 22, 2023

Module: wine Branch: master Commit: 63637f240769ae635a4894477d2a511d6cfeccb4 URL: https://gitlab.winehq.org/wine/wine/-/commit/63637f240769ae635a4894477d2a51… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Mar 22 09:18:46 2023 +0100 dinput: Return error from SetActionMap if SetDataFormat fails. --- dlls/dinput/device.c | 48 +++++++++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index e493149a474..162e4c451fb 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -2013,14 +2013,13 @@ static HRESULT WINAPI dinput_device_SetActionMap( IDirectInputDevice8W *iface, D int i, index, action = 0, num_actions = 0; unsigned int offset = 0; ActionMap *action_map; + HRESULT hr; FIXME( "iface %p, format %p, username %s, flags %#lx stub!\n", iface, format, debugstr_w(username), flags ); if (!format) return DIERR_INVALIDPARAM; - if (impl->status == STATUS_ACQUIRED) return DIERR_ACQUIRED; - /* Count the actions */ for (i = 0; i < format->dwNumActions; i++) if (IsEqualGUID( &impl->guid, &format->rgoAction[i].guidInstance )) @@ -2046,33 +2045,40 @@ static HRESULT WINAPI dinput_device_SetActionMap( IDirectInputDevice8W *iface, D data_format.dwNumObjs++; } - IDirectInputDevice8_SetDataFormat( iface, &data_format ); + EnterCriticalSection( &impl->crit ); - impl->action_map = action_map; - impl->num_actions = num_actions; + if (FAILED(hr = IDirectInputDevice8_SetDataFormat( iface, &data_format ))) + WARN( "Failed to set data format from action map, hr %#lx\n", hr ); + else + { + impl->action_map = action_map; + impl->num_actions = num_actions; - free( data_format.rgodf ); + if (format->lAxisMin != format->lAxisMax) + { + prop_range.lMin = format->lAxisMin; + prop_range.lMax = format->lAxisMax; + IDirectInputDevice8_SetProperty( iface, DIPROP_RANGE, &prop_range.diph ); + } - if (format->lAxisMin != format->lAxisMax) - { - prop_range.lMin = format->lAxisMin; - prop_range.lMax = format->lAxisMax; - IDirectInputDevice8_SetProperty( iface, DIPROP_RANGE, &prop_range.diph ); - } + prop_buffer.dwData = format->dwBufferSize; + IDirectInputDevice8_SetProperty( iface, DIPROP_BUFFERSIZE, &prop_buffer.diph ); - prop_buffer.dwData = format->dwBufferSize; - IDirectInputDevice8_SetProperty( iface, DIPROP_BUFFERSIZE, &prop_buffer.diph ); + if (username == NULL) GetUserNameW( username_buf, &username_len ); + else lstrcpynW( username_buf, username, MAX_PATH ); - if (username == NULL) GetUserNameW( username_buf, &username_len ); - else lstrcpynW( username_buf, username, MAX_PATH ); + if (flags & DIDSAM_NOUSER) prop_username.wsz[0] = '\0'; + else lstrcpynW( prop_username.wsz, username_buf, ARRAY_SIZE(prop_username.wsz) ); + dinput_device_set_username( impl, &prop_username ); - if (flags & DIDSAM_NOUSER) prop_username.wsz[0] = '\0'; - else lstrcpynW( prop_username.wsz, username_buf, ARRAY_SIZE(prop_username.wsz) ); - dinput_device_set_username( impl, &prop_username ); + save_mapping_settings( iface, format, username_buf ); + } - save_mapping_settings( iface, format, username_buf ); + LeaveCriticalSection( &impl->crit ); - return DI_OK; + if (FAILED(hr)) free( action_map ); + free( data_format.rgodf ); + return hr; } static HRESULT WINAPI dinput_device_GetImageInfo( IDirectInputDevice8W *iface, DIDEVICEIMAGEINFOHEADERW *header )

1 0

Alex Henrie : include: Annotate ldap_(*_attribute|get_dn)* with __WINE_(DEALLOC|MALLOC).
by Alexandre Julliard March 22, 2023

March 22, 2023

Module: wine Branch: master Commit: 151211284125da527eefa6e053031ef6696ee9c4 URL: https://gitlab.winehq.org/wine/wine/-/commit/151211284125da527eefa6e053031e… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Mar 21 18:33:57 2023 -0600 include: Annotate ldap_(*_attribute|get_dn)* with __WINE_(DEALLOC|MALLOC). --- include/winldap.h | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/include/winldap.h b/include/winldap.h index 0b4037f133e..825d3f63b1e 100644 --- a/include/winldap.h +++ b/include/winldap.h @@ -499,16 +499,18 @@ ULONG CDECL ldap_extended_operationW(LDAP*,PWCHAR,struct berval*,PLDAPControlW*, ULONG CDECL ldap_extended_operation_sA(LDAP*,PCHAR,struct berval*,PLDAPControlA*,PLDAPControlA*,PCHAR*,struct berval**); ULONG CDECL ldap_extended_operation_sW(LDAP*,PWCHAR,struct berval*,PLDAPControlW*,PLDAPControlW*,PWCHAR*,struct berval**); #define ldap_extended_operation_s WINELIB_NAME_AW(ldap_extended_operation_s) -PCHAR CDECL ldap_first_attributeA(LDAP*,LDAPMessage*,BerElement**); -PWCHAR CDECL ldap_first_attributeW(LDAP*,LDAPMessage*,BerElement**); +char* CDECL ldap_first_attributeA(LDAP*,LDAPMessage*,BerElement**) + __WINE_DEALLOC(ldap_memfreeA) __WINE_MALLOC; +WCHAR* CDECL ldap_first_attributeW(LDAP*,LDAPMessage*,BerElement**) + __WINE_DEALLOC(ldap_memfreeW) __WINE_MALLOC; #define ldap_first_attribute WINELIB_NAME_AW(ldap_first_attribute) LDAPMessage* CDECL ldap_first_entry(LDAP*,LDAPMessage*); LDAPMessage* CDECL ldap_first_reference(LDAP*,LDAPMessage*); ULONG CDECL ldap_free_controlsA(LDAPControlA**); ULONG CDECL ldap_free_controlsW(LDAPControlW**); #define ldap_free_controls WINELIB_NAME_AW(ldap_free_controls) -PCHAR CDECL ldap_get_dnA(LDAP*,LDAPMessage*); -PWCHAR CDECL ldap_get_dnW(LDAP*,LDAPMessage*); +char* CDECL ldap_get_dnA(LDAP*,LDAPMessage*) __WINE_DEALLOC(ldap_memfreeA) __WINE_MALLOC; +WCHAR* CDECL ldap_get_dnW(LDAP*,LDAPMessage*) __WINE_DEALLOC(ldap_memfreeW) __WINE_MALLOC; #define ldap_get_dn WINELIB_NAME_AW(ldap_get_dn) ULONG CDECL ldap_get_next_page(PLDAP,PLDAPSearch,ULONG,ULONG*); ULONG CDECL ldap_get_next_page_s(PLDAP,PLDAPSearch,struct l_timeval*,ULONG,ULONG*,LDAPMessage**); @@ -552,8 +554,10 @@ ULONG CDECL ldap_modrdn_sA(LDAP*,PCHAR,PCHAR); ULONG CDECL ldap_modrdn_sW(LDAP*,PWCHAR,PWCHAR); #define ldap_modrdn_s WINELIB_NAME_AW(ldap_modrdn_s) ULONG CDECL ldap_msgfree(LDAPMessage*); -PCHAR CDECL ldap_next_attributeA(LDAP*,LDAPMessage*,BerElement*); -PWCHAR CDECL ldap_next_attributeW(LDAP*,LDAPMessage*,BerElement*); +char* CDECL ldap_next_attributeA(LDAP*,LDAPMessage*,BerElement*) + __WINE_DEALLOC(ldap_memfreeA) __WINE_MALLOC; +WCHAR* CDECL ldap_next_attributeW(LDAP*,LDAPMessage*,BerElement*) + __WINE_DEALLOC(ldap_memfreeW) __WINE_MALLOC; #define ldap_next_attribute WINELIB_NAME_AW(ldap_next_attribute) LDAPMessage * CDECL ldap_next_entry(LDAP*,LDAPMessage*); LDAP * CDECL ldap_openA(PCHAR,ULONG);

1 0

Alex Henrie : wldap32: Annotate allocation functions with __WINE_(DEALLOC|MALLOC).
by Alexandre Julliard March 22, 2023

March 22, 2023

Module: wine Branch: master Commit: e1930443fa5a84c392e5f4dd38fd409e2222c431 URL: https://gitlab.winehq.org/wine/wine/-/commit/e1930443fa5a84c392e5f4dd38fd40… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Mar 21 18:42:04 2023 -0600 wldap32: Annotate allocation functions with __WINE_(DEALLOC|MALLOC). --- dlls/wldap32/winldap_private.h | 53 ++++++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 23 deletions(-) diff --git a/dlls/wldap32/winldap_private.h b/dlls/wldap32/winldap_private.h index 69dca519b0e..aeeffcfcc15 100644 --- a/dlls/wldap32/winldap_private.h +++ b/dlls/wldap32/winldap_private.h @@ -367,20 +367,26 @@ typedef struct ldapsearch #define MSG(entry) (entry->Request) #define BER(ber) ((BerElement *)((ber)->opaque)) -WLDAP32_BerElement * CDECL WLDAP32_ber_alloc_t( int ); -BERVAL * CDECL WLDAP32_ber_bvdup( BERVAL * ); void CDECL WLDAP32_ber_bvecfree( BERVAL ** ); void CDECL WLDAP32_ber_bvfree( BERVAL * ); +void CDECL WLDAP32_ber_free( WLDAP32_BerElement *, int ); +WLDAP32_BerElement * CDECL WLDAP32_ber_alloc_t( int ) __WINE_DEALLOC(WLDAP32_ber_free); +BERVAL * CDECL WLDAP32_ber_bvdup( BERVAL * ) __WINE_DEALLOC(WLDAP32_ber_bvfree); ULONG CDECL WLDAP32_ber_first_element( WLDAP32_BerElement *, ULONG *, char ** ); int CDECL WLDAP32_ber_flatten( WLDAP32_BerElement *, BERVAL ** ); -void CDECL WLDAP32_ber_free( WLDAP32_BerElement *, int ); -WLDAP32_BerElement * CDECL WLDAP32_ber_init( BERVAL * ); +WLDAP32_BerElement * CDECL WLDAP32_ber_init( BERVAL * ) __WINE_DEALLOC(WLDAP32_ber_free); ULONG CDECL WLDAP32_ber_next_element( WLDAP32_BerElement *, ULONG *, char * ); ULONG CDECL WLDAP32_ber_peek_tag( WLDAP32_BerElement *, ULONG * ); ULONG CDECL WLDAP32_ber_skip_tag( WLDAP32_BerElement *, ULONG * ); int WINAPIV WLDAP32_ber_printf( WLDAP32_BerElement *, char *, ... ); ULONG WINAPIV WLDAP32_ber_scanf( WLDAP32_BerElement *, char *, ... ); +void CDECL ldap_memfreeA( char * ); +void CDECL ldap_memfreeW( WCHAR * ); +ULONG CDECL ldap_value_freeA( char ** ); +ULONG CDECL ldap_value_freeW( WCHAR ** ); +ULONG CDECL WLDAP32_ldap_msgfree( WLDAP32_LDAPMessage * ); +ULONG CDECL WLDAP32_ldap_value_free_len(struct WLDAP32_berval **); ULONG CDECL ldap_addA( LDAP *, char *, LDAPModA ** ); ULONG CDECL ldap_addW( LDAP *, WCHAR *, LDAPModW ** ); ULONG CDECL ldap_add_extA( LDAP *, char *, LDAPModA **, LDAPControlA **, LDAPControlA **, ULONG * ); @@ -429,16 +435,12 @@ ULONG CDECL ldap_delete_ext_sA( LDAP *, char *, LDAPControlA **, LDAPControlA ** ULONG CDECL ldap_delete_ext_sW( LDAP *, WCHAR *, LDAPControlW **, LDAPControlW ** ); ULONG CDECL ldap_delete_sA( LDAP *, char * ); ULONG CDECL ldap_delete_sW( LDAP *, WCHAR * ); -char * CDECL ldap_dn2ufnA( char * ); -WCHAR * CDECL ldap_dn2ufnW( WCHAR * ); -void CDECL ldap_memfreeA( char * ); -void CDECL ldap_memfreeW( WCHAR * ); -char ** CDECL ldap_explode_dnA( char *, ULONG ); -WCHAR ** CDECL ldap_explode_dnW( WCHAR *, ULONG ); -ULONG CDECL ldap_value_freeA( char ** ); -ULONG CDECL ldap_value_freeW( WCHAR ** ); -char * CDECL ldap_get_dnA( LDAP *, WLDAP32_LDAPMessage * ); -WCHAR * CDECL ldap_get_dnW( LDAP *, WLDAP32_LDAPMessage * ); +char * CDECL ldap_dn2ufnA( char * ) __WINE_DEALLOC(ldap_memfreeA) __WINE_MALLOC; +WCHAR * CDECL ldap_dn2ufnW( WCHAR * ) __WINE_DEALLOC(ldap_memfreeW) __WINE_MALLOC; +char ** CDECL ldap_explode_dnA( char *, ULONG ) __WINE_DEALLOC(ldap_value_freeA); +WCHAR ** CDECL ldap_explode_dnW( WCHAR *, ULONG ) __WINE_DEALLOC(ldap_value_freeW); +char * CDECL ldap_get_dnA( LDAP *, WLDAP32_LDAPMessage * ) __WINE_DEALLOC(ldap_memfreeA) __WINE_MALLOC; +WCHAR * CDECL ldap_get_dnW( LDAP *, WLDAP32_LDAPMessage * ) __WINE_DEALLOC(ldap_memfreeW) __WINE_MALLOC; ULONG CDECL ldap_ufn2dnA( char *, char ** ); ULONG CDECL ldap_ufn2dnW( WCHAR *, WCHAR ** ); ULONG CDECL ldap_extended_operationA( LDAP *, char *, struct WLDAP32_berval *, LDAPControlA **, LDAPControlA **, @@ -461,11 +463,14 @@ ULONG CDECL ldap_start_tls_sA( LDAP *, ULONG *, WLDAP32_LDAPMessage **, LDAPCont ULONG CDECL ldap_start_tls_sW( LDAP *, ULONG *, WLDAP32_LDAPMessage **, LDAPControlW **, LDAPControlW ** ); ULONG CDECL ldap_check_filterA( LDAP *, char * ); ULONG CDECL ldap_check_filterW( LDAP *, WCHAR * ); -char * CDECL ldap_first_attributeA( LDAP *, WLDAP32_LDAPMessage *, WLDAP32_BerElement ** ); -WCHAR * CDECL ldap_first_attributeW( LDAP *, WLDAP32_LDAPMessage *, WLDAP32_BerElement ** ); -ULONG CDECL WLDAP32_ldap_msgfree( WLDAP32_LDAPMessage * ); -char * CDECL ldap_next_attributeA( LDAP *, WLDAP32_LDAPMessage *, WLDAP32_BerElement * ); -WCHAR * CDECL ldap_next_attributeW( LDAP *, WLDAP32_LDAPMessage *, WLDAP32_BerElement * ); +char * CDECL ldap_first_attributeA( LDAP *, WLDAP32_LDAPMessage *, + WLDAP32_BerElement ** ) __WINE_DEALLOC(ldap_memfreeA) __WINE_MALLOC; +WCHAR * CDECL ldap_first_attributeW( LDAP *, WLDAP32_LDAPMessage *, + WLDAP32_BerElement ** ) __WINE_DEALLOC(ldap_memfreeW) __WINE_MALLOC; +char * CDECL ldap_next_attributeA( LDAP *, WLDAP32_LDAPMessage *, + WLDAP32_BerElement * ) __WINE_DEALLOC(ldap_memfreeA) __WINE_MALLOC; +WCHAR * CDECL ldap_next_attributeW( LDAP *, WLDAP32_LDAPMessage *, + WLDAP32_BerElement * ) __WINE_DEALLOC(ldap_memfreeW) __WINE_MALLOC; ULONG CDECL WLDAP32_ldap_result( LDAP *, ULONG, ULONG, struct l_timeval *, WLDAP32_LDAPMessage ** ); ULONG CDECL ldap_modifyA( LDAP *, char *, LDAPModA ** ); ULONG CDECL ldap_modifyW( LDAP *, WCHAR *, LDAPModW ** ); @@ -528,10 +533,12 @@ ULONG CDECL ldap_search_stA( LDAP *, const PCHAR, ULONG, const PCHAR, char **, U WLDAP32_LDAPMessage ** ); ULONG CDECL ldap_search_stW( LDAP *, const PWCHAR, ULONG, const PWCHAR, WCHAR **, ULONG, struct l_timeval *, WLDAP32_LDAPMessage ** ); -char ** CDECL ldap_get_valuesA( LDAP *, WLDAP32_LDAPMessage *, char * ); -WCHAR ** CDECL ldap_get_valuesW( LDAP *, WLDAP32_LDAPMessage *, WCHAR * ); -struct WLDAP32_berval ** CDECL ldap_get_values_lenA( LDAP *, LDAPMessage *, char * ); -struct WLDAP32_berval ** CDECL ldap_get_values_lenW( LDAP *, LDAPMessage *, WCHAR * ); +char ** CDECL ldap_get_valuesA( LDAP *, WLDAP32_LDAPMessage *, char * ) __WINE_DEALLOC(ldap_value_freeA); +WCHAR ** CDECL ldap_get_valuesW( LDAP *, WLDAP32_LDAPMessage *, WCHAR * ) __WINE_DEALLOC(ldap_value_freeW); +struct WLDAP32_berval ** CDECL ldap_get_values_lenA( LDAP *, LDAPMessage *, + char * ) __WINE_DEALLOC(WLDAP32_ldap_value_free_len); +struct WLDAP32_berval ** CDECL ldap_get_values_lenW( LDAP *, LDAPMessage *, + WCHAR * ) __WINE_DEALLOC(WLDAP32_ldap_value_free_len); ULONG map_error( int ) DECLSPEC_HIDDEN;

1 0