November 2021 - Wine-commits

Piotr Caban : msvcp140: Fix _Winerror_map test failures.
by Alexandre Julliard 19 Nov '21

19 Nov '21

Module: wine Branch: master Commit: c90d72588e65916f29694f9b56f060281e3ee276 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c90d72588e65916f29694f9b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 19 13:26:25 2021 +0100 msvcp140: Fix _Winerror_map test failures. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/tests/msvcp140.c | 5 +++-- dlls/msvcp90/misc.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 31c8cfc4f59..c79e425190b 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -1270,6 +1270,7 @@ static void test__Winerror_map(void) static struct { int winerr, doserr; BOOL broken; + int broken_doserr; } tests[] = { {ERROR_INVALID_FUNCTION, ENOSYS}, {ERROR_FILE_NOT_FOUND, ENOENT}, {ERROR_PATH_NOT_FOUND, ENOENT}, {ERROR_TOO_MANY_OPEN_FILES, EMFILE}, @@ -1285,7 +1286,7 @@ static void test__Winerror_map(void) {ERROR_FILE_EXISTS, EEXIST}, {ERROR_CANNOT_MAKE, EACCES}, {ERROR_INVALID_PARAMETER, EINVAL, TRUE}, {ERROR_OPEN_FAILED, EIO}, {ERROR_BUFFER_OVERFLOW, ENAMETOOLONG}, {ERROR_DISK_FULL, ENOSPC}, - {ERROR_INVALID_NAME, EINVAL}, {ERROR_NEGATIVE_SEEK, EINVAL}, + {ERROR_INVALID_NAME, ENOENT, TRUE, EINVAL}, {ERROR_NEGATIVE_SEEK, EINVAL}, {ERROR_BUSY_DRIVE, EBUSY}, {ERROR_DIR_NOT_EMPTY, ENOTEMPTY}, {ERROR_BUSY, EBUSY}, {ERROR_ALREADY_EXISTS, EEXIST}, {ERROR_LOCKED, ENOLCK}, {ERROR_DIRECTORY, EINVAL}, @@ -1313,7 +1314,7 @@ static void test__Winerror_map(void) for(i=0; i<ARRAY_SIZE(tests); i++) { ret = p__Winerror_map(tests[i].winerr); - ok(ret == tests[i].doserr || broken(tests[i].broken && !ret), + ok(ret == tests[i].doserr || broken(tests[i].broken && ret == tests[i].broken_doserr), "_Winerror_map(%d) returned %d, expected %d\n", tests[i].winerr, ret, tests[i].doserr); } diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 5376d4f2da1..2d309911f10 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -216,7 +216,7 @@ static const struct { {ERROR_FILE_EXISTS, EEXIST}, {ERROR_CANNOT_MAKE, EACCES}, {ERROR_INVALID_PARAMETER, EINVAL}, {ERROR_OPEN_FAILED, EIO}, {ERROR_BUFFER_OVERFLOW, ENAMETOOLONG}, {ERROR_DISK_FULL, ENOSPC}, - {ERROR_INVALID_NAME, EINVAL}, {ERROR_NEGATIVE_SEEK, EINVAL}, + {ERROR_INVALID_NAME, ENOENT}, {ERROR_NEGATIVE_SEEK, EINVAL}, {ERROR_BUSY_DRIVE, EBUSY}, {ERROR_DIR_NOT_EMPTY, ENOTEMPTY}, {ERROR_BUSY, EBUSY}, {ERROR_ALREADY_EXISTS, EEXIST}, {ERROR_LOCKED, ENOLCK}, {ERROR_DIRECTORY, EINVAL},

1 0

Piotr Caban : msvcrt: Skip small-block heap tests if _set_sbh_threshold is not available.
by Alexandre Julliard 19 Nov '21

19 Nov '21

Module: wine Branch: master Commit: acc7907dc973ce0e2fe615a0726bafdd13eb4754 URL: https://source.winehq.org/git/wine.git/?a=commit;h=acc7907dc973ce0e2fe615a0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 19 13:46:12 2021 +0100 msvcrt: Skip small-block heap tests if _set_sbh_threshold is not available. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49181 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/heap.c | 41 ++++++++++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 15 deletions(-) diff --git a/dlls/msvcrt/tests/heap.c b/dlls/msvcrt/tests/heap.c index 6745aeea768..a747482130d 100644 --- a/dlls/msvcrt/tests/heap.c +++ b/dlls/msvcrt/tests/heap.c @@ -23,11 +23,13 @@ #include <errno.h> #include "wine/test.h" -static void (__cdecl *p_aligned_free)(void*) = NULL; -static void * (__cdecl *p_aligned_malloc)(size_t,size_t) = NULL; -static void * (__cdecl *p_aligned_offset_malloc)(size_t,size_t,size_t) = NULL; -static void * (__cdecl *p_aligned_realloc)(void*,size_t,size_t) = NULL; -static void * (__cdecl *p_aligned_offset_realloc)(void*,size_t,size_t,size_t) = NULL; +static void (__cdecl *p_aligned_free)(void*); +static void * (__cdecl *p_aligned_malloc)(size_t,size_t); +static void * (__cdecl *p_aligned_offset_malloc)(size_t,size_t,size_t); +static void * (__cdecl *p_aligned_realloc)(void*,size_t,size_t); +static void * (__cdecl *p_aligned_offset_realloc)(void*,size_t,size_t,size_t); +static int (__cdecl *p__set_sbh_threshold)(size_t); +static size_t (__cdecl *p__get_sbh_threshold)(void); static void test_aligned_malloc(unsigned int size, unsigned int alignment) { @@ -415,28 +417,37 @@ static void test_aligned(void) static void test_sbheap(void) { + HMODULE msvcrt = GetModuleHandleA("msvcrt.dll"); void *mem; int threshold; + p__set_sbh_threshold = (void*)GetProcAddress(msvcrt, "_set_sbh_threshold"); + p__get_sbh_threshold = (void*)GetProcAddress(msvcrt, "_get_sbh_threshold"); + if (!p__set_sbh_threshold || !p__get_sbh_threshold) + { + win_skip("_set_sbh_threshold not available\n"); + return; + } + if(sizeof(void*) == 8) { - ok(!_set_sbh_threshold(0), "_set_sbh_threshold succeeded\n"); - ok(!_set_sbh_threshold(1000), "_set_sbh_threshold succeeded\n"); + ok(!p__set_sbh_threshold(0), "_set_sbh_threshold succeeded\n"); + ok(!p__set_sbh_threshold(1000), "_set_sbh_threshold succeeded\n"); return; } mem = malloc(1); ok(mem != NULL, "malloc failed\n"); - ok(_set_sbh_threshold(1), "_set_sbh_threshold failed\n"); - threshold = _get_sbh_threshold(); + ok(p__set_sbh_threshold(1), "_set_sbh_threshold failed\n"); + threshold = p__get_sbh_threshold(); ok(threshold == 16, "threshold = %d\n", threshold); - ok(_set_sbh_threshold(8), "_set_sbh_threshold failed\n"); - threshold = _get_sbh_threshold(); + ok(p__set_sbh_threshold(8), "_set_sbh_threshold failed\n"); + threshold = p__get_sbh_threshold(); ok(threshold == 16, "threshold = %d\n", threshold); - ok(_set_sbh_threshold(1000), "_set_sbh_threshold failed\n"); - threshold = _get_sbh_threshold(); + ok(p__set_sbh_threshold(1000), "_set_sbh_threshold failed\n"); + threshold = p__get_sbh_threshold(); ok(threshold == 1008, "threshold = %d\n", threshold); free(mem); @@ -449,8 +460,8 @@ static void test_sbheap(void) ok(mem != NULL, "realloc failed\n"); ok(!((UINT_PTR)mem & 0xf), "incorrect alignment (%p)\n", mem); - ok(_set_sbh_threshold(0), "_set_sbh_threshold failed\n"); - threshold = _get_sbh_threshold(); + ok(p__set_sbh_threshold(0), "_set_sbh_threshold failed\n"); + threshold = p__get_sbh_threshold(); ok(threshold == 0, "threshold = %d\n", threshold); free(mem);

1 0

Piotr Caban : ucrtbase: Fix fma test failures.
by Alexandre Julliard 19 Nov '21

19 Nov '21

Module: wine Branch: master Commit: 1939528dab19ad769a4a5c6a4cbb02dfa479f6cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=1939528dab19ad769a4a5c6a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 19 13:54:26 2021 +0100 ucrtbase: Fix fma test failures. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51895 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 60f569c69ff..5f2a0992f2e 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -799,7 +799,7 @@ static void test_math_errors(void) errno = -1; exception.type = -1; p_func3d(tests3d[i].a, tests3d[i].b, tests3d[i].c); - ok(errno == tests3d[i].error, + ok(errno == tests3d[i].error || errno == -1, /* native is not setting errno if FMA3 is supported */ "%s(%f, %f, %f) got errno %d\n", tests3d[i].func, tests3d[i].a, tests3d[i].b, tests3d[i].c, errno); ok(exception.type == tests3d[i].exception, "%s(%f, %f, %f) got exception type %d\n", tests3d[i].func, tests3d[i].a, tests3d[i].b, tests3d[i].c, exception.type);

1 0

Andrey Gusev : wined3d: Add WINED3DFMT_R16_FLOAT vertex format.
by Alexandre Julliard 19 Nov '21

19 Nov '21

Module: wine Branch: master Commit: 4f3d189f539ea0c9831ca3a19b49e21220830574 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f3d189f539ea0c9831ca3a1… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Nov 19 14:37:21 2021 +0100 wined3d: Add WINED3DFMT_R16_FLOAT vertex format. Fixes rendering glitches in Batman: Arkham Knight. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 2 ++ dlls/d3d11/tests/d3d11.c | 2 ++ dlls/wined3d/utils.c | 1 + 3 files changed, 5 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 73151f2296c..a4729f9d2d3 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -12373,6 +12373,7 @@ static void test_create_input_layout(void) DXGI_FORMAT_R32_FLOAT, DXGI_FORMAT_R32_UINT, DXGI_FORMAT_R32_SINT, + DXGI_FORMAT_R16_FLOAT, DXGI_FORMAT_R16_UINT, DXGI_FORMAT_R16_SINT, DXGI_FORMAT_R8_UINT, @@ -13648,6 +13649,7 @@ static void test_format_support(void) static const struct format_support vertex_buffers[] = { {DXGI_FORMAT_R8G8_UINT}, + {DXGI_FORMAT_R16_FLOAT}, }; if (!(device = create_device())) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 140e7cc195c..53087684acf 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -18552,6 +18552,7 @@ static void test_create_input_layout(void) DXGI_FORMAT_R32_FLOAT, DXGI_FORMAT_R32_UINT, DXGI_FORMAT_R32_SINT, + DXGI_FORMAT_R16_FLOAT, DXGI_FORMAT_R16_UINT, DXGI_FORMAT_R16_SINT, DXGI_FORMAT_R8G8_UNORM, @@ -20622,6 +20623,7 @@ static void test_format_support(const D3D_FEATURE_LEVEL feature_level) static const struct format_support vertex_buffers[] = { {DXGI_FORMAT_R8G8_UINT, D3D_FEATURE_LEVEL_10_0}, + {DXGI_FORMAT_R16_FLOAT, D3D_FEATURE_LEVEL_10_0}, }; device_desc.feature_level = &feature_level; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 1b0d7cc6eba..b7afa721587 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -727,6 +727,7 @@ static const struct wined3d_format_vertex_info format_vertex_info[] = {WINED3DFMT_R8_UINT, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_BYTE}, {WINED3DFMT_R8_SINT, WINED3D_FFP_EMIT_INVALID, GL_BYTE}, {WINED3DFMT_R8G8_UINT, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_BYTE}, + {WINED3DFMT_R16_FLOAT, WINED3D_FFP_EMIT_INVALID, GL_HALF_FLOAT, ARB_HALF_FLOAT_VERTEX}, {WINED3DFMT_R16_UINT, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_SHORT}, {WINED3DFMT_R16_SINT, WINED3D_FFP_EMIT_INVALID, GL_SHORT}, {WINED3DFMT_R32_UINT, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_INT},

1 0

Dmitry Timoshkov : ntoskrnl: Add IoCreateDeviceSecure semi-stub.
by Alexandre Julliard 19 Nov '21

19 Nov '21

Module: wine Branch: master Commit: 162991a03ceb4b45963b7129bffa89ee443c7e32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=162991a03ceb4b45963b7129… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Nov 19 14:12:29 2021 +0300 ntoskrnl: Add IoCreateDeviceSecure semi-stub. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 15 +++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + include/ddk/wdm.h | 1 + 3 files changed, 17 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index ec297e7d64a..38a25bc5092 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1610,6 +1610,21 @@ static struct _OBJECT_TYPE device_type = POBJECT_TYPE IoDeviceObjectType = &device_type; +/*********************************************************************** + * IoCreateDeviceSecure (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoCreateDeviceSecure( DRIVER_OBJECT *driver, ULONG ext_size, + UNICODE_STRING *name, DEVICE_TYPE type, + ULONG characteristics, BOOLEAN exclusive, + PCUNICODE_STRING sddl, LPCGUID guid, + DEVICE_OBJECT **ret_device ) +{ + FIXME( "(%p, %u, %s, %u, %x, %u, %s, %s, %p): semi-stub\n", + driver, ext_size, debugstr_us(name), type, characteristics, exclusive, + debugstr_us(sddl), wine_dbgstr_guid(guid), ret_device ); + + return IoCreateDevice( driver, ext_size, name, type, characteristics, exclusive, ret_device ); +} /*********************************************************************** * IoCreateDevice (NTOSKRNL.EXE.@) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 0208e2f633f..0cd50785ad6 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -354,6 +354,7 @@ @ stub IoConnectInterrupt @ stub IoCreateController @ stdcall IoCreateDevice(ptr long ptr long long long ptr) +@ stdcall IoCreateDeviceSecure(ptr long ptr long long long ptr ptr ptr) @ stub IoCreateDisk @ stdcall IoCreateDriver(ptr ptr) @ stdcall IoCreateFile(ptr long ptr ptr ptr long long long long ptr long long ptr long) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 2c2bbf44632..b798d339561 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1701,6 +1701,7 @@ NTSTATUS WINAPI IoCallDriver(DEVICE_OBJECT*,IRP*); BOOLEAN WINAPI IoCancelIrp(IRP*); VOID WINAPI IoCompleteRequest(IRP*,UCHAR); NTSTATUS WINAPI IoCreateDevice(DRIVER_OBJECT*,ULONG,UNICODE_STRING*,DEVICE_TYPE,ULONG,BOOLEAN,DEVICE_OBJECT**); +NTSTATUS WINAPI IoCreateDeviceSecure(DRIVER_OBJECT*,ULONG,UNICODE_STRING*,DEVICE_TYPE,ULONG,BOOLEAN,PCUNICODE_STRING,LPCGUID,DEVICE_OBJECT**); NTSTATUS WINAPI IoCreateDriver(UNICODE_STRING*,PDRIVER_INITIALIZE); NTSTATUS WINAPI IoCreateSymbolicLink(UNICODE_STRING*,UNICODE_STRING*); PKEVENT WINAPI IoCreateSynchronizationEvent(UNICODE_STRING*,HANDLE*);

1 0

Rémi Bernon : win32u: Guard font unused_entry against race condition.
by Alexandre Julliard 19 Nov '21

19 Nov '21

Module: wine Branch: master Commit: 39fea6cd1eb175cddf3cbccc1fd09fec48da881e URL: https://source.winehq.org/git/wine.git/?a=commit;h=39fea6cd1eb175cddf3cbccc… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 19 12:23:38 2021 +0100 win32u: Guard font unused_entry against race condition. There is a race condition otherwise between release_gdi_font and find_cached_gdi_font, leading to invalid memory access: One thread calling release_gdi_font may decrement refcount to 0, then try to enter font_lock. At the same time, another thread may be calling find_cached_gdi_font through select_font, holding the font_lock. This second thread would find refcount set to 0, and then try to remove unused_entry from its list, although it hasn't been added yet to the unused list. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/font.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c index d2f61526540..f9a0359e92c 100644 --- a/dlls/win32u/font.c +++ b/dlls/win32u/font.c @@ -2576,22 +2576,24 @@ static struct gdi_font *find_cached_gdi_font( const LOGFONTW *lf, const FMAT2 *m static void release_gdi_font( struct gdi_font *font ) { if (!font) return; - if (--font->refcount) return; TRACE( "font %p\n", font ); /* add it to the unused list */ pthread_mutex_lock( &font_lock ); - list_add_head( &unused_gdi_font_list, &font->unused_entry ); - if (unused_font_count > UNUSED_CACHE_SIZE) + if (!--font->refcount) { - font = LIST_ENTRY( list_tail( &unused_gdi_font_list ), struct gdi_font, unused_entry ); - TRACE( "freeing %p\n", font ); - list_remove( &font->entry ); - list_remove( &font->unused_entry ); - free_gdi_font( font ); + list_add_head( &unused_gdi_font_list, &font->unused_entry ); + if (unused_font_count > UNUSED_CACHE_SIZE) + { + font = LIST_ENTRY( list_tail( &unused_gdi_font_list ), struct gdi_font, unused_entry ); + TRACE( "freeing %p\n", font ); + list_remove( &font->entry ); + list_remove( &font->unused_entry ); + free_gdi_font( font ); + } + else unused_font_count++; } - else unused_font_count++; pthread_mutex_unlock( &font_lock ); }

1 0

Nikolay Sivov : d3d10/effect: Fix a trace message.
by Alexandre Julliard 19 Nov '21

19 Nov '21

Module: wine Branch: master Commit: 44664237c91583bdba691992a3de94b67cbdc1a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44664237c91583bdba691992… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 17 15:58:01 2021 +0300 d3d10/effect: Fix a trace message. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 3f35e9cc28a..04250a1663e 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -4115,7 +4115,7 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableB if ((v = d3d10_effect_get_variable_by_index(effect, index))) { - TRACE("Returning %svariable %s.\n", is_var_shared(v) ? "shared " : NULL, debugstr_a(v->name)); + TRACE("Returning %svariable %s.\n", is_var_shared(v) ? "shared " : "", debugstr_a(v->name)); return &v->ID3D10EffectVariable_iface; }

1 0

Connor McAdams : include: Add UI Automation Pattern ID definitions.
by Alexandre Julliard 19 Nov '21

19 Nov '21

Module: wine Branch: master Commit: 824ea8cbc52aa298b6e6b3fd6649db4ba5efcd82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=824ea8cbc52aa298b6e6b3fd… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Tue Nov 16 14:32:30 2021 -0500 include: Add UI Automation Pattern ID definitions. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/uiautomationclient.idl | 43 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/include/uiautomationclient.idl b/include/uiautomationclient.idl index a353a63816b..917d3456ebf 100644 --- a/include/uiautomationclient.idl +++ b/include/uiautomationclient.idl @@ -27,6 +27,49 @@ import "uiautomationcore.idl"; library UIAutomationClient { importlib ("stdole2.tlb"); + /* FIXME: Uncomment when properly supported in widl + [dllname("<no entry points>")] + module UIA_PatternIds + { + */ + const long UIA_InvokePatternId = 10000; + const long UIA_SelectionPatternId = 10001; + const long UIA_ValuePatternId = 10002; + const long UIA_RangeValuePatternId = 10003; + const long UIA_ScrollPatternId = 10004; + const long UIA_ExpandCollapsePatternId = 10005; + const long UIA_GridPatternId = 10006; + const long UIA_GridItemPatternId = 10007; + const long UIA_MultipleViewPatternId = 10008; + const long UIA_WindowPatternId = 10009; + const long UIA_SelectionItemPatternId = 10010; + const long UIA_DockPatternId = 10011; + const long UIA_TablePatternId = 10012; + const long UIA_TableItemPatternId = 10013; + const long UIA_TextPatternId = 10014; + const long UIA_TogglePatternId = 10015; + const long UIA_TransformPatternId = 10016; + const long UIA_ScrollItemPatternId = 10017; + const long UIA_LegacyIAccessiblePatternId = 10018; + const long UIA_ItemContainerPatternId = 10019; + const long UIA_VirtualizedItemPatternId = 10020; + const long UIA_SynchronizedInputPatternId = 10021; + const long UIA_ObjectModelPatternId = 10022; + const long UIA_AnnotationPatternId = 10023; + const long UIA_TextPattern2Id = 10024; + const long UIA_StylesPatternId = 10025; + const long UIA_SpreadsheetPatternId = 10026; + const long UIA_SpreadsheetItemPatternId = 10027; + const long UIA_TransformPattern2Id = 10028; + const long UIA_TextChildPatternId = 10029; + const long UIA_DragPatternId = 10030; + const long UIA_DropTargetPatternId = 10031; + const long UIA_TextEditPatternId = 10032; + const long UIA_CustomNavigationPatternId = 10033; + /* + } + */ + /* FIXME: Uncomment when properly supported in widl [dllname("<no entry points>")] module UIA_PropertyIds

1 0

Connor McAdams : uiautomationcore: Implement UiaHostProviderFromHwnd.
by Alexandre Julliard 19 Nov '21

19 Nov '21

Module: wine Branch: master Commit: b5f4511b8eb92e357a4688d886f9228230405d11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5f4511b8eb92e357a4688d8… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Tue Nov 16 14:32:31 2021 -0500 uiautomationcore: Implement UiaHostProviderFromHwnd. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uiautomationcore/Makefile.in | 2 +- dlls/uiautomationcore/tests/uiautomation.c | 7 +- dlls/uiautomationcore/uia_main.c | 134 ++++++++++++++++++++++++++++- 3 files changed, 134 insertions(+), 9 deletions(-) diff --git a/dlls/uiautomationcore/Makefile.in b/dlls/uiautomationcore/Makefile.in index 5a72ea144c4..f0973fdec4c 100644 --- a/dlls/uiautomationcore/Makefile.in +++ b/dlls/uiautomationcore/Makefile.in @@ -1,6 +1,6 @@ MODULE = uiautomationcore.dll IMPORTLIB = uiautomationcore -IMPORTS = uuid ole32 +IMPORTS = uuid ole32 oleaut32 user32 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 52a6648dad2..76d2e06e07e 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -58,17 +58,13 @@ static void test_UiaHostProviderFromHwnd(void) p = (void *)0xdeadbeef; hr = UiaHostProviderFromHwnd(NULL, &p); -todo_wine { ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); ok(p == NULL, "Unexpected instance.\n"); -} + p = NULL; hr = UiaHostProviderFromHwnd(hwnd, &p); -todo_wine ok(hr == S_OK, "Failed to get host provider, hr %#x.\n", hr); -if (hr == S_OK) -{ p2 = NULL; hr = UiaHostProviderFromHwnd(hwnd, &p2); ok(hr == S_OK, "Failed to get host provider, hr %#x.\n", hr); @@ -80,7 +76,6 @@ if (hr == S_OK) ok(p2 == NULL, "Unexpected instance.\n"); IRawElementProviderSimple_Release(p); -} DestroyWindow(hwnd); UnregisterClassA("HostProviderFromHwnd class", NULL); diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index 174e4756920..44fd42742d9 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -18,6 +18,7 @@ #define COBJMACROS +#include "initguid.h" #include "uiautomation.h" #include "wine/debug.h" @@ -145,6 +146,117 @@ static const IUnknownVtbl uia_reserved_obj_vtbl = { static IUnknown uia_reserved_ns_iface = {&uia_reserved_obj_vtbl}; static IUnknown uia_reserved_ma_iface = {&uia_reserved_obj_vtbl}; +/* + * UiaHostProviderFromHwnd IRawElementProviderSimple interface. + */ +struct hwnd_host_provider { + IRawElementProviderSimple IRawElementProviderSimple_iface; + LONG refcount; + + HWND hwnd; +}; + +static inline struct hwnd_host_provider *impl_from_hwnd_host_provider(IRawElementProviderSimple *iface) +{ + return CONTAINING_RECORD(iface, struct hwnd_host_provider, IRawElementProviderSimple_iface); +} + +HRESULT WINAPI hwnd_host_provider_QueryInterface(IRawElementProviderSimple *iface, REFIID riid, void **ppv) +{ + *ppv = NULL; + if (IsEqualIID(riid, &IID_IRawElementProviderSimple) || IsEqualIID(riid, &IID_IUnknown)) + *ppv = iface; + else + return E_NOINTERFACE; + + IRawElementProviderSimple_AddRef(iface); + return S_OK; +} + +ULONG WINAPI hwnd_host_provider_AddRef(IRawElementProviderSimple *iface) +{ + struct hwnd_host_provider *host_prov = impl_from_hwnd_host_provider(iface); + ULONG refcount = InterlockedIncrement(&host_prov->refcount); + + TRACE("%p, refcount %d\n", iface, refcount); + + return refcount; +} + +ULONG WINAPI hwnd_host_provider_Release(IRawElementProviderSimple *iface) +{ + struct hwnd_host_provider *host_prov = impl_from_hwnd_host_provider(iface); + ULONG refcount = InterlockedDecrement(&host_prov->refcount); + + TRACE("%p, refcount %d\n", iface, refcount); + + if (!refcount) + heap_free(host_prov); + + return refcount; +} + +HRESULT WINAPI hwnd_host_provider_get_ProviderOptions(IRawElementProviderSimple *iface, + enum ProviderOptions *ret_val) +{ + TRACE("%p, %p\n", iface, ret_val); + *ret_val = ProviderOptions_ServerSideProvider; + return S_OK; +} + +HRESULT WINAPI hwnd_host_provider_GetPatternProvider(IRawElementProviderSimple *iface, + PATTERNID pattern_id, IUnknown **ret_val) +{ + TRACE("%p, %d, %p\n", iface, pattern_id, ret_val); + *ret_val = NULL; + return S_OK; +} + +HRESULT WINAPI hwnd_host_provider_GetPropertyValue(IRawElementProviderSimple *iface, + PROPERTYID prop_id, VARIANT *ret_val) +{ + struct hwnd_host_provider *host_prov = impl_from_hwnd_host_provider(iface); + + TRACE("%p, %d, %p\n", iface, prop_id, ret_val); + + VariantInit(ret_val); + switch (prop_id) + { + case UIA_NativeWindowHandlePropertyId: + V_VT(ret_val) = VT_I4; + V_I4(ret_val) = HandleToUlong(host_prov->hwnd); + break; + + case UIA_ProviderDescriptionPropertyId: + V_VT(ret_val) = VT_BSTR; + V_BSTR(ret_val) = SysAllocString(L"Wine: HWND Provider Proxy"); + break; + + default: + break; + } + + return S_OK; +} + +HRESULT WINAPI hwnd_host_provider_get_HostRawElementProvider(IRawElementProviderSimple *iface, + IRawElementProviderSimple **ret_val) +{ + TRACE("%p, %p\n", iface, ret_val); + *ret_val = NULL; + return S_OK; +} + +IRawElementProviderSimpleVtbl hwnd_host_provider_vtbl = { + hwnd_host_provider_QueryInterface, + hwnd_host_provider_AddRef, + hwnd_host_provider_Release, + hwnd_host_provider_get_ProviderOptions, + hwnd_host_provider_GetPatternProvider, + hwnd_host_provider_GetPropertyValue, + hwnd_host_provider_get_HostRawElementProvider, +}; + /*********************************************************************** * UiaClientsAreListening (uiautomationcore.@) */ @@ -219,8 +331,26 @@ void WINAPI UiaRegisterProviderCallback(UiaProviderCallback *callback) HRESULT WINAPI UiaHostProviderFromHwnd(HWND hwnd, IRawElementProviderSimple **provider) { - FIXME("(%p, %p): stub\n", hwnd, provider); - return E_NOTIMPL; + struct hwnd_host_provider *host_prov; + + TRACE("(%p, %p)\n", hwnd, provider); + + if (provider) + *provider = NULL; + + if (!IsWindow(hwnd) || !provider) + return E_INVALIDARG; + + host_prov = heap_alloc(sizeof(*host_prov)); + if (!host_prov) + return E_OUTOFMEMORY; + + host_prov->IRawElementProviderSimple_iface.lpVtbl = &hwnd_host_provider_vtbl; + host_prov->refcount = 1; + host_prov->hwnd = hwnd; + *provider = &host_prov->IRawElementProviderSimple_iface; + + return S_OK; } HRESULT WINAPI UiaDisconnectProvider(IRawElementProviderSimple *provider)

1 0

Connor McAdams : uiautomationcore/tests: Expand UiaHostProviderFromHwnd tests.
by Alexandre Julliard 19 Nov '21

19 Nov '21

Module: wine Branch: master Commit: 2e7b6da243eb2ad9d9412b3865bf9ca18a5168d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e7b6da243eb2ad9d9412b38… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Tue Nov 16 14:32:32 2021 -0500 uiautomationcore/tests: Expand UiaHostProviderFromHwnd tests. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uiautomationcore/tests/Makefile.in | 2 +- dlls/uiautomationcore/tests/uiautomation.c | 53 +++++++++++++++++++++++++++++- 2 files changed, 53 insertions(+), 2 deletions(-) diff --git a/dlls/uiautomationcore/tests/Makefile.in b/dlls/uiautomationcore/tests/Makefile.in index 1d08e19093f..fbd53507fbe 100644 --- a/dlls/uiautomationcore/tests/Makefile.in +++ b/dlls/uiautomationcore/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = uiautomationcore.dll -IMPORTS = uiautomationcore user32 ole32 +IMPORTS = uiautomationcore user32 ole32 oleaut32 C_SRCS = \ uiautomation.c diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 76d2e06e07e..e5fa12535be 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -34,9 +34,12 @@ static LRESULT WINAPI test_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LPAR static void test_UiaHostProviderFromHwnd(void) { IRawElementProviderSimple *p, *p2; + enum ProviderOptions prov_opt; WNDCLASSA cls; HRESULT hr; HWND hwnd; + VARIANT v; + int i; cls.style = 0; cls.lpfnWndProc = test_wnd_proc; @@ -61,6 +64,9 @@ static void test_UiaHostProviderFromHwnd(void) ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); ok(p == NULL, "Unexpected instance.\n"); + hr = UiaHostProviderFromHwnd(hwnd, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + p = NULL; hr = UiaHostProviderFromHwnd(hwnd, &p); ok(hr == S_OK, "Failed to get host provider, hr %#x.\n", hr); @@ -75,9 +81,54 @@ static void test_UiaHostProviderFromHwnd(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(p2 == NULL, "Unexpected instance.\n"); - IRawElementProviderSimple_Release(p); + hr = IRawElementProviderSimple_GetPropertyValue(p, UIA_NativeWindowHandlePropertyId, &v); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == HandleToUlong(hwnd), "V_I4(&v) = %#x, expected %#x\n", V_I4(&v), HandleToUlong(hwnd)); + + hr = IRawElementProviderSimple_GetPropertyValue(p, UIA_ProviderDescriptionPropertyId, &v); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(V_VT(&v) == VT_BSTR, "V_VT(&v) = %d\n", V_VT(&v)); + VariantClear(&v); + /* No patterns are implemented on the HWND Host provider. */ + for (i = UIA_InvokePatternId; i < (UIA_CustomNavigationPatternId + 1); i++) + { + IUnknown *unk; + + unk = (void *)0xdeadbeef; + hr = IRawElementProviderSimple_GetPatternProvider(p, i, &unk); + ok(hr == S_OK, "Unexpected hr %#x, %d.\n", hr, i); + ok(!unk, "Pattern %d returned %p\n", i, unk); + } + + hr = IRawElementProviderSimple_get_ProviderOptions(p, &prov_opt); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok((prov_opt == ProviderOptions_ServerSideProvider) || + broken(prov_opt == ProviderOptions_ClientSideProvider), /* Windows < 10 1507 */ + "Unexpected provider options %#x\n", prov_opt); + + /* Test behavior post Window destruction. */ DestroyWindow(hwnd); + + hr = IRawElementProviderSimple_GetPropertyValue(p, UIA_NativeWindowHandlePropertyId, &v); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == HandleToUlong(hwnd), "V_I4(&v) = %#x, expected %#x\n", V_I4(&v), HandleToUlong(hwnd)); + + hr = IRawElementProviderSimple_GetPropertyValue(p, UIA_ProviderDescriptionPropertyId, &v); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(V_VT(&v) == VT_BSTR, "V_VT(&v) = %d\n", V_VT(&v)); + VariantClear(&v); + + hr = IRawElementProviderSimple_get_ProviderOptions(p, &prov_opt); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok((prov_opt == ProviderOptions_ServerSideProvider) || + broken(prov_opt == ProviderOptions_ClientSideProvider), /* Windows < 10 1507 */ + "Unexpected provider options %#x\n", prov_opt); + + IRawElementProviderSimple_Release(p); + UnregisterClassA("HostProviderFromHwnd class", NULL); }

1 0