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

Rémi Bernon : dinput: Count the actual number of object formats in SetActionMap.
by Alexandre Julliard March 21, 2023

March 21, 2023

Module: wine Branch: master Commit: b75bd86ebd21c00c59ab689d170bd61dc1a30cf4 URL: https://gitlab.winehq.org/wine/wine/-/commit/b75bd86ebd21c00c59ab689d170bd6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 21 14:26:32 2023 +0100 dinput: Count the actual number of object formats in SetActionMap. Fixes crash introduced by 7b3f3d60782c63edd621353a635616f4cea029da, as SetActionMap is now called with unsupposed flags from the tests and skips some objects. --- dlls/dinput/device.c | 3 ++- dlls/dinput/tests/joystick8.c | 18 ++++++------------ 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 407e4f52a38..3b3912ce9d2 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -2028,7 +2028,7 @@ static HRESULT WINAPI dinput_device_SetActionMap( IDirectInputDevice8W *iface, D /* Construct the dataformat and actionmap */ obj_df = malloc( sizeof(DIOBJECTDATAFORMAT) * num_actions ); data_format.rgodf = (LPDIOBJECTDATAFORMAT)obj_df; - data_format.dwNumObjs = num_actions; + data_format.dwNumObjs = 0; action_map = malloc( sizeof(ActionMap) * num_actions ); @@ -2051,6 +2051,7 @@ static HRESULT WINAPI dinput_device_SetActionMap( IDirectInputDevice8W *iface, D 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 5295ee6c169..86747652d60 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -1031,9 +1031,7 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e hr = IDirectInputDevice8_Acquire( device ); - todo_wine ok( hr == DI_OK, "Acquire returned: %#lx\n", hr ); - if (hr != DI_OK) goto skip_input; hr = IDirectInputDevice8_SetActionMap( device, &action_format, L"username", DIDSAM_DEFAULT ); ok( hr == DIERR_ACQUIRED, "SetActionMap returned %#lx\n", hr ); @@ -1045,7 +1043,6 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e send_hid_input( file, &injected_input[0], sizeof(*injected_input) ); res = WaitForSingleObject( event, 100 ); } - todo_wine ok( res == WAIT_OBJECT_0, "WaitForSingleObject failed\n" ); for (i = 0; i < ARRAY_SIZE(injected_input); ++i) @@ -1053,11 +1050,10 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e winetest_push_context( "state[%ld]", i ); hr = IDirectInputDevice8_GetDeviceState( device, sizeof(state), state ); - todo_wine ok( hr == DI_OK, "GetDeviceState returned: %#lx\n", hr ); - todo_wine_if( expect_state[i][0] ) + todo_wine ok( state[0] == expect_state[i][0], "got state[0] %+ld\n", state[0] ); - todo_wine_if( expect_state[i][1] ) + todo_wine_if( i != 2 ) 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] ); @@ -1078,7 +1074,7 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e res = WaitForSingleObject( event, 100 ); if (i == 0 || i == 3) ok( res == WAIT_TIMEOUT, "WaitForSingleObject succeeded\n" ); - else todo_wine ok( res == WAIT_OBJECT_0, "WaitForSingleObject failed\n" ); + else ok( res == WAIT_OBJECT_0, "WaitForSingleObject failed\n" ); ResetEvent( event ); winetest_pop_context(); } @@ -1091,23 +1087,21 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e while (res--) { winetest_push_context( "%lu", res ); - todo_wine_if( expect_objdata[res].dwOfs ) + todo_wine check_member( objdata[res], expect_objdata[res], "%#lx", dwOfs ); - todo_wine_if( expect_objdata[res].dwData ) + todo_wine_if( res == 0 || res == 3 || res == 6 ) 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 != 1 && res != 4 ) check_member( objdata[res], expect_objdata[res], "%#Ix", uAppData ); winetest_pop_context(); } -skip_input: hr = IDirectInputDevice8_BuildActionMap( device, &action_format, L"username", DIDBAM_DEFAULT ); ok( hr == DI_OK, "BuildActionMap returned %#lx\n", hr ); hr = IDirectInputDevice8_Unacquire( device ); - todo_wine ok( hr == DI_OK, "Acquire returned: %#lx\n", hr );

