September 2020 - Wine-Commits

Zebediah Figura : ws2_32: Reimplement WSASocketW() on top of NtOpenFile() and IOCTL_AFD_CREATE.
by Alexandre Julliard Sept. 22, 2020

Sept. 22, 2020

Module: wine Branch: master Commit: 18df4912f455e0fb09b232a409c5825a44ee8f2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=18df4912f455e0fb09b232a4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Sep 19 17:13:37 2020 -0500 ws2_32: Reimplement WSASocketW() on top of NtOpenFile() and IOCTL_AFD_CREATE. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 109 +++++++++++++++++++++++++++++---------------------- 1 file changed, 63 insertions(+), 46 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 4162549d8b..1136ec87b9 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -155,6 +155,7 @@ #define USE_WC_PREFIX /* For CMSG_DATA */ #include "iphlpapi.h" #include "ip2string.h" +#include "wine/afd.h" #include "wine/server.h" #include "wine/debug.h" #include "wine/exception.h" @@ -7593,8 +7594,15 @@ SOCKET WINAPI WSASocketA(int af, int type, int protocol, */ SOCKET WINAPI WSASocketW(int af, int type, int protocol, LPWSAPROTOCOL_INFOW lpProtocolInfo, - GROUP g, DWORD dwFlags) + GROUP g, DWORD flags) { + static const WCHAR afdW[] = {'\\','D','e','v','i','c','e','\\','A','f','d',0}; + struct afd_create_params create_params; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING string; + IO_STATUS_BLOCK io; + NTSTATUS status; + HANDLE handle; SOCKET ret; DWORD err; int unixaf, unixtype, ipxptype = -1; @@ -7605,7 +7613,7 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, */ TRACE("af=%d type=%d protocol=%d protocol_info=%p group=%d flags=0x%x\n", - af, type, protocol, lpProtocolInfo, g, dwFlags ); + af, type, protocol, lpProtocolInfo, g, flags ); if (!num_startup) { @@ -7706,62 +7714,71 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, goto done; } - SERVER_START_REQ( create_socket ) + RtlInitUnicodeString(&string, afdW); + InitializeObjectAttributes(&attr, &string, (flags & WSA_FLAG_NO_HANDLE_INHERIT) ? 0 : OBJ_INHERIT, NULL, NULL); + if ((status = NtOpenFile(&handle, GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, &attr, &io, 0, 0))) { - req->family = unixaf; - req->type = unixtype; - req->protocol = protocol; - req->access = GENERIC_READ|GENERIC_WRITE|SYNCHRONIZE; - req->attributes = (dwFlags & WSA_FLAG_NO_HANDLE_INHERIT) ? 0 : OBJ_INHERIT; - req->flags = dwFlags & ~WSA_FLAG_NO_HANDLE_INHERIT; - err = NtStatusToWSAError( wine_server_call( req ) ); - ret = HANDLE2SOCKET( wine_server_ptr_handle( reply->handle )); + WARN("Failed to create socket, status %#x.\n", status); + WSASetLastError(NtStatusToWSAError(status)); + return INVALID_SOCKET; } - SERVER_END_REQ; - if (ret) - { - TRACE("\tcreated %04lx\n", ret ); - if (ipxptype > 0) - set_ipx_packettype(ret, ipxptype); - if (unixaf == AF_INET || unixaf == AF_INET6) + create_params.family = unixaf; + create_params.type = unixtype; + create_params.protocol = protocol; + create_params.flags = flags & ~WSA_FLAG_NO_HANDLE_INHERIT; + if ((status = NtDeviceIoControlFile(handle, NULL, NULL, NULL, &io, + IOCTL_AFD_CREATE, &create_params, sizeof(create_params), NULL, 0))) + { + WARN("Failed to initialize socket, status %#x.\n", status); + err = NtStatusToWSAError(status); + if (err == WSAEACCES) /* raw socket denied */ { - /* ensure IP_DONTFRAGMENT is disabled for SOCK_DGRAM and SOCK_RAW, enabled for SOCK_STREAM */ - if (unixtype == SOCK_DGRAM || unixtype == SOCK_RAW) /* in Linux the global default can be enabled */ - set_dont_fragment(ret, unixaf == AF_INET6 ? IPPROTO_IPV6 : IPPROTO_IP, FALSE); - else if (unixtype == SOCK_STREAM) - set_dont_fragment(ret, unixaf == AF_INET6 ? IPPROTO_IPV6 : IPPROTO_IP, TRUE); + if (type == SOCK_RAW) + ERR_(winediag)("Failed to create a socket of type SOCK_RAW, this requires special permissions.\n"); + else + ERR_(winediag)("Failed to create socket, this requires special permissions.\n"); } + WSASetLastError(err); + NtClose(handle); + return INVALID_SOCKET; + } + + ret = HANDLE2SOCKET(handle); + TRACE("\tcreated %04lx\n", ret ); + + if (ipxptype > 0) + set_ipx_packettype(ret, ipxptype); + + if (unixaf == AF_INET || unixaf == AF_INET6) + { + /* ensure IP_DONTFRAGMENT is disabled for SOCK_DGRAM and SOCK_RAW, enabled for SOCK_STREAM */ + if (unixtype == SOCK_DGRAM || unixtype == SOCK_RAW) /* in Linux the global default can be enabled */ + set_dont_fragment(ret, unixaf == AF_INET6 ? IPPROTO_IPV6 : IPPROTO_IP, FALSE); + else if (unixtype == SOCK_STREAM) + set_dont_fragment(ret, unixaf == AF_INET6 ? IPPROTO_IPV6 : IPPROTO_IP, TRUE); + } #ifdef IPV6_V6ONLY - if (unixaf == AF_INET6) - { - int fd = get_sock_fd(ret, 0, NULL); - if (fd != -1) - { - /* IPV6_V6ONLY is set by default on Windows */ - int enable = 1; - if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &enable, sizeof(enable))) - WARN("\tsetting IPV6_V6ONLY failed - errno = %i\n", errno); - release_sock_fd(ret, fd); - } - } -#endif - if (!socket_list_add(ret)) + if (unixaf == AF_INET6) + { + int fd = get_sock_fd(ret, 0, NULL); + if (fd != -1) { - CloseHandle(SOCKET2HANDLE(ret)); - return INVALID_SOCKET; + /* IPV6_V6ONLY is set by default on Windows */ + int enable = 1; + if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &enable, sizeof(enable))) + WARN("\tsetting IPV6_V6ONLY failed - errno = %i\n", errno); + release_sock_fd(ret, fd); } - return ret; } - - if (err == WSAEACCES) /* raw socket denied */ +#endif + if (!socket_list_add(ret)) { - if (type == SOCK_RAW) - ERR_(winediag)("Failed to create a socket of type SOCK_RAW, this requires special permissions.\n"); - else - ERR_(winediag)("Failed to create socket, this requires special permissions.\n"); + CloseHandle(handle); + return INVALID_SOCKET; } + return ret; done: WARN("\t\tfailed, error %d!\n", err);

