September 2021 - Wine-Commits

Alexandre Julliard : mountmgr: Add requests to query and set shell folder symbolic links.
by Alexandre Julliard Sept. 7, 2021

Sept. 7, 2021

Module: wine Branch: master Commit: 0a8776d455d3f784c357c8e8bbfd2ae91581c4cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a8776d455d3f784c357c8e8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 7 13:18:17 2021 +0200 mountmgr: Add requests to query and set shell folder symbolic links. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/mountmgr.c | 146 +++++++++++++++++++++++++++++++++++++++++++ include/ddk/mountmgr.h | 13 +++- 2 files changed, 157 insertions(+), 2 deletions(-) diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index 1e018a9fc0b..2f669fcc868 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" +#include "wine/port.h" + #ifdef __APPLE__ #include <CoreFoundation/CFString.h> #define LoadResource mac_LoadResource @@ -29,6 +32,9 @@ #include <stdarg.h> #include <unistd.h> +#ifdef HAVE_SYS_STAT_H +#include <sys/stat.h> +#endif #define NONAMELESSUNION @@ -286,6 +292,125 @@ static NTSTATUS define_unix_drive( const void *in_buff, SIZE_T insize ) } } +/* implementation of IOCTL_MOUNTMGR_DEFINE_SHELL_FOLDER */ +static NTSTATUS define_shell_folder( const void *in_buff, SIZE_T insize ) +{ + const struct mountmgr_shell_folder *input = in_buff; + const char *link = NULL; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING name; + NTSTATUS status; + ULONG size = 256; + char *buffer, *backup = NULL; + struct stat st; + unsigned int i; + + if (input->folder_offset >= insize || input->folder_size > insize - input->folder_offset || + input->symlink_offset >= insize) + return STATUS_INVALID_PARAMETER; + + /* make sure string is null-terminated */ + if (input->symlink_offset) + { + link = (const char *)in_buff + input->symlink_offset; + for (i = input->symlink_offset; i < insize; i++) + if (!*((const char *)in_buff + i)) break; + if (i >= insize) return STATUS_INVALID_PARAMETER; + if (!link[0]) link = NULL; + } + + /* ignore nonexistent link targets */ + if (link && stat( link, &st )) return STATUS_OBJECT_NAME_NOT_FOUND; + + name.Buffer = (WCHAR *)((char *)in_buff + input->folder_offset); + name.Length = input->folder_size; + InitializeObjectAttributes( &attr, &name, 0, 0, NULL ); + + for (;;) + { + if (!(buffer = HeapAlloc( GetProcessHeap(), 0, size ))) return STATUS_NO_MEMORY; + status = wine_nt_to_unix_file_name( &attr, buffer, &size, FILE_OPEN ); + if (!status) break; + HeapFree( GetProcessHeap(), 0, buffer ); + if (status != STATUS_BUFFER_TOO_SMALL) return status; + } + + if (!(backup = HeapAlloc( GetProcessHeap(), 0, strlen(buffer) + sizeof(".backup" ) ))) + { + status = STATUS_NO_MEMORY; + goto done; + } + strcpy( backup, buffer ); + 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 ); + } + +done: + HeapFree( GetProcessHeap(), 0, buffer ); + HeapFree( GetProcessHeap(), 0, backup ); + return status; +} + +/* implementation of IOCTL_MOUNTMGR_QUERY_SHELL_FOLDER */ +static NTSTATUS query_shell_folder( void *buff, SIZE_T insize, SIZE_T outsize, IO_STATUS_BLOCK *iosb ) +{ + char *output = buff; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING name; + NTSTATUS status; + ULONG size = 256; + char *buffer; + int ret; + + name.Buffer = buff; + name.Length = insize; + InitializeObjectAttributes( &attr, &name, 0, 0, NULL ); + + for (;;) + { + if (!(buffer = HeapAlloc( GetProcessHeap(), 0, size ))) return STATUS_NO_MEMORY; + status = wine_nt_to_unix_file_name( &attr, buffer, &size, FILE_OPEN ); + if (!status) break; + 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; + + HeapFree( GetProcessHeap(), 0, buffer ); + return status; +} + /* implementation of IOCTL_MOUNTMGR_QUERY_DHCP_REQUEST_PARAMS */ static void WINAPI query_dhcp_request_params( TP_CALLBACK_INSTANCE *instance, void *context ) { @@ -934,6 +1059,27 @@ static NTSTATUS WINAPI mountmgr_ioctl( DEVICE_OBJECT *device, IRP *irp ) irpsp->Parameters.DeviceIoControl.OutputBufferLength, &irp->IoStatus ); break; + case IOCTL_MOUNTMGR_DEFINE_SHELL_FOLDER: + if (irpsp->Parameters.DeviceIoControl.InputBufferLength < sizeof(struct mountmgr_shell_folder)) + { + status = STATUS_INVALID_PARAMETER; + break; + } + irp->IoStatus.Information = 0; + status = define_shell_folder( irp->AssociatedIrp.SystemBuffer, + irpsp->Parameters.DeviceIoControl.InputBufferLength ); + break; + case IOCTL_MOUNTMGR_QUERY_SHELL_FOLDER: + if (irpsp->Parameters.DeviceIoControl.InputBufferLength < sizeof(struct mountmgr_shell_folder)) + { + status = STATUS_INVALID_PARAMETER; + break; + } + status = query_shell_folder( irp->AssociatedIrp.SystemBuffer, + irpsp->Parameters.DeviceIoControl.InputBufferLength, + irpsp->Parameters.DeviceIoControl.OutputBufferLength, + &irp->IoStatus ); + break; case IOCTL_MOUNTMGR_QUERY_DHCP_REQUEST_PARAMS: if (irpsp->Parameters.DeviceIoControl.InputBufferLength < sizeof(struct mountmgr_dhcp_request_params)) { diff --git a/include/ddk/mountmgr.h b/include/ddk/mountmgr.h index 6cf870f4f34..3c82e03ea36 100644 --- a/include/ddk/mountmgr.h +++ b/include/ddk/mountmgr.h @@ -51,8 +51,10 @@ static const WCHAR MOUNTMGR_DOS_DEVICE_NAME[] = {'\\','\\','.','\\','M','o','u', /* Wine extensions */ #ifdef WINE_MOUNTMGR_EXTENSIONS -#define IOCTL_MOUNTMGR_DEFINE_UNIX_DRIVE CTL_CODE(MOUNTMGRCONTROLTYPE, 32, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) -#define IOCTL_MOUNTMGR_QUERY_UNIX_DRIVE CTL_CODE(MOUNTMGRCONTROLTYPE, 33, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_MOUNTMGR_DEFINE_UNIX_DRIVE CTL_CODE(MOUNTMGRCONTROLTYPE, 32, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_MOUNTMGR_QUERY_UNIX_DRIVE CTL_CODE(MOUNTMGRCONTROLTYPE, 33, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_MOUNTMGR_DEFINE_SHELL_FOLDER CTL_CODE(MOUNTMGRCONTROLTYPE, 34, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_MOUNTMGR_QUERY_SHELL_FOLDER CTL_CODE(MOUNTMGRCONTROLTYPE, 35, METHOD_BUFFERED, FILE_READ_ACCESS) enum mountmgr_fs_type { @@ -76,6 +78,13 @@ struct mountmgr_unix_drive USHORT label_offset; }; +struct mountmgr_shell_folder +{ + ULONG folder_offset; + ULONG folder_size; + ULONG symlink_offset; +}; + #define IOCTL_MOUNTMGR_READ_CREDENTIAL CTL_CODE(MOUNTMGRCONTROLTYPE, 48, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_MOUNTMGR_WRITE_CREDENTIAL CTL_CODE(MOUNTMGRCONTROLTYPE, 49, METHOD_BUFFERED, FILE_WRITE_ACCESS) #define IOCTL_MOUNTMGR_DELETE_CREDENTIAL CTL_CODE(MOUNTMGRCONTROLTYPE, 50, METHOD_BUFFERED, FILE_WRITE_ACCESS)

