May 2023 - Wine-commits - list.winehq.org

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

26 May '23

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

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

26 May '23

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

Connor McAdams : uiautomationcore: Implement UiaAddEvent.
by Alexandre Julliard 26 May '23

26 May '23

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 26 May '23

26 May '23

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

Connor McAdams : uiautomationcore: Call IRawElementProviderAdviseEvents methods when events are added or removed.
by Alexandre Julliard 26 May '23

26 May '23

Module: wine Branch: master Commit: a5426f6ace6b22ebf794e9e3fcbd2a1a1a24364f URL: https://gitlab.winehq.org/wine/wine/-/commit/a5426f6ace6b22ebf794e9e3fcbd2a… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon May 15 14:12:47 2023 -0400 uiautomationcore: Call IRawElementProviderAdviseEvents methods when events are added or removed. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 30 +++++------ dlls/uiautomationcore/uia_classes.idl | 2 + dlls/uiautomationcore/uia_client.c | 77 ++++++++++++++++++++++++++++ dlls/uiautomationcore/uia_event.c | 82 +++++++++++++++++++++++++----- dlls/uiautomationcore/uia_private.h | 21 ++++++++ 5 files changed, 184 insertions(+), 28 deletions(-)

1 0

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

26 May '23

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

Alexandre Julliard : ntdll: Also update the entry point address when loading an ARM64X binary.
by Alexandre Julliard 26 May '23

26 May '23

Module: wine Branch: master Commit: 30040cc9d7d87338fe00150fec85adf4e01e65d5 URL: https://gitlab.winehq.org/wine/wine/-/commit/30040cc9d7d87338fe00150fec85ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 26 16:52:23 2023 +0200 ntdll: Also update the entry point address when loading an ARM64X binary. --- dlls/ntdll/unix/virtual.c | 5 ++++- include/wine/server_protocol.h | 5 +++-- server/mapping.c | 3 ++- server/protocol.def | 1 + server/request.h | 3 ++- server/trace.c | 1 + 6 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 6835f9cd645..92ee61e6353 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2677,7 +2677,9 @@ static NTSTATUS map_image_into_view( struct file_view *view, const WCHAR *filena (!machine && main_image_info.Machine == IMAGE_FILE_MACHINE_AMD64)) { update_arm64x_mapping( ptr, nt, sections ); - image_info->machine = nt->FileHeader.Machine; /* reload changed machine from NT header */ + /* reload changed data from NT header */ + image_info->machine = nt->FileHeader.Machine; + image_info->entry_point = nt->OptionalHeader.AddressOfEntryPoint; } #endif if (machine && machine != nt->FileHeader.Machine) return STATUS_NOT_SUPPORTED; @@ -2810,6 +2812,7 @@ static NTSTATUS virtual_map_image( HANDLE mapping, void **addr_ptr, SIZE_T *size req->mapping = wine_server_obj_handle( mapping ); req->base = wine_server_client_ptr( view->base ); req->size = size; + req->entry = image_info->entry_point; req->machine = image_info->machine; status = wine_server_call( req ); } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 45a50106408..87626aaf051 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1998,8 +1998,9 @@ struct map_image_view_request obj_handle_t mapping; client_ptr_t base; mem_size_t size; + unsigned int entry; unsigned short machine; - char __pad_34[6]; + char __pad_38[2]; }; struct map_image_view_reply { @@ -6414,7 +6415,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 769 +#define SERVER_PROTOCOL_VERSION 770 /* ### protocol_version end ### */ diff --git a/server/mapping.c b/server/mapping.c index bcb05ec8f8f..e730486ac77 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -1270,7 +1270,8 @@ DECL_HANDLER(map_image_view) view->committed = NULL; view->shared = mapping->shared ? (struct shared_map *)grab_object( mapping->shared ) : NULL; view->image = mapping->image; - view->image.machine = req->machine; + view->image.machine = req->machine; + view->image.entry_point = req->entry; add_process_view( current, view ); if (view->base != mapping->image.base) set_error( STATUS_IMAGE_NOT_AT_BASE ); diff --git a/server/protocol.def b/server/protocol.def index 95ddb1d5011..1c492ea5cc2 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1612,6 +1612,7 @@ enum server_fd_type obj_handle_t mapping; /* file mapping handle */ client_ptr_t base; /* view base address (page-aligned) */ mem_size_t size; /* view size */ + unsigned int entry; /* entry point in mapped view */ unsigned short machine; /* machine in the mapped view */ @END diff --git a/server/request.h b/server/request.h index bb1863b2b85..c7288255aa3 100644 --- a/server/request.h +++ b/server/request.h @@ -1126,7 +1126,8 @@ C_ASSERT( sizeof(struct map_view_request) == 48 ); C_ASSERT( FIELD_OFFSET(struct map_image_view_request, mapping) == 12 ); C_ASSERT( FIELD_OFFSET(struct map_image_view_request, base) == 16 ); C_ASSERT( FIELD_OFFSET(struct map_image_view_request, size) == 24 ); -C_ASSERT( FIELD_OFFSET(struct map_image_view_request, machine) == 32 ); +C_ASSERT( FIELD_OFFSET(struct map_image_view_request, entry) == 32 ); +C_ASSERT( FIELD_OFFSET(struct map_image_view_request, machine) == 36 ); C_ASSERT( sizeof(struct map_image_view_request) == 40 ); C_ASSERT( sizeof(struct map_builtin_view_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct unmap_view_request, base) == 16 ); diff --git a/server/trace.c b/server/trace.c index 93c98b85590..007c0b578f5 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2185,6 +2185,7 @@ static void dump_map_image_view_request( const struct map_image_view_request *re fprintf( stderr, " mapping=%04x", req->mapping ); dump_uint64( ", base=", &req->base ); dump_uint64( ", size=", &req->size ); + fprintf( stderr, ", entry=%08x", req->entry ); fprintf( stderr, ", machine=%04x", req->machine ); }