1 0

Rémi Bernon : dinput: Initialize device object format when creating devices.
by Alexandre Julliard March 21, 2023

March 21, 2023

Module: wine Branch: master Commit: 256f35dc42688d983d72ebc636ca0974e64ce0cf URL: https://gitlab.winehq.org/wine/wine/-/commit/256f35dc42688d983d72ebc636ca09… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 20 10:13:15 2023 +0100 dinput: Initialize device object format when creating devices. --- dlls/dinput/dinput.c | 6 ------ dlls/dinput/joystick_hid.c | 14 ++++++++------ dlls/dinput/keyboard.c | 9 +++++++-- dlls/dinput/mouse.c | 11 ++++++++--- 4 files changed, 23 insertions(+), 17 deletions(-) diff --git a/dlls/dinput/dinput.c b/dlls/dinput/dinput.c index db367e1f1ba..998573ad20d 100644 --- a/dlls/dinput/dinput.c +++ b/dlls/dinput/dinput.c @@ -299,12 +299,6 @@ static HRESULT WINAPI dinput7_CreateDeviceEx( IDirectInput7W *iface, const GUID if (FAILED(hr)) return hr; - if (FAILED(hr = dinput_device_init_device_format( device ))) - { - IDirectInputDevice8_Release( device ); - return hr; - } - hr = IDirectInputDevice8_QueryInterface( device, iid, out ); IDirectInputDevice8_Release( device ); return hr; diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index e8a554142f4..7efae608b5f 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -2022,12 +2022,6 @@ HRESULT hid_joystick_create_device( struct dinput *dinput, const GUID *guid, IDi list_init( &impl->effect_list ); hr = E_OUTOFMEMORY; - preparsed = (struct hid_preparsed_data *)impl->preparsed; - size = preparsed->input_caps_count * sizeof(struct object_properties); - if (!(object_properties = calloc( 1, size ))) goto failed; - impl->base.object_properties = object_properties; - enum_objects( impl, &filter, DIDFT_AXIS | DIDFT_POV, init_object_properties, NULL ); - size = impl->caps.InputReportByteLength; if (!(buffer = malloc( size ))) goto failed; impl->input_report_buf = buffer; @@ -2087,6 +2081,14 @@ HRESULT hid_joystick_create_device( struct dinput *dinput, const GUID *guid, IDi impl->base.caps.dwFFDriverVersion = 1; } + preparsed = (struct hid_preparsed_data *)impl->preparsed; + size = preparsed->input_caps_count * sizeof(struct object_properties); + if (!(object_properties = calloc( 1, size ))) goto failed; + impl->base.object_properties = object_properties; + enum_objects( impl, &filter, DIDFT_AXIS | DIDFT_POV, init_object_properties, NULL ); + + if (FAILED(hr = dinput_device_init_device_format( &impl->base.IDirectInputDevice8W_iface ))) goto failed; + *out = &impl->base.IDirectInputDevice8W_iface; return DI_OK; diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 0dfc909585a..cbcbf94f0f6 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -188,6 +188,7 @@ HRESULT keyboard_enum_device( DWORD type, DWORD flags, DIDEVICEINSTANCEW *instan HRESULT keyboard_create_device( struct dinput *dinput, const GUID *guid, IDirectInputDevice8W **out ) { struct keyboard *impl; + HRESULT hr; TRACE( "dinput %p, guid %s, out %p.\n", dinput, debugstr_guid( guid ), out ); @@ -202,12 +203,16 @@ HRESULT keyboard_create_device( struct dinput *dinput, const GUID *guid, IDirect impl->base.caps.dwDevType = impl->base.instance.dwDevType; impl->base.caps.dwFirmwareRevision = 100; impl->base.caps.dwHardwareRevision = 100; + if (dinput->dwVersion >= 0x0800) impl->base.use_raw_input = TRUE; - if (dinput->dwVersion >= 0x0800) - impl->base.use_raw_input = TRUE; + if (FAILED(hr = dinput_device_init_device_format( &impl->base.IDirectInputDevice8W_iface ))) goto failed; *out = &impl->base.IDirectInputDevice8W_iface; return DI_OK; + +failed: + IDirectInputDevice_Release( &impl->base.IDirectInputDevice8W_iface ); + return hr; } static HRESULT keyboard_poll( IDirectInputDevice8W *iface ) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 9b1bf74b8d5..1c2a66e1bfa 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -107,6 +107,7 @@ HRESULT mouse_create_device( struct dinput *dinput, const GUID *guid, IDirectInp struct mouse *impl; HKEY hkey, appkey; WCHAR buffer[20]; + HRESULT hr; TRACE( "dinput %p, guid %s, out %p\n", dinput, debugstr_guid( guid ), out ); @@ -122,6 +123,7 @@ HRESULT mouse_create_device( struct dinput *dinput, const GUID *guid, IDirectInp impl->base.caps.dwFirmwareRevision = 100; impl->base.caps.dwHardwareRevision = 100; impl->base.dwCoopLevel = DISCL_NONEXCLUSIVE | DISCL_BACKGROUND; + if (dinput->dwVersion >= 0x0800) impl->base.use_raw_input = TRUE; /* One object_properties per axis */ impl->base.object_properties = calloc( 3, sizeof(struct object_properties) ); @@ -132,6 +134,8 @@ HRESULT mouse_create_device( struct dinput *dinput, const GUID *guid, IDirectInp } IDirectInputDevice8_EnumObjects( &impl->base.IDirectInputDevice8W_iface, init_object_properties, impl, DIDFT_RELAXIS ); + if (FAILED(hr = dinput_device_init_device_format( &impl->base.IDirectInputDevice8W_iface ))) goto failed; + get_app_key(&hkey, &appkey); if (!get_config_key( hkey, appkey, L"MouseWarpOverride", buffer, sizeof(buffer) )) { @@ -141,11 +145,12 @@ HRESULT mouse_create_device( struct dinput *dinput, const GUID *guid, IDirectInp if (appkey) RegCloseKey(appkey); if (hkey) RegCloseKey(hkey); - if (dinput->dwVersion >= 0x0800) - impl->base.use_raw_input = TRUE; - *out = &impl->base.IDirectInputDevice8W_iface; return DI_OK; + +failed: + IDirectInputDevice_Release( &impl->base.IDirectInputDevice8W_iface ); + return hr; } void dinput_mouse_rawinput_hook( IDirectInputDevice8W *iface, WPARAM wparam, LPARAM lparam, RAWINPUT *ri )