1 0

Zhiyi Zhang : uninstaller: Add system DPI awareness settings to the application manifest.
by Alexandre Julliard Sept. 7, 2021

Sept. 7, 2021

Module: wine Branch: master Commit: ae384e637710d6257bd3fcb5e5104acbf6f2eb4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae384e637710d6257bd3fcb5… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Sep 7 11:11:41 2021 +0800 uninstaller: Add system DPI awareness settings to the application manifest. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/uninstaller/uninstaller.manifest | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/uninstaller/uninstaller.manifest b/programs/uninstaller/uninstaller.manifest index ee41796562e..56595d8a281 100644 --- a/programs/uninstaller/uninstaller.manifest +++ b/programs/uninstaller/uninstaller.manifest @@ -13,4 +13,9 @@ /> </dependentAssembly> </dependency> +<application xmlns="urn:schemas-microsoft-com:asm.v3"> + <windowsSettings> + <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware> + </windowsSettings> +</application> </assembly>

1 0

Zhiyi Zhang : view: Add system DPI awareness settings to the application manifest.
by Alexandre Julliard Sept. 7, 2021

Sept. 7, 2021

Module: wine Branch: master Commit: 0db1d906f52cf25995904cdecd958334a4bbef3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0db1d906f52cf25995904cde… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Sep 7 11:11:51 2021 +0800 view: Add system DPI awareness settings to the application manifest. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/view/view.manifest | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/view/view.manifest b/programs/view/view.manifest index 198ffbfc055..19882bc943f 100644 --- a/programs/view/view.manifest +++ b/programs/view/view.manifest @@ -13,4 +13,9 @@ /> </dependentAssembly> </dependency> +<application xmlns="urn:schemas-microsoft-com:asm.v3"> + <windowsSettings> + <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware> + </windowsSettings> +</application> </assembly>

