September 2021 - Wine-Commits

Gabriel Ivăncescu : mshtml: Fix out-of-bounds props access.
by Alexandre Julliard Sept. 16, 2021

Sept. 16, 2021

Module: wine Branch: master Commit: 2868e9350a18aa5154cb7772c2f848bb5646bed2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2868e9350a18aa5154cb7772… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Sep 15 16:06:07 2021 +0300 mshtml: Fix out-of-bounds props access. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index c7588006295..64ead8f115c 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -1736,7 +1736,7 @@ static HRESULT WINAPI DispatchEx_DeleteMemberByDispID(IDispatchEx *iface, DISPID DWORD idx = id - DISPID_DYNPROP_0; dynamic_prop_t *prop; - if(!get_dynamic_data(This) || idx > This->dynamic_data->prop_cnt) + if(!get_dynamic_data(This) || idx >= This->dynamic_data->prop_cnt) return S_OK; prop = This->dynamic_data->props + idx;

1 0

Nikolay Sivov : mf/evr: Remove duplicated check in GetStreamSinkCount() (Coverity).
by Alexandre Julliard Sept. 16, 2021

Sept. 16, 2021

Module: wine Branch: master Commit: b14ba22a2c290c449d02f75415506221d7c09352 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b14ba22a2c290c449d02f754… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 16 12:58:49 2021 +0300 mf/evr: Remove duplicated check in GetStreamSinkCount() (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 3 --- dlls/mf/tests/mf.c | 6 ++++++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index a5545c157de..9552990006d 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -1291,9 +1291,6 @@ static HRESULT WINAPI video_renderer_sink_GetStreamSinkCount(IMFMediaSink *iface TRACE("%p, %p.\n", iface, count); - if (!count) - return E_POINTER; - EnterCriticalSection(&renderer->cs); if (renderer->flags & EVR_SHUT_DOWN) hr = MF_E_SHUTDOWN; diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 3dfd852643c..1740e4e36d9 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -4559,6 +4559,12 @@ todo_wine hr = IMFMediaSink_Shutdown(sink); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaSink_GetStreamSinkCount(sink, NULL); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaSink_GetStreamSinkCount(sink, &count); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + hr = IMFRateSupport_GetSlowestRate(rs, MFRATE_FORWARD, FALSE, &rate); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr);

1 0

Henri Verbeet : d2d1: Check the vertex count again after duplicate removal in d2d_path_geometry_triangulate().
by Alexandre Julliard Sept. 16, 2021

Sept. 16, 2021

Module: wine Branch: master Commit: 8718a23b2e5125189eccd0e4e495662e8e4081d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8718a23b2e5125189eccd0e4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 16 16:01:51 2021 +0200 d2d1: Check the vertex count again after duplicate removal in d2d_path_geometry_triangulate(). As the test shows, we can create geometries that have less than two vertices after eliminating duplicates. Calling d2d_cdt_triangulate() on those would lead to infinite recursion. In principle we could now get rid of the original vertex count check, but it seems cheap enough that it's worth keeping in order to avoid some unnecessary work in the somewhat more common case that we have less than three vertices before duplicate removal. Based on a patch by Changsheng Chen. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 7 +++++++ dlls/d2d1/tests/d2d1.c | 22 ++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 6da93de3eb4..c7d0d94f1ad 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -2061,6 +2061,13 @@ static HRESULT d2d_path_geometry_triangulate(struct d2d_geometry *geometry) } } + if (vertex_count < 3) + { + WARN("Geometry has %lu vertices after eliminating duplicates.\n", (long)vertex_count); + heap_free(vertices); + return S_OK; + } + geometry->fill.vertices = vertices; geometry->fill.vertex_count = vertex_count; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 3e2eda8a4a4..d38d49cd139 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -3268,6 +3268,28 @@ static void test_path_geometry(BOOL d3d11) ID2D1PathGeometry_Release(geometry); + /* Degenerate figure. */ + hr = ID2D1Factory_CreatePathGeometry(factory, &geometry); + ok(SUCCEEDED(hr), "Failed to create path geometry, hr %#x.\n", hr); + hr = ID2D1PathGeometry_Open(geometry, &sink); + ok(SUCCEEDED(hr), "Failed to open geometry sink, hr %#x.\n", hr); + set_point(&point, 123.0f, 456.0f); + ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED); + quadratic_to(sink, 123.0f, 456.0f, 123.0f, 456.0f); + quadratic_to(sink, 123.0f, 456.0f, 123.0f, 456.0f); + quadratic_to(sink, 123.0f, 456.0f, 123.0f, 456.0f); + ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED); + hr = ID2D1GeometrySink_Close(sink); + ok(SUCCEEDED(hr), "Failed to close geometry sink, hr %#x.\n", hr); + ID2D1GeometrySink_Release(sink); + hr = ID2D1PathGeometry_GetFigureCount(geometry, &count); + ok(SUCCEEDED(hr), "Failed to get figure count, hr %#x.\n", hr); + ok(count == 1, "Got unexpected figure count %u.\n", count); + hr = ID2D1PathGeometry_GetSegmentCount(geometry, &count); + ok(SUCCEEDED(hr), "Failed to get segment count, hr %#x.\n", hr); + ok(count == 4, "Got unexpected segment count %u.\n", count); + ID2D1PathGeometry_Release(geometry); + /* Close right after Open(). */ hr = ID2D1Factory_CreatePathGeometry(factory, &geometry); ok(SUCCEEDED(hr), "Failed to create path geometry, hr %#x.\n", hr);

1 0

Connor McAdams : oleacc: Check proper GUI thread for window focus.
by Alexandre Julliard Sept. 16, 2021

Sept. 16, 2021

Module: wine Branch: master Commit: fdbb46faf2ab38d4c8b7954f43382ece1594a54c URL: https://source.winehq.org/git/wine.git/?a=commit;h=fdbb46faf2ab38d4c8b7954f… Author: Connor McAdams <conmanx360(a)gmail.com> Date: Thu Sep 16 13:54:17 2021 +0200 oleacc: Check proper GUI thread for window focus. Check for window focus against the current foreground window's thread GUI data rather than the currently executing thread's GUI data. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/client.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 3b33be55a21..0c2215fe62e 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -227,6 +227,7 @@ static HRESULT WINAPI Client_get_accRole(IAccessible *iface, VARIANT varID, VARI static HRESULT WINAPI Client_get_accState(IAccessible *iface, VARIANT varID, VARIANT *pvarState) { Client *This = impl_from_Client(iface); + GUITHREADINFO info; LONG style; TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pvarState); @@ -244,7 +245,9 @@ static HRESULT WINAPI Client_get_accState(IAccessible *iface, VARIANT varID, VAR V_I4(pvarState) |= STATE_SYSTEM_UNAVAILABLE; else if(IsWindow(This->hwnd)) V_I4(pvarState) |= STATE_SYSTEM_FOCUSABLE; - if(GetFocus() == This->hwnd) + + info.cbSize = sizeof(info); + if(GetGUIThreadInfo(0, &info) && info.hwndFocus == This->hwnd) V_I4(pvarState) |= STATE_SYSTEM_FOCUSED; if(!(style & WS_VISIBLE)) V_I4(pvarState) |= STATE_SYSTEM_INVISIBLE;

1 0

Zhiyi Zhang : winemac.drv: Register GUID_DEVINTERFACE_MONITOR interface for monitors.
by Alexandre Julliard Sept. 16, 2021

Sept. 16, 2021

Module: wine Branch: master Commit: 0ed105fb002877932e077913518cadd17d90a266 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ed105fb002877932e077913… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Sep 16 15:11:04 2021 +0800 winemac.drv: Register GUID_DEVINTERFACE_MONITOR interface for monitors. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/display.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 484f658981f..277a19155d8 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -1715,6 +1715,13 @@ static BOOL macdrv_init_monitor(HDEVINFO devinfo, const struct macdrv_monitor *m if (!SetupDiRegisterDeviceInfo(devinfo, &device_data, 0, NULL, NULL, NULL)) goto done; + /* Register GUID_DEVINTERFACE_MONITOR */ + if (!SetupDiCreateDeviceInterfaceW(devinfo, &device_data, &GUID_DEVINTERFACE_MONITOR, NULL, 0, NULL)) + goto done; + + if (!link_device(bufferW, &GUID_DEVINTERFACE_MONITOR)) + goto done; + /* Write HardwareID registry property */ if (!SetupDiSetDeviceRegistryPropertyW(devinfo, &device_data, SPDRP_HARDWAREID, (const BYTE *)monitor_hardware_idW, sizeof(monitor_hardware_idW)))

1 0

Eric Pouech : dbghelp/dwarf: Load the alternate dwarf file content as we do for a regular dwarf module.
by Alexandre Julliard Sept. 16, 2021

Sept. 16, 2021

Module: wine Branch: master Commit: 517f614bc8fedd2866114f83433fc23aefea1b52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=517f614bc8fedd2866114f83… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Sep 16 11:10:10 2021 +0200 dbghelp/dwarf: Load the alternate dwarf file content as we do for a regular dwarf module. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 90 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 54 insertions(+), 36 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index e3d1e35c179..34e59aa3a75 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -191,6 +191,7 @@ typedef struct dwarf2_dwz_alternate_s struct image_file_map* fmap; dwarf2_section_t sections[section_max]; struct image_section_map sectmap[section_max]; + dwarf2_parse_module_context_t module_ctx; } dwarf2_dwz_alternate_t; enum unit_status @@ -3689,6 +3690,41 @@ static void dwarf2_module_remove(struct process* pcs, struct module_format* modf HeapFree(GetProcessHeap(), 0, modfmt); } +static BOOL dwarf2_load_CU_module(dwarf2_parse_module_context_t* module_ctx, struct module* module, + dwarf2_section_t* sections, ULONG_PTR load_offset, + const struct elf_thunk_area* thunks) +{ + dwarf2_traverse_context_t mod_ctx; + unsigned i; + + module_ctx->sections = sections; + module_ctx->module = module; + module_ctx->thunks = thunks; + module_ctx->load_offset = load_offset; + memset(module_ctx->symt_cache, 0, sizeof(module_ctx->symt_cache)); + module_ctx->symt_cache[sc_void] = &symt_new_basic(module_ctx->module, btVoid, "void", 0)->symt; + module_ctx->symt_cache[sc_unknown] = &symt_new_basic(module_ctx->module, btNoType, "# unknown", 0)->symt; + vector_init(&module_ctx->unit_contexts, sizeof(dwarf2_parse_context_t), 16); + module_ctx->cu_versions = 0; + + /* phase I: parse all CU heads */ + mod_ctx.data = sections[section_debug].address; + mod_ctx.end_data = mod_ctx.data + sections[section_debug].size; + while (mod_ctx.data < mod_ctx.end_data) + { + dwarf2_parse_context_t* unit_ctx = vector_add(&module_ctx->unit_contexts, &module_ctx->module->pool); + + unit_ctx->module_ctx = module_ctx; + dwarf2_parse_compilation_unit_head(unit_ctx, &mod_ctx); + } + + /* phase2: load content of all CU */ + for (i = 0; i < module_ctx->unit_contexts.num_elts; ++i) + dwarf2_parse_compilation_unit((dwarf2_parse_context_t*)vector_at(&module_ctx->unit_contexts, i)); + + return TRUE; +} + static dwarf2_dwz_alternate_t* dwarf2_load_dwz(struct image_file_map* fmap, struct module* module) { struct image_file_map* fmap_dwz; @@ -3710,6 +3746,8 @@ static dwarf2_dwz_alternate_t* dwarf2_load_dwz(struct image_file_map* fmap, stru dwarf2_init_section(&dwz->sections[section_line], fmap_dwz, ".debug_line", ".zdebug_line", &dwz->sectmap[section_line]); dwarf2_init_section(&dwz->sections[section_ranges], fmap_dwz, ".debug_ranges", ".zdebug_ranges", &dwz->sectmap[section_ranges]); + dwz->module_ctx.dwz = NULL; + dwarf2_load_CU_module(&dwz->module_ctx, module, dwz->sections, 0/*FIXME*/, NULL); return dwz; } @@ -3732,20 +3770,29 @@ static void dwarf2_unload_dwz(dwarf2_dwz_alternate_t* dwz) HeapFree(GetProcessHeap(), 0, dwz); } +static BOOL dwarf2_unload_CU_module(dwarf2_parse_module_context_t* module_ctx) +{ + unsigned i; + for (i = 0; i < module_ctx->unit_contexts.num_elts; ++i) + { + dwarf2_parse_context_t* unit = vector_at(&module_ctx->unit_contexts, i); + if (unit->status != UNIT_ERROR) + pool_destroy(&unit->pool); + } + dwarf2_unload_dwz(module_ctx->dwz); + return TRUE; +} + BOOL dwarf2_parse(struct module* module, ULONG_PTR load_offset, const struct elf_thunk_area* thunks, struct image_file_map* fmap) { dwarf2_section_t eh_frame, section[section_max]; - dwarf2_traverse_context_t mod_ctx; struct image_section_map debug_sect, debug_str_sect, debug_abbrev_sect, debug_line_sect, debug_ranges_sect, eh_frame_sect; BOOL ret = TRUE; struct module_format* dwarf2_modfmt; dwarf2_parse_module_context_t module_ctx; - unsigned i; - - module_ctx.dwz = dwarf2_load_dwz(fmap, module); if (!dwarf2_init_section(&eh_frame, fmap, ".eh_frame", NULL, &eh_frame_sect)) /* lld produces .eh_fram to avoid generating a long name */ @@ -3798,30 +3845,8 @@ BOOL dwarf2_parse(struct module* module, ULONG_PTR load_offset, dwarf2_modfmt->u.dwarf2_info->cuheads = NULL; dwarf2_modfmt->u.dwarf2_info->num_cuheads = 0; - module_ctx.sections = section; - module_ctx.module = dwarf2_modfmt->module; - module_ctx.thunks = thunks; - module_ctx.load_offset = load_offset; - memset(module_ctx.symt_cache, 0, sizeof(module_ctx.symt_cache)); - module_ctx.symt_cache[sc_void] = &symt_new_basic(module_ctx.module, btVoid, "void", 0)->symt; - module_ctx.symt_cache[sc_unknown] = &symt_new_basic(module_ctx.module, btNoType, "# unknown", 0)->symt; - vector_init(&module_ctx.unit_contexts, sizeof(dwarf2_parse_context_t), 16); - module_ctx.cu_versions = 0; - - /* phase I: parse all CU heads */ - mod_ctx.data = section[section_debug].address; - mod_ctx.end_data = mod_ctx.data + section[section_debug].size; - while (mod_ctx.data < mod_ctx.end_data) - { - dwarf2_parse_context_t* unit_ctx = vector_add(&module_ctx.unit_contexts, &module_ctx.module->pool); - - unit_ctx->module_ctx = &module_ctx; - dwarf2_parse_compilation_unit_head(unit_ctx, &mod_ctx); - } - - /* phase2: load content of all CU */ - for (i = 0; i < module_ctx.unit_contexts.num_elts; ++i) - dwarf2_parse_compilation_unit((dwarf2_parse_context_t*)vector_at(&module_ctx.unit_contexts, i)); + module_ctx.dwz = dwarf2_load_dwz(fmap, module); + dwarf2_load_CU_module(&module_ctx, module, section, load_offset, thunks); dwarf2_modfmt->module->module.SymType = SymDia; /* hide dwarf versions in CVSig @@ -3835,15 +3860,8 @@ BOOL dwarf2_parse(struct module* module, ULONG_PTR load_offset, dwarf2_modfmt->module->module.SourceIndexed = TRUE; dwarf2_modfmt->module->module.Publics = TRUE; - for (i = 0; i < module_ctx.unit_contexts.num_elts; ++i) - { - dwarf2_parse_context_t* unit = vector_at(&module_ctx.unit_contexts, i); - if (unit->status != UNIT_ERROR) - pool_destroy(&unit->pool); - } - + dwarf2_unload_CU_module(&module_ctx); leave: - dwarf2_unload_dwz(module_ctx.dwz); dwarf2_fini_section(&section[section_debug]); dwarf2_fini_section(&section[section_abbrev]);

1 0

Zhiyi Zhang : winemac.drv: Register GUID_DISPLAY_DEVICE_ARRIVAL interface for GPUs.
by Alexandre Julliard Sept. 16, 2021

Sept. 16, 2021

Module: wine Branch: master Commit: 5a804af79b7a86a74377d21f9b44d50faa14345c URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a804af79b7a86a74377d21f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Sep 16 15:10:57 2021 +0800 winemac.drv: Register GUID_DISPLAY_DEVICE_ARRIVAL interface for GPUs. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/display.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 6cb53cb092f..484f658981f 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -1540,6 +1540,13 @@ static BOOL macdrv_init_gpu(HDEVINFO devinfo, const struct macdrv_gpu *gpu, int if (!link_device(instanceW, &GUID_DEVINTERFACE_DISPLAY_ADAPTER)) goto done; + /* Register GUID_DISPLAY_DEVICE_ARRIVAL */ + if (!SetupDiCreateDeviceInterfaceW(devinfo, &device_data, &GUID_DISPLAY_DEVICE_ARRIVAL, NULL, 0, NULL)) + goto done; + + if (!link_device(instanceW, &GUID_DISPLAY_DEVICE_ARRIVAL)) + goto done; + /* Write HardwareID registry property, REG_MULTI_SZ */ written = sprintfW(bufferW, gpu_hardware_id_fmtW, gpu->vendor_id, gpu->device_id); bufferW[written + 1] = 0;

1 0

Nikolay Sivov : mfplay: Remove some dead code (Coverity).
by Alexandre Julliard Sept. 16, 2021

Sept. 16, 2021

Module: wine Branch: master Commit: 8eee81b690ff7119a48c06b1412a0d8897d65860 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8eee81b690ff7119a48c06b1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 16 11:57:48 2021 +0300 mfplay: Remove some dead code (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 959cf701b99..f7832598ae6 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -1884,7 +1884,6 @@ static HRESULT WINAPI media_player_session_events_callback_Invoke(IMFAsyncCallba IMFMediaEvent *session_event; MFP_MEDIAPLAYER_STATE state; HRESULT hr, event_status; - IMFPMediaItem *item = NULL; IMFTopology *topology; unsigned int status; PROPVARIANT value; @@ -1964,9 +1963,6 @@ static HRESULT WINAPI media_player_session_events_callback_Invoke(IMFAsyncCallba ; } - if (item) - IMFPMediaItem_Release(item); - if (event) { media_player_queue_event(player, event);

1 0

Connor McAdams : oleacc: Add STATE_SYSTEM_FOCUSED test for default client object.
by Alexandre Julliard Sept. 16, 2021

Sept. 16, 2021

Module: wine Branch: master Commit: 966e6283dbae70a0a65fa918af5e386a413b5a48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=966e6283dbae70a0a65fa918… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Sep 16 13:54:26 2021 +0200 oleacc: Add STATE_SYSTEM_FOCUSED test for default client object. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/tests/main.c | 68 +++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 59 insertions(+), 9 deletions(-) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index ce44e06abe4..f7504d6af63 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -729,6 +729,38 @@ static void test_AccessibleChildren(IAccessible *acc) ok(V_VT(children+2) == VT_EMPTY, "V_VT(children+2) = %d\n", V_VT(children+2)); } +#define check_acc_state(acc, state) _check_acc_state(__LINE__, acc, state) +static void _check_acc_state(unsigned line, IAccessible *acc, INT state) +{ + VARIANT vid, v; + HRESULT hr; + + V_VT(&vid) = VT_I4; + V_I4(&vid) = CHILDID_SELF; + hr = IAccessible_get_accState(acc, vid, &v); + ok_(__FILE__, line)(hr == S_OK, "got %x\n", hr); + ok_(__FILE__, line)(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); + ok_(__FILE__, line)(V_I4(&v) == state, "V_I4(&v) = %x\n", V_I4(&v)); +} + +static DWORD WINAPI default_client_thread(LPVOID param) +{ + IAccessible *acc = param; + IOleWindow *ow; + HRESULT hr; + HWND hwnd; + + hr = IAccessible_QueryInterface(acc, &IID_IOleWindow, (void**)&ow); + ok(hr == S_OK, "got %x\n", hr); + hr = IOleWindow_GetWindow(ow, &hwnd); + ok(hr == S_OK, "got %x\n", hr); + IOleWindow_Release(ow); + + ShowWindow(hwnd, SW_SHOW); + check_acc_state(acc, STATE_SYSTEM_FOCUSABLE | STATE_SYSTEM_FOCUSED); + return 0; +} + static void test_default_client_accessible_object(void) { IAccessible *acc; @@ -743,6 +775,7 @@ static void test_default_client_accessible_object(void) RECT rect; LONG l, left, top, width, height; ULONG fetched; + HANDLE thread; hwnd = CreateWindowA("oleacc_test", "wnd &t &junk", WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, NULL, NULL, NULL, NULL); @@ -893,13 +926,18 @@ static void test_default_client_accessible_object(void) ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); ok(V_I4(&v) == ROLE_SYSTEM_CLIENT, "V_I4(&v) = %d\n", V_I4(&v)); - V_VT(&v) = VT_DISPATCH; - V_DISPATCH(&v) = (void*)0xdeadbeef; - hr = IAccessible_get_accState(acc, vid, &v); - ok(hr == S_OK, "got %x\n", hr); - ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); - ok(V_I4(&v) == (STATE_SYSTEM_FOCUSABLE|STATE_SYSTEM_INVISIBLE), - "V_I4(&v) = %x\n", V_I4(&v)); + check_acc_state(acc, STATE_SYSTEM_FOCUSABLE | STATE_SYSTEM_INVISIBLE); + SetFocus(hwnd); + if (GetForegroundWindow() != hwnd) + { + todo_wine ok(0, "incorrect foreground window\n"); + SetForegroundWindow(hwnd); + } + check_acc_state(acc, STATE_SYSTEM_FOCUSABLE | STATE_SYSTEM_INVISIBLE | + STATE_SYSTEM_FOCUSED); + ShowWindow(hwnd, SW_SHOW); + check_acc_state(acc, STATE_SYSTEM_FOCUSABLE | STATE_SYSTEM_FOCUSED); + ShowWindow(hwnd, SW_HIDE); str = (void*)0xdeadbeef; hr = IAccessible_get_accHelp(acc, vid, &str); @@ -925,7 +963,7 @@ static void test_default_client_accessible_object(void) ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); ok(V_I4(&v) == 0, "V_I4(&v) = %d\n", V_I4(&v)); - ShowWindow(hwnd, TRUE); + ShowWindow(hwnd, SW_SHOW); pt.x = pt.y = 60; ok(ClientToScreen(hwnd, &pt), "ClientToScreen failed\n"); hr = IAccessible_accHitTest(acc, pt.x, pt.y, &v); @@ -941,7 +979,7 @@ static void test_default_client_accessible_object(void) ok(V_DISPATCH(&v) != NULL, "V_DISPATCH(&v) = %p\n", V_DISPATCH(&v)); VariantClear(&v); - ShowWindow(chld, FALSE); + ShowWindow(chld, SW_HIDE); pt.x = pt.y = 25; ok(ClientToScreen(hwnd, &pt), "ClientToScreen failed\n"); hr = IAccessible_accHitTest(acc, pt.x, pt.y, &v); @@ -970,6 +1008,18 @@ static void test_default_client_accessible_object(void) ok(width == pt.x-rect.left, "width = %d, expected %d\n", width, pt.x-rect.left); ok(height == pt.y-rect.top, "height = %d, expected %d\n", height, pt.y-rect.top); + thread = CreateThread(NULL, 0, default_client_thread, (void *)acc, 0, NULL); + while(MsgWaitForMultipleObjects(1, &thread, FALSE, INFINITE, QS_ALLINPUT) != WAIT_OBJECT_0) + { + MSG msg; + while(PeekMessageW(&msg, 0, 0, 0, PM_REMOVE)) + { + TranslateMessage(&msg); + DispatchMessageW(&msg); + } + } + CloseHandle(thread); + DestroyWindow(hwnd); hr = IAccessible_get_accChildCount(acc, &l);

1 0

Connor McAdams : oleacc: Add tests for AccessibleObjectFromEvent.
by Alexandre Julliard Sept. 16, 2021

Sept. 16, 2021

Module: wine Branch: master Commit: c33618ffdda4464959765df92e5233ddd6033a34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c33618ffdda4464959765df9… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Sep 16 15:30:06 2021 +0200 oleacc: Add tests for AccessibleObjectFromEvent. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Connor Mcadams <cmcadams(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/tests/main.c | 170 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 162 insertions(+), 8 deletions(-) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index f7504d6af63..97fc625ac8b 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -53,6 +53,10 @@ DEFINE_EXPECT(Accessible_QI_IEnumVARIANT); DEFINE_EXPECT(Accessible_get_accChildCount); DEFINE_EXPECT(Accessible_get_accChild); +DEFINE_EXPECT(Accessible_get_accName); +DEFINE_EXPECT(Accessible_get_accParent); +DEFINE_EXPECT(Accessible_child_get_accName); +DEFINE_EXPECT(Accessible_child_get_accParent); static HANDLE (WINAPI *pGetProcessHandleFromHwnd)(HWND); @@ -69,16 +73,39 @@ static BOOL init(void) return TRUE; } +static BOOL iface_cmp(IUnknown *iface1, IUnknown *iface2) +{ + IUnknown *unk1, *unk2; + + if(iface1 == iface2) + return TRUE; + + IUnknown_QueryInterface(iface1, &IID_IUnknown, (void**)&unk1); + IUnknown_Release(unk1); + IUnknown_QueryInterface(iface2, &IID_IUnknown, (void**)&unk2); + IUnknown_Release(unk2); + return unk1 == unk2; +} + +static IAccessible Accessible_child; + static HRESULT WINAPI Accessible_QueryInterface( IAccessible *iface, REFIID riid, void **ppvObject) { + if(IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IDispatch) || + IsEqualIID(riid, &IID_IAccessible)) { + IAccessible_AddRef(iface); + *ppvObject = iface; + return S_OK; + } + if(IsEqualIID(riid, &IID_IEnumVARIANT)) { CHECK_EXPECT(Accessible_QI_IEnumVARIANT); return E_NOINTERFACE; } - ok(0, "unexpected QI call: %s\n", wine_dbgstr_guid(riid)); - return E_NOTIMPL; + return E_NOINTERFACE; } static ULONG WINAPI Accessible_AddRef(IAccessible *iface) @@ -123,7 +150,11 @@ static HRESULT WINAPI Accessible_Invoke(IAccessible *iface, DISPID dispIdMember, static HRESULT WINAPI Accessible_get_accParent( IAccessible *iface, IDispatch **ppdispParent) { - ok(0, "unexpected call\n"); + if(iface == &Accessible_child) + CHECK_EXPECT(Accessible_child_get_accParent); + else + CHECK_EXPECT(Accessible_get_accParent); + return E_NOTIMPL; } @@ -140,17 +171,38 @@ static HRESULT WINAPI Accessible_get_accChild(IAccessible *iface, { CHECK_EXPECT(Accessible_get_accChild); ok(V_VT(&varChildID) == VT_I4, "V_VT(&varChildID) = %d\n", V_VT(&varChildID)); - ok(V_I4(&varChildID) == 1, "V_I4(&varChildID) = %d\n", V_I4(&varChildID)); - *ppdispChild = NULL; - return S_OK; + switch(V_I4(&varChildID)) + { + case 1: + *ppdispChild = NULL; + return S_OK; + case 2: + *ppdispChild = NULL; + return S_FALSE; + case 3: + *ppdispChild = (IDispatch*)&Accessible_child; + return S_OK; + case 4: + *ppdispChild = (IDispatch*)&Accessible_child; + return S_FALSE; + default: + ok(0, "unexpected call\n"); + return E_NOTIMPL; + } } static HRESULT WINAPI Accessible_get_accName(IAccessible *iface, VARIANT varID, BSTR *pszName) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + + if(iface == &Accessible_child) + CHECK_EXPECT(Accessible_child_get_accName); + else + CHECK_EXPECT(Accessible_get_accName); + + ok(!pszName, "pszName != NULL\n"); + return E_INVALIDARG; } static HRESULT WINAPI Accessible_get_accValue(IAccessible *iface, @@ -303,6 +355,7 @@ static IAccessibleVtbl AccessibleVtbl = { }; static IAccessible Accessible = {&AccessibleVtbl}; +static IAccessible Accessible_child = {&AccessibleVtbl}; static void test_getroletext(void) { @@ -490,6 +543,8 @@ static HRESULT WINAPI Object_QueryInterface(IUnknown *iface, REFIID riid, void * IUnknown_AddRef(iface); return S_OK; } + /* on Win7 AccessibleObjectFromEvent doesn't check return value */ + *ppv = NULL; return E_NOINTERFACE; } @@ -567,6 +622,8 @@ static LRESULT WINAPI test_window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARA return LresultFromObject(&IID_IUnknown, wparam, &Object); if(lparam == (DWORD)OBJID_WINDOW) return 0; + if(lparam == 1) + return LresultFromObject(&IID_IUnknown, wparam, (IUnknown*)&Accessible); ok(0, "unexpected (%ld)\n", lparam); return 0; @@ -621,6 +678,102 @@ static void test_AccessibleObjectFromWindow(void) DestroyWindow(hwnd); } +static void test_AccessibleObjectFromEvent(void) +{ + IAccessible *acc; + VARIANT cid; + HRESULT hr; + HWND hwnd; + + hwnd = CreateWindowA("oleacc_test", "test", WS_OVERLAPPEDWINDOW, + 0, 0, 0, 0, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindow failed\n"); + + hr = AccessibleObjectFromEvent(NULL, OBJID_CLIENT, CHILDID_SELF, &acc, &cid); + ok(hr == E_FAIL, "got %#x\n", hr); + + hr = AccessibleObjectFromEvent(hwnd, OBJID_CLIENT, CHILDID_SELF, NULL, &cid); + ok(hr == E_INVALIDARG, "got %#x\n", hr); + + acc = (IAccessible*)0xdeadbeef; + V_VT(&cid) = VT_UNKNOWN; + V_UNKNOWN(&cid) = (IUnknown*)0xdeadbeef; + hr = AccessibleObjectFromEvent(hwnd, OBJID_CLIENT, CHILDID_SELF, &acc, &cid); + ok(hr == E_NOINTERFACE || broken(hr == S_OK), "got %#x\n", hr); + if (hr == S_OK) + IAccessible_Release(acc); + else + { + ok(acc == NULL, "Unexpected acc %p\n", acc); + ok(V_VT(&cid) == VT_EMPTY, "got %#x, expected %#x\n", V_VT(&cid), VT_I4); + } + + hr = AccessibleObjectFromEvent(hwnd, OBJID_CURSOR, CHILDID_SELF, &acc, &cid); + ok(hr == E_UNEXPECTED, "got %#x\n", hr); + + SET_EXPECT(Accessible_get_accChild); + hr = AccessibleObjectFromEvent(hwnd, 1, 1, &acc, &cid); + CHECK_CALLED(Accessible_get_accChild); + ok(hr == S_OK, "got %#x\n", hr); + todo_wine ok(!iface_cmp((IUnknown*)acc, (IUnknown*)&Accessible), "acc == &Accessible\n"); + ok(V_VT(&cid) == VT_I4, "got %#x, expected %#x\n", V_VT(&cid), VT_I4); + ok(V_I4(&cid) == 1, "got %#x, expected %#x\n", V_I4(&cid), CHILDID_SELF); + SET_EXPECT(Accessible_get_accParent); + SET_EXPECT(Accessible_get_accName); + V_I4(&cid) = 0; + hr = IAccessible_get_accName(acc, cid, NULL); + ok(hr == E_INVALIDARG, "get_accName returned %x\n", hr); + todo_wine CHECK_CALLED(Accessible_get_accParent); + CHECK_CALLED(Accessible_get_accName); + IAccessible_Release(acc); + + SET_EXPECT(Accessible_get_accChild); + hr = AccessibleObjectFromEvent(hwnd, 1, 2, &acc, &cid); + CHECK_CALLED(Accessible_get_accChild); + ok(hr == S_OK, "got %#x\n", hr); + todo_wine ok(!iface_cmp((IUnknown*)acc, (IUnknown*)&Accessible), "acc == &Accessible\n"); + ok(V_VT(&cid) == VT_I4, "got %#x, expected %#x\n", V_VT(&cid), VT_I4); + ok(V_I4(&cid) == 2, "got %#x, expected %#x\n", V_I4(&cid), CHILDID_SELF); + SET_EXPECT(Accessible_get_accParent); + SET_EXPECT(Accessible_get_accName); + V_I4(&cid) = 0; + hr = IAccessible_get_accName(acc, cid, NULL); + ok(hr == E_INVALIDARG, "get_accName returned %x\n", hr); + todo_wine CHECK_CALLED(Accessible_get_accParent); + CHECK_CALLED(Accessible_get_accName); + IAccessible_Release(acc); + + SET_EXPECT(Accessible_get_accChild); + hr = AccessibleObjectFromEvent(hwnd, 1, 3, &acc, &cid); + CHECK_CALLED(Accessible_get_accChild); + ok(hr == S_OK, "got %#x\n", hr); + todo_wine ok(!iface_cmp((IUnknown*)acc, (IUnknown*)&Accessible_child), "acc == &Accessible_child\n"); + ok(V_VT(&cid) == VT_I4, "got %#x, expected %#x\n", V_VT(&cid), VT_I4); + ok(V_I4(&cid) == 0, "got %#x, expected %#x\n", V_I4(&cid), CHILDID_SELF); + SET_EXPECT(Accessible_child_get_accParent); + SET_EXPECT(Accessible_child_get_accName); + hr = IAccessible_get_accName(acc, cid, NULL); + ok(hr == E_INVALIDARG, "get_accName returned %x\n", hr); + todo_wine CHECK_CALLED(Accessible_child_get_accParent); + CHECK_CALLED(Accessible_child_get_accName); + IAccessible_Release(acc); + + SET_EXPECT(Accessible_get_accChild); + hr = AccessibleObjectFromEvent(hwnd, 1, 4, &acc, &cid); + CHECK_CALLED(Accessible_get_accChild); + ok(hr == S_OK, "got %#x\n", hr); + ok(acc == &Accessible_child, "acc != &Accessible_child\n"); + ok(V_VT(&cid) == VT_I4, "got %#x, expected %#x\n", V_VT(&cid), VT_I4); + ok(V_I4(&cid) == 0, "got %#x, expected %#x\n", V_I4(&cid), CHILDID_SELF); + SET_EXPECT(Accessible_child_get_accName); + hr = IAccessible_get_accName(acc, cid, NULL); + ok(hr == E_INVALIDARG, "get_accName returned %x\n", hr); + CHECK_CALLED(Accessible_child_get_accName); + IAccessible_Release(acc); + + DestroyWindow(hwnd); +} + static void test_GetProcessHandleFromHwnd(void) { HANDLE proc; @@ -1111,6 +1264,7 @@ START_TEST(main) test_GetProcessHandleFromHwnd(); test_default_client_accessible_object(); test_AccessibleChildren(&Accessible); + test_AccessibleObjectFromEvent(); unregister_window_class(); CoUninitialize();

1 0