March 2022 - Wine-Commits - list.winehq.org

Stefan Dösinger : wined3d: Use extra bits in the queue head and tail counters.
by Alexandre Julliard March 9, 2022

March 9, 2022

Module: wine Branch: master Commit: e308f53aa6eedef6f86ea39fef463f6932c293ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=e308f53aa6eedef6f86ea39f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Mar 9 13:48:29 2022 +0300 wined3d: Use extra bits in the queue head and tail counters. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 28 ++++++++++++++-------------- dlls/wined3d/wined3d_private.h | 3 ++- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index ce297d724f2..c4d68fd8f4f 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -624,7 +624,7 @@ static const char *debug_cs_op(enum wined3d_cs_op op) static struct wined3d_cs_packet *wined3d_next_cs_packet(const uint8_t *data, SIZE_T *offset) { - struct wined3d_cs_packet *packet = (struct wined3d_cs_packet *)&data[*offset]; + struct wined3d_cs_packet *packet = (struct wined3d_cs_packet *)&data[WINED3D_CS_QUEUE_MASK(*offset)]; *offset += offsetof(struct wined3d_cs_packet, data[packet->size]); @@ -3263,7 +3263,7 @@ static const struct wined3d_device_context_ops wined3d_cs_st_ops = static BOOL wined3d_cs_queue_is_empty(const struct wined3d_cs *cs, const struct wined3d_cs_queue *queue) { wined3d_from_cs(cs); - return *(volatile LONG *)&queue->head == queue->tail; + return *(volatile ULONG *)&queue->head == queue->tail; } static void wined3d_cs_queue_submit(struct wined3d_cs_queue *queue, struct wined3d_cs *cs) @@ -3271,10 +3271,10 @@ static void wined3d_cs_queue_submit(struct wined3d_cs_queue *queue, struct wined struct wined3d_cs_packet *packet; size_t packet_size; - packet = (struct wined3d_cs_packet *)&queue->data[queue->head]; + packet = (struct wined3d_cs_packet *)&queue->data[WINED3D_CS_QUEUE_MASK(queue->head)]; TRACE("Queuing op %s at %p.\n", debug_cs_op(*(const enum wined3d_cs_op *)packet->data), packet); packet_size = FIELD_OFFSET(struct wined3d_cs_packet, data[packet->size]); - InterlockedExchange(&queue->head, (queue->head + packet_size) & (WINED3D_CS_QUEUE_SIZE - 1)); + InterlockedExchange((LONG *)&queue->head, queue->head + packet_size); if (InterlockedCompareExchange(&cs->waiting_for_event, FALSE, TRUE)) SetEvent(cs->event); @@ -3295,6 +3295,7 @@ static void *wined3d_cs_queue_require_space(struct wined3d_cs_queue *queue, size size_t queue_size = ARRAY_SIZE(queue->data); size_t header_size, packet_size, remaining; struct wined3d_cs_packet *packet; + ULONG head = WINED3D_CS_QUEUE_MASK(queue->head); header_size = FIELD_OFFSET(struct wined3d_cs_packet, data[0]); packet_size = FIELD_OFFSET(struct wined3d_cs_packet, data[size]); @@ -3307,7 +3308,7 @@ static void *wined3d_cs_queue_require_space(struct wined3d_cs_queue *queue, size return NULL; } - remaining = queue_size - queue->head; + remaining = queue_size - head; if (remaining < packet_size) { size_t nop_size = remaining - header_size; @@ -3321,19 +3322,19 @@ static void *wined3d_cs_queue_require_space(struct wined3d_cs_queue *queue, size nop->opcode = WINED3D_CS_OP_NOP; wined3d_cs_queue_submit(queue, cs); - assert(!queue->head); + head = WINED3D_CS_QUEUE_MASK(queue->head); + assert(!head); } for (;;) { - LONG tail = *(volatile LONG *)&queue->tail; - LONG head = queue->head; - LONG new_pos; + ULONG tail = WINED3D_CS_QUEUE_MASK(*(volatile ULONG *)&queue->tail); + ULONG new_pos; /* Empty. */ if (head == tail) break; - new_pos = (head + packet_size) & (WINED3D_CS_QUEUE_SIZE - 1); + new_pos = WINED3D_CS_QUEUE_MASK(head + packet_size); /* Head ahead of tail. We checked the remaining size above, so we only * need to make sure we don't make head equal to tail. */ if (head > tail && (new_pos != tail)) @@ -3347,7 +3348,7 @@ static void *wined3d_cs_queue_require_space(struct wined3d_cs_queue *queue, size head, tail, (unsigned long)packet_size); } - packet = (struct wined3d_cs_packet *)&queue->data[queue->head]; + packet = (struct wined3d_cs_packet *)&queue->data[head]; packet->size = size; return packet->data; } @@ -3370,7 +3371,7 @@ static void wined3d_cs_mt_finish(struct wined3d_device_context *context, enum wi if (cs->thread_id == GetCurrentThreadId()) return wined3d_cs_st_finish(context, queue_id); - while (cs->queue[queue_id].head != *(volatile LONG *)&cs->queue[queue_id].tail) + while (cs->queue[queue_id].head != *(volatile ULONG *)&cs->queue[queue_id].tail) YieldProcessor(); } @@ -3496,8 +3497,7 @@ static DWORD WINAPI wined3d_cs_run(void *ctx) TRACE("%s at %p executed.\n", debug_cs_op(opcode), packet); } - tail &= (WINED3D_CS_QUEUE_SIZE - 1); - InterlockedExchange(&queue->tail, tail); + InterlockedExchange((LONG *)&queue->tail, tail); } cs->queue[WINED3D_CS_QUEUE_MAP].tail = cs->queue[WINED3D_CS_QUEUE_MAP].head; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 58ef6764f2d..895f7a76a26 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4904,10 +4904,11 @@ enum wined3d_push_constants #define WINED3D_CS_QUERY_POLL_INTERVAL 10u #define WINED3D_CS_QUEUE_SIZE 0x100000u #define WINED3D_CS_SPIN_COUNT 10000000u +#define WINED3D_CS_QUEUE_MASK(a) ((a) & (WINED3D_CS_QUEUE_SIZE - 1)) struct wined3d_cs_queue { - LONG head, tail; + ULONG head, tail; BYTE data[WINED3D_CS_QUEUE_SIZE]; };

1 0

Paul Gofman : ws2_32: Manage shorter length for SO_REUSEADDR.
by Alexandre Julliard March 9, 2022

March 9, 2022

Module: wine Branch: master Commit: 9a198964f7f97eb011e00ec43d3e2e154d750738 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a198964f7f97eb011e00ec4… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Mar 9 11:59:46 2022 +0300 ws2_32: Manage shorter length for SO_REUSEADDR. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 12 ++++++++++-- dlls/ws2_32/tests/sock.c | 1 + 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 58bb332e5ca..e47e6212d45 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1621,7 +1621,9 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl return server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_RCVTIMEO, optval, optlen ); case SO_REUSEADDR: - return server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_REUSEADDR, optval, optlen ); + ret = server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_REUSEADDR, optval, optlen ); + if (!ret && *optlen < sizeof(DWORD)) *optlen = 1; + return ret; case SO_SNDBUF: return server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_SNDBUF, optval, optlen ); @@ -2877,7 +2879,13 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_RCVTIMEO, optval, optlen ); case SO_REUSEADDR: - return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_REUSEADDR, optval, optlen ); + if (!optval) + { + SetLastError( WSAEFAULT ); + return SOCKET_ERROR; + } + memcpy( &value, optval, min( optlen, sizeof(value) )); + return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_REUSEADDR, (char *)&value, sizeof(value) ); case SO_SNDBUF: return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_SNDBUF, optval, optlen ); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index dde33dc4403..879f03d2e42 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1177,6 +1177,7 @@ static void test_set_getsockopt(void) {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_KEEPALIVE, TRUE, {1, 1, 1}, {0}, TRUE}, {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_DONTROUTE, TRUE, {1, 1, 1}, {0}, TRUE}, {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_RCVTIMEO, FALSE, {1, 2, 4}, {0}, TRUE}, + {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_REUSEADDR, TRUE, {1, 1, 4}, {0, 0xdead0001, 0}, TRUE, TRUE}, {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_SNDTIMEO, FALSE, {1, 2, 4}, {0}, TRUE}, {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_OPENTYPE, FALSE, {1, 2, 4}, {0}, TRUE}, {AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_MULTICAST_LOOP, TRUE, {1, 1, 4}, {0}, TRUE, TRUE},