1 0

Alexandre Julliard : ntdll: Allocate the ARM64EC code map when the first ARM64X binary is loaded.
by Alexandre Julliard 26 May '23

26 May '23

Module: wine Branch: master Commit: 71d9f327f02156a9dff72f02faf494f452a9995f URL: https://gitlab.winehq.org/wine/wine/-/commit/71d9f327f02156a9dff72f02faf494… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 26 17:15:18 2023 +0200 ntdll: Allocate the ARM64EC code map when the first ARM64X binary is loaded. --- dlls/ntdll/unix/env.c | 1 - dlls/ntdll/unix/unix_private.h | 1 - dlls/ntdll/unix/virtual.c | 39 +++++++++++++++++++-------------------- 3 files changed, 19 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 30782a70eb0..fd505a7d2c2 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1869,7 +1869,6 @@ static void init_peb( RTL_USER_PROCESS_PARAMETERS *params, void *module ) break; case IMAGE_FILE_MACHINE_AMD64: if (main_image_info.Machine == current_machine) break; - peb->EcCodeBitMap = virtual_alloc_arm64ec_map(); ERR( "starting %s in experimental ARM64EC mode\n", debugstr_us(&params->ImagePathName) ); break; } diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 2b19b8af3d2..9b69c71209a 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -233,7 +233,6 @@ extern void virtual_free_teb( TEB *teb ) DECLSPEC_HIDDEN; extern NTSTATUS virtual_clear_tls_index( ULONG index ) DECLSPEC_HIDDEN; extern NTSTATUS virtual_alloc_thread_stack( INITIAL_TEB *stack, ULONG_PTR limit, SIZE_T reserve_size, SIZE_T commit_size, BOOL guard_page ) DECLSPEC_HIDDEN; -extern void *virtual_alloc_arm64ec_map(void) DECLSPEC_HIDDEN; extern void virtual_map_user_shared_data(void) DECLSPEC_HIDDEN; extern NTSTATUS virtual_handle_fault( void *addr, DWORD err, void *stack ) DECLSPEC_HIDDEN; extern unsigned int virtual_locked_server_call( void *req_ptr ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 92ee61e6353..2d0dda64249 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2383,6 +2383,23 @@ static NTSTATUS map_pe_header( void *ptr, size_t size, int fd, BOOL *removable ) #ifdef __aarch64__ +/*********************************************************************** + * alloc_arm64ec_map + */ +static void alloc_arm64ec_map(void) +{ + SIZE_T size = ((ULONG_PTR)user_space_limit + page_size) >> (page_shift + 3); /* one bit per page */ + unsigned int status = NtAllocateVirtualMemory( NtCurrentProcess(), (void **)&arm64ec_map, 0, &size, + MEM_COMMIT, PAGE_READWRITE ); + if (status) + { + ERR( "failed to allocate ARM64EC map: %08x\n", status ); + exit(1); + } + peb->EcCodeBitMap = arm64ec_map; +} + + /*********************************************************************** * apply_arm64x_relocations */ @@ -2449,8 +2466,9 @@ static void update_arm64x_mapping( char *base, IMAGE_NT_HEADERS *nt, IMAGE_SECTI if (size <= offsetof( IMAGE_LOAD_CONFIG_DIRECTORY, CHPEMetadataPointer )) return; if (!cfg->CHPEMetadataPointer) return; + if (!arm64ec_map) alloc_arm64ec_map(); metadata = (void *)(base + (cfg->CHPEMetadataPointer - nt->OptionalHeader.ImageBase)); - if (metadata->CodeMap && arm64ec_map) + if (metadata->CodeMap) { const IMAGE_CHPE_RANGE_ENTRY *map = (void *)(base + metadata->CodeMap); @@ -3523,25 +3541,6 @@ done: } -/*********************************************************************** - * virtual_alloc_arm64ec_map - */ -void *virtual_alloc_arm64ec_map(void) -{ -#ifdef __aarch64__ - SIZE_T size = ((ULONG_PTR)user_space_limit + page_size) >> (page_shift + 3); /* one bit per page */ - unsigned int status = NtAllocateVirtualMemory( NtCurrentProcess(), (void **)&arm64ec_map, 0, &size, - MEM_COMMIT, PAGE_READWRITE ); - if (status) - { - ERR( "failed to allocate ARM64EC map: %08x\n", status ); - exit(1); - } -#endif - return arm64ec_map; -} - - /*********************************************************************** * virtual_map_user_shared_data */

