- Wine-Commits - list.winehq.org

Connor McAdams : uiautomationcore: Implement UiaAddEvent.
by Alexandre Julliard May 26, 2023

May 26, 2023

Module: wine Branch: master Commit: 407ce9a1d5b4a51549d2d534a43139c1cb5b01c5 URL: https://gitlab.winehq.org/wine/wine/-/commit/407ce9a1d5b4a51549d2d534a43139… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon May 15 13:44:15 2023 -0400 uiautomationcore: Implement UiaAddEvent. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/Makefile.in | 1 + dlls/uiautomationcore/tests/uiautomation.c | 79 +++++++++++---- dlls/uiautomationcore/uia_classes.idl | 9 ++ dlls/uiautomationcore/uia_client.c | 11 --- dlls/uiautomationcore/uia_event.c | 148 +++++++++++++++++++++++++++++ dlls/uiautomationcore/uia_ids.c | 19 ++++ dlls/uiautomationcore/uia_private.h | 1 + 7 files changed, 237 insertions(+), 31 deletions(-)

1 0

Connor McAdams : uiautomationcore: Implement UiaRemoveEvent.
by Alexandre Julliard May 26, 2023

May 26, 2023

Module: wine Branch: master Commit: 973d00db1b645af37a139a151d443c65fbefd57b URL: https://gitlab.winehq.org/wine/wine/-/commit/973d00db1b645af37a139a151d443c… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon May 15 13:56:05 2023 -0400 uiautomationcore: Implement UiaRemoveEvent. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 37 +++++++++++++++++++----------- dlls/uiautomationcore/uia_client.c | 9 -------- dlls/uiautomationcore/uia_event.c | 24 +++++++++++++++++++ 3 files changed, 47 insertions(+), 23 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 475955e251e..596104484ac 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -13807,7 +13807,7 @@ static DWORD WINAPI uia_add_event_test_thread(LPVOID param) CoInitializeEx(NULL, COINIT_MULTITHREADED); hr = UiaRemoveEvent(data->event); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(Provider.ref == 2, "Unexpected refcnt %ld\n", Provider.ref); ok(Provider2.ref == 1, "Unexpected refcnt %ld\n", Provider2.ref); todo_wine ok(Provider2.last_call_tid == data->exp_thread_id || @@ -13855,7 +13855,18 @@ static void test_UiaAddEvent_args(HUIANODE node) ok(!!event, "event == NULL\n"); hr = UiaRemoveEvent(event); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); +} + +static void test_UiaRemoveEvent_args(HUIANODE node) +{ + HRESULT hr; + + hr = UiaRemoveEvent(NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + + hr = UiaRemoveEvent((HUIAEVENT)node); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); } static void test_UiaAddEvent(void) @@ -13896,6 +13907,7 @@ static void test_UiaAddEvent(void) /* Test valid function input arguments. */ test_UiaAddEvent_args(node); + test_UiaRemoveEvent_args(node); /* * Raise event without any registered event handlers. @@ -13933,10 +13945,9 @@ static void test_UiaAddEvent(void) ok_method_sequence(event_seq3, "event_seq3"); hr = UiaRemoveEvent(event); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(Provider.ref == 2, "Unexpected refcnt %ld\n", Provider.ref); - if (SUCCEEDED(hr)) - ok_method_sequence(event_seq4, "event_seq4"); + ok_method_sequence(event_seq4, "event_seq4"); /* * Register an event on the same node again, except this time we have a @@ -13985,10 +13996,9 @@ static void test_UiaAddEvent(void) method_sequences_enabled = TRUE; hr = UiaRemoveEvent(event); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(Provider.ref == 2, "Unexpected refcnt %ld\n", Provider.ref); - if (SUCCEEDED(hr)) - ok_method_sequence(event_seq4, "event_seq4"); + ok_method_sequence(event_seq4, "event_seq4"); /* Create an event with TreeScope_Children. */ hr = UiaAddEvent(node, UIA_AutomationFocusChangedEventId, uia_event_callback, TreeScope_Children, NULL, 0, &cache_req, @@ -14034,7 +14044,7 @@ static void test_UiaAddEvent(void) set_provider_prop_override(&Provider_child, NULL, 0); hr = UiaRemoveEvent(event); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(Provider.ref == 2, "Unexpected refcnt %ld\n", Provider.ref); /* Create an event with TreeScope_Descendants. */ @@ -14054,7 +14064,7 @@ static void test_UiaAddEvent(void) todo_wine CHECK_CALLED(uia_event_callback); hr = UiaRemoveEvent(event); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(Provider.ref == 2, "Unexpected refcnt %ld\n", Provider.ref); CoUninitialize(); @@ -14122,12 +14132,11 @@ static void test_UiaAddEvent(void) method_sequences_enabled = TRUE; hr = UiaRemoveEvent(event); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(Provider.ref == 2, "Unexpected refcnt %ld\n", Provider.ref); ok(Provider_child.ref == 1, "Unexpected refcnt %ld\n", Provider_child.ref); ok(Provider_child2.ref == 1, "Unexpected refcnt %ld\n", Provider_child2.ref); - if (SUCCEEDED(hr)) - ok_method_sequence(event_seq6, "event_seq6"); + ok_method_sequence(event_seq6, "event_seq6"); UiaNodeRelease(node); ok(Provider.ref == 1, "Unexpected refcnt %ld\n", Provider.ref); @@ -14204,7 +14213,7 @@ static void test_UiaAddEvent(void) todo_wine CHECK_CALLED(uia_event_callback); hr = UiaRemoveEvent(event); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); UiaNodeRelease(node); method_sequences_enabled = TRUE; diff --git a/dlls/uiautomationcore/uia_client.c b/dlls/uiautomationcore/uia_client.c index c8b369fa65b..ced728428a3 100644 --- a/dlls/uiautomationcore/uia_client.c +++ b/dlls/uiautomationcore/uia_client.c @@ -3513,15 +3513,6 @@ exit: return hr; } -/*********************************************************************** - * UiaRemoveEvent (uiautomationcore.@) - */ -HRESULT WINAPI UiaRemoveEvent(HUIAEVENT huiaevent) -{ - FIXME("(%p): stub\n", huiaevent); - return E_NOTIMPL; -} - /*********************************************************************** * UiaEventAddWindow (uiautomationcore.@) */ diff --git a/dlls/uiautomationcore/uia_event.c b/dlls/uiautomationcore/uia_event.c index e1d2585c056..faeb689a3b6 100644 --- a/dlls/uiautomationcore/uia_event.c +++ b/dlls/uiautomationcore/uia_event.c @@ -84,6 +84,14 @@ static const IWineUiaEventVtbl uia_event_vtbl = { uia_event_Release, }; +static struct uia_event *unsafe_impl_from_IWineUiaEvent(IWineUiaEvent *iface) +{ + if (!iface || (iface->lpVtbl != &uia_event_vtbl)) + return NULL; + + return CONTAINING_RECORD(iface, struct uia_event, IWineUiaEvent_iface); +} + static HRESULT create_uia_event(struct uia_event **out_event, int event_id, int scope, UiaEventCallback *cback, SAFEARRAY *runtime_id) { @@ -146,3 +154,19 @@ HRESULT WINAPI UiaAddEvent(HUIANODE huianode, EVENTID event_id, UiaEventCallback return S_OK; } + +/*********************************************************************** + * UiaRemoveEvent (uiautomationcore.@) + */ +HRESULT WINAPI UiaRemoveEvent(HUIAEVENT huiaevent) +{ + struct uia_event *event = unsafe_impl_from_IWineUiaEvent((IWineUiaEvent *)huiaevent); + + TRACE("(%p)\n", event); + + if (!event) + return E_INVALIDARG; + + IWineUiaEvent_Release(&event->IWineUiaEvent_iface); + return S_OK; +}