1 0

Paul Gofman : ws2_32: Manage shorter length for SO_KEEPALIVE.
by Alexandre Julliard March 9, 2022

March 9, 2022

Module: wine Branch: master Commit: f7c48f23e36861d0240afa0898c0631f85e445d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7c48f23e36861d0240afa08… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Mar 9 11:59:41 2022 +0300 ws2_32: Manage shorter length for SO_KEEPALIVE. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 14 +++++++++++++- dlls/ws2_32/tests/sock.c | 1 + 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 31e8be5b6b0..1a0d28c484e 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1525,6 +1525,12 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl return server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_ERROR, optval, optlen ); case SO_KEEPALIVE: + if (*optlen < 1 || !optval) + { + SetLastError( WSAEFAULT ); + return SOCKET_ERROR; + } + *optlen = 1; return server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_KEEPALIVE, optval, optlen ); case SO_LINGER: @@ -2827,7 +2833,13 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int return -1; case SO_KEEPALIVE: - return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_KEEPALIVE, optval, optlen ); + if (optlen <= 0 || !optval) + { + SetLastError( optlen ? WSAENOBUFS : WSAEFAULT ); + return SOCKET_ERROR; + } + value = *optval; + return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_KEEPALIVE, (char *)&value, sizeof(value) ); case SO_LINGER: return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_LINGER, optval, optlen ); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 3da68b0e4a8..a6505134d44 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1171,6 +1171,7 @@ static void test_set_getsockopt(void) { {AF_INET, SOCK_DGRAM, SOL_SOCKET, SO_BROADCAST, TRUE, {1, 1, 4}, {0, 0xdead0001, 0}, TRUE, TRUE}, {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_DONTLINGER, TRUE, {1, 1, 4}, {0, 0xdead0001, 0}, TRUE, TRUE}, + {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_KEEPALIVE, TRUE, {1, 1, 1}, {0}, TRUE}, {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_DONTROUTE, TRUE, {1, 1, 1}, {0}, TRUE}, {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_RCVTIMEO, FALSE, {1, 2, 4}, {0}, TRUE}, {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_SNDTIMEO, FALSE, {1, 2, 4}, {0}, TRUE},

1 0

Bernhard Kölbl : windows.media.speech: Create private header.
by Alexandre Julliard March 9, 2022

March 9, 2022

Module: wine Branch: master Commit: 22690a80ccb899d613cdfc517779a6512aefc18c URL: https://source.winehq.org/git/wine.git/?a=commit;h=22690a80ccb899d613cdfc51… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Wed Mar 9 18:45:29 2022 +0100 windows.media.speech: Create private header. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.speech/main.c | 17 ++------------- dlls/windows.media.speech/private.h | 41 +++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 15 deletions(-) diff --git a/dlls/windows.media.speech/main.c b/dlls/windows.media.speech/main.c index d14d06773f7..94e6e5f9b2c 100644 --- a/dlls/windows.media.speech/main.c +++ b/dlls/windows.media.speech/main.c @@ -17,23 +17,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winstring.h" -#include "wine/debug.h" -#include "objbase.h" - #include "initguid.h" -#include "activation.h" +#include "private.h" -#define WIDL_using_Windows_Foundation -#define WIDL_using_Windows_Foundation_Collections -#include "windows.foundation.h" -#define WIDL_using_Windows_Media_SpeechSynthesis -#include "windows.media.speechsynthesis.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(speech); diff --git a/dlls/windows.media.speech/private.h b/dlls/windows.media.speech/private.h new file mode 100644 index 00000000000..0af024d0a72 --- /dev/null +++ b/dlls/windows.media.speech/private.h @@ -0,0 +1,41 @@ +/* WinRT Windows.Media.Speech private header + * + * Copyright 2022 Bernhard Kölbl + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_WINDOWS_MEDIA_SPEECH_PRIVATE_H +#define __WINE_WINDOWS_MEDIA_SPEECH_PRIVATE_H + +#include <stdarg.h> + +#define COBJMACROS +#include "windef.h" +#include "winbase.h" +#include "winstring.h" +#include "objbase.h" + +#include "activation.h" + +#define WIDL_using_Windows_Foundation +#define WIDL_using_Windows_Foundation_Collections +#include "windows.foundation.h" +#define WIDL_using_Windows_Globalization +#include "windows.globalization.h" +#define WIDL_using_Windows_Media_SpeechSynthesis +#include "windows.media.speechsynthesis.h" + +#endif

1 0

Stefan Dösinger : wined3d: Remove the no-op wined3d_resource_release.
by Alexandre Julliard March 9, 2022

March 9, 2022

Module: wine Branch: master Commit: 10baf0cb9ee01d25e4a814e956e79140b6abd1e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=10baf0cb9ee01d25e4a814e9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Mar 9 13:48:31 2022 +0300 wined3d: Remove the no-op wined3d_resource_release. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 138 ++--------------------------------------- dlls/wined3d/resource.c | 1 - dlls/wined3d/wined3d_private.h | 4 -- 3 files changed, 5 insertions(+), 138 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=10baf0cb9ee01d25e4a8…

1 0

Jacek Caban : win32u: Move GetClientRect implementation from user32.
by Alexandre Julliard March 9, 2022

March 9, 2022

Module: wine Branch: master Commit: fd5849382a1ddfa9798ca418397e3fcf5a094ef1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd5849382a1ddfa9798ca418… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 9 15:22:49 2022 +0100 win32u: Move GetClientRect implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winpos.c | 2 +- dlls/win32u/window.c | 8 ++++++++ include/ntuser.h | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index ba46440bc36..1387552ca55 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -225,7 +225,7 @@ int WINAPI SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL bRedraw ) */ BOOL WINAPI GetClientRect( HWND hwnd, LPRECT rect ) { - return WIN_GetRectangles( hwnd, COORDS_CLIENT, NULL, rect ); + return NtUserCallHwndParam( hwnd, (UINT_PTR)rect, NtUserGetClientRect ); } diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 19b2b4335f8..abfc19de40a 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -1139,6 +1139,12 @@ BOOL get_window_rect( HWND hwnd, RECT *rect ) return get_window_rects( hwnd, COORDS_SCREEN, rect, NULL, get_thread_dpi() ); } +/* see GetClientRect */ +static BOOL get_client_rect( HWND hwnd, RECT *rect ) +{ + return get_window_rects( hwnd, COORDS_CLIENT, NULL, rect, get_thread_dpi() ); +} + /* see GetWindowInfo */ static BOOL get_window_info( HWND hwnd, WINDOWINFO *info ) { @@ -1357,6 +1363,8 @@ ULONG_PTR WINAPI NtUserCallHwndParam( HWND hwnd, DWORD_PTR param, DWORD code ) return get_class_long_ptr( hwnd, param, FALSE ); case NtUserGetClassWord: return get_class_word( hwnd, param ); + case NtUserGetClientRect: + return get_client_rect( hwnd, (RECT *)param ); case NtUserGetWindowInfo: return get_window_info( hwnd, (WINDOWINFO *)param ); case NtUserGetWindowLongA: diff --git a/include/ntuser.h b/include/ntuser.h index 5192bd63a90..547471daf69 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -160,6 +160,7 @@ enum NtUserGetClassLongPtrA, NtUserGetClassLongPtrW, NtUserGetClassWord, + NtUserGetClientRect, NtUserGetWindowInfo, NtUserGetWindowLongA, NtUserGetWindowLongW,

1 0

Paul Gofman : ws2_32: Manage shorter length for SO_RCVBUF.
by Alexandre Julliard March 9, 2022

March 9, 2022

Module: wine Branch: master Commit: d5f79cbfaa22f29a5fc108c5d0dc4aed195b07f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5f79cbfaa22f29a5fc108c5… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Mar 9 11:59:45 2022 +0300 ws2_32: Manage shorter length for SO_RCVBUF. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 7 +++++++ dlls/ws2_32/tests/sock.c | 1 + 2 files changed, 8 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index f440d7b0abd..58bb332e5ca 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1609,6 +1609,12 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl } case SO_RCVBUF: + if (*optlen < sizeof(DWORD) || !optval) + { + if (optval) memset( optval, 0, *optlen ); + SetLastError( WSAEFAULT ); + return SOCKET_ERROR; + } return server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_RCVBUF, optval, optlen ); case SO_RCVTIMEO: @@ -2863,6 +2869,7 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_OOBINLINE, (char *)&value, sizeof(value) ); case SO_RCVBUF: + if (optlen < 0) optlen = 4; return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_RCVBUF, optval, optlen ); case SO_RCVTIMEO: diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 7d0fd60522f..dde33dc4403 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1173,6 +1173,7 @@ static void test_set_getsockopt(void) {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_DONTLINGER, TRUE, {1, 1, 4}, {0, 0xdead0001, 0}, TRUE, TRUE}, {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_LINGER, FALSE, {1, 2, 4}, {0xdeadbe00, 0xdead0000}, TRUE}, {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_OOBINLINE, TRUE, {1, 1, 4}, {0, 0xdead0001, 0}, TRUE, TRUE}, + {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_RCVBUF, FALSE, {1, 2, 4}, {0xdeadbe00, 0xdead0000}, TRUE}, {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_KEEPALIVE, TRUE, {1, 1, 1}, {0}, TRUE}, {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_DONTROUTE, TRUE, {1, 1, 1}, {0}, TRUE}, {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_RCVTIMEO, FALSE, {1, 2, 4}, {0}, TRUE},