1 0

Gabriel Ivăncescu : mshtml: Expose the other remaining props for element.classList.
by Alexandre Julliard 26 May '23

26 May '23

Module: wine Branch: master Commit: ced75455807b9d7ea8b693770db6eb3fb08e1d1d URL: https://gitlab.winehq.org/wine/wine/-/commit/ced75455807b9d7ea8b693770db6eb… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri May 26 17:04:38 2023 +0300 mshtml: Expose the other remaining props for element.classList. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlelem.c | 40 ++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private_iface.idl | 8 ++++++++ dlls/mshtml/tests/dom.js | 10 ++++++++- 3 files changed, 57 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 5cdb74c2051..42572637238 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -7561,6 +7561,42 @@ static HRESULT WINAPI token_list_remove(IWineDOMTokenList *iface, BSTR token) return token_list_add_remove(iface, token, TRUE); } +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; +} + +static HRESULT WINAPI token_list_contains(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; +} + +static HRESULT WINAPI token_list_get_length(IWineDOMTokenList *iface, LONG *p) +{ + struct token_list *token_list = impl_from_IWineDOMTokenList(iface); + + FIXME("(%p)->(%p)\n", token_list, p); + + return E_NOTIMPL; +} + +static HRESULT WINAPI token_list_item(IWineDOMTokenList *iface, LONG index, VARIANT *p) +{ + struct token_list *token_list = impl_from_IWineDOMTokenList(iface); + + FIXME("(%p)->(%ld %p)\n", token_list, index, p); + + return E_NOTIMPL; +} + static HRESULT WINAPI token_list_toString(IWineDOMTokenList *iface, BSTR *String) { struct token_list *token_list = impl_from_IWineDOMTokenList(iface); @@ -7580,6 +7616,10 @@ static const IWineDOMTokenListVtbl WineDOMTokenListVtbl = { token_list_Invoke, token_list_add, token_list_remove, + token_list_toggle, + token_list_contains, + token_list_get_length, + token_list_item, token_list_toString }; diff --git a/dlls/mshtml/mshtml_private_iface.idl b/dlls/mshtml/mshtml_private_iface.idl index 8e4a64bda39..c0bb30fbbc8 100644 --- a/dlls/mshtml/mshtml_private_iface.idl +++ b/dlls/mshtml/mshtml_private_iface.idl @@ -159,6 +159,14 @@ interface IWineDOMTokenList : IDispatch [id(2)] HRESULT remove([in] BSTR token); [id(3)] + HRESULT toggle([in] BSTR token, [retval, out] VARIANT_BOOL *p); + [id(4)] + HRESULT contains([in] BSTR token, [retval, out] VARIANT_BOOL *p); + [propget, id(5)] + HRESULT length([retval, out] LONG *p); + [id(6)] + HRESULT item([in] LONG index, [retval, out] VARIANT *p); + [id(7)] HRESULT toString([retval, out] BSTR *String); } diff --git a/dlls/mshtml/tests/dom.js b/dlls/mshtml/tests/dom.js index e5a07027f7c..85890074431 100644 --- a/dlls/mshtml/tests/dom.js +++ b/dlls/mshtml/tests/dom.js @@ -623,7 +623,15 @@ sync_test("hasAttribute", function() { sync_test("classList", function() { var elem = document.createElement("div"); - var classList = elem.classList; + var classList = elem.classList, i; + + var props = [ "add", "contains", "item", "length", "remove", "toggle" ]; + for(i = 0; i < props.length; i++) + ok(props[i] in classList, props[i] + " not found in classList."); + + props = [ "entries", "forEach", "keys", "replace", "supports", "value", "values"]; + for(i = 0; i < props.length; i++) + ok(!(props[i] in classList), props[i] + " found in classList."); classList.add("a"); ok(elem.className === "a", "Expected className 'a', got " + elem.className);