1 0

Nikolay Sivov : d2d1: Improve resource properties check when creating a bitmap.
by Alexandre Julliard May 26, 2023

May 26, 2023

Module: wine Branch: master Commit: b62f3c881b474a597c3104844fe0c1b04104acb2 URL: https://gitlab.winehq.org/wine/wine/-/commit/b62f3c881b474a597c3104844fe0c1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 26 13:56:36 2023 +0200 d2d1: Improve resource properties check when creating a bitmap. --- dlls/d2d1/device.c | 4 +-- dlls/d2d1/tests/d2d1.c | 80 ++++++++++++++++++++++++++++++++------------------ 2 files changed, 53 insertions(+), 31 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 6b230f717fe..25cbb609b26 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -2097,10 +2097,10 @@ static BOOL d2d_bitmap_check_options_with_surface(unsigned int options, unsigned if (options && (options & D2D1_BITMAP_OPTIONS_TARGET) != (surface_options & D2D1_BITMAP_OPTIONS_TARGET)) return FALSE; + if (!(options & D2D1_BITMAP_OPTIONS_CANNOT_DRAW) && (surface_options & D2D1_BITMAP_OPTIONS_CANNOT_DRAW)) + return FALSE; if (options & D2D1_BITMAP_OPTIONS_TARGET) { - if (!(options & D2D1_BITMAP_OPTIONS_CANNOT_DRAW) && (surface_options & D2D1_BITMAP_OPTIONS_CANNOT_DRAW)) - return FALSE; if (options & D2D1_BITMAP_OPTIONS_GDI_COMPATIBLE && !(surface_options & D2D1_BITMAP_OPTIONS_GDI_COMPATIBLE)) return FALSE; return TRUE; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 3d8f82237a6..6e2b3bb622a 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -13249,6 +13249,24 @@ static void test_bitmap_map(BOOL d3d11) { { D2D1_BITMAP_OPTIONS_CANNOT_DRAW | D2D1_BITMAP_OPTIONS_CPU_READ }, }; + static const struct + { + unsigned int bind_flags; + unsigned int options; + HRESULT hr; + } options_tests[] = + { + { D3D11_BIND_RENDER_TARGET | D3D11_BIND_SHADER_RESOURCE, + D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW }, + { D3D11_BIND_RENDER_TARGET, D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW }, + { D3D11_BIND_RENDER_TARGET | D3D11_BIND_SHADER_RESOURCE, D2D1_BITMAP_OPTIONS_NONE }, + { 0, D2D1_BITMAP_OPTIONS_CANNOT_DRAW }, + + { 0, D2D1_BITMAP_OPTIONS_TARGET, E_INVALIDARG }, + { 0, D2D1_BITMAP_OPTIONS_NONE, E_INVALIDARG }, + { D3D11_BIND_RENDER_TARGET, D2D1_BITMAP_OPTIONS_TARGET, E_INVALIDARG }, + { D3D11_BIND_RENDER_TARGET, D2D1_BITMAP_OPTIONS_NONE, E_INVALIDARG }, + }; D2D1_BITMAP_PROPERTIES1 bitmap_desc; D3D11_TEXTURE2D_DESC texture_desc; ID2D1Bitmap *bitmap2, *bitmap3; @@ -13436,9 +13454,8 @@ static void test_bitmap_map(BOOL d3d11) ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_NONE; hr = ID2D1DeviceContext_CreateBitmapFromDxgiSurface(ctx.context, surface, &bitmap_desc, &bitmap); - todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); - if (SUCCEEDED(hr)) ID2D1Bitmap1_Release(bitmap); + bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW; hr = ID2D1DeviceContext_CreateBitmapFromDxgiSurface(ctx.context, surface, &bitmap_desc, &bitmap); ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); @@ -13454,37 +13471,42 @@ static void test_bitmap_map(BOOL d3d11) ID3D11Texture2D_Release(texture); IDXGISurface_Release(surface); - /* Surface D2D1_BITMAP_OPTIONS_TARGET */ - texture_desc.Width = 4; - texture_desc.Height = 4; - texture_desc.MipLevels = 1; - texture_desc.ArraySize = 1; - texture_desc.Format = DXGI_FORMAT_B8G8R8A8_UNORM; - texture_desc.SampleDesc.Count = 1; - texture_desc.SampleDesc.Quality = 0; - texture_desc.Usage = D3D11_USAGE_DEFAULT; - texture_desc.BindFlags = D3D11_BIND_RENDER_TARGET | D3D11_BIND_SHADER_RESOURCE; - texture_desc.CPUAccessFlags = 0; - texture_desc.MiscFlags = 0; + for (i = 0; i < ARRAY_SIZE(options_tests); ++i) + { + winetest_push_context("Test %u", i); - hr = ID3D11Device_CreateTexture2D(d3d_device, &texture_desc, NULL, &texture); - ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - hr = ID3D11Texture2D_QueryInterface(texture, &IID_IDXGISurface, (void **)&surface); - ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + texture_desc.Width = 4; + texture_desc.Height = 4; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_B8G8R8A8_UNORM; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D11_USAGE_DEFAULT; + texture_desc.BindFlags = options_tests[i].bind_flags; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + hr = ID3D11Device_CreateTexture2D(d3d_device, &texture_desc, NULL, &texture); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID3D11Texture2D_QueryInterface(texture, &IID_IDXGISurface, (void **)&surface); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_CANNOT_DRAW | D2D1_BITMAP_OPTIONS_TARGET; - hr = ID2D1DeviceContext_CreateBitmapFromDxgiSurface(ctx.context, surface, &bitmap_desc, &bitmap); - ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - ID2D1Bitmap1_Release(bitmap); + bitmap = NULL; + bitmap_desc.bitmapOptions = options_tests[i].options; + hr = ID2D1DeviceContext_CreateBitmapFromDxgiSurface(ctx.context, surface, &bitmap_desc, &bitmap); + ok(hr == options_tests[i].hr, "Got unexpected hr %#lx.\n", hr); + if (SUCCEEDED(hr)) + { + check_bitmap_options((ID2D1Bitmap *)bitmap, options_tests[i].options); + ID2D1Bitmap1_Release(bitmap); + } - bitmap_desc.bitmapOptions = 0; - hr = ID2D1DeviceContext_CreateBitmapFromDxgiSurface(ctx.context, surface, &bitmap_desc, &bitmap); - ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - check_bitmap_options((ID2D1Bitmap *)bitmap, 0); - ID2D1Bitmap1_Release(bitmap); + ID3D11Texture2D_Release(texture); + IDXGISurface_Release(surface); - ID3D11Texture2D_Release(texture); - IDXGISurface_Release(surface); + winetest_pop_context(); + } ID3D11Device_Release(d3d_device);

