November 2021 - Wine-commits

Alex Henrie : shcore: Add SubscribeFeatureStateChangeNotification stub.
by Alexandre Julliard 25 Nov '21

25 Nov '21

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

Alex Henrie : shcore: Add GetFeatureEnabledState stub.
by Alexandre Julliard 25 Nov '21

25 Nov '21

Module: wine Branch: master Commit: 67d0509f2f523935b0f4dbd3a713125252b37627 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67d0509f2f523935b0f4dbd3… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Nov 21 22:02:57 2021 -0700 shcore: Add GetFeatureEnabledState stub. Also for Windows PC Health Check. 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 | 9 +++++++++ dlls/shcore/shcore.spec | 2 +- 3 files changed, 11 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 696e57f695a..eb7bbe9460e 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,4 +1,4 @@ -@ stub GetFeatureEnabledState +@ stdcall GetFeatureEnabledState(long long) shcore.GetFeatureEnabledState @ stub RecordFeatureError @ stub RecordFeatureUsage @ stdcall SubscribeFeatureStateChangeNotification(ptr ptr ptr) shcore.SubscribeFeatureStateChangeNotification diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index 213569b4acf..633628b4c72 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -2515,3 +2515,12 @@ void WINAPI SubscribeFeatureStateChangeNotification(FEATURE_STATE_CHANGE_SUBSCRI { FIXME("(%p, %p, %p) stub\n", subscription, callback, context); } + +/************************************************************************* + * GetFeatureEnabledState [SHCORE.@] + */ +FEATURE_ENABLED_STATE WINAPI GetFeatureEnabledState(UINT32 feature, FEATURE_CHANGE_TIME change_time) +{ + FIXME("(%u, %u) stub\n", feature, change_time); + return FEATURE_ENABLED_STATE_DEFAULT; +} diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index 836a90ee5cf..9ed7c87b0fe 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -9,7 +9,7 @@ @ stdcall GetCurrentProcessExplicitAppUserModelID(ptr) @ stdcall GetDpiForMonitor(long long ptr ptr) @ stub GetDpiForShellUIComponent -# @ stub GetFeatureEnabledState +@ stdcall GetFeatureEnabledState(long long) # @ stub GetFeatureVariant @ stdcall GetProcessDpiAwareness(long ptr) @ stdcall GetProcessReference(ptr)

1 0

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

25 Nov '21

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

Alexandre Julliard : mountmgr: Remove the obsolete libhal support.
by Alexandre Julliard 25 Nov '21

25 Nov '21

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: Pass the SCSI device information when creating a volume.
by Alexandre Julliard 25 Nov '21

25 Nov '21

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

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

25 Nov '21

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

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

25 Nov '21

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: Move the macOS credentials support to a separate file.
by Alexandre Julliard 25 Nov '21

25 Nov '21

Module: wine Branch: master Commit: af7b364a289dcfd09747758ca1328f4dd9787301 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af7b364a289dcfd09747758c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 25 17:35:38 2021 +0100 mountmgr: Move the macOS credentials support to a separate file. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/Makefile.in | 1 + dlls/mountmgr.sys/cred.c | 633 ++++++++++++++++++++++++++++++++++++++++++ dlls/mountmgr.sys/mountmgr.c | 593 ++------------------------------------- dlls/mountmgr.sys/unixlib.h | 6 + 4 files changed, 658 insertions(+), 575 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=af7b364a289dcfd09747…

1 0

Alexandre Julliard : mountmgr: Put the Unix helpers in a separate Unix library.
by Alexandre Julliard 25 Nov '21

25 Nov '21

Module: wine Branch: master Commit: 9d293a1e9be980b48544c92fb43a9e964331877d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d293a1e9be980b48544c92f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 25 19:00:21 2021 +0100 mountmgr: Put the Unix helpers in a separate Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/Makefile.in | 1 + dlls/mountmgr.sys/device.c | 53 ++++++++++++++++------- dlls/mountmgr.sys/mountmgr.c | 27 +++++++++--- dlls/mountmgr.sys/unixlib.c | 97 ++++++++++++++++++++++++++++--------------- dlls/mountmgr.sys/unixlib.h | 88 ++++++++++++++++++++++++++++++++++----- 5 files changed, 201 insertions(+), 65 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9d293a1e9be980b48544…

1 0

Piotr Caban : oleacc: Add partial Window_accHitTest implementation.
by Alexandre Julliard 25 Nov '21

25 Nov '21

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