1 0

Rémi Bernon : imm32/tests: Remove GetLastError check on default IME ImmEscape tests.
by Alexandre Julliard March 21, 2023

March 21, 2023

Module: wine Branch: master Commit: 9ab5fb591fcfbe53bab16754adacc2adf0d27b24 URL: https://gitlab.winehq.org/wine/wine/-/commit/9ab5fb591fcfbe53bab16754adacc2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 21 09:03:16 2023 +0100 imm32/tests: Remove GetLastError check on default IME ImmEscape tests. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=54710 --- dlls/imm32/tests/imm32.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 6f98fb4f645..254b897f3cc 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -3321,11 +3321,8 @@ static void test_ImmEscape( BOOL unicode ) winetest_push_context( unicode ? "unicode" : "ansi" ); - SetLastError( 0xdeadbeef ); ok_ret( 0, ImmEscapeW( hkl, 0, 0, NULL ) ); ok_ret( 0, ImmEscapeA( hkl, 0, 0, NULL ) ); - todo_wine - ok_ret( 0xdeadbeef, GetLastError() ); /* IME_PROP_END_UNLOAD for the IME to unload / reload. */ ime_info.fdwProperty = IME_PROP_END_UNLOAD;

1 0

Rémi Bernon : dinput/tests: Flush messages after creating the test_mouse_keyboard window.
by Alexandre Julliard March 21, 2023

March 21, 2023