1 0

Connor McAdams : uiautomationcore/tests: Add tests for non-nested node events.
by Alexandre Julliard May 26, 2023

May 26, 2023

Module: wine Branch: master Commit: a3e71d4c4b3e38594a2839cee720533431e38526 URL: https://gitlab.winehq.org/wine/wine/-/commit/a3e71d4c4b3e38594a2839cee72053… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Fri Mar 24 13:45:54 2023 -0400 uiautomationcore/tests: Add tests for non-nested node events. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 605 ++++++++++++++++++++++++++++- 1 file changed, 603 insertions(+), 2 deletions(-)

1 0

Rémi Bernon : imm32: Silence some unnecessary FIXMEs.
by Alexandre Julliard May 26, 2023

May 26, 2023

Module: wine Branch: master Commit: 0e90213ed8961b533cdaad3179f200b5e2a81887 URL: https://gitlab.winehq.org/wine/wine/-/commit/0e90213ed8961b533cdaad3179f200… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 26 17:52:40 2023 +0200 imm32: Silence some unnecessary FIXMEs. --- dlls/imm32/ime.c | 7 +------ dlls/imm32/imm.c | 11 +++-------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/dlls/imm32/ime.c b/dlls/imm32/ime.c index e15367f5fa8..fa8e94acb21 100644 --- a/dlls/imm32/ime.c +++ b/dlls/imm32/ime.c @@ -396,7 +396,6 @@ static LRESULT ime_ui_notify( HIMC himc, HWND hwnd, WPARAM wparam, LPARAM lparam case IMN_WINE_SET_COMP_STRING: return ime_set_comp_string( himc, lparam ); default: - FIXME( "himc %p, hwnd %p, wparam %s, lparam %#Ix stub!\n", hwnd, himc, debugstr_imn(wparam), lparam ); return 0; } } @@ -503,8 +502,7 @@ BOOL WINAPI ImeSelect( HIMC himc, BOOL select ) BOOL WINAPI ImeSetActiveContext( HIMC himc, BOOL flag ) { - static int once; - if (!once++) FIXME( "himc %p, flag %#x stub!\n", himc, flag ); + TRACE( "himc %p, flag %#x stub!\n", himc, flag ); return TRUE; } @@ -661,9 +659,6 @@ BOOL WINAPI NotifyIME( HIMC himc, DWORD action, DWORD index, DWORD value ) } NtUserNotifyIMEStatus( ctx->hWnd, ctx->fOpen ); break; - default: - FIXME( "himc %p, action %#lx, index %#lx, value %#lx stub!\n", himc, action, index, value ); - break; } break; diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index aa1881e0918..c2cd5415e98 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -2337,15 +2337,10 @@ BOOL WINAPI ImmRegisterWordW( HKL hkl, const WCHAR *readingW, DWORD style, const /*********************************************************************** * ImmReleaseContext (IMM32.@) */ -BOOL WINAPI ImmReleaseContext(HWND hWnd, HIMC hIMC) +BOOL WINAPI ImmReleaseContext( HWND hwnd, HIMC himc ) { - static BOOL shown = FALSE; - - if (!shown) { - FIXME("(%p, %p): stub\n", hWnd, hIMC); - shown = TRUE; - } - return TRUE; + TRACE( "hwnd %p, himc %p\n", hwnd, himc ); + return TRUE; } /***********************************************************************

