November 2021 - Wine-Commits

Jactry Zeng : include: Add ISharedPropertyGroupManager interface.
by Alexandre Julliard Nov. 25, 2021

Nov. 25, 2021

Module: wine Branch: master Commit: bfd2c040142f6d4aed97e3f94a1144f060659186 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfd2c040142f6d4aed97e3f9… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Thu Nov 25 00:20:44 2021 -0600 include: Add ISharedPropertyGroupManager interface. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/comsvcs.idl | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/include/comsvcs.idl b/include/comsvcs.idl index d64af1f5a85..902c78b05c8 100644 --- a/include/comsvcs.idl +++ b/include/comsvcs.idl @@ -37,6 +37,8 @@ typedef DWORD_PTR TRANSID; ] library COMSVCSLib { + importlib("stdole2.tlb"); + [ object, hidden, @@ -96,4 +98,65 @@ library COMSVCSLib { [default] interface IDispenserManager; }; + + [ + object, + hidden, + local, + uuid(2a005c01-a5de-11cf-9e66-00aa00a3f464), + pointer_default(unique) + ] + interface ISharedProperty : IDispatch + { + [id(DISPID_VALUE), propget] HRESULT Value([out, retval] VARIANT *value); + [id(DISPID_VALUE), propput] HRESULT Value([in] VARIANT value); + } + + [ + object, + hidden, + local, + uuid(2a005c07-a5de-11cf-9e66-00aa00a3f464), + pointer_default(unique) + ] + interface ISharedPropertyGroup : IDispatch + { + [id(0x00000001)] + HRESULT CreatePropertyByPosition([in] int index, [out] VARIANT_BOOL *exists, [out, retval] ISharedProperty **property); + [id(0x00000002), propget] + HRESULT PropertyByPosition([in] int index, [out, retval] ISharedProperty **property); + [id(0x00000003)] + HRESULT CreateProperty([in] BSTR name, [out] VARIANT_BOOL *exists, [out, retval] ISharedProperty **property); + [id(0x00000004), propget] + HRESULT Property([in] BSTR name, [out, retval] ISharedProperty **property); + } + + [ + object, + hidden, + local, + uuid(2a005c0d-a5de-11cf-9e66-00aa00a3f464), + pointer_default(unique) + ] + interface ISharedPropertyGroupManager : IDispatch + { + [id(0x00000001)] + HRESULT CreatePropertyGroup([in] BSTR name, [in, out] LONG *isolation, [in, out] LONG *release, + [out] VARIANT_BOOL *exists, [out, retval] ISharedPropertyGroup **group); + [id(0x00000002), propget] + HRESULT Group([in] BSTR name, [out, retval] ISharedPropertyGroup **group); + [id(DISPID_NEWENUM), propget] + HRESULT _NewEnum([out, retval] IUnknown **retval); + } + + [ + uuid(2a005c11-a5de-11cf-9e66-00aa00a3f464), + progid("MTxSpm.SharedPropertyGroupManager.1"), + vi_progid("MTxSpm.SharedPropertyGroupManager"), + threading(both) + ] + coclass SharedPropertyGroupManager + { + [default] interface ISharedPropertyGroupManager; + } }

1 0

Alex Henrie : shcore: Add SubscribeFeatureStateChangeNotification stub.
by Alexandre Julliard Nov. 25, 2021

Nov. 25, 2021

Module: wine Branch: master Commit: d9a63101b5437e1597b22313eadfac94bc9e28c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9a63101b5437e1597b22313… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Nov 21 22:02:56 2021 -0700 shcore: Add SubscribeFeatureStateChangeNotification stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52077 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-featurestaging-l1-1-0.spec | 2 +- dlls/shcore/main.c | 10 ++++++++++ dlls/shcore/shcore.spec | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-featurestaging-l1-1-0/api-ms-win-core-featurestaging-l1-1-0.spec b/dlls/api-ms-win-core-featurestaging-l1-1-0/api-ms-win-core-featurestaging-l1-1-0.spec index ab5127b7dfd..696e57f695a 100644 --- a/dlls/api-ms-win-core-featurestaging-l1-1-0/api-ms-win-core-featurestaging-l1-1-0.spec +++ b/dlls/api-ms-win-core-featurestaging-l1-1-0/api-ms-win-core-featurestaging-l1-1-0.spec @@ -1,5 +1,5 @@ @ stub GetFeatureEnabledState @ stub RecordFeatureError @ stub RecordFeatureUsage -@ stub SubscribeFeatureStateChangeNotification +@ stdcall SubscribeFeatureStateChangeNotification(ptr ptr ptr) shcore.SubscribeFeatureStateChangeNotification @ stub UnsubscribeFeatureStateChangeNotification diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index 82b236bb47d..213569b4acf 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -27,6 +27,7 @@ #include "winuser.h" #include "initguid.h" #include "ocidl.h" +#include "featurestagingapi.h" #include "shellscalingapi.h" #include "shlwapi.h" @@ -2505,3 +2506,12 @@ BOOL WINAPI IsOS(DWORD feature) return FALSE; } + +/************************************************************************* + * SubscribeFeatureStateChangeNotification [SHCORE.@] + */ +void WINAPI SubscribeFeatureStateChangeNotification(FEATURE_STATE_CHANGE_SUBSCRIPTION *subscription, + FEATURE_STATE_CHANGE_CALLBACK *callback, void *context) +{ + FIXME("(%p, %p, %p) stub\n", subscription, callback, context); +} diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index a0bc8a2463b..836a90ee5cf 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -92,7 +92,7 @@ @ stdcall SetCurrentProcessExplicitAppUserModelID(wstr) @ stdcall SetProcessDpiAwareness(long) @ stdcall SetProcessReference(ptr) -# @ stub SubscribeFeatureStateChangeNotification +@ stdcall SubscribeFeatureStateChangeNotification(ptr ptr ptr) @ stub UnregisterScaleChangeEvent # @ stub UnsubscribeFeatureStateChangeNotification

1 0

Alexandre Julliard : mountmgr: Pass the SCSI device information when creating a volume.
by Alexandre Julliard Nov. 25, 2021

Nov. 25, 2021

Module: wine Branch: master Commit: 88cde9e71727c36244369e4076ff5b07025b2262 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88cde9e71727c36244369e40… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 25 12:29:00 2021 +0100 mountmgr: Pass the SCSI device information when creating a volume. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/dbus.c | 4 +-- dlls/mountmgr.sys/device.c | 75 ++++++++++---------------------------------- dlls/mountmgr.sys/diskarb.c | 48 ++++++++++++++-------------- dlls/mountmgr.sys/mountmgr.h | 38 +++++++++++++--------- 4 files changed, 65 insertions(+), 100 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=88cde9e71727c3624436…

1 0

Piotr Caban : oleacc: Add partial Window_accHitTest implementation.
by Alexandre Julliard Nov. 25, 2021

Nov. 25, 2021

Module: wine Branch: master Commit: b704a6f336ebf8ae28d4b4424f718a5d87ebe00a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b704a6f336ebf8ae28d4b442… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 25 18:54:58 2021 +0100 oleacc: Add partial Window_accHitTest implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/window.c | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/dlls/oleacc/window.c b/dlls/oleacc/window.c index aa433d624cf..87f9956b49e 100644 --- a/dlls/oleacc/window.c +++ b/dlls/oleacc/window.c @@ -247,11 +247,38 @@ static HRESULT WINAPI Window_accNavigate(IAccessible *iface, return E_NOTIMPL; } -static HRESULT WINAPI Window_accHitTest(IAccessible *iface, - LONG xLeft, LONG yTop, VARIANT *pvarID) +static HRESULT WINAPI Window_accHitTest(IAccessible *iface, LONG x, LONG y, VARIANT *v) { Window *This = impl_from_Window(iface); - FIXME("(%p)->(%d %d %p)\n", This, xLeft, yTop, pvarID); + IDispatch *disp; + POINT pt; + HRESULT hr; + RECT rect; + + TRACE("(%p)->(%d %d %p)\n", This, x, y, v); + + V_VT(v) = VT_EMPTY; + if (!GetClientRect(This->hwnd, &rect)) + return E_FAIL; + if (!ClientToScreen(This->hwnd, (POINT*)&rect) || + !ClientToScreen(This->hwnd, &((POINT*)&rect)[1])) + return E_FAIL; + pt.x = x; + pt.y = y; + if (PtInRect(&rect, pt)) + { + hr = AccessibleObjectFromWindow(This->hwnd, OBJID_CLIENT, &IID_IDispatch, (void**)&disp); + if (FAILED(hr)) + return hr; + if (!disp) + return E_FAIL; + + V_VT(v) = VT_DISPATCH; + V_DISPATCH(v) = disp; + return S_OK; + } + + FIXME("non-client area not handled yet\n"); return E_NOTIMPL; }

1 0

Alexandre Julliard : mountmgr: Remove the obsolete libhal support.
by Alexandre Julliard Nov. 25, 2021

Nov. 25, 2021

Module: wine Branch: master Commit: 37b7259f0764aaf5cee67762655af2a700142f0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=37b7259f0764aaf5cee67762… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 25 11:21:14 2021 +0100 mountmgr: Remove the obsolete libhal support. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 116 --------------- configure.ac | 13 -- dlls/mountmgr.sys/dbus.c | 364 +---------------------------------------------- include/config.h.in | 3 - 4 files changed, 1 insertion(+), 495 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=37b7259f0764aaf5cee6…

1 0

Alexandre Julliard : mountmgr: Add some helpers to abstract the Unix calls from mountmgr.c.
by Alexandre Julliard Nov. 25, 2021

Nov. 25, 2021

Module: wine Branch: master Commit: 086e9e0eda074bba36d1cb35cd0e2fc8c2e8e285 URL: https://source.winehq.org/git/wine.git/?a=commit;h=086e9e0eda074bba36d1cb35… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 25 17:20:07 2021 +0100 mountmgr: Add some helpers to abstract the Unix calls from mountmgr.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/mountmgr.c | 63 +++++-------------------------------------- dlls/mountmgr.sys/unixlib.c | 64 ++++++++++++++++++++++++++++++++++++++++++++ dlls/mountmgr.sys/unixlib.h | 2 ++ 3 files changed, 72 insertions(+), 57 deletions(-) diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index 6c7f21172fa..33be9293713 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -33,14 +33,12 @@ #include <stdarg.h> #include <stdlib.h> #include <unistd.h> -#ifdef HAVE_SYS_STAT_H -#include <sys/stat.h> -#endif #define NONAMELESSUNION #include "mountmgr.h" #include "winreg.h" +#include "unixlib.h" #include "wine/list.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -297,9 +295,7 @@ static NTSTATUS define_shell_folder( const void *in_buff, SIZE_T insize ) UNICODE_STRING name; NTSTATUS status; ULONG size = 256; - const char *home; - char *buffer = NULL, *backup = NULL, *homelink = NULL; - struct stat st; + char *buffer = NULL, *backup = NULL; if (input->folder_offset >= insize || input->folder_size > insize - input->folder_offset || input->symlink_offset >= insize) @@ -313,22 +309,6 @@ static NTSTATUS define_shell_folder( const void *in_buff, SIZE_T insize ) if (!link[0]) link = NULL; } - if (link && (!strcmp( link, "$HOME" ) || !strncmp( link, "$HOME/", 6 )) && (home = getenv( "HOME" ))) - { - link += 5; - homelink = HeapAlloc( GetProcessHeap(), 0, strlen(home) + strlen(link) + 1 ); - strcpy( homelink, home ); - strcat( homelink, link ); - link = homelink; - } - - /* ignore nonexistent link targets */ - if (link && (stat( link, &st ) || !S_ISDIR( st.st_mode ))) - { - status = STATUS_OBJECT_NAME_NOT_FOUND; - goto done; - } - name.Buffer = (WCHAR *)((char *)in_buff + input->folder_offset); name.Length = input->folder_size; InitializeObjectAttributes( &attr, &name, 0, 0, NULL ); @@ -358,37 +338,11 @@ static NTSTATUS define_shell_folder( const void *in_buff, SIZE_T insize ) strcat( backup, ".backup" ); } - if (!lstat( buffer, &st )) /* move old folder/link out of the way */ - { - if (S_ISLNK( st.st_mode )) - { - unlink( buffer ); - } - else if (link && S_ISDIR( st.st_mode )) - { - if (rmdir( buffer )) /* non-empty dir, try to make a backup */ - { - if (!backup || rename( buffer, backup )) - { - status = STATUS_OBJECT_NAME_COLLISION; - goto done; - } - } - } - else goto done; /* nothing to do, folder already exists */ - } - - if (link) symlink( link, buffer ); - else - { - if (backup && !lstat( backup, &st ) && S_ISDIR( st.st_mode )) rename( backup, buffer ); - else mkdir( buffer, 0777 ); - } + status = set_shell_folder( buffer, backup, link ); done: HeapFree( GetProcessHeap(), 0, buffer ); HeapFree( GetProcessHeap(), 0, backup ); - HeapFree( GetProcessHeap(), 0, homelink ); return status; } @@ -401,7 +355,6 @@ static NTSTATUS query_shell_folder( void *buff, SIZE_T insize, SIZE_T outsize, I NTSTATUS status; ULONG size = 256; char *buffer; - int ret; name.Buffer = buff; name.Length = insize; @@ -415,13 +368,9 @@ static NTSTATUS query_shell_folder( void *buff, SIZE_T insize, SIZE_T outsize, I HeapFree( GetProcessHeap(), 0, buffer ); if (status != STATUS_BUFFER_TOO_SMALL) return status; } - ret = readlink( buffer, output, outsize - 1 ); - if (ret >= 0) - { - output[ret] = 0; - iosb->Information = ret + 1; - } - else status = STATUS_OBJECT_NAME_NOT_FOUND; + + status = get_shell_folder( buffer, output, outsize ); + if (!status) iosb->Information = strlen(output) + 1; HeapFree( GetProcessHeap(), 0, buffer ); return status; diff --git a/dlls/mountmgr.sys/unixlib.c b/dlls/mountmgr.sys/unixlib.c index b2c475c90cc..8e6378e5637 100644 --- a/dlls/mountmgr.sys/unixlib.c +++ b/dlls/mountmgr.sys/unixlib.c @@ -277,3 +277,67 @@ NTSTATUS detect_parallel_ports( char *names, ULONG size ) detect_devices( paths, names, size ); return STATUS_SUCCESS; } + +NTSTATUS set_shell_folder( const char *folder, const char *backup, const char *link ) +{ + struct stat st; + const char *home; + char *homelink = NULL; + NTSTATUS status = STATUS_SUCCESS; + + if (link && (!strcmp( link, "$HOME" ) || !strncmp( link, "$HOME/", 6 )) && (home = getenv( "HOME" ))) + { + link += 5; + homelink = malloc( strlen(home) + strlen(link) + 1 ); + strcpy( homelink, home ); + strcat( homelink, link ); + link = homelink; + } + + /* ignore nonexistent link targets */ + if (link && (stat( link, &st ) || !S_ISDIR( st.st_mode ))) + { + status = STATUS_OBJECT_NAME_NOT_FOUND; + goto done; + } + + if (!lstat( folder, &st )) /* move old folder/link out of the way */ + { + if (S_ISLNK( st.st_mode )) + { + unlink( folder ); + } + else if (link && S_ISDIR( st.st_mode )) + { + if (rmdir( folder )) /* non-empty dir, try to make a backup */ + { + if (!backup || rename( folder, backup )) + { + status = STATUS_OBJECT_NAME_COLLISION; + goto done; + } + } + } + else goto done; /* nothing to do, folder already exists */ + } + + if (link) symlink( link, folder ); + else + { + if (backup && !lstat( backup, &st ) && S_ISDIR( st.st_mode )) rename( backup, folder ); + else mkdir( folder, 0777 ); + } + +done: + free( homelink ); + return status; +} + +NTSTATUS get_shell_folder( const char *folder, char *buffer, ULONG size ) +{ + int ret = readlink( folder, buffer, size - 1 ); + + if (ret < 0) return STATUS_OBJECT_NAME_NOT_FOUND; + buffer[ret] = 0; + return STATUS_SUCCESS; +} diff --git a/dlls/mountmgr.sys/unixlib.h b/dlls/mountmgr.sys/unixlib.h index b99ea7adca8..ab51481cabb 100644 --- a/dlls/mountmgr.sys/unixlib.h +++ b/dlls/mountmgr.sys/unixlib.h @@ -28,3 +28,5 @@ extern NTSTATUS read_volume_file( const char *volume, const char *file, void *bu extern BOOL match_unixdev( const char *device, ULONGLONG unix_dev ) DECLSPEC_HIDDEN; extern NTSTATUS detect_serial_ports( char *names, ULONG size ) DECLSPEC_HIDDEN; extern NTSTATUS detect_parallel_ports( char *names, ULONG size ) DECLSPEC_HIDDEN; +extern NTSTATUS set_shell_folder( const char *folder, const char *backup, const char *link ) DECLSPEC_HIDDEN; +extern NTSTATUS get_shell_folder( const char *folder, char *buffer, ULONG size ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : mountmgr: Add some helpers to abstract the Unix calls from device.c.
by Alexandre Julliard Nov. 25, 2021

Nov. 25, 2021

Module: wine Branch: master Commit: 9c587c50990061dfe6e9a322bf2caaeda08b54a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c587c50990061dfe6e9a322… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 25 17:06:43 2021 +0100 mountmgr: Add some helpers to abstract the Unix calls from device.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/Makefile.in | 3 +- dlls/mountmgr.sys/device.c | 378 +++++++----------------------------------- dlls/mountmgr.sys/unixlib.c | 279 +++++++++++++++++++++++++++++++ dlls/mountmgr.sys/unixlib.h | 30 ++++ 4 files changed, 370 insertions(+), 320 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9c587c50990061dfe6e9…

1 0

Piotr Caban : oleacc: Add AccessibleObjectFromPoint implementation.
by Alexandre Julliard Nov. 25, 2021

Nov. 25, 2021

Module: wine Branch: master Commit: 92f4f4a4c13e822cb5eb03207ec76f71640353d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=92f4f4a4c13e822cb5eb0320… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 25 18:55:07 2021 +0100 oleacc: Add AccessibleObjectFromPoint implementation. Based on a patch by Alex Henrie. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/main.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 65 insertions(+), 6 deletions(-) diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index 3ce616ae0c1..d2a80cfde34 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -263,18 +263,77 @@ LRESULT WINAPI LresultFromObject( REFIID riid, WPARAM wParam, LPUNKNOWN pAcc ) return atom; } -HRESULT WINAPI AccessibleObjectFromPoint( POINT ptScreen, IAccessible** ppacc, VARIANT* pvarChild ) -{ - FIXME("{%d,%d} %p %p: stub\n", ptScreen.x, ptScreen.y, ppacc, pvarChild ); - return E_NOTIMPL; -} - static void variant_init_i4( VARIANT *v, int val ) { V_VT(v) = VT_I4; V_I4(v) = val; } +HRESULT WINAPI AccessibleObjectFromPoint( POINT point, IAccessible** acc, VARIANT* child_id ) +{ + IAccessible *cur; + HRESULT hr; + VARIANT v; + HWND hwnd; + + TRACE("{%d,%d} %p %p\n", point.x, point.y, acc, child_id); + + if (!acc || !child_id) + return E_INVALIDARG; + + *acc = NULL; + V_VT(child_id) = VT_EMPTY; + + hwnd = WindowFromPoint(point); + if (!hwnd) + return E_FAIL; + hwnd = GetAncestor(hwnd, GA_ROOT); + + hr = AccessibleObjectFromWindow(hwnd, OBJID_WINDOW, &IID_IAccessible, (void **)&cur); + if (FAILED(hr)) + return hr; + if (!cur) + return E_FAIL; + + V_VT(&v) = VT_EMPTY; + while (1) + { + hr = IAccessible_accHitTest(cur, point.x, point.y, &v); + if (FAILED(hr)) + { + IAccessible_Release(cur); + return hr; + } + + if (V_VT(&v) == VT_I4) + { + *acc = cur; + variant_init_i4(child_id, V_I4(&v)); + return S_OK; + } + else if (V_VT(&v) == VT_DISPATCH) + { + IAccessible_Release(cur); + + hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IAccessible, (void**)&cur); + VariantClear(&v); + if (FAILED(hr)) + return hr; + if (!cur) + return E_FAIL; + } + else + { + VariantClear(&v); + IAccessible_Release(cur); + FIXME("unhandled variant type: %d\n", V_VT(&v)); + return E_NOTIMPL; + } + } + + return S_OK; +} + HRESULT WINAPI AccessibleObjectFromEvent( HWND hwnd, DWORD object_id, DWORD child_id, IAccessible **acc_out, VARIANT *child_id_out ) {

1 0

Alex Henrie : oleacc/tests: Add AccessibleObjectFromPoint tests.
by Alexandre Julliard Nov. 25, 2021

Nov. 25, 2021

Module: wine Branch: master Commit: 9d8bf363cf6251e54ebca29ebcdc9451c359faab URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d8bf363cf6251e54ebca29e… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 25 18:55:21 2021 +0100 oleacc/tests: Add AccessibleObjectFromPoint tests. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/tests/main.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 8c234aee8aa..1f09581f64f 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -1304,6 +1304,72 @@ static void test_default_client_accessible_object(void) IAccessible_Release(acc); } +static void test_AccessibleObjectFromPoint(void) +{ + HWND hwnd, child; + IAccessible *acc; + VARIANT cid, var; + POINT point; + HRESULT hr; + + hwnd = CreateWindowA("oleacc_test", "test", WS_POPUP | WS_VISIBLE, + 0, 0, 400, 300, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindow failed\n"); + ok(SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)&DefWindowProcA), + "SetWindowLongPtr failed\n"); + + point.x = point.y = 0; + ok(ClientToScreen(hwnd, &point), "ClientToScreen failed\n"); + + if (WindowFromPoint(point) != hwnd) + { + win_skip("test window not returned from WindowFromPoint\n"); + return; + } + + hr = AccessibleObjectFromPoint(point, NULL, NULL); + ok(hr == E_INVALIDARG, "got %x\n", hr); + + hr = AccessibleObjectFromPoint(point, &acc, NULL); + ok(hr == E_INVALIDARG, "got %x\n", hr); + + V_VT(&cid) = VT_DISPATCH; + V_DISPATCH(&cid) = (IDispatch*)0xdeadbeef; + hr = AccessibleObjectFromPoint(point, NULL, &cid); + ok(hr == E_INVALIDARG, "got %x\n", hr); + ok(V_VT(&cid) == VT_DISPATCH, "got %#x, expected %#x\n", V_VT(&cid), VT_DISPATCH); + + hr = AccessibleObjectFromPoint(point, &acc, &cid); + ok(hr == S_OK, "got %x\n", hr); + ok(V_VT(&cid) == VT_I4, "got %#x, expected %#x\n", V_VT(&cid), VT_I4); + ok(V_I4(&cid) == CHILDID_SELF, "got %#x, expected %#x\n", V_I4(&cid), CHILDID_SELF); + check_acc_hwnd((IUnknown*)acc, hwnd); + hr = IAccessible_get_accRole(acc, cid, &var); + ok(hr == S_OK, "got %x\n", hr); + ok(V_VT(&var) == VT_I4, "got %#x, expected %#x\n", V_VT(&var), VT_I4); + ok(V_I4(&var) == ROLE_SYSTEM_CLIENT, "got %#x, expected %#x\n", + V_I4(&var), ROLE_SYSTEM_CLIENT); + IAccessible_Release(acc); + + child = CreateWindowA("edit", "edit", WS_CHILD | WS_VISIBLE, + 0, 0, 100, 100, hwnd, NULL, NULL, NULL); + ok(child != NULL, "CreateWindow failed\n"); + + hr = AccessibleObjectFromPoint(point, &acc, &cid); + ok(hr == S_OK, "got %x\n", hr); + ok(V_VT(&cid) == VT_I4, "got %#x, expected %#x\n", V_VT(&cid), VT_I4); + ok(V_I4(&cid) == CHILDID_SELF, "got %#x, expected %#x\n", V_I4(&cid), CHILDID_SELF); + check_acc_hwnd((IUnknown*)acc, child); + hr = IAccessible_get_accRole(acc, cid, &var); + ok(hr == S_OK, "got %x\n", hr); + ok(V_VT(&var) == VT_I4, "got %#x, expected %#x\n", V_VT(&var), VT_I4); + ok(V_I4(&var) == ROLE_SYSTEM_TEXT, "got %#x, expected %#x\n", + V_I4(&var), ROLE_SYSTEM_TEXT); + IAccessible_Release(acc); + + DestroyWindow(hwnd); +} + static void test_CAccPropServices(void) { IAccPropServices *acc_prop_services; @@ -1749,6 +1815,7 @@ START_TEST(main) test_default_client_accessible_object(); test_AccessibleChildren(&Accessible); test_AccessibleObjectFromEvent(); + test_AccessibleObjectFromPoint(); test_CreateStdAccessibleObject_classes(); test_default_edit_accessible_object();

1 0

Alexandre Julliard : mountmgr: Pass a Unix interface name in the dhcp_request_params ioctl.
by Alexandre Julliard Nov. 25, 2021

Nov. 25, 2021

Module: wine Branch: master Commit: dbe3269c9d97f59d2b4a17a8cb3a33de92bedc55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dbe3269c9d97f59d2b4a17a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 25 11:07:37 2021 +0100 mountmgr: Pass a Unix interface name in the dhcp_request_params ioctl. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dhcpcsvc/dhcpcsvc.c | 21 ++++++++++++++++++--- dlls/mountmgr.sys/Makefile.in | 2 +- dlls/mountmgr.sys/dbus.c | 28 +++++++--------------------- dlls/mountmgr.sys/diskarb.c | 25 +++++++------------------ dlls/mountmgr.sys/mountmgr.c | 21 +++++++++------------ dlls/mountmgr.sys/mountmgr.h | 4 ++-- include/ddk/mountmgr.h | 2 +- 7 files changed, 45 insertions(+), 58 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dbe3269c9d97f59d2b4a…

1 0