1 0

Zebediah Figura : server: Make sure that async_request_complete() is called in the case of a failed connection as well.
by Alexandre Julliard Sept. 7, 2021

Sept. 7, 2021

Module: wine Branch: master Commit: 08eaf8f4819ce2dc2c0463817f2e77cc456cdb74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08eaf8f4819ce2dc2c046381… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Sep 6 19:12:22 2021 -0500 server: Make sure that async_request_complete() is called in the case of a failed connection as well. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51726 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/sock.c b/server/sock.c index 3c5f2612b51..6452cfb0dd7 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2905,7 +2905,7 @@ static void poll_socket( struct sock *poll_sock, struct async *async, timeout_t /* FIXME: do other error conditions deserve a similar treatment? */ if (sock->state != SOCK_CONNECTING && sock->errors[AFD_POLL_BIT_CONNECT_ERR] && (mask & AFD_POLL_CONNECT_ERR)) { - req->iosb->status = STATUS_SUCCESS; + signaled = TRUE; output[i].flags |= AFD_POLL_CONNECT_ERR; output[i].status = sock_get_ntstatus( sock->errors[AFD_POLL_BIT_CONNECT_ERR] ); }

1 0

Gerald Pfeifer : nsiproxy: Include sys/param.h from udp.c.
by Alexandre Julliard Sept. 7, 2021

Sept. 7, 2021

Module: wine Branch: master Commit: fa6e791ca55246624ed0c5ad02dbdd6da75ab168 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa6e791ca55246624ed0c5ad… Author: Gerald Pfeifer <gerald(a)FreeBSD.org> Date: Mon Sep 6 20:08:59 2021 +0200 nsiproxy: Include sys/param.h from udp.c. udp.c features specific code to handle versions of FreeBSD past early 12.0 snapshots. This is guarded by a check on __FreeBSD_version which is defined in sys/param.h. Actually including that, like tcp.c already does, activates that check and adjusted code and unbreaks the build. Signed-off-by: Gerald Pfeifer <gerald(a)FreeBSD.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsiproxy.sys/udp.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/nsiproxy.sys/udp.c b/dlls/nsiproxy.sys/udp.c index 112170782f7..a0ace071753 100644 --- a/dlls/nsiproxy.sys/udp.c +++ b/dlls/nsiproxy.sys/udp.c @@ -22,6 +22,10 @@ #include <stdarg.h> #include <stddef.h> +#ifdef HAVE_SYS_PARAM_H +#include <sys/param.h> +#endif + #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> #endif

1 0

Zhiyi Zhang : taskmgr: Add system DPI awareness settings to the application manifest.
by Alexandre Julliard Sept. 7, 2021

Sept. 7, 2021

Module: wine Branch: master Commit: ce9b2911d44f32b53ccede098b93c2ddc4168387 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce9b2911d44f32b53ccede09… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Sep 7 11:11:31 2021 +0800 taskmgr: Add system DPI awareness settings to the application manifest. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/taskmgr/taskmgr.manifest | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/taskmgr/taskmgr.manifest b/programs/taskmgr/taskmgr.manifest index b93212bc931..dc599d1ee9f 100644 --- a/programs/taskmgr/taskmgr.manifest +++ b/programs/taskmgr/taskmgr.manifest @@ -13,4 +13,9 @@ /> </dependentAssembly> </dependency> +<application xmlns="urn:schemas-microsoft-com:asm.v3"> + <windowsSettings> + <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware> + </windowsSettings> +</application> </assembly>

1 0

Zhiyi Zhang : regedit: Add system DPI awareness settings to the application manifest.
by Alexandre Julliard Sept. 7, 2021

Sept. 7, 2021

Module: wine Branch: master Commit: 190467d6af041c3503943bd5de4f892b2d7a3cf7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=190467d6af041c3503943bd5… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Sep 7 11:11:24 2021 +0800 regedit: Add system DPI awareness settings to the application manifest. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regedit.manifest | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/regedit/regedit.manifest b/programs/regedit/regedit.manifest index a2c1a437027..9ffabb0f9db 100644 --- a/programs/regedit/regedit.manifest +++ b/programs/regedit/regedit.manifest @@ -13,4 +13,9 @@ /> </dependentAssembly> </dependency> +<application xmlns="urn:schemas-microsoft-com:asm.v3"> + <windowsSettings> + <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware> + </windowsSettings> +</application> </assembly>

1 0

Zhiyi Zhang : oleview: Add system DPI awareness settings to the application manifest.
by Alexandre Julliard Sept. 7, 2021

Sept. 7, 2021

Module: wine Branch: master Commit: bec770bc949ab53642ae04d639a832b4b941b902 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bec770bc949ab53642ae04d6… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Sep 7 11:11:16 2021 +0800 oleview: Add system DPI awareness settings to the application manifest. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/oleview/oleview.manifest | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/oleview/oleview.manifest b/programs/oleview/oleview.manifest index da8d81cffec..135559d7cbb 100644 --- a/programs/oleview/oleview.manifest +++ b/programs/oleview/oleview.manifest @@ -13,4 +13,9 @@ /> </dependentAssembly> </dependency> +<application xmlns="urn:schemas-microsoft-com:asm.v3"> + <windowsSettings> + <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware> + </windowsSettings> +</application> </assembly>

1 0

Zhiyi Zhang : notepad: Add system DPI awareness settings to the application manifest.
by Alexandre Julliard Sept. 7, 2021

Sept. 7, 2021

Module: wine Branch: master Commit: 3c8bd7c0d0d4dc38568daa13576a36c07cdc49ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c8bd7c0d0d4dc38568daa13… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Sep 7 11:11:04 2021 +0800 notepad: Add system DPI awareness settings to the application manifest. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/notepad/notepad.manifest | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/notepad/notepad.manifest b/programs/notepad/notepad.manifest index 30aa0f3853b..2e50e69399e 100644 --- a/programs/notepad/notepad.manifest +++ b/programs/notepad/notepad.manifest @@ -13,4 +13,9 @@ /> </dependentAssembly> </dependency> +<application xmlns="urn:schemas-microsoft-com:asm.v3"> + <windowsSettings> + <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware> + </windowsSettings> +</application> </assembly>

1 0

Zhiyi Zhang : msinfo32: Add system DPI awareness settings to the application manifest.
by Alexandre Julliard Sept. 7, 2021

Sept. 7, 2021

Module: wine Branch: master Commit: 517eccd0c168dc8cf0c743f5bceee2e1c1b0b607 URL: https://source.winehq.org/git/wine.git/?a=commit;h=517eccd0c168dc8cf0c743f5… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Sep 7 11:10:55 2021 +0800 msinfo32: Add system DPI awareness settings to the application manifest. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/msinfo32/msinfo32.manifest | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/msinfo32/msinfo32.manifest b/programs/msinfo32/msinfo32.manifest index 67eb98a2799..07d174ba19c 100644 --- a/programs/msinfo32/msinfo32.manifest +++ b/programs/msinfo32/msinfo32.manifest @@ -13,4 +13,9 @@ /> </dependentAssembly> </dependency> +<application xmlns="urn:schemas-microsoft-com:asm.v3"> + <windowsSettings> + <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware> + </windowsSettings> +</application> </assembly>

1 0