1 0

Connor McAdams : uiautomationcore: Fix maximum ID comparison for uia_{prop,pattern,control}_info_from_id().
by Alexandre Julliard May 26, 2023

May 26, 2023

Module: wine Branch: master Commit: bfdda1c311a9f25628e8c3a4f8de08427853f576 URL: https://gitlab.winehq.org/wine/wine/-/commit/bfdda1c311a9f25628e8c3a4f8de08… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed May 24 15:17:37 2023 -0400 uiautomationcore: Fix maximum ID comparison for uia_{prop,pattern,control}_info_from_id(). Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/uia_ids.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/uiautomationcore/uia_ids.c b/dlls/uiautomationcore/uia_ids.c index d23ba14c333..db4bdccc24a 100644 --- a/dlls/uiautomationcore/uia_ids.c +++ b/dlls/uiautomationcore/uia_ids.c @@ -331,7 +331,7 @@ static const struct uia_prop_info *uia_prop_info_from_guid(const GUID *guid) const struct uia_prop_info *uia_prop_info_from_id(PROPERTYID prop_id) { - if ((prop_id < PROP_ID_MIN) || (prop_id > PROP_ID_MAX)) + if ((prop_id < PROP_ID_MIN) || (prop_id >= PROP_ID_MAX)) return NULL; return &default_uia_properties[prop_id_idx[prop_id - PROP_ID_MIN]]; @@ -520,7 +520,7 @@ static const struct uia_pattern_info *uia_pattern_info_from_guid(const GUID *gui const struct uia_pattern_info *uia_pattern_info_from_id(PATTERNID pattern_id) { - if ((pattern_id < PATTERN_ID_MIN) || (pattern_id > PATTERN_ID_MAX)) + if ((pattern_id < PATTERN_ID_MIN) || (pattern_id >= PATTERN_ID_MAX)) return NULL; return &default_uia_patterns[pattern_id_idx[pattern_id - PATTERN_ID_MIN]]; @@ -596,7 +596,7 @@ static const struct uia_control_type_info *uia_control_type_info_from_guid(const const struct uia_control_type_info *uia_control_type_info_from_id(CONTROLTYPEID control_type_id) { - if ((control_type_id < CONTROL_TYPE_ID_MIN) || (control_type_id > CONTROL_TYPE_ID_MAX)) + if ((control_type_id < CONTROL_TYPE_ID_MIN) || (control_type_id >= CONTROL_TYPE_ID_MAX)) return NULL; return &default_uia_control_types[control_type_id_idx[control_type_id - CONTROL_TYPE_ID_MIN]];