Module: wine Branch: master Commit: 01e4c4335a981f420218b5fb68fb405f289e7b67 URL: https://gitlab.winehq.org/wine/wine/-/commit/01e4c4335a981f420218b5fb68fb40… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 21 13:29:28 2023 +0100 dinput/tests: Flush messages after creating the test_mouse_keyboard window. Preventing spurious failures on some Windows 7 VMs. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=54713 --- dlls/dinput/tests/device8.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dinput/tests/device8.c b/dlls/dinput/tests/device8.c index c50f6e4681a..ea0ec8db837 100644 --- a/dlls/dinput/tests/device8.c +++ b/dlls/dinput/tests/device8.c @@ -549,6 +549,7 @@ static void test_mouse_keyboard(void) hwnd = CreateWindowExA(WS_EX_TOPMOST, "static", "dinput", WS_POPUP | WS_VISIBLE, 0, 0, 100, 100, NULL, NULL, NULL, NULL); ok(hwnd != NULL, "CreateWindowExA failed\n"); + flush_events(); hr = CoCreateInstance(&CLSID_DirectInput8, 0, CLSCTX_INPROC_SERVER, &IID_IDirectInput8A, (LPVOID*)&di); if (hr == DIERR_OLDDIRECTINPUTVERSION ||

1 0

Rémi Bernon : imm32/tests: Update ImmGetProperty expectations for Korean locale.
by Alexandre Julliard March 21, 2023

March 21, 2023

Module: wine Branch: master Commit: 067b81fcfa82cd442b0c2542ff4e902fe19869a2 URL: https://gitlab.winehq.org/wine/wine/-/commit/067b81fcfa82cd442b0c2542ff4e90… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 21 09:05:26 2023 +0100 imm32/tests: Update ImmGetProperty expectations for Korean locale. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=54711 --- dlls/imm32/tests/imm32.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 254b897f3cc..301480090cd 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -3062,7 +3062,7 @@ static void test_ImmGetProperty(void) }; static const IMEINFO expect_ime_info_0411 = /* MS Japanese IME */ { - .fdwProperty = IME_PROP_COMPLETE_ON_UNSELECT | IME_PROP_CANDLIST_START_FROM_1 | IME_PROP_UNICODE | IME_PROP_AT_CARET | 0xa, + .fdwProperty = IME_PROP_CANDLIST_START_FROM_1 | IME_PROP_UNICODE | IME_PROP_AT_CARET | 0xa, .fdwConversionCaps = IME_CMODE_NATIVE | IME_CMODE_FULLSHAPE | IME_CMODE_KATAKANA, .fdwSentenceCaps = IME_SMODE_PLAURALCLAUSE | IME_SMODE_CONVERSATION, .fdwSCSCaps = SCS_CAP_COMPSTR | SCS_CAP_SETRECONVERTSTRING | SCS_CAP_MAKEREAD, @@ -3101,7 +3101,8 @@ static void test_ImmGetProperty(void) else if (hkl == (HKL)0x08040804) expect = &expect_ime_info_0804; else expect = &expect_ime_info; - ok_ret( expect->fdwProperty, ImmGetProperty( hkl, IGP_PROPERTY ) ); + /* IME_PROP_COMPLETE_ON_UNSELECT seems to be somtimes set on CJK locales IMEs, sometimes not */ + ok_ret( expect->fdwProperty, ImmGetProperty( hkl, IGP_PROPERTY ) & ~IME_PROP_COMPLETE_ON_UNSELECT ); todo_wine ok_ret( expect->fdwConversionCaps, ImmGetProperty( hkl, IGP_CONVERSION ) ); todo_wine

1 0

Biswapriyo Nath : include: Add IDirectManipulationInteractionEventHandler declaration in directmanipulation.idl.
by Alexandre Julliard March 21, 2023

March 21, 2023