1 0

Gabriel Ivăncescu : mshtml: Implement classList's contains() method.
by Alexandre Julliard 26 May '23

26 May '23

Module: wine Branch: master Commit: 59f7fbeeb01ac75ad723ffedf6e071f60baf3738 URL: https://gitlab.winehq.org/wine/wine/-/commit/59f7fbeeb01ac75ad723ffedf6e071… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri May 26 17:04:38 2023 +0300 mshtml: Implement classList's contains() method. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlelem.c | 20 ++++++++++++++++++-- dlls/mshtml/tests/dom.js | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 42572637238..13941e98ee8 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -7573,10 +7573,26 @@ static HRESULT WINAPI token_list_toggle(IWineDOMTokenList *iface, BSTR token, VA static HRESULT WINAPI token_list_contains(IWineDOMTokenList *iface, BSTR token, VARIANT_BOOL *p) { struct token_list *token_list = impl_from_IWineDOMTokenList(iface); + unsigned len; + HRESULT hres; + BSTR list; - FIXME("(%p)->(%s %p)\n", token_list, debugstr_w(token), p); + TRACE("(%p)->(%s %p)\n", token_list, debugstr_w(token), p); - return E_NOTIMPL; + if(!token || !*token) + return E_INVALIDARG; + + for(len = 0; token[len]; len++) + if(iswspace(token[len])) + return E_INVALIDARG; + + hres = IHTMLElement_get_className(token_list->element, &list); + if(FAILED(hres)) + return hres; + + *p = find_token(list, token, len) ? VARIANT_TRUE : VARIANT_FALSE; + SysFreeString(list); + return S_OK; } static HRESULT WINAPI token_list_get_length(IWineDOMTokenList *iface, LONG *p) diff --git a/dlls/mshtml/tests/dom.js b/dlls/mshtml/tests/dom.js index 85890074431..8f43b924a88 100644 --- a/dlls/mshtml/tests/dom.js +++ b/dlls/mshtml/tests/dom.js @@ -685,6 +685,43 @@ sync_test("classList", function() { } ok(exception, "Expected exception for classList.add(\"e f\")"); + exception = false; + try + { + classList.contains(); + } + catch(e) + { + exception = true; + } + ok(exception, "Expected exception for classList.contains()"); + + exception = false; + try + { + classList.contains(""); + } + catch(e) + { + exception = true; + } + ok(exception, "Expected exception for classList.contains(\"\")"); + + exception = false; + try + { + classList.contains("a b"); + } + catch(e) + { + exception = true; + } + ok(exception, "Expected exception for classList.contains(\"a b\")"); + + ok(classList.contains("4") === true, "contains: expected '4' to return true"); + ok(classList.contains("b") === true, "contains: expected 'b' to return true"); + ok(classList.contains("d") === false, "contains: expected 'd' to return false"); + classList.remove("e"); ok(elem.className === "a b c 4", "remove: expected className 'a b c 4', got " + elem.className);

1 0