1 0

Jacek Caban : win32u: Move GetWindowInfo implementation from user32.
by Alexandre Julliard March 9, 2022

March 9, 2022

Module: wine Branch: master Commit: 441522add7943e0bfa3cbd81a9d8f93062ba2b6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=441522add7943e0bfa3cbd81… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 9 15:22:39 2022 +0100 win32u: Move GetWindowInfo implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 21 ++------------------- dlls/win32u/input.c | 8 ++++++++ dlls/win32u/win32u_private.h | 1 + dlls/win32u/window.c | 20 ++++++++++++++++++++ include/ntuser.h | 1 + 5 files changed, 32 insertions(+), 19 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 98396293912..bb792037640 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3214,26 +3214,9 @@ UINT WINAPI GetWindowModuleFileNameW( HWND hwnd, LPWSTR module, UINT size ) * * Note: tests show that Windows doesn't check cbSize of the structure. */ -BOOL WINAPI DECLSPEC_HOTPATCH GetWindowInfo( HWND hwnd, PWINDOWINFO pwi) +BOOL WINAPI DECLSPEC_HOTPATCH GetWindowInfo( HWND hwnd, WINDOWINFO *info ) { - RECT rcWindow, rcClient; - - if (!WIN_GetRectangles( hwnd, COORDS_SCREEN, &rcWindow, &rcClient )) return FALSE; - if (!pwi) return FALSE; - - pwi->rcWindow = rcWindow; - pwi->rcClient = rcClient; - pwi->dwStyle = GetWindowLongW(hwnd, GWL_STYLE); - pwi->dwExStyle = GetWindowLongW(hwnd, GWL_EXSTYLE); - pwi->dwWindowStatus = ((GetActiveWindow() == hwnd) ? WS_ACTIVECAPTION : 0); - - pwi->cxWindowBorders = pwi->rcClient.left - pwi->rcWindow.left; - pwi->cyWindowBorders = pwi->rcWindow.bottom - pwi->rcClient.bottom; - - pwi->atomWindowType = GetClassLongW( hwnd, GCW_ATOM ); - pwi->wCreatorVersion = 0x0400; - - return TRUE; + return NtUserCallHwndParam( hwnd, (UINT_PTR)info, NtUserGetWindowInfo ); } /****************************************************************************** diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index 72af32fd471..71f30e7ae20 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -1078,3 +1078,11 @@ HWND WINAPI NtUserGetForegroundWindow(void) SERVER_END_REQ; return ret; } + +/* see GetActiveWindow */ +HWND get_active_window(void) +{ + GUITHREADINFO info; + info.cbSize = sizeof(info); + return NtUserGetGUIThreadInfo( GetCurrentThreadId(), &info ) ? info.hwndActive : 0; +} diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 988a009d874..7c8134367c2 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -275,6 +275,7 @@ extern BOOL unhook_windows_hook( INT id, HOOKPROC proc ) DECLSPEC_HIDDEN; /* input.c */ extern LONG global_key_state_counter DECLSPEC_HIDDEN; +extern HWND get_active_window(void) DECLSPEC_HIDDEN; extern BOOL get_cursor_pos( POINT *pt ) DECLSPEC_HIDDEN; extern DWORD get_input_state(void) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 84aa052a231..19b2b4335f8 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -1139,6 +1139,24 @@ BOOL get_window_rect( HWND hwnd, RECT *rect ) return get_window_rects( hwnd, COORDS_SCREEN, rect, NULL, get_thread_dpi() ); } +/* see GetWindowInfo */ +static BOOL get_window_info( HWND hwnd, WINDOWINFO *info ) +{ + + if (!info || !get_window_rects( hwnd, COORDS_SCREEN, &info->rcWindow, + &info->rcClient, get_thread_dpi() )) + return FALSE; + + info->dwStyle = get_window_long( hwnd, GWL_STYLE ); + info->dwExStyle = get_window_long( hwnd, GWL_EXSTYLE ); + info->dwWindowStatus = get_active_window() == hwnd ? WS_ACTIVECAPTION : 0; + info->cxWindowBorders = info->rcClient.left - info->rcWindow.left; + info->cyWindowBorders = info->rcWindow.bottom - info->rcClient.bottom; + info->atomWindowType = get_class_long( hwnd, GCW_ATOM, FALSE ); + info->wCreatorVersion = 0x0400; + return TRUE; +} + /***************************************************************************** * NtUserGetLayeredWindowAttributes (win32u.@) */ @@ -1339,6 +1357,8 @@ ULONG_PTR WINAPI NtUserCallHwndParam( HWND hwnd, DWORD_PTR param, DWORD code ) return get_class_long_ptr( hwnd, param, FALSE ); case NtUserGetClassWord: return get_class_word( hwnd, param ); + case NtUserGetWindowInfo: + return get_window_info( hwnd, (WINDOWINFO *)param ); case NtUserGetWindowLongA: return get_window_long_size( hwnd, param, sizeof(LONG), TRUE ); case NtUserGetWindowLongW: diff --git a/include/ntuser.h b/include/ntuser.h index f5911d112a2..5192bd63a90 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -160,6 +160,7 @@ enum NtUserGetClassLongPtrA, NtUserGetClassLongPtrW, NtUserGetClassWord, + NtUserGetWindowInfo, NtUserGetWindowLongA, NtUserGetWindowLongW, NtUserGetWindowLongPtrA,