Module: wine Branch: master Commit: 26eb50e4940500280c1c4a81a1cc31a66613fb78 URL: https://gitlab.winehq.org/wine/wine/-/commit/26eb50e4940500280c1c4a81a1cc31… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Tue Mar 21 12:33:47 2023 +0530 include: Add IDirectManipulationInteractionEventHandler declaration in directmanipulation.idl. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> --- include/directmanipulation.idl | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/include/directmanipulation.idl b/include/directmanipulation.idl index b478b16a6b8..a48aa640fd4 100644 --- a/include/directmanipulation.idl +++ b/include/directmanipulation.idl @@ -135,6 +135,17 @@ typedef enum DIRECTMANIPULATION_INPUT_MODE DIRECTMANIPULATION_INPUT_MODE_MANUAL } DIRECTMANIPULATION_INPUT_MODE; +typedef enum DIRECTMANIPULATION_INTERACTION_TYPE +{ + DIRECTMANIPULATION_INTERACTION_BEGIN = 0, + DIRECTMANIPULATION_INTERACTION_TYPE_MANIPULATION = 1, + DIRECTMANIPULATION_INTERACTION_TYPE_GESTURE_TAP = 2, + DIRECTMANIPULATION_INTERACTION_TYPE_GESTURE_HOLD = 3, + DIRECTMANIPULATION_INTERACTION_TYPE_GESTURE_CROSS_SLIDE = 4, + DIRECTMANIPULATION_INTERACTION_TYPE_GESTURE_PINCH_ZOOM = 5, + DIRECTMANIPULATION_INTERACTION_END = 100 +} DIRECTMANIPULATION_INTERACTION_TYPE; + [ local, object, @@ -390,6 +401,18 @@ interface IDirectManipulationCompositor2 : IDirectManipulationCompositor [in] IUnknown *parentVisual, [in] IUnknown *childVisual); } +[ + local, + object, + uuid(e43f45b8-42b4-403e-b1f2-273b8f510830), + pointer_default(unique) +] +interface IDirectManipulationInteractionEventHandler : IUnknown +{ + HRESULT OnInteraction([in] IDirectManipulationViewport2 *viewport, + [in] DIRECTMANIPULATION_INTERACTION_TYPE interaction); +} + [ uuid(9fbedf98-f6d8-4e3b-b488-fa66dbf5e9f3), version(1.0)

1 0

Shaun Ren : quartz: Set filter sync source in FilterGraph2_AddFilter.
by Alexandre Julliard March 21, 2023

March 21, 2023

Module: wine Branch: master Commit: 6992b7623b8f5673c9b5da0fe3b32ef82854dc25 URL: https://gitlab.winehq.org/wine/wine/-/commit/6992b7623b8f5673c9b5da0fe3b32e… Author: Shaun Ren <sren(a)codeweavers.com> Date: Sat Mar 11 14:12:18 2023 -0500 quartz: Set filter sync source in FilterGraph2_AddFilter. --- dlls/quartz/filtergraph.c | 2 ++ dlls/quartz/tests/filtergraph.c | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 437691b5553..8c8f89ce2ac 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -663,6 +663,8 @@ static HRESULT WINAPI FilterGraph2_AddFilter(IFilterGraph2 *iface, return hr; } + IBaseFilter_SetSyncSource(filter, graph->refClock); + IBaseFilter_AddRef(entry->filter = filter); list_add_head(&graph->filters, &entry->entry); diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index d6ce9d31ce2..391f9777175 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -3314,7 +3314,7 @@ static void test_connect_direct(void) static void test_sync_source(void) { - struct testfilter filter1, filter2; + struct testfilter filter1, filter2, filter3; IFilterGraph2 *graph = create_graph(); IReferenceClock *systemclock, *clock; @@ -3326,6 +3326,7 @@ static void test_sync_source(void) testfilter_init(&filter1, NULL, 0); testfilter_init(&filter2, NULL, 0); + testfilter_init(&filter3, NULL, 0); IFilterGraph2_AddFilter(graph, &filter1.IBaseFilter_iface, NULL); IFilterGraph2_AddFilter(graph, &filter2.IBaseFilter_iface, NULL); @@ -3346,10 +3347,14 @@ static void test_sync_source(void) ok(clock == systemclock, "Got clock %p.\n", clock); IReferenceClock_Release(clock); + IFilterGraph2_AddFilter(graph, &filter3.IBaseFilter_iface, NULL); + ok(filter3.clock == systemclock, "Got clock %p.\n", filter3.clock); + hr = IMediaFilter_SetSyncSource(filter, NULL); ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(!filter1.clock, "Got clock %p.\n", filter1.clock); ok(!filter2.clock, "Got clock %p.\n", filter2.clock); + ok(!filter3.clock, "Got clock %p.\n", filter3.clock); hr = IMediaFilter_GetSyncSource(filter, &clock); todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr); @@ -3361,6 +3366,7 @@ static void test_sync_source(void) ok(!ref, "Got outstanding refcount %ld\n", ref); ok(filter1.ref == 1, "Got outstanding refcount %ld.\n", filter1.ref); ok(filter2.ref == 1, "Got outstanding refcount %ld.\n", filter2.ref); + ok(filter3.ref == 1, "Got outstanding refcount %ld.\n", filter3.ref); } #define check_filter_state(a, b) check_filter_state_(__LINE__, a, b)