1 0

Gabriel Ivăncescu : mshtml: Implement indexed props for classList.
by Alexandre Julliard May 26, 2023

May 26, 2023

Module: wine Branch: master Commit: 13e94072dd02c85e193f3abe89ff316b5b0d9a07 URL: https://gitlab.winehq.org/wine/wine/-/commit/13e94072dd02c85e193f3abe89ff31… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri May 26 17:04:39 2023 +0300 mshtml: Implement indexed props for classList. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlelem.c | 61 +++++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/dom.js | 33 ++++++++++++++++++++++++ 3 files changed, 94 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 6f3d6c37aa4..21a1ad69254 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -7710,6 +7710,9 @@ static const IWineDOMTokenListVtbl WineDOMTokenListVtbl = { token_list_toString }; +/* idx can be negative, so offset it halfway through custom dispids */ +#define DISPID_TOKENLIST_0 (MSHTML_DISPID_CUSTOM_MIN + (MSHTML_DISPID_CUSTOM_MAX+1 - MSHTML_DISPID_CUSTOM_MIN) / 2) + static inline struct token_list *token_list_from_DispatchEx(DispatchEx *iface) { return CONTAINING_RECORD(iface, struct token_list, dispex); @@ -7736,8 +7739,64 @@ static HRESULT token_list_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPP return S_OK; } +static HRESULT token_list_get_dispid(DispatchEx *dispex, BSTR name, DWORD flags, DISPID *dispid) +{ + WCHAR *end; + LONG idx; + ULONG i; + + idx = wcstol(name, &end, 10); + if(*end) + return DISP_E_UNKNOWNNAME; + + i = idx + DISPID_TOKENLIST_0 - MSHTML_DISPID_CUSTOM_MIN; + if(i > MSHTML_CUSTOM_DISPID_CNT) + return DISP_E_UNKNOWNNAME; + + *dispid = MSHTML_DISPID_CUSTOM_MIN + i; + return S_OK; +} + +static HRESULT token_list_get_name(DispatchEx *dispex, DISPID id, BSTR *name) +{ + LONG idx = id - MSHTML_DISPID_CUSTOM_MIN; + WCHAR buf[12]; + UINT len; + + len = swprintf(buf, ARRAY_SIZE(buf), L"%d", idx); + return (*name = SysAllocStringLen(buf, len)) ? S_OK : E_OUTOFMEMORY; +} + +static HRESULT token_list_invoke(DispatchEx *dispex, DISPID id, LCID lcid, WORD flags, DISPPARAMS *params, + VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) +{ + struct token_list *token_list = token_list_from_DispatchEx(dispex); + + TRACE("(%p)->(%lx %lx %x %p %p %p %p)\n", token_list, id, lcid, flags, params, res, ei, caller); + + switch(flags) { + case DISPATCH_PROPERTYGET: + return token_list_item(&token_list->IWineDOMTokenList_iface, id - DISPID_TOKENLIST_0, res); + case DISPATCH_PROPERTYPUTREF|DISPATCH_PROPERTYPUT: + case DISPATCH_PROPERTYPUTREF: + case DISPATCH_PROPERTYPUT: + /* Ignored by IE */ + return S_OK; + case DISPATCH_METHOD|DISPATCH_PROPERTYGET: + case DISPATCH_METHOD: + return MSHTML_E_NOT_FUNC; + default: + break; + } + + return MSHTML_E_INVALID_ACTION; +} + static const dispex_static_data_vtbl_t token_list_dispex_vtbl = { - token_list_value + token_list_value, + token_list_get_dispid, + token_list_get_name, + token_list_invoke }; static const tid_t token_list_iface_tids[] = { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 8a14d2ee47f..4bc492f7532 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -75,6 +75,7 @@ #define MSHTML_E_INVALID_PROPERTY 0x800a01b6 #define MSHTML_E_INVALID_ACTION 0x800a01bd #define MSHTML_E_NODOC 0x800a025c +#define MSHTML_E_NOT_FUNC 0x800a138a typedef struct DOMEvent DOMEvent; typedef struct HTMLDOMNode HTMLDOMNode; diff --git a/dlls/mshtml/tests/dom.js b/dlls/mshtml/tests/dom.js index 8a60cb2e1e4..4f2d1a5edc5 100644 --- a/dlls/mshtml/tests/dom.js +++ b/dlls/mshtml/tests/dom.js @@ -840,6 +840,39 @@ sync_test("classList", function() { ok(classList.length === 2, "Expected length 2 for className ' testclass foobar ', got " + classList.length); ok(("" + classList) === " testclass foobar ", "Expected classList value ' testclass foobar ', got " + classList); ok(classList.toString() === " testclass foobar ", "Expected classList toString ' testclass foobar ', got " + classList.toString()); + + r = classList[-1]; + ok(r === null, "classList[-1] = " + r); + r = classList[0]; + ok(r === "testclass", "classList[0] = " + r); + r = classList[1]; + ok(r === "foobar", "classList[1] = " + r); + r = classList[2]; + ok(r === null, "classList[2] = " + r); + + classList[0] = "barfoo"; + classList[2] = "added"; + ok(classList.toString() === " testclass foobar ", "Expected classList toString to not be changed after setting indexed props, got " + classList.toString()); + + try + { + classList[0](); + ok(false, "Expected exception calling classList[0]"); + } + catch(e) + { + ok(e.number === 0xa138a - 0x80000000, "Calling classList[0] threw " + e.number); + } + + try + { + new classList[0](); + ok(false, "Expected exception calling classList[0] as constructor"); + } + catch(e) + { + ok(e.number === 0xa01bd - 0x80000000, "Calling classList[0] as constructor threw " + e.number); + } }); sync_test("importNode", function() {