1 0

Eric Pouech : vbscript/tests: Enable compilation with long types.
by Alexandre Julliard March 9, 2022

March 9, 2022

Module: wine Branch: master Commit: e9ef4df8c84c3d1d33dbc04142b22eaabea9b624 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9ef4df8c84c3d1d33dbc041… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 8 09:31:11 2022 +0100 vbscript/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/Makefile.in | 1 - dlls/vbscript/tests/createobj.c | 84 ++--- dlls/vbscript/tests/run.c | 380 ++++++++++----------- dlls/vbscript/tests/vbscript.c | 738 ++++++++++++++++++++-------------------- 4 files changed, 601 insertions(+), 602 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e9ef4df8c84c3d1d33db…

1 0

Jacek Caban : win32u: Move GetDpiForWindow from user32.
by Alexandre Julliard March 9, 2022

March 9, 2022

Module: wine Branch: master Commit: 6c8cac10ef9d6b38a7db8a23e6ce47e3a9b91bb9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c8cac10ef9d6b38a7db8a23… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 9 15:22:07 2022 +0100 win32u: Move GetDpiForWindow from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 30 +----------------------------- dlls/win32u/sysparams.c | 9 +++++++++ dlls/win32u/win32u_private.h | 1 + dlls/win32u/window.c | 36 ++++++++++++++++++++++++++++++++++++ include/ntuser.h | 1 + 5 files changed, 48 insertions(+), 29 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 48541c19a66..98396293912 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2099,35 +2099,7 @@ DPI_AWARENESS_CONTEXT WINAPI GetWindowDpiAwarenessContext( HWND hwnd ) */ UINT WINAPI GetDpiForWindow( HWND hwnd ) { - WND *win; - UINT ret = 0; - - if (!(win = WIN_GetPtr( hwnd ))) - { - SetLastError( ERROR_INVALID_WINDOW_HANDLE ); - return 0; - } - if (win == WND_DESKTOP) - { - POINT pt = { 0, 0 }; - return get_monitor_dpi( MonitorFromPoint( pt, MONITOR_DEFAULTTOPRIMARY )); - } - if (win != WND_OTHER_PROCESS) - { - ret = win->dpi; - if (!ret) ret = get_win_monitor_dpi( hwnd ); - WIN_ReleasePtr( win ); - } - else - { - SERVER_START_REQ( get_window_info ) - { - req->handle = wine_server_user_handle( hwnd ); - if (!wine_server_call_err( req )) ret = reply->dpi; - } - SERVER_END_REQ; - } - return ret; + return NtUserCallHwnd( hwnd, NtUserGetDpiForWindow ); } diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index c1a5470d9c1..3bcc2df007a 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1379,6 +1379,15 @@ UINT get_monitor_dpi( HMONITOR monitor ) return system_dpi; } +/********************************************************************** + * get_win_monitor_dpi + */ +UINT get_win_monitor_dpi( HWND hwnd ) +{ + /* FIXME: use the monitor DPI instead */ + return system_dpi; +} + /********************************************************************** * get_thread_dpi_awareness */ diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 131e177a397..42426a512f0 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -284,6 +284,7 @@ extern LRESULT send_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) /* sysparams.c */ extern RECT get_display_rect( const WCHAR *display ) DECLSPEC_HIDDEN; extern UINT get_monitor_dpi( HMONITOR monitor ) DECLSPEC_HIDDEN; +extern UINT get_win_monitor_dpi( HWND hwnd ) DECLSPEC_HIDDEN; extern UINT get_system_dpi(void) DECLSPEC_HIDDEN; extern int get_system_metrics( int index ) DECLSPEC_HIDDEN; extern UINT get_thread_dpi(void) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index ce03df84994..8aa794421d2 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -708,6 +708,40 @@ static DPI_AWARENESS_CONTEXT get_window_dpi_awareness_context( HWND hwnd ) return ret; } +/* see GetDpiForWindow */ +static UINT get_dpi_for_window( HWND hwnd ) +{ + WND *win; + UINT ret = 0; + + if (!(win = get_win_ptr( hwnd ))) + { + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + return 0; + } + if (win == WND_DESKTOP) + { + POINT pt = { 0, 0 }; + return get_monitor_dpi( monitor_from_point( pt, MONITOR_DEFAULTTOPRIMARY, 0 )); + } + if (win != WND_OTHER_PROCESS) + { + ret = win->dpi; + if (!ret) ret = get_win_monitor_dpi( hwnd ); + release_win_ptr( win ); + } + else + { + SERVER_START_REQ( get_window_info ) + { + req->handle = wine_server_user_handle( hwnd ); + if (!wine_server_call_err( req )) ret = reply->dpi; + } + SERVER_END_REQ; + } + return ret; +} + static LONG_PTR get_win_data( const void *ptr, UINT size ) { if (size == sizeof(WORD)) @@ -1115,6 +1149,8 @@ ULONG_PTR WINAPI NtUserCallHwnd( HWND hwnd, DWORD code ) { switch (code) { + case NtUserGetDpiForWindow: + return get_dpi_for_window( hwnd ); case NtUserGetParent: return HandleToUlong( get_parent( hwnd )); case NtUserGetWindowDpiAwarenessContext: diff --git a/include/ntuser.h b/include/ntuser.h index f45d0e8641c..20c8c2876f0 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -141,6 +141,7 @@ enum /* NtUserCallHwnd codes, not compatible with Windows */ enum { + NtUserGetDpiForWindow, NtUserGetParent, NtUserGetWindowDpiAwarenessContext, NtUserGetWindowTextLength,

1 0