1 0

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

March 21, 2023

Module: wine Branch: master Commit: 320c688ed3393c688717404941caf09024baa046 URL: https://gitlab.winehq.org/wine/wine/-/commit/320c688ed3393c688717404941caf0… 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 --- 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 March 21, 2023

March 21, 2023

Module: wine Branch: master Commit: fce0baa9b6c19d6763b126d276e119c7998515b2 URL: https://gitlab.winehq.org/wine/wine/-/commit/fce0baa9b6c19d6763b126d276e119… 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 --- 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 : include: Annotate LDAP allocation functions with __WINE_(DEALLOC|MALLOC).
by Alexandre Julliard March 20, 2023

March 20, 2023

Module: wine Branch: master Commit: fd99bd4e247a879e8cb186212d1dc66268aa0888 URL: https://gitlab.winehq.org/wine/wine/-/commit/fd99bd4e247a879e8cb186212d1dc6… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Mar 20 01:09:36 2023 -0600 include: Annotate LDAP allocation functions with __WINE_(DEALLOC|MALLOC). --- include/winldap.h | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/include/winldap.h b/include/winldap.h index 5e744b25baf..0b4037f133e 100644 --- a/include/winldap.h +++ b/include/winldap.h @@ -396,6 +396,14 @@ DECL_WINELIB_TYPE_AW(LDAPAPIFeatureInfo) extern "C" { #endif +void CDECL ldap_memfreeA(char*); +void CDECL ldap_memfreeW(WCHAR*); +#define ldap_memfree WINELIB_NAME_AW(ldap_memfree) +ULONG CDECL ldap_value_freeA(char**); +ULONG CDECL ldap_value_freeW(WCHAR**); +#define ldap_value_free WINELIB_NAME_AW(ldap_value_free) +ULONG CDECL ldap_value_free_len(struct berval**); + LDAP * CDECL cldap_openA(PCHAR,ULONG); LDAP * CDECL cldap_openW(PWCHAR,ULONG); #define cldap_open WINELIB_NAME_AW(cldap_open) @@ -470,8 +478,8 @@ ULONG CDECL ldap_delete_ext_sW(LDAP*,PWCHAR,PLDAPControlW*,PLDAPControlW*); ULONG CDECL ldap_delete_sA(LDAP*,PCHAR); ULONG CDECL ldap_delete_sW(LDAP*,PWCHAR); #define ldap_delete_s WINELIB_NAME_AW(ldap_delete_s) -PCHAR CDECL ldap_dn2ufnA(PCHAR); -PWCHAR CDECL ldap_dn2ufnW(PWCHAR); +char* CDECL ldap_dn2ufnA(char*) __WINE_DEALLOC(ldap_memfreeA) __WINE_MALLOC; +WCHAR* CDECL ldap_dn2ufnW(WCHAR*) __WINE_DEALLOC(ldap_memfreeW) __WINE_MALLOC; #define ldap_dn2ufn WINELIB_NAME_AW(ldap_dn2ufn) ULONG CDECL ldap_encode_sort_controlA(PLDAP,PLDAPSortKeyA*,PLDAPControlA,BOOLEAN); ULONG CDECL ldap_encode_sort_controlW(PLDAP,PLDAPSortKeyW*,PLDAPControlW,BOOLEAN); @@ -482,8 +490,8 @@ PWCHAR CDECL ldap_err2stringW(ULONG); ULONG CDECL ldap_escape_filter_elementA(PCHAR,ULONG,PCHAR,ULONG); ULONG CDECL ldap_escape_filter_elementW(PCHAR,ULONG,PWCHAR,ULONG); #define ldap_escape_filter_element WINELIB_NAME_AW(ldap_escape_filter_element) -PCHAR* CDECL ldap_explode_dnA(PCHAR,ULONG); -PWCHAR* CDECL ldap_explode_dnW(PWCHAR,ULONG); +char** CDECL ldap_explode_dnA(char*,ULONG) __WINE_DEALLOC(ldap_value_freeA); +WCHAR** CDECL ldap_explode_dnW(WCHAR*,ULONG) __WINE_DEALLOC(ldap_value_freeW); #define ldap_explode_dn WINELIB_NAME_AW(ldap_explode_dn) ULONG CDECL ldap_extended_operationA(LDAP*,PCHAR,struct berval*,PLDAPControlA*,PLDAPControlA*,ULONG*); ULONG CDECL ldap_extended_operationW(LDAP*,PWCHAR,struct berval*,PLDAPControlW*,PLDAPControlW*,ULONG*); @@ -508,18 +516,17 @@ ULONG CDECL ldap_get_optionA(LDAP*,int,void*); ULONG CDECL ldap_get_optionW(LDAP*,int,void*); #define ldap_get_option WINELIB_NAME_AW(ldap_get_option) ULONG CDECL ldap_get_paged_count(LDAP*,PLDAPSearch,ULONG*,LDAPMessage*); -PCHAR* CDECL ldap_get_valuesA(LDAP*,LDAPMessage*,PCHAR); -PWCHAR* CDECL ldap_get_valuesW(LDAP*,LDAPMessage*,PWCHAR); +char** CDECL ldap_get_valuesA(LDAP*,LDAPMessage*,char*) __WINE_DEALLOC(ldap_value_freeA); +WCHAR** CDECL ldap_get_valuesW(LDAP*,LDAPMessage*,WCHAR*) __WINE_DEALLOC(ldap_value_freeW); #define ldap_get_values WINELIB_NAME_AW(ldap_get_values) -struct berval ** CDECL ldap_get_values_lenA(LDAP*,LDAPMessage*,PCHAR); -struct berval ** CDECL ldap_get_values_lenW(LDAP*,LDAPMessage*,PWCHAR); +struct berval ** CDECL ldap_get_values_lenA(LDAP*,LDAPMessage*,char*) + __WINE_DEALLOC(ldap_value_free_len); +struct berval ** CDECL ldap_get_values_lenW(LDAP*,LDAPMessage*,WCHAR*) + __WINE_DEALLOC(ldap_value_free_len); #define ldap_get_values_len WINELIB_NAME_AW(ldap_get_values_len) LDAP* CDECL ldap_initA(const PCHAR,ULONG); LDAP* CDECL ldap_initW(const PWCHAR,ULONG); #define ldap_init WINELIB_NAME_AW(ldap_init) -VOID CDECL ldap_memfreeA(PCHAR); -VOID CDECL ldap_memfreeW(PWCHAR); -#define ldap_memfree WINELIB_NAME_AW(ldap_memfree) ULONG CDECL ldap_modifyA(LDAP*,PCHAR,LDAPModA*[]); ULONG CDECL ldap_modifyW(LDAP*,PWCHAR,LDAPModW*[]); #define ldap_modify WINELIB_NAME_AW(ldap_modify) @@ -635,10 +642,6 @@ ULONG CDECL ldap_ufn2dnW(PWCHAR,PWCHAR*); #define ldap_ufn2dn WINELIB_NAME_AW(ldap_ufn2dn) ULONG CDECL ldap_unbind(LDAP*); ULONG CDECL ldap_unbind_s(LDAP*); -ULONG CDECL ldap_value_freeA(PCHAR*); -ULONG CDECL ldap_value_freeW(PWCHAR*); -#define ldap_value_free WINELIB_NAME_AW(ldap_value_free) -ULONG CDECL ldap_value_free_len(struct berval**); void CDECL ber_bvfree(BERVAL*);

1 0