1 0

Gabriel Ivăncescu : mshtml: Implement classList's item() method.
by Alexandre Julliard May 26, 2023

May 26, 2023

Module: wine Branch: master Commit: e807da918ba6014e15000cd6ae364514dca5e88c URL: https://gitlab.winehq.org/wine/wine/-/commit/e807da918ba6014e15000cd6ae3645… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri May 26 17:04:39 2023 +0300 mshtml: Implement classList's item() method. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlelem.c | 47 +++++++++++++++++++++++++++++++++++++++++++++-- dlls/mshtml/tests/dom.js | 13 +++++++++++++ 2 files changed, 58 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index fd3cf149619..6f3d6c37aa4 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -7635,10 +7635,53 @@ static HRESULT WINAPI token_list_get_length(IWineDOMTokenList *iface, LONG *p) static HRESULT WINAPI token_list_item(IWineDOMTokenList *iface, LONG index, VARIANT *p) { struct token_list *token_list = impl_from_IWineDOMTokenList(iface); + BSTR list, token = NULL; + unsigned i = 0; + HRESULT hres; + WCHAR *ptr; - FIXME("(%p)->(%ld %p)\n", token_list, index, p); + TRACE("(%p)->(%ld %p)\n", token_list, index, p); - return E_NOTIMPL; + hres = IHTMLElement_get_className(token_list->element, &list); + if(FAILED(hres)) + return hres; + + if(!list) { + V_VT(p) = VT_NULL; + return S_OK; + } + + ptr = list; + do { + while(iswspace(*ptr)) + ptr++; + if(!*ptr) + break; + if(i == index) { + token = ptr++; + while(*ptr && !iswspace(*ptr)) + ptr++; + token = SysAllocStringLen(token, ptr - token); + if(!token) { + SysFreeString(list); + return E_OUTOFMEMORY; + } + break; + } + i++; + ptr++; + while(*ptr && !iswspace(*ptr)) + ptr++; + } while(*ptr++); + + SysFreeString(list); + if(!token) + V_VT(p) = VT_NULL; + else { + V_VT(p) = VT_BSTR; + V_BSTR(p) = token; + } + return S_OK; } static HRESULT WINAPI token_list_toString(IWineDOMTokenList *iface, BSTR *String) diff --git a/dlls/mshtml/tests/dom.js b/dlls/mshtml/tests/dom.js index 67eb702452d..8a60cb2e1e4 100644 --- a/dlls/mshtml/tests/dom.js +++ b/dlls/mshtml/tests/dom.js @@ -726,6 +726,19 @@ sync_test("classList", function() { ok(classList.contains("b") === true, "contains: expected 'b' to return true"); ok(classList.contains("d") === false, "contains: expected 'd' to return false"); + r = classList.item(-1); + ok(r === null, "item(-1) = " + r); + r = classList.item(0); + ok(r === "a", "item(0) = " + r); + r = classList.item(1); + ok(r === "b", "item(1) = " + r); + r = classList.item(2); + ok(r === "c", "item(2) = " + r); + r = classList.item(3); + ok(r === "4", "item(3) = " + r); + r = classList.item(4); + ok(r === null, "item(4) = " + r); + classList.remove("e"); ok(elem.className === "a b c 4", "remove: expected className 'a b c 4', got " + elem.className);