1 0

Gijs Vermeulen : msvcirt: Implement ofstream class.
by Alexandre Julliard Sept. 22, 2020

Sept. 22, 2020

Module: wine Branch: master Commit: d18a9b963081cae4d3e824fa77756f2f9035319c URL: https://source.winehq.org/git/wine.git/?a=commit;h=d18a9b963081cae4d3e824fa… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Tue Sep 22 16:07:55 2020 +0200 msvcirt: Implement ofstream class. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=31342 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 205 ++++++++++++++++++++++- dlls/msvcirt/msvcirt.spec | 72 ++++---- dlls/msvcirt/tests/msvcirt.c | 388 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt20/msvcrt20.spec | 72 ++++---- dlls/msvcrt40/msvcrt40.spec | 72 ++++---- 5 files changed, 699 insertions(+), 110 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d18a9b963081cae4d3e8…

1 0

Michael Stefaniuc : directmanipulation: Print the debug string and not the pointer to it.
by Alexandre Julliard Sept. 22, 2020

Sept. 22, 2020

Module: wine Branch: master Commit: b4c890e37c5d51ee60dd738e5e2ca6dd2e557626 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4c890e37c5d51ee60dd738e… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Sep 21 22:52:31 2020 +0200 directmanipulation: Print the debug string and not the pointer to it. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/directmanipulation/directmanipulation.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/directmanipulation/directmanipulation.c b/dlls/directmanipulation/directmanipulation.c index 987f780c6c..36a863c7c6 100644 --- a/dlls/directmanipulation/directmanipulation.c +++ b/dlls/directmanipulation/directmanipulation.c @@ -363,14 +363,14 @@ static HRESULT WINAPI content_SetContentRect(IDirectManipulationContent *iface, static HRESULT WINAPI content_GetViewport(IDirectManipulationContent *iface, REFIID riid, void **object) { struct primarycontext *This = impl_from_IDirectManipulationContent(iface); - FIXME("%p, %p, %p\n", This, debugstr_guid(riid), object); + FIXME("%p, %s, %p\n", This, debugstr_guid(riid), object); return E_NOTIMPL; } static HRESULT WINAPI content_GetTag(IDirectManipulationContent *iface, REFIID riid, void **object, UINT32 *id) { struct primarycontext *This = impl_from_IDirectManipulationContent(iface); - FIXME("%p, %p, %p, %p\n", This, debugstr_guid(riid), object, id); + FIXME("%p, %s, %p, %p\n", This, debugstr_guid(riid), object, id); return E_NOTIMPL; }

1 0

Michael Stefaniuc : winegstreamer: Drop redundant NULL check before heap_free().
by Alexandre Julliard Sept. 22, 2020

Sept. 22, 2020

Module: wine Branch: master Commit: 60a8f050a5b438ea06898f09d081206977ebde9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=60a8f050a5b438ea06898f09… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Sep 21 22:52:32 2020 +0200 winegstreamer: Drop redundant NULL check before heap_free(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/media_source.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 84ecf305d4..f365c8a182 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -394,8 +394,7 @@ static ULONG WINAPI create_object_context_Release(IUnknown *iface) IPropertyStore_Release(context->props); if (context->stream) IMFByteStream_Release(context->stream); - if (context->url) - heap_free(context->url); + heap_free(context->url); heap_free(context); }

1 0

Alexandre Julliard : ntdll: Don't lock mutexes during process exit.
by Alexandre Julliard Sept. 22, 2020

Sept. 22, 2020

Module: wine Branch: master Commit: 9c8dce215512ac42ed657ce0dd6681712a4c29c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c8dce215512ac42ed657ce0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 22 11:28:41 2020 +0200 ntdll: Don't lock mutexes during process exit. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/process.c | 5 ++--- dlls/ntdll/unix/server.c | 1 + dlls/ntdll/unix/unix_private.h | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 64380aba03..3e0bd02a59 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -1042,7 +1042,6 @@ done: */ NTSTATUS WINAPI NtTerminateProcess( HANDLE handle, LONG exit_code ) { - static BOOL clean_exit; NTSTATUS ret; BOOL self; @@ -1056,8 +1055,8 @@ NTSTATUS WINAPI NtTerminateProcess( HANDLE handle, LONG exit_code ) SERVER_END_REQ; if (self) { - if (!handle) clean_exit = TRUE; - else if (clean_exit) exit_process( exit_code ); + if (!handle) process_exiting = TRUE; + else if (process_exiting) exit_process( exit_code ); else abort_process( exit_code ); } return ret; diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index b9ec66537a..81a903ca77 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -105,6 +105,7 @@ static const char *server_dir; unsigned int server_cpus = 0; BOOL is_wow64 = FALSE; +BOOL process_exiting = FALSE; timeout_t server_start_time = 0; /* time of server startup */ diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index c737a3a842..3d9dca3c51 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -132,6 +132,7 @@ extern char **main_envp DECLSPEC_HIDDEN; extern WCHAR **main_wargv DECLSPEC_HIDDEN; extern unsigned int server_cpus DECLSPEC_HIDDEN; extern BOOL is_wow64 DECLSPEC_HIDDEN; +extern BOOL process_exiting DECLSPEC_HIDDEN; extern HANDLE keyed_event DECLSPEC_HIDDEN; extern timeout_t server_start_time DECLSPEC_HIDDEN; extern sigset_t server_block_set DECLSPEC_HIDDEN; @@ -280,12 +281,12 @@ static inline void *get_signal_stack(void) static inline void mutex_lock( pthread_mutex_t *mutex ) { - pthread_mutex_lock( mutex ); + if (!process_exiting) pthread_mutex_lock( mutex ); } static inline void mutex_unlock( pthread_mutex_t *mutex ) { - pthread_mutex_unlock( mutex ); + if (!process_exiting) pthread_mutex_unlock( mutex ); } #ifndef _WIN64

1 0

Paul Gofman : ntdll/tests: Test named pipe with empty name.
by Alexandre Julliard Sept. 22, 2020

Sept. 22, 2020

Module: wine Branch: master Commit: ba2924a64dee3d672230bc7bf7a60ec6b67c8ab9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba2924a64dee3d672230bc7b… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Sep 21 18:53:47 2020 +0300 ntdll/tests: Test named pipe with empty name. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/pipe.c | 101 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 98 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 4eb957b1c2..9e8b623d75 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -147,7 +147,7 @@ static NTSTATUS create_pipe(PHANDLE handle, ULONG access, ULONG sharing, ULONG o attr.Length = sizeof(attr); attr.RootDirectory = 0; attr.ObjectName = &name; - attr.Attributes = 0x40; /*case insensitive */ + attr.Attributes = OBJ_CASE_INSENSITIVE; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; @@ -188,7 +188,7 @@ static void test_create_invalid(void) attr.Length = sizeof(attr); attr.RootDirectory = 0; attr.ObjectName = &name; - attr.Attributes = 0x40; /*case insensitive */ + attr.Attributes = OBJ_CASE_INSENSITIVE; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; @@ -592,7 +592,7 @@ static void test_filepipeinfo(void) attr.Length = sizeof(attr); attr.RootDirectory = 0; attr.ObjectName = &name; - attr.Attributes = 0x40; /* case insensitive */ + attr.Attributes = OBJ_CASE_INSENSITIVE; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; @@ -2402,6 +2402,100 @@ static void test_security_info(void) HeapFree(GetProcessHeap(), 0, local_sid); } +static void test_empty_name(void) +{ + HANDLE hdirectory, hpipe, hwrite, handle; + OBJECT_ATTRIBUTES attr; + LARGE_INTEGER timeout; + UNICODE_STRING name; + IO_STATUS_BLOCK io; + DWORD data, length; + NTSTATUS status; + BOOL ret; + + hpipe = hwrite = NULL; + + attr.Length = sizeof(attr); + attr.Attributes = OBJ_CASE_INSENSITIVE; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + pRtlInitUnicodeString(&name, L"\\Device\\NamedPipe"); + attr.RootDirectory = 0; + attr.ObjectName = &name; + + status = NtCreateFile(&hdirectory, GENERIC_READ | SYNCHRONIZE, &attr, &io, NULL, 0, + FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, 0, NULL, 0 ); + ok(!status, "Got unexpected status %#x.\n", status); + + name.Buffer = NULL; + name.Length = 0; + name.MaximumLength = 0; + attr.RootDirectory = hdirectory; + + timeout.QuadPart = -(LONG64)10000000; + status = pNtCreateNamedPipeFile(&hpipe, GENERIC_READ | FILE_WRITE_ATTRIBUTES | SYNCHRONIZE, &attr, + &io, FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_CREATE, FILE_SYNCHRONOUS_IO_NONALERT, + 0, 0, 0, 3, 4096, 4096, &timeout); + todo_wine ok(status == STATUS_OBJECT_NAME_INVALID, "Got unexpected status %#x.\n", status); + + CloseHandle(hdirectory); + + pRtlInitUnicodeString(&name, L"\\Device\\NamedPipe\\"); + attr.RootDirectory = 0; + attr.ObjectName = &name; + + status = NtCreateFile(&hdirectory, GENERIC_READ | SYNCHRONIZE, &attr, &io, NULL, 0, + FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, 0, NULL, 0 ); + ok(!status, "Got unexpected status %#x.\n", status); + + name.Buffer = NULL; + name.Length = 0; + name.MaximumLength = 0; + attr.RootDirectory = hdirectory; + + status = pNtCreateNamedPipeFile(&hpipe, GENERIC_READ | SYNCHRONIZE, &attr, + &io, FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_CREATE, FILE_SYNCHRONOUS_IO_NONALERT, + 0, 0, 0, 3, 4096, 4096, &timeout); + todo_wine ok(!status, "Got unexpected status %#x.\n", status); + + status = pNtCreateNamedPipeFile(&handle, GENERIC_READ | SYNCHRONIZE, &attr, + &io, FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_OPEN, FILE_SYNCHRONOUS_IO_NONALERT, + 0, 0, 0, 1, 4096, 4096, &timeout); + todo_wine ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "Got unexpected status %#x.\n", status); + + attr.RootDirectory = hpipe; + status = NtCreateFile(&hwrite, GENERIC_WRITE | FILE_WRITE_ATTRIBUTES | SYNCHRONIZE, &attr, &io, NULL, 0, + FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0 ); + todo_wine ok(!status, "Got unexpected status %#x.\n", status); + + attr.RootDirectory = hpipe; + status = NtCreateFile(&handle, GENERIC_READ | SYNCHRONIZE, &attr, &io, NULL, 0, + FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, + FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0 ); + todo_wine ok(status == STATUS_PIPE_NOT_AVAILABLE, "Got unexpected status %#x.\n", status); + + attr.RootDirectory = hpipe; + status = NtCreateFile(&handle, GENERIC_WRITE | SYNCHRONIZE, &attr, &io, NULL, 0, + FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0 ); + todo_wine ok(status == STATUS_PIPE_NOT_AVAILABLE, "Got unexpected status %#x.\n", status); + + data = 0xdeadbeef; + ret = WriteFile(hwrite, &data, sizeof(data), &length, NULL); + todo_wine ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); + todo_wine ok(length == sizeof(data), "Got unexpected length %#x.\n", length); + + data = 0; + ret = ReadFile(hpipe, &data, sizeof(data), &length, NULL); + todo_wine ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); + todo_wine ok(length == sizeof(data), "Got unexpected length %#x.\n", length); + todo_wine ok(data == 0xdeadbeef, "Got unexpected data %#x.\n", data); + + CloseHandle(hwrite); + CloseHandle(hpipe); + CloseHandle(hdirectory); +} + START_TEST(pipe) { if (!init_func_ptrs()) @@ -2455,6 +2549,7 @@ START_TEST(pipe) test_volume_info(); test_file_info(); test_security_info(); + test_empty_name(); pipe_for_each_state(create_pipe_server, connect_pipe, test_pipe_state); pipe_for_each_state(create_pipe_server, connect_and_write_pipe, test_pipe_with_data_state);

1 0

Zhiyi Zhang : winex11.drv: Sort display modes with orientation considered.
by Alexandre Julliard Sept. 22, 2020

Sept. 22, 2020

Module: wine Branch: master Commit: ec245c7e300f7cb779cf404079872f68c812585e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec245c7e300f7cb779cf4040… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Sep 22 15:01:44 2020 +0800 winex11.drv: Sort display modes with orientation considered. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/settings.c | 42 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 37 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 902f1ec15d..5bbba453b9 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -359,18 +359,50 @@ BOOL get_primary_adapter(WCHAR *name) static int mode_compare(const void *p1, const void *p2) { + DWORD a_width, a_height, b_width, b_height; const DEVMODEW *a = p1, *b = p2; + /* Use the width and height in landscape mode for comparison */ + if (a->u1.s2.dmDisplayOrientation == DMDO_DEFAULT || a->u1.s2.dmDisplayOrientation == DMDO_180) + { + a_width = a->dmPelsWidth; + a_height = a->dmPelsHeight; + } + else + { + a_width = a->dmPelsHeight; + a_height = a->dmPelsWidth; + } + + if (b->u1.s2.dmDisplayOrientation == DMDO_DEFAULT || b->u1.s2.dmDisplayOrientation == DMDO_180) + { + b_width = b->dmPelsWidth; + b_height = b->dmPelsHeight; + } + else + { + b_width = b->dmPelsHeight; + b_height = b->dmPelsWidth; + } + + /* Depth in descending order */ if (a->dmBitsPerPel != b->dmBitsPerPel) return b->dmBitsPerPel - a->dmBitsPerPel; - if (a->dmPelsWidth != b->dmPelsWidth) - return a->dmPelsWidth - b->dmPelsWidth; + /* Width in ascending order */ + if (a_width != b_width) + return a_width - b_width; + + /* Height in ascending order */ + if (a_height != b_height) + return a_height - b_height; - if (a->dmPelsHeight != b->dmPelsHeight) - return a->dmPelsHeight - b->dmPelsHeight; + /* Frequency in descending order */ + if (a->dmDisplayFrequency != b->dmDisplayFrequency) + return b->dmDisplayFrequency - a->dmDisplayFrequency; - return b->dmDisplayFrequency - a->dmDisplayFrequency; + /* Orientation in ascending order */ + return a->u1.s2.dmDisplayOrientation - b->u1.s2.dmDisplayOrientation; } /***********************************************************************

1 0

Zhiyi Zhang : winex11.drv: Support finding a full display mode with specified orientation.
by Alexandre Julliard Sept. 22, 2020

Sept. 22, 2020

Module: wine Branch: master Commit: bbae35f0fb04ea7efb8e1d6e5535e42715ae7766 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbae35f0fb04ea7efb8e1d6e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Sep 22 15:01:54 2020 +0800 winex11.drv: Support finding a full display mode with specified orientation. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/settings.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 5bbba453b9..0fa5bcf629 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -497,7 +497,7 @@ static DEVMODEW *get_full_mode(ULONG_PTR id, DEVMODEW *dev_mode) if (is_detached_mode(dev_mode)) return dev_mode; - if (!handler.get_modes(id, 0, &modes, &mode_count)) + if (!handler.get_modes(id, EDS_ROTATEDMODE, &modes, &mode_count)) return NULL; qsort(modes, mode_count, sizeof(*modes) + modes[0].dmDriverExtra, mode_compare); @@ -519,6 +519,9 @@ static DEVMODEW *get_full_mode(ULONG_PTR id, DEVMODEW *dev_mode) dev_mode->dmDisplayFrequency != 1 && dev_mode->dmDisplayFrequency != found_mode->dmDisplayFrequency) continue; + if (dev_mode->dmFields & DM_DISPLAYORIENTATION && + found_mode->u1.s2.dmDisplayOrientation != dev_mode->u1.s2.dmDisplayOrientation) + continue; break; }

1 0

Zebediah Figura : server: Create the Afd device.
by Alexandre Julliard Sept. 22, 2020

Sept. 22, 2020

Module: wine Branch: master Commit: 3ad1739bc85a69c3a2ee4df2ccc1d7b60b466e9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ad1739bc85a69c3a2ee4df2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Sep 19 17:13:34 2020 -0500 server: Create the Afd device. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/directory.c | 6 +++++- server/file.h | 1 + server/sock.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 64 insertions(+), 1 deletion(-) diff --git a/server/directory.c b/server/directory.c index 198fc48ece..c66d10b192 100644 --- a/server/directory.c +++ b/server/directory.c @@ -373,10 +373,12 @@ void init_directories(void) static const WCHAR mailslotW[] = {'M','a','i','l','S','l','o','t'}; static const WCHAR condrvW[] = {'C','o','n','D','r','v'}; static const WCHAR nullW[] = {'N','u','l','l'}; + static const WCHAR afdW[] = {'A','f','d'}; static const struct unicode_str named_pipe_str = {named_pipeW, sizeof(named_pipeW)}; static const struct unicode_str mailslot_str = {mailslotW, sizeof(mailslotW)}; static const struct unicode_str condrv_str = {condrvW, sizeof(condrvW)}; static const struct unicode_str null_str = {nullW, sizeof(nullW)}; + static const struct unicode_str afd_str = {afdW, sizeof(afdW)}; /* events */ static const WCHAR event_low_memW[] = {'L','o','w','M','e','m','o','r','y','C','o','n','d','i','t','i','o','n'}; @@ -404,7 +406,7 @@ void init_directories(void) struct directory *dir_driver, *dir_device, *dir_global, *dir_kernel; struct object *link_dosdev, *link_global, *link_nul, *link_pipe, *link_mailslot; struct object *link_conin, *link_conout, *link_con; - struct object *named_pipe_device, *mailslot_device, *null_device, *user_data_mapping, *console_device; + struct object *named_pipe_device, *mailslot_device, *null_device, *user_data_mapping, *console_device, *socket_device; struct keyed_event *keyed_event; unsigned int i; @@ -422,11 +424,13 @@ void init_directories(void) named_pipe_device = create_named_pipe_device( &dir_device->obj, &named_pipe_str ); mailslot_device = create_mailslot_device( &dir_device->obj, &mailslot_str ); console_device = create_console_device( &dir_device->obj, &condrv_str ); + socket_device = create_socket_device( &dir_device->obj, &afd_str ); null_device = create_unix_device( &dir_device->obj, &null_str, "/dev/null" ); make_object_static( named_pipe_device ); make_object_static( mailslot_device ); make_object_static( null_device ); make_object_static( console_device ); + make_object_static( socket_device ); /* sessions */ create_session( 0 ); diff --git a/server/file.h b/server/file.h index b02c9fe603..5fb4e5614b 100644 --- a/server/file.h +++ b/server/file.h @@ -179,6 +179,7 @@ extern struct object *create_user_data_mapping( struct object *root, const struc extern struct object *create_named_pipe_device( struct object *root, const struct unicode_str *name ); extern struct object *create_mailslot_device( struct object *root, const struct unicode_str *name ); extern struct object *create_console_device( struct object *root, const struct unicode_str *name ); +extern struct object *create_socket_device( struct object *root, const struct unicode_str *name ); extern struct object *create_unix_device( struct object *root, const struct unicode_str *name, const char *unix_path ); diff --git a/server/sock.c b/server/sock.c index 1a53ce4b09..fa4a8be671 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1164,6 +1164,64 @@ static void sock_release_ifchange( struct sock *sock ) } } +static struct object_type *socket_device_get_type( struct object *obj ); +static void socket_device_dump( struct object *obj, int verbose ); +static struct object *socket_device_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ); +static struct object *socket_device_open_file( struct object *obj, unsigned int access, + unsigned int sharing, unsigned int options ); + +static const struct object_ops socket_device_ops = +{ + sizeof(struct object), /* size */ + socket_device_dump, /* dump */ + socket_device_get_type, /* get_type */ + no_add_queue, /* add_queue */ + NULL, /* remove_queue */ + NULL, /* signaled */ + no_satisfied, /* satisfied */ + no_signal, /* signal */ + no_get_fd, /* get_fd */ + default_fd_map_access, /* map_access */ + default_get_sd, /* get_sd */ + default_set_sd, /* set_sd */ + socket_device_lookup_name, /* lookup_name */ + directory_link_name, /* link_name */ + default_unlink_name, /* unlink_name */ + socket_device_open_file, /* open_file */ + no_kernel_obj_list, /* get_kernel_obj_list */ + no_close_handle, /* close_handle */ + no_destroy /* destroy */ +}; + +static struct object_type *socket_device_get_type( struct object *obj ) +{ + static const WCHAR name[] = {'D','e','v','i','c','e'}; + static const struct unicode_str str = { name, sizeof(name) }; + return get_object_type( &str ); +} + +static void socket_device_dump( struct object *obj, int verbose ) +{ + fputs( "Socket device\n", stderr ); +} + +static struct object *socket_device_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ) +{ + return NULL; +} + +static struct object *socket_device_open_file( struct object *obj, unsigned int access, + unsigned int sharing, unsigned int options ) +{ + set_error( STATUS_NOT_IMPLEMENTED ); + return NULL; +} + +struct object *create_socket_device( struct object *root, const struct unicode_str *name ) +{ + return create_named_object( root, &socket_device_ops, name, 0, NULL ); +} + /* create a socket */ DECL_HANDLER(create_socket) {

1 0

Zebediah Figura : server: Return a new, uninitialized socket when opening the Afd device.
by Alexandre Julliard Sept. 22, 2020

Sept. 22, 2020

Module: wine Branch: master Commit: db8a75312d55480392a8bd9304339b5adba70de4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=db8a75312d55480392a8bd93… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Sep 19 17:13:35 2020 -0500 server: Return a new, uninitialized socket when opening the Afd device. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 63 +++++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 40 insertions(+), 23 deletions(-) diff --git a/server/sock.c b/server/sock.c index fa4a8be671..fd26c6c845 100644 --- a/server/sock.c +++ b/server/sock.c @@ -542,6 +542,8 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) assert( sock->obj.ops == &sock_ops ); + if (get_unix_fd( fd ) == -1) return 0; + switch(code) { case WS_SIO_ADDRESS_LIST_CHANGE: @@ -631,14 +633,19 @@ static void sock_destroy( struct object *obj ) } } -static void init_sock(struct sock *sock) +static struct sock *create_socket(void) { - sock->state = 0; + struct sock *sock; + + if (!(sock = alloc_object( &sock_ops ))) return NULL; + sock->fd = NULL; + sock->state = 0; sock->mask = 0; sock->hmask = 0; sock->pmask = 0; sock->polling = 0; sock->flags = 0; + sock->proto = 0; sock->type = 0; sock->family = 0; sock->event = NULL; @@ -652,12 +659,11 @@ static void init_sock(struct sock *sock) init_async_queue( &sock->write_q ); init_async_queue( &sock->ifchange_q ); memset( sock->errors, 0, sizeof(sock->errors) ); + return sock; } -/* create a new and unconnected socket */ -static struct object *create_socket( int family, int type, int protocol, unsigned int flags ) +static int init_socket( struct sock *sock, int family, int type, int protocol, unsigned int flags ) { - struct sock *sock; int sockfd; sockfd = socket( family, type, protocol ); @@ -665,15 +671,9 @@ static struct object *create_socket( int family, int type, int protocol, unsigne { if (errno == EINVAL) set_win32_error( WSAESOCKTNOSUPPORT ); else set_win32_error( sock_get_error( errno )); - return NULL; + return -1; } fcntl(sockfd, F_SETFL, O_NONBLOCK); /* make socket nonblocking */ - if (!(sock = alloc_object( &sock_ops ))) - { - close( sockfd ); - return NULL; - } - init_sock( sock ); sock->state = (type != SOCK_STREAM) ? (FD_READ|FD_WRITE) : 0; sock->flags = flags; sock->proto = protocol; @@ -683,12 +683,11 @@ static struct object *create_socket( int family, int type, int protocol, unsigne if (!(sock->fd = create_anonymous_fd( &sock_fd_ops, sockfd, &sock->obj, (flags & WSA_FLAG_OVERLAPPED) ? 0 : FILE_SYNCHRONOUS_IO_NONALERT ))) { - release_object( sock ); - return NULL; + return -1; } sock_reselect( sock ); clear_error(); - return &sock->obj; + return 0; } /* accepts a socket and inits it */ @@ -720,6 +719,8 @@ static struct sock *accept_socket( obj_handle_t handle ) if (!sock) return NULL; + if (get_unix_fd( sock->fd ) == -1) return NULL; + if ( sock->deferred ) { acceptsock = sock->deferred; @@ -732,14 +733,13 @@ static struct sock *accept_socket( obj_handle_t handle ) release_object( sock ); return NULL; } - if (!(acceptsock = alloc_object( &sock_ops ))) + if (!(acceptsock = create_socket())) { close( acceptfd ); release_object( sock ); return NULL; } - init_sock( acceptsock ); /* newly created socket gets the same properties of the listening socket */ acceptsock->state = FD_WINE_CONNECTED|FD_READ|FD_WRITE; if (sock->state & FD_WINE_NONBLOCKING) @@ -773,6 +773,9 @@ static int accept_into_socket( struct sock *sock, struct sock *acceptsock ) { int acceptfd; struct fd *newfd; + + if (get_unix_fd( sock->fd ) == -1) return FALSE; + if ( sock->deferred ) { newfd = dup_fd_object( sock->deferred->fd, 0, 0, @@ -1213,8 +1216,15 @@ static struct object *socket_device_lookup_name( struct object *obj, struct unic static struct object *socket_device_open_file( struct object *obj, unsigned int access, unsigned int sharing, unsigned int options ) { - set_error( STATUS_NOT_IMPLEMENTED ); - return NULL; + struct sock *sock; + + if (!(sock = create_socket())) return NULL; + if (!(sock->fd = alloc_pseudo_fd( &sock_fd_ops, &sock->obj, options ))) + { + release_object( sock ); + return NULL; + } + return &sock->obj; } struct object *create_socket_device( struct object *root, const struct unicode_str *name ) @@ -1225,13 +1235,14 @@ struct object *create_socket_device( struct object *root, const struct unicode_s /* create a socket */ DECL_HANDLER(create_socket) { - struct object *obj; + struct sock *sock; reply->handle = 0; - if ((obj = create_socket( req->family, req->type, req->protocol, req->flags )) != NULL) + if ((sock = create_socket()) != NULL) { - reply->handle = alloc_handle( current->process, obj, req->access, req->attributes ); - release_object( obj ); + if (!init_socket( sock, req->family, req->type, req->protocol, req->flags )) + reply->handle = alloc_handle( current->process, &sock->obj, req->access, req->attributes ); + release_object( sock ); } } @@ -1284,6 +1295,7 @@ DECL_HANDLER(set_socket_event) if (!(sock = (struct sock *)get_handle_obj( current->process, req->handle, FILE_WRITE_ATTRIBUTES, &sock_ops))) return; + if (get_unix_fd( sock->fd ) == -1) return; old_event = sock->event; sock->mask = req->mask; sock->hmask &= ~req->mask; /* re-enable held events */ @@ -1316,6 +1328,7 @@ DECL_HANDLER(get_socket_event) if (!(sock = (struct sock *)get_handle_obj( current->process, req->handle, FILE_READ_ATTRIBUTES, &sock_ops ))) return; + if (get_unix_fd( sock->fd ) == -1) return; reply->mask = sock->mask; reply->pmask = sock->pmask; reply->state = sock->state; @@ -1348,6 +1361,8 @@ DECL_HANDLER(enable_socket_event) FILE_WRITE_ATTRIBUTES, &sock_ops))) return; + if (get_unix_fd( sock->fd ) == -1) return; + /* for event-based notification, windows erases stale events */ sock->pmask &= ~req->mask; @@ -1386,6 +1401,8 @@ DECL_HANDLER(get_socket_info) sock = (struct sock *)get_handle_obj( current->process, req->handle, FILE_READ_ATTRIBUTES, &sock_ops ); if (!sock) return; + if (get_unix_fd( sock->fd ) == -1) return; + reply->family = sock->family; reply->type = sock->type; reply->protocol = sock->proto;

1 0