1 0

Gabriel Ivăncescu : mshtml: Implement classList's length prop.
by Alexandre Julliard May 26, 2023

May 26, 2023

Module: wine Branch: master Commit: 808fcf23c78c30997fc4e44d4b201cf5a3c2ba71 URL: https://gitlab.winehq.org/wine/wine/-/commit/808fcf23c78c30997fc4e44d4b201c… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri May 26 17:04:39 2023 +0300 mshtml: Implement classList's length prop. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlelem.c | 31 +++++++++++++++++++++++++++++-- dlls/mshtml/tests/dom.js | 5 +++++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 807457b087b..fd3cf149619 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -7599,10 +7599,37 @@ static HRESULT WINAPI token_list_contains(IWineDOMTokenList *iface, BSTR token, static HRESULT WINAPI token_list_get_length(IWineDOMTokenList *iface, LONG *p) { struct token_list *token_list = impl_from_IWineDOMTokenList(iface); + unsigned length = 0; + const WCHAR *ptr; + HRESULT hres; + BSTR list; - FIXME("(%p)->(%p)\n", token_list, p); + TRACE("(%p)->(%p)\n", token_list, p); - return E_NOTIMPL; + hres = IHTMLElement_get_className(token_list->element, &list); + if(FAILED(hres)) + return hres; + + if(!list) { + *p = 0; + return S_OK; + } + + ptr = list; + do { + while(iswspace(*ptr)) + ptr++; + if(!*ptr) + break; + length++; + ptr++; + while(*ptr && !iswspace(*ptr)) + ptr++; + } while(*ptr++); + + SysFreeString(list); + *p = length; + return S_OK; } static HRESULT WINAPI token_list_item(IWineDOMTokenList *iface, LONG index, VARIANT *p) diff --git a/dlls/mshtml/tests/dom.js b/dlls/mshtml/tests/dom.js index f373cfb11ea..67eb702452d 100644 --- a/dlls/mshtml/tests/dom.js +++ b/dlls/mshtml/tests/dom.js @@ -635,15 +635,19 @@ sync_test("classList", function() { classList.add("a"); ok(elem.className === "a", "Expected className 'a', got " + elem.className); + ok(classList.length === 1, "Expected length 1 for className 'a', got " + classList.length); classList.add("b"); ok(elem.className === "a b", "Expected className 'a b', got " + elem.className); + ok(classList.length === 2, "Expected length 2 for className 'a b', got " + classList.length); classList.add("c"); ok(elem.className === "a b c", "Expected className 'a b c', got " + elem.className); + ok(classList.length === 3, "Expected length 3 for className 'a b c', got " + classList.length); classList.add(4); ok(elem.className === "a b c 4", "Expected className 'a b c 4', got " + elem.className); + ok(classList.length === 4, "Expected length 4 for className 'a b c 4', got " + classList.length); classList.add("c"); ok(elem.className === "a b c 4", "(2) Expected className 'a b c 4', got " + elem.className); @@ -820,6 +824,7 @@ sync_test("classList", function() { ok(elem.className === "abc", "toggle('123', null): got className " + elem.className); elem.className = " testclass foobar "; + ok(classList.length === 2, "Expected length 2 for className ' testclass foobar ', got " + classList.length); ok(("" + classList) === " testclass foobar ", "Expected classList value ' testclass foobar ', got " + classList); ok(classList.toString() === " testclass foobar ", "Expected classList toString ' testclass foobar ', got " + classList.toString()); });

1 0

Gabriel Ivăncescu : mshtml: Implement classList's toggle() method.
by Alexandre Julliard May 26, 2023

May 26, 2023

Module: wine Branch: master Commit: fcaa9bbedcddac34747359a290e470cace11660c URL: https://gitlab.winehq.org/wine/wine/-/commit/fcaa9bbedcddac34747359a290e470… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri May 26 17:04:39 2023 +0300 mshtml: Implement classList's toggle() method. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlelem.c | 23 ++++++++++---------- dlls/mshtml/tests/dom.js | 56 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 67 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 13941e98ee8..807457b087b 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -7464,7 +7464,7 @@ static const WCHAR *find_token(const WCHAR *list, const WCHAR *token, unsigned i return NULL; } -static HRESULT token_list_add_remove(IWineDOMTokenList *iface, BSTR token, BOOL remove) +static HRESULT token_list_add_remove(IWineDOMTokenList *iface, BSTR token, BOOL remove, VARIANT_BOOL *toggle_ret) { struct token_list *token_list = impl_from_IWineDOMTokenList(iface); unsigned int i, len, old_len, new_len; @@ -7472,7 +7472,7 @@ static HRESULT token_list_add_remove(IWineDOMTokenList *iface, BSTR token, BOOL BSTR new, old; HRESULT hr; - TRACE("iface %p, token %s, remove %#x.\n", iface, debugstr_w(token), remove); + TRACE("token_list %p, token %s, remove %#x, toggle_ret %p.\n", token_list, debugstr_w(token), remove, toggle_ret); len = token ? lstrlenW(token) : 0; if (!len) @@ -7493,8 +7493,13 @@ static HRESULT token_list_add_remove(IWineDOMTokenList *iface, BSTR token, BOOL TRACE("old %s.\n", debugstr_w(old)); - if (((old_pos = find_token(old, token, len)) && !remove) - || (!old_pos && remove)) + old_pos = find_token(old, token, len); + if (toggle_ret) + { + remove = !!old_pos; + *toggle_ret = !remove; + } + else if (!!old_pos != remove) { SysFreeString(old); return S_OK; @@ -7553,21 +7558,17 @@ static HRESULT token_list_add_remove(IWineDOMTokenList *iface, BSTR token, BOOL static HRESULT WINAPI token_list_add(IWineDOMTokenList *iface, BSTR token) { - return token_list_add_remove(iface, token, FALSE); + return token_list_add_remove(iface, token, FALSE, NULL); } static HRESULT WINAPI token_list_remove(IWineDOMTokenList *iface, BSTR token) { - return token_list_add_remove(iface, token, TRUE); + return token_list_add_remove(iface, token, TRUE, NULL); } static HRESULT WINAPI token_list_toggle(IWineDOMTokenList *iface, BSTR token, VARIANT_BOOL *p) { - struct token_list *token_list = impl_from_IWineDOMTokenList(iface); - - FIXME("(%p)->(%s %p)\n", token_list, debugstr_w(token), p); - - return E_NOTIMPL; + return token_list_add_remove(iface, token, FALSE, p); } static HRESULT WINAPI token_list_contains(IWineDOMTokenList *iface, BSTR token, VARIANT_BOOL *p) diff --git a/dlls/mshtml/tests/dom.js b/dlls/mshtml/tests/dom.js index 8f43b924a88..f373cfb11ea 100644 --- a/dlls/mshtml/tests/dom.js +++ b/dlls/mshtml/tests/dom.js @@ -623,7 +623,7 @@ sync_test("hasAttribute", function() { sync_test("classList", function() { var elem = document.createElement("div"); - var classList = elem.classList, i; + var classList = elem.classList, i, r; var props = [ "add", "contains", "item", "length", "remove", "toggle" ]; for(i = 0; i < props.length; i++) @@ -765,6 +765,60 @@ sync_test("classList", function() { classList.remove("b"); ok(elem.className === "", "remove: expected className '', got " + elem.className); + exception = false; + try + { + classList.toggle(); + } + catch(e) + { + exception = true; + } + ok(exception, "Expected exception for classList.toggle()"); + + exception = false; + try + { + classList.toggle(""); + } + catch(e) + { + exception = true; + } + ok(exception, "Expected exception for classList.toggle(\"\")"); + + exception = false; + try + { + classList.toggle("a b"); + } + catch(e) + { + exception = true; + } + ok(exception, "Expected exception for classList.toggle(\"a b\")"); + + // toggle's second arg is not implemented by IE, and ignored + r = classList.toggle("abc"); + ok(r === true, "toggle('abc') returned " + r); + ok(elem.className === "abc", "toggle('abc'): got className " + elem.className); + + r = classList.toggle("def", false); + ok(r === true, "toggle('def', false) returned " + r); + ok(elem.className === "abc def", "toggle('def', false): got className " + elem.className); + + r = classList.toggle("123", 1234); + ok(r === true, "toggle('123', 1234) returned " + r); + ok(elem.className === "abc def 123", "toggle('123', 1234): got className " + elem.className); + + r = classList.toggle("def", true); + ok(r === false, "toggle('def', true) returned " + r); + ok(elem.className === "abc 123", "toggle('def', true): got className " + elem.className); + + r = classList.toggle("123", null); + ok(r === false, "toggle('123', null) returned " + r); + ok(elem.className === "abc", "toggle('123', null): got className " + elem.className); + elem.className = " testclass foobar "; ok(("" + classList) === " testclass foobar ", "Expected classList value ' testclass foobar ', got " + classList); ok(classList.toString() === " testclass foobar ", "Expected classList toString ' testclass foobar ', got " + classList.toString());

1 0